diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 222232e0bc..4925ba0bfe 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -29,7 +29,7 @@
 	<string name="later">لاحقا</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">البحث</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">ابحث في الخريطة</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">التطبيق أو جميع خدمات تحديد المواقع معطلة لديك في الوقت الحالي. الرجاء تفعيلها في الإعدادات.</string>
@@ -363,7 +363,7 @@
 	<string name="editor_example_values">أمثلة على القيم</string>
 	<string name="editor_correct_mistake">تصحيح الخطأ</string>
 	<string name="editor_add_select_location">الموقع</string>
-	<string name="editor_report_problem_desription_1">يرجى وصف المشكلة بالتفاصيل حتى يتسنى لفريق OpenStreeMap إصلاح الخطأ.</string>
+	<string name="editor_report_problem_desription_1">يرجى وصف المشكلة بالتفاصيل حتى يتسنى لفريق OpenStreetMap إصلاح الخطأ.</string>
 	<string name="editor_report_problem_desription_2">أو افعل ذلك بنفسك من خلال الموقع https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">إرسال</string>
 	<string name="editor_report_problem_title">مشكلة</string>
@@ -450,6 +450,7 @@
 	<string name="kilometer">كم</string>
 	<string name="kilometers_per_hour">كم/ساعة</string>
 	<string name="mile">ميل</string>
+	<!-- A unit of measure -->
 	<string name="foot">قدم</string>
 	<string name="miles_per_hour">ميل/ساعة</string>
 	<string name="hour">س</string>
@@ -547,6 +548,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">المسارات %d</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">إعدادات التتبع</string>
 	<string name="crash_reports">تقرير الحادث</string>
 	<string name="crash_reports_description">قد نستخدم بياناتك لتحسين تجربة Organic Maps. سوف تكون التغييرات نافذة المفعول بعد إعادة تشغيل التطبيق.</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 1f0aa13e4b..e2c274cfd5 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -30,7 +30,7 @@
 	<string name="later">Потым</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Шукаць</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Шукаць на мапе</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">У вас выключана геалакацыя для гэтай прылады альбо дадатку. Калі ласка, уключыце яе ў Наладах.</string>
@@ -460,6 +460,7 @@
 	<string name="kilometer">км</string>
 	<string name="kilometers_per_hour">км/г</string>
 	<string name="mile">міля</string>
+	<!-- A unit of measure -->
 	<string name="foot">фут</string>
 	<string name="miles_per_hour">міль/г</string>
 	<string name="hour">г</string>
@@ -565,6 +566,7 @@
 	  <item quantity="one">%d сцежка</item>
 	  <item quantity="other">%d сцежак</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Налады адсочвання</string>
 	<string name="crash_reports">Справаздача аб памылцы</string>
 	<string name="crash_reports_description">Мы можам выкарыстоўваць вашы дадзеныя, каб палепшыць Organic Maps. Змены набудуць сілу пасля перапуску дататка.</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index bfa030ae20..a40e5f3fd2 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -30,7 +30,7 @@
 	<string name="later">По-късно</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Търсене</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Търсене в карта</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">В момента всички услуги за местоположение за това устройство или приложение са деактивирани. Моля, разрешете ги в Настройки.</string>
@@ -352,7 +352,7 @@
 	<string name="editor_example_values">Примерни стойности</string>
 	<string name="editor_correct_mistake">Поправяне на грешка</string>
 	<string name="editor_add_select_location">Местоположение</string>
-	<string name="editor_report_problem_desription_1">Моля, опишете подробно проблема, за да може общността на OpenStreeMap да отстрани грешката.</string>
+	<string name="editor_report_problem_desription_1">Моля, опишете подробно проблема, за да може общността на OpenStreetMap да отстрани грешката.</string>
 	<string name="editor_report_problem_desription_2">Или го направете сами на https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Изпращане</string>
 	<string name="editor_report_problem_title">Проблем</string>
@@ -438,6 +438,7 @@
 	<string name="meter">м</string>
 	<string name="kilometer">км</string>
 	<string name="mile">ми</string>
+	<!-- A unit of measure -->
 	<string name="foot">фут</string>
 	<string name="hour">ч</string>
 	<string name="minute">мин</string>
@@ -539,6 +540,7 @@
 	  <item quantity="one">%d пътека</item>
 	  <item quantity="other">%d пътеки</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Настройки за проследяване</string>
 	<string name="crash_reports">Доклад за срив</string>
 	<string name="crash_reports_description">Можем да използваме данни ви, за да подобрим изживяването с Organic Maps. Промените ще влязат в сила, след рестартиране на приложението.</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 4c1904dcf9..020ae8dca7 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">Později</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Hledat</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Prohledat mapu</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Aktuálně máte všechny možnosti pro určování polohy vypnuté. Prosím, povolte je v Nastavení.</string>
@@ -361,7 +361,7 @@
 	<string name="editor_example_values">Vzorové hodnoty</string>
 	<string name="editor_correct_mistake">Opravit chybu</string>
 	<string name="editor_add_select_location">Umístění</string>
-	<string name="editor_report_problem_desription_1">Popište prosím detailně problém, aby vám komunita OpenStreeMap mohla pomoct opravit chybu.</string>
+	<string name="editor_report_problem_desription_1">Popište prosím detailně problém, aby vám komunita OpenStreetMap mohla pomoct opravit chybu.</string>
 	<string name="editor_report_problem_desription_2">Nebo to udělejte sami na https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Odeslat</string>
 	<string name="editor_report_problem_title">Problém</string>
@@ -448,6 +448,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mil</string>
+	<!-- A unit of measure -->
 	<string name="foot">stopa</string>
 	<string name="miles_per_hour">mil/h</string>
 	<string name="hour">hod</string>
@@ -547,6 +548,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d cest</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Natavení doprovodu</string>
 	<string name="crash_reports">Zprávy o chybách</string>
 	<string name="crash_reports_description">Můžeme používat vaše údaje pro vývoj a zlepšení Organic Maps. Změny se projeví po restartování aplikace.</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 9b7aacbf87..cc3a23369b 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">Senere</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Søg</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Søg kort</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Du har alle lokationstjenester for denne enhed eller applikation slukket. Slå dem venligst til i Indstillinger.</string>
@@ -448,6 +448,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/t</string>
 	<string name="mile">mil</string>
+	<!-- A unit of measure -->
 	<string name="foot">fod</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">time</string>
@@ -546,6 +547,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d ruter</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Tracking-indstillinger</string>
 	<string name="crash_reports">Nedbrudsrapport</string>
 	<string name="crash_reports_description">Vi kan anvende dine data til at forbedre brugeroplevelsen på Organic Maps. Ændringerne træder i kraft, når du har genstartet appen.</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 29c6123fa6..5341e45651 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -29,7 +29,7 @@
 	<string name="later">Später</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Suche</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Auf der Karte suchen</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Ortungsdienste sind für dieses Gerät oder die App deaktiviert. Bitte aktivieren Sie diese in den Einstellungen.</string>
@@ -367,7 +367,7 @@
 	<string name="editor_example_values">Beispiele</string>
 	<string name="editor_correct_mistake">Fehler korrigieren</string>
 	<string name="editor_add_select_location">Position</string>
-	<string name="editor_report_problem_desription_1">Bitte beschreiben Sie das Problem detailliert, damit die OpenStreeMap-Gemeinschaft den Fehler beheben kann.</string>
+	<string name="editor_report_problem_desription_1">Bitte beschreiben Sie das Problem detailliert, damit die OpenStreetMap-Gemeinschaft den Fehler beheben kann.</string>
 	<string name="editor_report_problem_desription_2">Oder kümmern Sie sich selbst darum auf https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Senden</string>
 	<string name="editor_report_problem_title">Problem</string>
@@ -455,6 +455,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km / h</string>
 	<string name="mile">mi</string>
+	<!-- A unit of measure -->
 	<string name="foot">ft</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">h</string>
@@ -559,6 +560,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d Strecken</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Einstellungen der Begleitung</string>
 	<string name="crash_reports">Berichte über die Fehler</string>
 	<string name="crash_reports_description">Wir können Ihre Daten benutzen, um Organic Maps zu entwickeln und zu verbessern. Die Änderungen werden nach dem Neustart der App in Kraft treten.</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 365e4f6039..c056a53863 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -28,7 +28,7 @@
 	<string name="later">Αργότερα</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Αναζήτηση</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Αναζήτηση χάρτη</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Οι υπηρεσίες εντοπισμού τοποθεσίας είναι προς το παρόν απενεργοποιημένες σε αυτή τη συσκευή ή για αυτή την εφαρμογή. Ενεργοποιήστε τις από τις Ρυθμίσεις.</string>
@@ -364,7 +364,7 @@
 	<string name="editor_example_values">Παράδειγμα τιμών</string>
 	<string name="editor_correct_mistake">Διόρθωση λάθους</string>
 	<string name="editor_add_select_location">Τοποθεσία</string>
-	<string name="editor_report_problem_desription_1">Περιγράψτε το πρόβλημα αναλυτικά ώστε η Κοινότητα OpenStreeMap να διορθώσει το σφάλμα.</string>
+	<string name="editor_report_problem_desription_1">Περιγράψτε το πρόβλημα αναλυτικά ώστε η Κοινότητα OpenStreetMap να διορθώσει το σφάλμα.</string>
 	<string name="editor_report_problem_desription_2">Ή κάντε το μόνοι σας στη διεύθυνση https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Αποστολή</string>
 	<string name="editor_report_problem_title">Πρόβλημα</string>
@@ -539,6 +539,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d διαδρομές</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Ρυθμίσεις διαδρομών</string>
 	<string name="crash_reports">Αναφορά σφάλματος</string>
 	<string name="crash_reports_description">Μπορεί να χρησιμοποιήσουμε τα δεδομένα σας για να βελτιώσουμε την εμπειρία του Organic Maps. Οι αλλαγές θα ενεργοποιηθούν μετά την επανεκκίνηση της εφαρμογής.</string>
diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index b041156c57..6678f809eb 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -79,6 +79,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d rastreos</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Configuraciones de rastreo</string>
 	<string name="crash_reports">Reporte de fallas</string>
 	<string name="crash_reports_description">Puede que utilicemos sus datos para mejorar la experiencia de Organic Maps. Los cambios surtirán efecto después de que reinicie la aplicación.</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 8bd64a0d69..3e263727a1 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">Luego</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Buscar</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Buscar en el mapa</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">No se puede acceder a los servicios de localización. Por favor, activelo en los ajustes.</string>
@@ -366,7 +366,7 @@
 	<string name="editor_example_values">Valores de ejemplo</string>
 	<string name="editor_correct_mistake">Corregir error</string>
 	<string name="editor_add_select_location">Ubicación</string>
-	<string name="editor_report_problem_desription_1">Por favor, describe el problema en detalle para que la comunidad de OpenStreeMap pueda corregir el error.</string>
+	<string name="editor_report_problem_desription_1">Por favor, describe el problema en detalle para que la comunidad de OpenStreetMap pueda corregir el error.</string>
 	<string name="editor_report_problem_desription_2">O hazlo tú mismo en https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Enviar</string>
 	<string name="editor_report_problem_title">Problema</string>
@@ -453,6 +453,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
+	<!-- A unit of measure -->
 	<string name="foot">pie</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">h</string>
@@ -560,6 +561,7 @@
 	  <item quantity="one">%d ruta</item>
 	  <item quantity="other">%d rutas</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Configuraciones de seguimiento</string>
 	<string name="crash_reports">Informe de incidentes</string>
 	<string name="crash_reports_description">Puede que utilicemos vuestros datos para mejorar la experiencia de Organic Maps. Los cambios tendrán efecto después que reinicie la aplicación.</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 868ee346ff..9ef5219fe6 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -30,7 +30,7 @@
 	<string name="later">بعداً</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">جست‌وجو</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">جست‌وجوی نقشه</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">سرویس موقعیت مکانی شما غیر فعال است .لطفا جهت کارکرد صحیح نرم افزار ان را فعال کنید.</string>
@@ -444,6 +444,7 @@
 	<string name="kilometer">کیلومتر</string>
 	<string name="kilometers_per_hour">کیلومتربرساعت (km/h)</string>
 	<string name="mile">مایل</string>
+	<!-- A unit of measure -->
 	<string name="foot">فوت</string>
 	<string name="miles_per_hour">مایل بر ساعت (mph)</string>
 	<string name="hour">ساعت</string>
@@ -545,6 +546,7 @@
 	  <item quantity="one">%d رد</item>
 	  <item quantity="other">%d رد</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">تنظیمات ردیابی</string>
 	<string name="crash_reports">گزارش خرابی</string>
 	<string name="crash_reports_description">ما از داده‌های شما برای بهبود Organic Maps استفاده می‌کنیم. تغییرات پس از راه‌اندازی مجدد برنامه به‌کار می‌افتد.</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 8e4a19c0c1..05d839057f 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -29,7 +29,7 @@
 	<string name="later">Myöhemmin</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Haku</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Hae kartalta</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Laitteen tai sovelluksen kaikki sijaintipalvelut ovat tällä hetkellä poissa käytöstä. Ota ne käyttöön Asetukset-valikossa.</string>
@@ -452,6 +452,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
+	<!-- A unit of measure -->
 	<string name="foot">ft</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">t</string>
@@ -552,6 +553,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d radat</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Paikannusasetukset</string>
 	<string name="crash_reports">Kaatumisraportti</string>
 	<string name="crash_reports_description">Me saatamme käyttää tietojasi parantaaksemme Organic Maps kokemusta. Muutokset alkavat vaikuttamaan kun käynnistät sovelluksen uudestaan.</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 91314934bb..a6784f80c7 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -29,7 +29,7 @@
 	<string name="later">Plus tard</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Recherche</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Rechercher sur la carte</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Tous les services de localisation de cet appareil sont désactivés, ou ils le sont pour cette application. Veuillez les activer dans les paramètres.</string>
@@ -370,7 +370,7 @@
 	<string name="editor_example_values">Exemple de valeurs</string>
 	<string name="editor_correct_mistake">Corriger l\'erreur</string>
 	<string name="editor_add_select_location">Emplacement</string>
-	<string name="editor_report_problem_desription_1">Veuillez décrire le problème en détail pour permettre à la communauté OpenStreeMap de réparer l\'erreur.</string>
+	<string name="editor_report_problem_desription_1">Veuillez décrire le problème en détail pour permettre à la communauté OpenStreetMap de réparer l\'erreur.</string>
 	<string name="editor_report_problem_desription_2">Ou faites-le vous-même sur https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Envoyer</string>
 	<string name="editor_report_problem_title">Problème</string>
@@ -456,7 +456,6 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
-	<string name="foot">pied</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">h</string>
 	<string name="minute">min</string>
@@ -562,6 +561,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">pistes %d</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Paramètres de suivi</string>
 	<string name="crash_reports">Rapport d\'accident</string>
 	<string name="crash_reports_description">Nous pouvons utiliser vos données pour améliorer l\'expérience de Organic Maps. Les modifications prendront effet après le redémarrage de l\'application.</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 1ab5e25b90..b46eaa3311 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">Később</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Keresés</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Keresés a térképen</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Ezen az eszközön jelenleg minden helyzetmeghatározó szolgáltatás ki van kapcsolva. Kérjük kapcsolja be ezeket a Beállítások között.</string>
@@ -361,7 +361,7 @@
 	<string name="editor_example_values">Példa értékek</string>
 	<string name="editor_correct_mistake">Hiba javítása</string>
 	<string name="editor_add_select_location">Elhelyezkedés</string>
-	<string name="editor_report_problem_desription_1">Kérjük, írd le részletesen a problémát, hogy az OpenStreeMap csapata kijavíthassa.</string>
+	<string name="editor_report_problem_desription_1">Kérjük, írd le részletesen a problémát, hogy az OpenStreetMap csapata kijavíthassa.</string>
 	<string name="editor_report_problem_desription_2">Vagy végezd el te magad a javítást itt: https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Küldés</string>
 	<string name="editor_report_problem_title">Probléma</string>
@@ -446,6 +446,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mf</string>
+	<!-- A unit of measure -->
 	<string name="foot">ft</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">ó</string>
@@ -544,6 +545,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d út</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Követési beállítások</string>
 	<string name="crash_reports">Hibajelentés</string>
 	<string name="crash_reports_description">A Organic Maps fejlesztéséhez felhasználhatjuk az adatait. A változtatások az alkalmazás újraindítása után lépnek életbe.</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 9f33114b75..052feea92d 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -29,7 +29,7 @@
 	<string name="later">Nanti</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Cari</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Cari Peta</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Saat ini semua Layanan Lokasi untuk perangkat atau aplikasi ini non-aktif. Mohon aktifkan lewat Setelan.</string>
@@ -361,7 +361,7 @@
 	<string name="editor_example_values">Contoh Nilai</string>
 	<string name="editor_correct_mistake">Koreksi kesalahan</string>
 	<string name="editor_add_select_location">Lokasi</string>
-	<string name="editor_report_problem_desription_1">Harap menggambarkan masalah secara rinci sehingga komunitas OpenStreeMap dapat memperbaiki kesalahan.</string>
+	<string name="editor_report_problem_desription_1">Harap menggambarkan masalah secara rinci sehingga komunitas OpenStreetMap dapat memperbaiki kesalahan.</string>
 	<string name="editor_report_problem_desription_2">Atau Anda bisa melakukan sendiri di https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Kirim</string>
 	<string name="editor_report_problem_title">Masalah</string>
@@ -446,6 +446,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/j</string>
 	<string name="mile">mil</string>
+	<!-- A unit of measure -->
 	<string name="foot">kaki</string>
 	<string name="miles_per_hour">mpj</string>
 	<string name="hour">j</string>
@@ -544,6 +545,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">trek %d</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Pengaturan treking</string>
 	<string name="crash_reports">Laporan tabrakan</string>
 	<string name="crash_reports_description">Kami dapat menggunakan data Anda untuk meningkatkan pengalaman Organic Maps. Perubahan akan berlaku setelah Anda memulai ulang aplikasi.</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 06b6a79ac0..86de7b3835 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -27,8 +27,8 @@
 	<string name="later">Più tardi</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Cerca</string>
-	<!-- Search box placeholder text -->
-	<string name="search_map">Cerca mappa</string>
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
+	<string name="search_map">Cerca sulla mappa</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Attualmente tutti i servizi di localizzazione per questo dispositivo o applicazione sono disattivati. Si prega di abilitarli in Impostazioni.</string>
 	<!-- View and button titles for accessibility -->
@@ -110,7 +110,7 @@
 	<!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @nightlife! -->
 	<string name="nightlife">Vita notturna</string>
 	<!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @children! -->
-	<string name="children">Tempo libero</string>
+	<string name="children">Divertimento in famiglia</string>
 	<!-- Search category for banks; any changes should be duplicated in categories.txt @bank! -->
 	<string name="bank">Banca</string>
 	<!-- Search category for pharmacies; any changes should be duplicated in categories.txt @pharmacy! -->
@@ -366,7 +366,7 @@
 	<string name="editor_example_values">Esempi</string>
 	<string name="editor_correct_mistake">Correggi errore</string>
 	<string name="editor_add_select_location">Posizione</string>
-	<string name="editor_report_problem_desription_1">Si prega di descrivere il problema in dettaglio in modo che la community OpenStreeMap possa riparare l’errore.</string>
+	<string name="editor_report_problem_desription_1">Si prega di descrivere il problema in dettaglio in modo che la community OpenStreetMap possa riparare l’errore.</string>
 	<string name="editor_report_problem_desription_2">O fallo tu stesso su https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Invia</string>
 	<string name="editor_report_problem_title">Problema</string>
@@ -454,9 +454,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
-	<string name="foot">piede</string>
 	<string name="miles_per_hour">mph</string>
-	<string name="hour">o</string>
 	<string name="minute">min</string>
 	<string name="placepage_place_description">Descrizione</string>
 	<string name="placepage_more_button">Di più</string>
@@ -564,6 +562,7 @@
 	  <item quantity="one">%d percorso</item>
 	  <item quantity="other">%d percorsi</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Impostazioni percorso</string>
 	<string name="crash_reports">Rapporto d\'arresto</string>
 	<string name="crash_reports_description">Potremmo utilizzare i tuoi dati per migliorare l\'esperienza di Organic Maps. Le modifiche avranno effetto dopo aver riavviato l\'app.</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index 1406b3c3db..0edb26b896 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -25,7 +25,7 @@
 	<string name="core_my_position">מיקומי</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">מאוחר יותר</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">חפש במפה</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">שרותי המיקום של מכשיר או ישום זה זה כבויים. הכנס ל \"הגדרות\" Settings)) כדי להדליקם.</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 1db19b4273..502645719a 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">次の機会に</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">検索</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">マップを検索</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">端末の位置情報サービスが無効になっているか、このアプリケーションからの位置情報利用が制限されています。端末の設定を有効化してください。</string>
@@ -359,7 +359,7 @@
 	<string name="editor_example_values">値の例</string>
 	<string name="editor_correct_mistake">間違いの訂正</string>
 	<string name="editor_add_select_location">現在位置</string>
-	<string name="editor_report_problem_desription_1">OpenStreeMapコミュニティがエラーを修正できるよう、問題の詳細を説明してください。</string>
+	<string name="editor_report_problem_desription_1">OpenStreetMapコミュニティがエラーを修正できるよう、問題の詳細を説明してください。</string>
 	<string name="editor_report_problem_desription_2">または、このURLでご自身で修正してください https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">送信</string>
 	<string name="editor_report_problem_title">問題</string>
@@ -444,6 +444,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">キロメートル毎時</string>
 	<string name="mile">マイル</string>
+	<!-- A unit of measure -->
 	<string name="foot">フィート</string>
 	<string name="miles_per_hour">マイル毎時</string>
 	<string name="hour">時間</string>
@@ -541,6 +542,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%dの追跡</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">追跡の設定</string>
 	<string name="crash_reports">クラッシュレポート</string>
 	<string name="crash_reports_description">Organic Maps体験を向上させるため、お客様のデータを使用する可能性があります。変更は、アプリを再起動した後に、反映されます。</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index a5f2d652dc..2c01099617 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">후</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">검색하기</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">지도 검색하기</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">현재 이 장치나 애플리케이션을 위한 전 위치 서비스를 불능시키셨습니다. 설정에서 이를 작동시켜 주시기 바랍니다.</string>
@@ -361,7 +361,7 @@
 	<string name="editor_example_values">예제</string>
 	<string name="editor_correct_mistake">입력 수정</string>
 	<string name="editor_add_select_location">위치</string>
-	<string name="editor_report_problem_desription_1">OpenStreeMap 커뮤니티가 오류를 수정할 수 있도록 상세하게 문제를 설명하십시오.</string>
+	<string name="editor_report_problem_desription_1">OpenStreetMap 커뮤니티가 오류를 수정할 수 있도록 상세하게 문제를 설명하십시오.</string>
 	<string name="editor_report_problem_desription_2">아니면, 다음에서 스스로 가능: https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">전송</string>
 	<string name="editor_report_problem_title">문제</string>
@@ -446,6 +446,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/시</string>
 	<string name="mile">mi</string>
+	<!-- A unit of measure -->
 	<string name="foot">풋</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">t</string>
@@ -543,6 +544,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d 추적</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">추적 설정</string>
 	<string name="crash_reports">오류 보고서</string>
 	<string name="crash_reports_description">당사는 Organic Maps 경험을 개선하기 위해 귀하의 데이터를 활용할 수 있습니다. 앱을 다시 시작한 후 변경사항이 적용됩니다.</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index f2fe5d6bcc..7b620109c5 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -29,7 +29,7 @@
 	<string name="later">Senere</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Søk</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Søk kart</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Du har for øyeblikket deaktivert alle posisjonstjenester for denne enheten eller applikasjonen. Slå dem på i «Innstillinger».</string>
@@ -446,6 +446,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/t</string>
 	<string name="mile">mi</string>
+	<!-- A unit of measure -->
 	<string name="foot">fot</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">t</string>
@@ -544,6 +545,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d stier</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Turinnstillinger</string>
 	<string name="crash_reports">Krasjrapport</string>
 	<string name="crash_reports_description">Vi kan bruke dine data for å forbedre Organic Maps-opplevelsen. Endringer vil bli aktive når du restarter appen.</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index d81f99f108..91735520e4 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -25,7 +25,7 @@
 	<string name="core_my_position">Mijn locatie</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Zoeken</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Op de kaart zoeken</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">U heeft momenteel alle locatieservices voor dit apparaat of deze app uitgeschakeld. Schakel ze in bij Instellingen</string>
@@ -448,6 +448,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mijl</string>
+	<!-- A unit of measure -->
 	<string name="foot">voet</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">u</string>
@@ -546,6 +547,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d routes</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Tracking-instellingen</string>
 	<string name="crash_reports">Crash rapport</string>
 	<string name="crash_reports_description">Wij kunnen uw gegevens gebruiken om Organic Maps te verbeteren. Wijzigingen treden in werking na het opnieuw opstarten van de app.</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 7865130c97..ccb702ece7 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">Później</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Wyszukaj</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Wyszukaj mapy</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Usługi lokalizacji są aktualnie wyłączone dla tego urządzenia lub aplikacji. Proszę włączyć je w ustawieniach.</string>
@@ -452,6 +452,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
+	<!-- A unit of measure -->
 	<string name="foot">ft</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">godz</string>
@@ -557,6 +558,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d tras</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Ustawienia śledzenia</string>
 	<string name="crash_reports">Raport o błędzie</string>
 	<string name="crash_reports_description">Możemy używać Twoich danych do usprawnienia działania Organic Maps. Zmiany zostaną zastosowane po ponownym uruchomieniu aplikacji.</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 675e7cecff..d051b5ec88 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">Mais tarde</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Buscar</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Procurar mapa</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Atualmente todos os Serviços de Localização para este dispositivo ou aplicação estão desativados. Por favor ative-os em Configurações.</string>
@@ -363,7 +363,7 @@
 	<string name="editor_example_values">Valores de exemplo</string>
 	<string name="editor_correct_mistake">Corrigir erro</string>
 	<string name="editor_add_select_location">Local</string>
-	<string name="editor_report_problem_desription_1">Por favor, descreva o problema em detalhes para que a comunidade OpenStreeMap possa corrigir o erro.</string>
+	<string name="editor_report_problem_desription_1">Por favor, descreva o problema em detalhes para que a comunidade OpenStreetMap possa corrigir o erro.</string>
 	<string name="editor_report_problem_desription_2">Ou faça-o você mesmo em https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Enviar</string>
 	<string name="editor_report_problem_title">Problema</string>
@@ -448,6 +448,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
+	<!-- A unit of measure -->
 	<string name="foot">ft</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">h</string>
@@ -550,6 +551,7 @@
 	  <item quantity="one">%d percurso</item>
 	  <item quantity="other">%d percursos</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Configurações de rastreamento</string>
 	<string name="crash_reports">Relatório de erros</string>
 	<string name="crash_reports_description">Nós podemor utilizar seus dados para melhorar a experiência Organic Maps As mudanças terão efeitos após reiniciar o app.</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index f24e53e9fd..a90af5d256 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">Mais tarde</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Pesquisar</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Pesquisar mapa</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Atualmente tem todos os serviços de localização para este dispositivo ou aplicação desativados. Por favor ative-os nas definições do sistema.</string>
@@ -368,7 +368,7 @@
 	<string name="editor_example_values">Valores de exemplo</string>
 	<string name="editor_correct_mistake">Corrigir erro</string>
 	<string name="editor_add_select_location">Local</string>
-	<string name="editor_report_problem_desription_1">Por favor, descreva o problema ao pormenor para que a comunidade OpenStreeMap possa corrigir o erro.</string>
+	<string name="editor_report_problem_desription_1">Por favor, descreva o problema ao pormenor para que a comunidade OpenStreetMap possa corrigir o erro.</string>
 	<string name="editor_report_problem_desription_2">Ou faça-o em https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Enviar</string>
 	<string name="editor_report_problem_title">Problema</string>
@@ -453,6 +453,7 @@
 	<string name="kilometer">Km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
+	<!-- A unit of measure -->
 	<string name="foot">ft</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">h</string>
@@ -556,6 +557,7 @@
 	  <item quantity="one">%d percurso</item>
 	  <item quantity="other">%d percursos</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Configurações de rastreamento</string>
 	<string name="crash_reports">Relatório de erros</string>
 	<string name="crash_reports_description">Podemos utilizar os seus dados para melhorar a experiência no Organic Maps. As alterações entrarão em vigor quando reiniciar a aplicação.</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index af53016f28..6323383ea9 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -7,12 +7,12 @@
 	<!-- Button text (should be short) -->
 	<string name="back">Înapoi</string>
 	<!-- Button text (should be short) -->
-	<string name="cancel">Renunță</string>
+	<string name="cancel">Anulare</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Șterge</string>
 	<string name="download_maps">Descarcă hărți</string>
 	<!-- Settings/Downloader - info for country when download fails -->
-	<string name="download_has_failed">Descărcarea a eșuat. Încearcă din nou.</string>
+	<string name="download_has_failed">Descărcarea a eșuat. Atinge pentru a încearca din nou.</string>
 	<!-- Settings/Downloader - info for country which started downloading -->
 	<string name="downloading">Se descarcă…</string>
 	<!-- Choose measurement on first launch alert - choose metric system button -->
@@ -24,28 +24,28 @@
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Poziția mea</string>
 	<!-- Update maps later/Buy pro version later button text -->
-	<string name="later">Mai tîrziu</string>
+	<string name="later">Mai târziu</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Caută</string>
-	<!-- Search box placeholder text -->
-	<string name="search_map">Caută harta</string>
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
+	<string name="search_map">Caută pe hartă</string>
 	<!-- Location services are disabled by user alert - message -->
-	<string name="location_is_disabled_long_text">În prezent, toate serviciile de localizare pentru acest aparat sau aplicație sînt dezactivate. Dacă vrei, activează-le.</string>
+	<string name="location_is_disabled_long_text">În prezent, toate serviciile de localizare pentru acest dispozitiv sau aplicație sunt dezactivate. Le poți activa din setări.</string>
 	<!-- View and button titles for accessibility -->
 	<string name="zoom_to_country">Arată pe hartă</string>
 	<!-- Message to display at the center of the screen when the country download has failed -->
-	<string name="country_status_download_failed">Descărcarea nu a reușit</string>
+	<string name="country_status_download_failed">Descărcarea a eșuat</string>
 	<!-- Button text for the button under the country_status_download_failed message -->
 	<string name="try_again">Mai încearcă</string>
 	<string name="connection_settings">Opțiuni de conectare</string>
 	<string name="close">Închide</string>
-	<string name="unsupported_phone">Este necesară accelerarea hardware OpenGL. Din păcate, aparatul tău nu este compatibil.</string>
+	<string name="unsupported_phone">Această aplicație necesită accelerarea hardware OpenGL. Din păcate, dispozitivul tău nu este compatibil.</string>
 	<string name="download">Descarcă</string>
-	<string name="disconnect_usb_cable">Deconectează cablul USB sau introdu cartela de memorie pentru a utiliza Organic Maps</string>
-	<string name="not_enough_free_space_on_sdcard">Eliberează spațiu pe cartela SD/memoria USB pentru a putea utiliza aplicația</string>
+	<string name="disconnect_usb_cable">Deconectează cablul USB sau introdu un card de memorie pentru a utiliza Organic Maps</string>
+	<string name="not_enough_free_space_on_sdcard">Spațiul de stocare de pe cardul SD/memoria USB este insuficient pentru a putea utiliza aplicația</string>
 	<string name="not_enough_memory">Memorie insuficientă pentru a porni aplicația</string>
-	<string name="download_resources">Înainte de a începe, trebuie descărcată harta generală a lumii în aparatul tău.\nSe vor descărca %s.</string>
-	<string name="download_resources_continue">Du-te la hartă</string>
+	<string name="download_resources">Înainte de a începe, trebuie descărcată harta generală a lumii în dispozitivul tău.\nSe vor descărca %s.</string>
+	<string name="download_resources_continue">Mergi la hartă</string>
 	<string name="downloading_country_can_proceed">Se descarcă %s. Acum poți\ntrece la hartă.</string>
 	<string name="download_country_ask">Descarci %s?</string>
 	<string name="update_country_ask">Actualizezi %s?</string>
@@ -54,25 +54,25 @@
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
 	<string name="continue_download">Continuă</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
-	<string name="download_country_failed">Descărcarea %s nu a reușit</string>
+	<string name="download_country_failed">Descărcarea %s a eșuat</string>
 	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Adaugă o listă nouă</string>
 	<!-- Bookmark Color dialog title -->
-	<string name="bookmark_color">Culoare Loc preferat</string>
+	<string name="bookmark_color">Culoare loc preferat</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
-	<string name="bookmark_set_name">Dă un nume listei</string>
+	<string name="bookmark_set_name">Denumirea listei</string>
 	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Locuri preferate</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Locurile mele</string>
 	<!-- Add bookmark dialog - bookmark name -->
-	<string name="name">Nume</string>
+	<string name="name">Denumire</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adresa</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Listă</string>
 	<!-- Settings button in system menu -->
-	<string name="settings">Preferințe</string>
+	<string name="settings">Setări</string>
 	<!-- Header of settings activity where user defines storage path -->
 	<string name="maps_storage">Salvează hărțile în</string>
 	<!-- Detailed description of Maps Storage settings button -->
@@ -80,7 +80,7 @@
 	<!-- Question dialog for transferring maps from one storage to another -->
 	<string name="move_maps">Muți hărțile?</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
-	<string name="wait_several_minutes">Poate dura cîteva minute.\nAșteaptă…</string>
+	<string name="wait_several_minutes">Poate dura câteva minute.\nAșteaptă…</string>
 	<!-- Measurement units title in settings activity -->
 	<string name="measurement_units">Unități de măsură</string>
 	<!-- Detailed description of Measurement Units settings button -->
@@ -88,7 +88,7 @@
 
 	<!-- SECTION: Search categories -->
 	<!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @eat! -->
-	<string name="eat">Unde să mănînci</string>
+	<string name="eat">Unde să mănânci</string>
 	<!-- Search category for grocery stores; any changes should be duplicated in categories.txt @food! -->
 	<string name="food">Alimentare</string>
 	<!-- Search category for public transport; any changes should be duplicated in categories.txt @transport! -->
@@ -98,7 +98,7 @@
 	<!-- Search category for parking lots; any changes should be duplicated in categories.txt @parking! -->
 	<string name="parking">Parcare</string>
 	<!-- Search category for clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @shopping! -->
-	<string name="shopping">Magazine</string>
+	<string name="shopping">Shopping</string>
 	<!-- Search category for places to stay; any changes should be duplicated in categories.txt @hotel! -->
 	<string name="hotel">Hotel</string>
 	<!-- Search category sight seeings and touristic attractions; any changes should be duplicated in categories.txt @tourism! -->
@@ -110,7 +110,7 @@
 	<!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @nightlife! -->
 	<string name="nightlife">Viață nocturnă</string>
 	<!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @children! -->
-	<string name="children">Timp liber</string>
+	<string name="children">Divertisment cu copiii</string>
 	<!-- Search category for banks; any changes should be duplicated in categories.txt @bank! -->
 	<string name="bank">Bancă</string>
 	<!-- Search category for pharmacies; any changes should be duplicated in categories.txt @pharmacy! -->
@@ -127,11 +127,13 @@
 	<string name="recycling">Reciclare</string>
 	<!-- Search category for water; any changes should be duplicated in categories.txt @water! also used to sort bookmarks by type -->
 	<string name="water">Apă</string>
+	<!-- Search category for RV facilities; any changes should be duplicated in categories.txt @rv! -->
+	<string name="rv">Pentru rulote</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Detalii</string>
 	<!-- Email Subject when sharing bookmark list -->
-	<string name="share_bookmarks_email_subject">Îți trimit locurile mele preferate</string>
-	<string name="share_bookmarks_email_body">Bună!\n\nȚi-am atașat locurile mele preferate din aplicația Organic Maps. Deschide-le dacă ai instalat Organic Maps. Dacă nu, descarcă aplicația pentru iOS sau Android de aici: https://organicmaps.app/</string>
+	<string name="share_bookmarks_email_subject">Îți trimit locurile mele preferate din Organic Maps</string>
+	<string name="share_bookmarks_email_body">Bună!\n\nȚi-am atașat locurile mele preferate din aplicația Organic Maps. Deschide-le dacă ai instalată Organic Maps. Dacă nu, o poți descărca pentru iOS sau Android de aici: https://organicmaps.app/</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Se încarcă locurile preferate</string>
 	<!-- Kmz file successful loading -->
@@ -143,7 +145,7 @@
 	<!-- Warning message when doing search around current position -->
 	<string name="unknown_current_position">Poziția ta nu a fost stabilită încă</string>
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-	<string name="cant_change_this_setting">Opțiunile pentru stocarea hărților sînt dezactivate în acest moment.</string>
+	<string name="cant_change_this_setting">Opțiunile pentru stocarea hărților sunt dezactivate în acest moment.</string>
 	<!-- Alert message that downloading is in progress. -->
 	<string name="downloading_is_active">Harta este în curs de descărcare.</string>
 	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
@@ -153,7 +155,7 @@
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Poți vedea poziția mea pe harta Organic Maps!</string>
 	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
-	<string name="my_position_share_email">Bună,\n\nAcum sînt aici: %1$s. Apasă pe adresa %2$s sau pe %3$s pentru a vedea locul pe hartă.\n\nMulțumesc.</string>
+	<string name="my_position_share_email">Bună,\n\nAcum sunt aici: %1$s. Apasă pe adresa %2$s sau pe %3$s pentru a vedea locul pe hartă.\n\nMulțumesc.</string>
 	<!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
 	<string name="share">Trimite</string>
 	<!-- Share by email button text, also used in editor and About. -->
@@ -207,7 +209,7 @@
 	<string name="duration_1_day">1 zi</string>
 	<string name="search_show_on_map">Vezi pe hartă</string>
 	<!-- Text in menu -->
-	<string name="website">Sit web</string>
+	<string name="website">Site web</string>
 	<!-- Settings: Send feedback button and dialog title -->
 	<string name="feedback">Părere</string>
 	<!-- Text in menu -->
@@ -232,14 +234,14 @@
 	<string name="downloader_downloaded_subtitle">Descărcate</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">În așteptare</string>
-	<string name="downloader_near_me_subtitle">Lîngă mine</string>
+	<string name="downloader_near_me_subtitle">Lângă mine</string>
 	<string name="downloader_status_maps">Hărți</string>
 	<string name="downloader_download_all_button">Descarcă tot</string>
 	<string name="downloader_downloading">Se descarcă:</string>
 	<!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
 	<string name="downloader_delete_map_while_routing_dialog">Pentru a șterge harta, oprește navigarea.</string>
 	<!-- PointsInDifferentMWM -->
-	<string name="routing_failed_cross_mwm_building">Se pot crea numai trasee cuprinse în întregime în cadrul unei hărți a unei singure regiuni.</string>
+	<string name="routing_failed_cross_mwm_building">Pot fi create numai trasee cuprinse de harta unei singure regiuni.</string>
 	<!-- Context menu item for downloader. -->
 	<string name="downloader_download_map">Descarcă harta</string>
 	<!-- Item status in downloader. -->
@@ -251,11 +253,11 @@
 	<!-- Preference title -->
 	<string name="google_play_services">Servicii Google Play</string>
 	<!-- Preference text -->
-	<string name="pref_use_google_play">Folosește serviciile Google Play, pentru a obține poziția actuală</string>
+	<string name="pref_use_google_play">Folosește serviciile Google Play pentru a obține poziția actuală</string>
 	<!-- Text for routing error dialog -->
 	<string name="routing_download_maps_along">Descarcă hărțile de pe traseu</string>
 	<!-- Text for routing error dialog -->
-	<string name="routing_requires_all_map">Crearea unui traseu necesită ca toate hărțile de la poziția ta pînă la destinație să fie descărcate și actualizate.</string>
+	<string name="routing_requires_all_map">Pentru a crea un traseu, este necesar ca toate hărțile, de la poziția ta până la destinație să fie descărcate și actualizate</string>
 	<!-- Text for routing error dialog -->
 	<string name="routing_not_enough_space">Spațiu insuficient</string>
 	<!-- location service disabled -->
@@ -299,11 +301,11 @@
 	<string name="WiFi_available">Da</string>
 
 	<!-- SECTION: Routing dialogs strings -->
-	<string name="dialog_routing_disclaimer_title">Cînd parcurgi traseul, ai în vedere următoarele:</string>
-	<string name="dialog_routing_disclaimer_priority">— Condiţiile de drum, legile şi semnele rutiere sînt mai importante decît indicațiile navigatorului;</string>
-	<string name="dialog_routing_disclaimer_precision">— Harta poate să conţină greşeli şi traseul sugerat poate să nu fie cel mai bun pentru a ajunge la destinaţie;</string>
-	<string name="dialog_routing_disclaimer_recommendations">— Traseele sugerate au numai rol de recomandări;</string>
-	<string name="dialog_routing_disclaimer_borders">— Ai grijă în zonele de graniță: traseele create de aplicația noastră ar putea, ocazional, să treacă granița prin locuri nepermise;</string>
+	<string name="dialog_routing_disclaimer_title">Când parcurgi traseul, ai în vedere următoarele:</string>
+	<string name="dialog_routing_disclaimer_priority">— Condiţiile de drum, legile şi semnele rutiere sunt mai importante decât indicațiile navigatorului;</string>
+	<string name="dialog_routing_disclaimer_precision">— Harta poate conţine greşeli, iar traseul sugerat pentru a ajunge la destinaţie nu e întotdeauna cel mai bun;</string>
+	<string name="dialog_routing_disclaimer_recommendations">— Traseele sugerate sunt doar niște recomandări;</string>
+	<string name="dialog_routing_disclaimer_borders">— Ai grijă în zonele de graniță: traseele create de aplicația noastră pot trece granița prin locuri nepermise;</string>
 	<string name="dialog_routing_disclaimer_beware">Fii vigilent şi condu în siguranţă!</string>
 	<string name="dialog_routing_check_gps">Verifică semnalul GPS</string>
 	<string name="dialog_routing_error_location_not_found">Crearea traseului a eşuat. Coordonatele GPS actuale nu au putut fi identificate.</string>
@@ -312,10 +314,10 @@
 	<string name="dialog_routing_location_unknown_turn_on">Localizarea coordonatelor GPS curente a eşuat. Pentru a calcula traseul, activează serviciile de localizare.</string>
 	<string name="dialog_routing_unable_locate_route">Localizarea traseului a eşuat</string>
 	<string name="dialog_routing_cant_build_route">Crearea traseului a eşuat.</string>
-	<string name="dialog_routing_change_start_or_end">Schimbă punctul de plecare sau destinaţia.</string>
-	<string name="dialog_routing_change_start">Schimbă punctul de plecare</string>
-	<string name="dialog_routing_start_not_determined">Traseul nu a fost creat. Localizarea punctului de plecare a eşuat.</string>
-	<string name="dialog_routing_select_closer_start">Alege un punct de plecare mai aproape de un drum.</string>
+	<string name="dialog_routing_change_start_or_end">Modifică punctul de pornire sau destinaţia.</string>
+	<string name="dialog_routing_change_start">Modifică punctul de pornire</string>
+	<string name="dialog_routing_start_not_determined">Traseul nu a fost creat. Localizarea punctului de pornire a eşuat.</string>
+	<string name="dialog_routing_select_closer_start">Alege un punct de pornire mai aproape de un drum.</string>
 	<string name="dialog_routing_change_end">Schimbă destinaţia</string>
 	<string name="dialog_routing_end_not_determined">Traseul nu a fost creat. Localizarea destinaţiei a eşuat.</string>
 	<string name="dialog_routing_select_closer_end">Alege un punct de destinaţie mai aproape de un drum.</string>
@@ -328,7 +330,7 @@
 	<string name="dialog_routing_download_cross_route">Descarcă hărți suplimentare pentru a crea un traseu mai bun care să traverseze limitele acestei hărți.</string>
 
 	<!-- SECTION: Strings for downloading map from search -->
-	<string name="search_without_internet_advertisement">Pentru a putea începe căutarea și crearea unor trasee, descarcă harta, iar apoi nu vei mai avea nevoie de conexiune la internet.</string>
+	<string name="search_without_internet_advertisement">Pentru a putea începe căutarea și crearea unor trasee, descarcă harta. După aceasta nu vei mai avea nevoie de conexiune la internet.</string>
 	<string name="search_select_map">Alege harta</string>
 	<!-- «Show» context menu -->
 	<string name="show">Arată</string>
@@ -340,18 +342,18 @@
 	<string name="history">Cronologia</string>
 	<string name="closed">Închis</string>
 	<string name="search_not_found">Nu s-a găsit nimic.</string>
-	<string name="search_not_found_query">Caută altfel.</string>
-	<string name="search_history_title">Cronologia căutărilor</string>
+	<string name="search_not_found_query">Încearcă să modifici condițiile căutării.</string>
+	<string name="search_history_title">Istoricul căutărilor</string>
 	<string name="search_history_text">Arată căutările recente.</string>
-	<string name="clear_search">Șterge cronologia căutărilor</string>
+	<string name="clear_search">Șterge istoricul căutărilor</string>
 	<!-- Place Page link to Wikipedia article (if map object has it). -->
 	<string name="read_in_wikipedia">Wikipedia</string>
 	<string name="p2p_your_location">Poziția ta</string>
 	<string name="p2p_start">Pornește</string>
 	<string name="p2p_from_here">De la</string>
 	<string name="p2p_to_here">La</string>
-	<string name="p2p_only_from_current">Navigația este disponibilă doar avînd ca punct de plecare poziția ta actuală.</string>
-	<string name="p2p_reroute_from_current">Vrei să planificăm un traseu din poziția ta actuală?</string>
+	<string name="p2p_only_from_current">Navigația este disponibilă doar având ca punct de plecare poziția ta actuală.</string>
+	<string name="p2p_reroute_from_current">Vrei să planifici un traseu din poziția ta actuală?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Următorul</string>
 	<string name="editor_time_add">Adaugă planificare</string>
@@ -368,7 +370,7 @@
 	<string name="editor_example_values">Exemple</string>
 	<string name="editor_correct_mistake">Corectare greșeală</string>
 	<string name="editor_add_select_location">Poziția</string>
-	<string name="editor_report_problem_desription_1">Descrie problema în detaliu, astfel încît comunitatea OpenStreeMap să poată remedia eroarea.</string>
+	<string name="editor_report_problem_desription_1">Descrie problema în detaliu, astfel încât comunitatea OpenStreetMap să poată remedia eroarea.</string>
 	<string name="editor_report_problem_desription_2">Sau corecteaz-o tu pe https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Trimite</string>
 	<string name="editor_report_problem_title">Problemă</string>
@@ -379,10 +381,10 @@
 	<!-- Place Page opening hours text -->
 	<string name="daily">Zilnic</string>
 	<string name="twentyfour_seven">24/7</string>
-	<string name="day_off_today">Astăzi închis</string>
+	<string name="day_off_today">Închis astăzi</string>
 	<string name="day_off">Închis</string>
 	<string name="today">Azi</string>
-	<string name="edit_opening_hours">Modifică ore de funcționare</string>
+	<string name="edit_opening_hours">Modifică orele de funcționare</string>
 	<string name="no_osm_account">Nu ai un cont OpenStreetMap?</string>
 	<string name="register_at_openstreetmap">Înscrie-te</string>
 	<string name="login">Autentificare</string>
@@ -412,9 +414,9 @@
 	<string name="downloader_update_maps">Actualizează hărțile</string>
 	<string name="downloader_mwm_migration_dialog">Pentru a crea un traseu, trebuie să actualizezi toate hărțile, iar apoi să planifici traseul încă o dată.</string>
 	<string name="downloader_search_field_hint">Caută harta</string>
-	<string name="common_check_internet_connection_dialog">Verifică dacă aparatul tău este conectat la internet.</string>
+	<string name="common_check_internet_connection_dialog">Verifică dacă dispozitivul tău este conectat la internet.</string>
 	<string name="downloader_no_space_title">Spațiu insuficient</string>
-	<string name="downloader_no_space_message">Șterge datele care nu sînt necesare</string>
+	<string name="downloader_no_space_message">Șterge datele care nu sunt necesare</string>
 	<string name="editor_login_error_dialog">Eroare de conectare.</string>
 	<string name="editor_profile_changes">Modificări confirmate</string>
 	<string name="editor_focus_map_on_location">Trage de hartă pentru a alege poziția corectă a obiectului.</string>
@@ -423,7 +425,7 @@
 	<string name="editor_edit_place_name_hint">Numele locului</string>
 	<string name="editor_edit_place_category_title">Categorie</string>
 	<string name="detailed_problem_description">Descriere detaliată a problemei</string>
-	<string name="editor_report_problem_other_title">O problemă diferită</string>
+	<string name="editor_report_problem_other_title">Altă problemă</string>
 	<string name="placepage_add_business_button">Adaugă o firmă</string>
 	<string name="message_invalid_feature_position">Niciun obiect nu poate fi poziționat aici</string>
 	<string name="login_to_make_edits_visible">Autentifică-te pentru ca modificările pe care le-ai făcut să poată fi văzute și de alți utilizatori.</string>
@@ -439,7 +441,7 @@
 	<string name="error_enter_correct_zip_code">Introdu codul poștal corect</string>
 	<!-- Place Page title for long tap -->
 	<string name="core_placepage_unknown_place">Loc necunoscut</string>
-	<string name="editor_other_info">Trimite un mesaj către OSM</string>
+	<string name="editor_other_info">Trimite un mesaj către editorii OSM</string>
 	<string name="editor_detailed_description_hint">Comentariu detaliat</string>
 	<string name="editor_detailed_description">Modificările aduse hărții, sugerate de tine, vor fi trimise comunității OpenStreetMap. Descrie orice detalii suplimentare care nu pot fi modificate în Organic Maps.</string>
 	<string name="editor_more_about_osm">Mai multe despre OpenStreetMap</string>
@@ -456,9 +458,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
-	<string name="foot">picior</string>
 	<string name="miles_per_hour">mph</string>
-	<string name="hour">o</string>
 	<string name="minute">min</string>
 	<string name="placepage_place_description">Descriere</string>
 	<string name="placepage_more_button">Mai mult</string>
@@ -489,7 +489,7 @@
 	<string name="editor_share_to_all_dialog_message_1">Asigură-te că nu ai introdus niciun fel de date personale.</string>
 	<string name="editor_share_to_all_dialog_message_2">Vom verifica modificările. Dacă vor apărea întrebări, te vom contacta prin e-mail.</string>
 	<!-- Text under the version number in the Help dialog. TODO: Synchronize other translations with English. -->
-	<string name="about_description">Organic Maps este o aplicație gratuită și cod sursă public care permite descărcarea hărților și navigare fără internet. Fără reclame. Fără urmărire. Dacă vezi o eroare pe hartă, te rugăm să o corectezi în OpenStreetMap. Proiectul este creat de entuziaști în timpul nostru liber, așa că avem nevoie de părerea și sprijinul tău.</string>
+	<string name="about_description">Organic Maps este o aplicație rapidă și gratuită fără reclame și urmărire. Hărțile sunt bazate pe datele OpenStreetMap.org oferite de utilizatori, de aceea chiar și tu poți corecta erorile și adăuga obiecte noi pe hartă. Organic Maps este un proiect creat de entuziaști în timpul lor liber. Părerea și sprijinul tău sunt foarte importante pentru noi</string>
 	<!-- For the first routing -->
 	<string name="accept">Acceptă</string>
 	<!-- For the first routing -->
@@ -502,21 +502,21 @@
 	<string name="mobile_data_option_not_today">Nu folosi astăzi</string>
 	<string name="mobile_data">Internet mobil</string>
 	<!-- NOTE to translators: please synchronize your translation with the English one. -->
-	<string name="mobile_data_description">Internetul mobil este necesar pentru afişarea de informaţii detaliate despre locuri, precum fotografii, preţuri şi recenzii.</string>
+	<string name="mobile_data_description">Internetul mobil este necesar pentru a afișa informaţii detaliate despre locuri generale și cele preferate.</string>
 	<string name="mobile_data_option_never">Nu utiliza niciodată</string>
-	<string name="mobile_data_option_ask">Întreabă mereu</string>
+	<string name="mobile_data_option_ask">Întreabă întotdeauna</string>
 	<string name="traffic_update_maps_text">Pentru a afişa datele privind traficul, hărțile trebuie actualizate.</string>
-	<string name="big_font">Mărește literele pe hartă</string>
+	<string name="big_font">Mărește dimensiunea literelor pe hartă</string>
 	<string name="traffic_update_app">Actualizează Organic Maps</string>
 	<!-- "traffic" as in "road congestion" -->
-	<string name="traffic_data_unavailable">Datele privind traficul nu sînt disponibile</string>
+	<string name="traffic_data_unavailable">Datele privind traficul nu sunt disponibile</string>
 	<string name="enable_logging">Activează jurnalizarea</string>
 	<!-- Settings: "Send general feedback" button -->
 	<string name="feedback_general">Părere generală</string>
 	<string name="on">Pornit</string>
 	<string name="off">Oprit</string>
-	<string name="prefs_languages_information">Pentru instrucțiuni vocale utilizăm sistemul TTS. Multe dispozitive cu Android folosesc Google TTS. Poți descărca sau actualiza aplicația din Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
-	<string name="prefs_languages_information_off">Pentru unele limbi trebuie să instalezi alt sintetizator de voce sau un pachet lingvistic suplimentar din Magazinul de aplicații (Google Play, Samsung Apps, App Gallery, FDroid).\nDeschide reglările aparatului → Limbă → Transformare text în vorbire → Motor preferat.\nAici poți alege motorul de transformare a textului în vorbire și poți descărca o limbă pentru utilizare fără internet.</string>
+	<string name="prefs_languages_information">Pentru instrucțiuni vocale utilizăm sistemul TTS. Multe dispozitive Android folosesc Google TTS. Poți descărca sau actualiza aplicația din Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+	<string name="prefs_languages_information_off">Pentru unele limbi trebuie să instalezi alt sintetizator de voce sau un pachet lingvistic suplimentar din Magazinul de aplicații (Google Play, Samsung Apps, App Gallery, FDroid).\nDeschide setările dispozitivului → Limbă → Transformare text în vorbire → Motor preferat.\nAici poți alege motorul de transformare a textului în vorbire și poți descărca o limbă pentru utilizare fără internet.</string>
 	<string name="prefs_languages_information_off_link">Consultă acest ghid pentru informații suplimentare.</string>
 	<string name="transliteration_title">Transcrie în alfabet latin</string>
 	<string name="learn_more">Mai multe</string>
@@ -538,13 +538,13 @@
 	<string name="bookmarks_create_new_group">Creează o listă nouă</string>
 	<!-- Bookmark categories screen -->
 	<string name="bookmarks_import">Importă locuri preferate</string>
-	<string name="bookmarks_error_message_share_general">Imposibil de trimis din cauza unei erori a aplicației</string>
-	<string name="bookmarks_error_title_share_empty">Eroare la trimitere</string>
-	<string name="bookmarks_error_message_share_empty">Nu se poate trimite o listă goală</string>
-	<string name="bookmarks_error_title_empty_list_name">Numele este necesar</string>
+	<string name="bookmarks_error_message_share_general">Nu poate fi trimis din cauza unei erori a aplicației</string>
+	<string name="bookmarks_error_title_share_empty">Eroare de trimitere</string>
+	<string name="bookmarks_error_message_share_empty">Nu poate fi trimisă o listă goală</string>
+	<string name="bookmarks_error_title_empty_list_name">Numele listei nu poate fi gol</string>
 	<string name="bookmarks_error_message_empty_list_name">Introdu numele listei</string>
 	<string name="bookmarks_new_list_hint">Listă nouă</string>
-	<string name="bookmarks_error_title_list_name_already_taken">Acest nume este deja ales</string>
+	<string name="bookmarks_error_title_list_name_already_taken">Acest nume este deja folosit</string>
 	<string name="bookmarks_error_message_list_name_already_taken">Alege un alt nume</string>
 	<string name="please_wait">Așteaptă…</string>
 	<string name="phone_number">Număr de telefon</string>
@@ -566,7 +566,8 @@
 	  <item quantity="one">%d traseu</item>
 	  <item quantity="other">%d trasee</item>
 	</plurals>
-	<string name="subtittle_opt_out">Opțiuni traseu</string>
+	<!-- used to choose between the Google and Android location services -->
+	<string name="subtittle_opt_out">Opțiuni tracking</string>
 	<string name="crash_reports">Raport de eroare</string>
 	<string name="crash_reports_description">Putem folosi datele tale pentru a îmbunătăți Organic Maps. Modificările vor intra în vigoare după repornirea aplicației.</string>
 	<string name="privacy_policy">Confidențialitate</string>
@@ -593,20 +594,20 @@
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Descărcarea hărților</string>
 	<string name="power_managment_title">Economisire a energiei</string>
-	<string name="power_managment_description">Dacă este pornit modul de economisire a energiei, aplicația va deconecta caracteristicile care consumă multă energie în funcție de nivelul de încărcare a bateriei</string>
+	<string name="power_managment_description">Dacă este pornit modul de economisire a energiei, aplicația va deconecta funcțiile care consumă multă energie în dependență de nivelul de încărcare a bateriei</string>
 	<string name="power_managment_setting_never">Niciodată</string>
 	<string name="power_managment_setting_auto">Automat</string>
 	<string name="power_managment_setting_manual_max">Economisire maximă a energiei</string>
-	<string name="enable_logging_warning_message">Opțiunea activează jurnalizarea în scopuri de diagnosticare. Aceasta poate fi utilă pentru echipa noastră pentru a depana problemele cu aplicația. Activează temporar această opțiune pentru a înregistra și a ne trimite jurnale detaliate despre problema ta.</string>
-	<string name="access_rules_author_only">Modifică în internet</string>
+	<string name="enable_logging_warning_message">Opțiunea activează jurnalizarea în scopuri de diagnosticare. Aceasta poate fi utilă echipei noastre pentru a rezolva problemele cu aplicația. Activează temporar această opțiune pentru a înregistra și a ne trimite jurnale detaliate despre problema ta.</string>
+	<string name="access_rules_author_only">Modifică online</string>
 	<string name="driving_options_title">Opțiuni de ocolire</string>
 	<string name="driving_options_subheader">De evitat pe orice traseu</string>
 	<string name="avoid_tolls">Drumuri cu plată</string>
-	<string name="avoid_unpaved">Drum neasfaltat</string>
-	<string name="avoid_ferry">Trecere cu bac</string>
+	<string name="avoid_unpaved">Drumuri neasfaltate</string>
+	<string name="avoid_ferry">Treceri cu bac</string>
 	<string name="avoid_motorways">Autostrăzi</string>
-	<string name="unable_to_calc_alert_title">Imposibil de creat un traseu</string>
-	<string name="unable_to_calc_alert_subtitle">Din păcate, nu reușim să elaborăm un traseu cu opțiunile alese. Modifică-le și încearcă din nou.</string>
+	<string name="unable_to_calc_alert_title">Nu poate fi creat un traseu</string>
+	<string name="unable_to_calc_alert_subtitle">Din păcate, nu putem elabora un traseu cu opțiunile alese. Modifică-le și încearcă din nou.</string>
 	<string name="define_to_avoid_btn">Stabilește drumurile de evitat</string>
 	<string name="change_driving_options_btn">Opțiuni de ocolire activate</string>
 	<string name="toll_road">Drum cu plată</string>
@@ -619,7 +620,7 @@
 	<!-- max. 10 symbols, both iOS and Android -->
 	<string name="sort">Sortare…</string>
 	<!-- Android, title, max 20-22 symbols -->
-	<string name="sort_bookmarks">Aranjează preferatele</string>
+	<string name="sort_bookmarks">Sortează preferatele</string>
 	<!-- Android -->
 	<string name="by_default">Prestabilit</string>
 	<!-- Android -->
@@ -628,15 +629,15 @@
 	<string name="by_distance">După distanță</string>
 	<!-- Android -->
 	<string name="by_date">După dată</string>
-	<string name="week_ago_sorttype">Acum o săptămînă</string>
+	<string name="week_ago_sorttype">Acum o săptămână</string>
 	<string name="month_ago_sorttype">Acum o lună</string>
 	<string name="moremonth_ago_sorttype">Acum mai mult de o lună</string>
-	<string name="moreyear_ago_sorttype">Cu peste un an în urmă</string>
-	<string name="near_me_sorttype">Lîngă mine</string>
+	<string name="moreyear_ago_sorttype">Cu mai mult de un an în urmă</string>
+	<string name="near_me_sorttype">Lângă mine</string>
 	<string name="others_sorttype">Altele</string>
 
 	<!-- SECTION: Bookmark types used for sorting -->
-	<string name="food_places">Mîncare</string>
+	<string name="food_places">Mâncare</string>
 	<string name="tourist_places">Obiective turistice</string>
 	<string name="museums">Muzee</string>
 	<string name="parks">Parcuri</string>
@@ -660,23 +661,23 @@
 	<string name="isolines_activation_error_dialog">Pentru a activa și utiliza stratul topografic actualizează sau descarcă harta zonei</string>
 	<string name="isolines_location_error_dialog">Stratul topografic nu este încă disponibil în această zonă</string>
 	<string name="elevation_profile_ascent">Urcare</string>
-	<string name="elevation_profile_descent">Coborîre</string>
+	<string name="elevation_profile_descent">Coborâre</string>
 	<string name="elevation_profile_minaltitude">Înălțime minimă</string>
 	<string name="elevation_profile_maxaltitude">Înălțime maximă</string>
 	<string name="elevation_profile_difficulty">Dificultate</string>
 	<string name="elevation_profile_distance">Dist.:</string>
 	<string name="elevation_profile_time">Timp:</string>
-	<string name="isolines_toast_zooms_1_10">Mărește harta pentru a vedea contururile</string>
+	<string name="isolines_toast_zooms_1_10">Mărește harta pentru a vedea izoliniile</string>
 	<string name="download_map_title">Descarcă harta lumii</string>
 	<string name="connection_failure">Eroare de conectare</string>
 	<string name="disconnect_usb_cable_title">Deconectează cablul USB</string>
-	<string name="enable_screen_sleep">Lasă ecranul să se stingă</string>
+	<string name="enable_screen_sleep">Permite ecranului să se stingă</string>
 	<!-- Description in preferences -->
-	<string name="enable_screen_sleep_description">Cînd este activat, ecranul se va stinge după o perioadă de inactivitate.</string>
+	<string name="enable_screen_sleep_description">Când este activat, ecranul se va stinge după o perioadă de inactivitate.</string>
 	<!-- A preference title; keep short! -->
-	<string name="enable_show_on_lock_screen">Arată pe ecranul blocat</string>
+	<string name="enable_show_on_lock_screen">Arată pe ecranul de blocare</string>
 	<!-- Description in preferences -->
-	<string name="enable_show_on_lock_screen_description">Cînd este activată, nu trebuie să deblochezi telefonul de fiecare dată cînd aplicația este în funcțiune.</string>
+	<string name="enable_show_on_lock_screen_description">Când este activată, nu trebuie să deblochezi telefonul de fiecare dată când aplicația este în funcțiune.</string>
 
 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Stație de teleferic</string>
@@ -692,7 +693,7 @@
 	<string name="type.amenity.bicycle_parking">Parcare biciclete</string>
 	<string name="type.amenity.bicycle_rental">Închiriere de biciclete</string>
 	<string name="type.amenity.biergarten">Berărie</string>
-	<string name="type.amenity.brothel">Divertisment</string>
+	<string name="type.amenity.brothel">Bordel</string>
 	<string name="type.amenity.bureau_de_change">Schimb valutar</string>
 	<string name="type.amenity.bus_station">Gara de autobuz</string>
 	<string name="type.amenity.cafe">Cafenea</string>
@@ -1132,7 +1133,7 @@
 	<string name="type.natural.water.river">Râu</string>
 	<string name="type.natural.peak">Munte</string>
 	<string name="type.natural.scrub">Boschet</string>
-	<string name="type.natural.spring">Primăvară</string>
+	<string name="type.natural.spring">Izvor</string>
 	<string name="type.natural.strait">Strâmtoare</string>
 	<string name="type.natural.tree">Arbore</string>
 	<string name="type.natural.volcano">Vulcan</string>
@@ -1210,7 +1211,7 @@
 	<string name="type.shop">Magazin</string>
 	<string name="type.shop.alcohol">Băuturi alcoolice</string>
 	<string name="type.shop.bakery">Brutărie</string>
-	<string name="type.shop.beauty">Salon de infrumusetare</string>
+	<string name="type.shop.beauty">Salon de înfrumusețare</string>
 	<string name="type.shop.beverages">Băuturi</string>
 	<string name="type.shop.bicycle">Bicicletă</string>
 	<string name="type.shop.bookmaker">Casă de pariuri</string>
@@ -1246,7 +1247,7 @@
 	<string name="type.shop.jewelry">Bijutier</string>
 	<string name="type.shop.kiosk">Magazin</string>
 	<string name="type.shop.laundry">Spălătorie</string>
-	<string name="type.shop.mall">Mall-ul</string>
+	<string name="type.shop.mall">Mall</string>
 	<string name="type.shop.massage">Salon de masaj</string>
 	<string name="type.shop.mobile_phone">Magazin de telefoane mobile</string>
 	<string name="type.shop.money_lender">Magazin</string>
@@ -1272,7 +1273,7 @@
 	<string name="type.shop.variety_store">Magazin universal</string>
 	<string name="type.shop.video">Magazin video</string>
 	<string name="type.shop.video_games">Magazin de jocuri video</string>
-	<string name="type.shop.wine">Magazin de băuturi alcolice</string>
+	<string name="type.shop.wine">Vinărie</string>
 	<string name="type.sport.athletics">Atletica ușoară</string>
 	<string name="type.sport.basketball">Baschetbal</string>
 	<string name="type.sport.equestrian">Sport ecvestru</string>
@@ -1289,7 +1290,7 @@
 	<string name="type.tourism.attraction.specified">Punct de atracție</string>
 	<string name="type.tourism.caravan_site">Teren pentru campare</string>
 	<string name="type.tourism.chalet">Cabană</string>
-	<string name="type.tourism.gallery">Obiective turistice</string>
+	<string name="type.tourism.gallery">Galerie</string>
 	<string name="type.tourism.guest_house">Pensiune</string>
 	<string name="type.tourism.information">Informații turistice</string>
 	<string name="type.tourism.information.board">Panou de informații</string>
@@ -1299,9 +1300,9 @@
 	<string name="type.tourism.museum">Muzeu</string>
 	<string name="type.tourism.picnic_site">Locații picnic</string>
 	<string name="type.tourism.resort">Stațiuni</string>
-	<string name="type.tourism.theme_park">Obiective turistice</string>
+	<string name="type.tourism.theme_park">Parc de distracții</string>
 	<string name="type.tourism.viewpoint">Punct de vedere</string>
-	<string name="type.tourism.wilderness_hut">Adăpost</string>
+	<string name="type.tourism.wilderness_hut">Cabană în pădure</string>
 	<string name="type.tourism.zoo">Grădină zoologică</string>
 	<string name="type.waterway.lock_gate">Ecluză</string>
 	<string name="type.waterway.river">Râu</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 51abf7617a..6dff1382e2 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -30,7 +30,7 @@
 	<string name="later">Не сейчас</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Поиск</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Поиск на карте</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Геолокация выключена в настройках устройства. Пожалуйста, включите её для удобного использования программы.</string>
@@ -461,6 +461,7 @@
 	<string name="kilometer">км</string>
 	<string name="kilometers_per_hour">км/ч</string>
 	<string name="mile">ми</string>
+	<!-- A unit of measure -->
 	<string name="foot">фут</string>
 	<string name="miles_per_hour">ми/ч</string>
 	<string name="hour">ч</string>
@@ -575,6 +576,7 @@
 	  <item quantity="one">%d трек</item>
 	  <item quantity="other">%d треков</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Настройки сопровождения</string>
 	<string name="crash_reports">Отчеты об ошибках</string>
 	<string name="crash_reports_description">Мы можем использовать ваши данные, чтобы развивать и улучшать Organic Maps. Изменения вступят в силу после перезапуска приложения.</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index e52a421701..b1b3226dea 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">Neskôr</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Hľadať</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Prehľadať mapu</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Aktuálne máte všetky možnosti pre určovanie polohy vypnuté. Prosím, povoľte ich v Nastaveniach.</string>
@@ -444,6 +444,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
+	<!-- A unit of measure -->
 	<string name="foot">stopa</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">hod</string>
@@ -543,6 +544,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d sledovania</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Nastavenie sledovania</string>
 	<string name="crash_reports">Hlásenie chýb</string>
 	<string name="crash_reports_description">Vaše údaje môžeme použiť na zlepšenie skúseností s programom Organic Maps. Zmeny sa prejavia po reštartovaní aplikácie.</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index e584292ec9..783566b81b 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">Senare</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Sök</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Sök karta</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Du har inaktiverat alla platstjänster för denna enhet eller program. Vänligen aktivera dem i Inställningar.</string>
@@ -359,7 +359,7 @@
 	<string name="editor_example_values">Exempelvärden</string>
 	<string name="editor_correct_mistake">Korrigera fel</string>
 	<string name="editor_add_select_location">Plats</string>
-	<string name="editor_report_problem_desription_1">Beskriv problemet i detalj så att OpenStreeMaps community kan lösa felet.</string>
+	<string name="editor_report_problem_desription_1">Beskriv problemet i detalj så att OpenStreetMaps community kan lösa felet.</string>
 	<string name="editor_report_problem_desription_2">Eller gör det själv på https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Skicka</string>
 	<string name="editor_report_problem_title">Problem</string>
@@ -444,6 +444,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mile</string>
+	<!-- A unit of measure -->
 	<string name="foot">fot</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">h</string>
@@ -542,6 +543,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d spår</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Spårningsinställningar</string>
 	<string name="crash_reports">Olycksrapport</string>
 	<string name="crash_reports_description">Vi kan komma att använda din data för att förbättra Organic Maps upplevelsen. Ändringarna kommer träda i kraft när du startar om appen.</string>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index b78010e1d7..ece049a7a7 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -107,6 +107,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">Njia %d</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Mipangilio ya ufuatiliaji</string>
 	<string name="crash_reports">Ripoti ya kuharibika</string>
 	<string name="crash_reports_description">Tunaweza kutumia data yako kuboresha uzoefu wa Organic Maps Mabadiliko yataanza kutumika baada ya kuwasha upya programu.</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index fbc0c95f89..bd1dbdaf4c 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -29,7 +29,7 @@
 	<string name="later">ภายหลัง</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">ค้นหา</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">ค้นหาแผนที่</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">ในปัจจุบันนี้มีการปิดการใช้งานการบริการตำแหน่งที่ตั้งสำหรับอุปกรณ์หรือแอปพลิเคชันนี้ โปรดเปิดใช้งานในการตั้งค่า</string>
@@ -363,7 +363,7 @@
 	<string name="editor_example_values">ตัวอย่างของค่าที่ตั้งไว้</string>
 	<string name="editor_correct_mistake">แก้ไขข้อผิดพลาด</string>
 	<string name="editor_add_select_location">ตำแหน่ง</string>
-	<string name="editor_report_problem_desription_1">กรุณาอธิบายปัญหาโดยละเอียดเพื่อที่ชุมชน OpenStreeMap จะสามารถแก้ไขข้อผิดพลาดได้</string>
+	<string name="editor_report_problem_desription_1">กรุณาอธิบายปัญหาโดยละเอียดเพื่อที่ชุมชน OpenStreetMap จะสามารถแก้ไขข้อผิดพลาดได้</string>
 	<string name="editor_report_problem_desription_2">หรือทำด้วยตัวคุณเองที่ https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">ส่ง</string>
 	<string name="editor_report_problem_title">ปัญหา</string>
@@ -448,6 +448,7 @@
 	<string name="kilometer">กม.</string>
 	<string name="kilometers_per_hour">กม./ชม.</string>
 	<string name="mile">ไมล์</string>
+	<!-- A unit of measure -->
 	<string name="foot">ฟุต</string>
 	<string name="miles_per_hour">ไมล์/ชม.</string>
 	<string name="hour">ชม.</string>
@@ -545,6 +546,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d ติดตามต่าง ๆ</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">การตั้งค่าการติดตาม</string>
 	<string name="crash_reports">รายงานข้อขัดข้อง</string>
 	<string name="crash_reports_description">เราอาจใช้ข้อมูลของคุณเพื่อพัฒนาประสบการณ์ของ Organic Maps การเปลี่ยนแปลงจะมีผลหลังจากที่คุณเปิดแอพฯ ขึ้นใหม่</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 95e1740cde..7c8d1e884c 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -29,7 +29,7 @@
 	<string name="later">Daha sonra</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Ara</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Haritada Ara</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Şu anda bu cihaz veya uygulama için tüm Konum Hizmetleri devre dışı bırakılmış. Lütfen bunu ayarlardan etkinleştirin.</string>
@@ -460,6 +460,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/s</string>
 	<string name="mile">mil</string>
+	<!-- A unit of measure -->
 	<string name="foot">fit</string>
 	<string name="miles_per_hour">saatte mil</string>
 	<string name="hour">sa</string>
@@ -566,6 +567,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d kayıt</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Takip ayarları</string>
 	<string name="crash_reports">Çökme raporu</string>
 	<string name="crash_reports_description">Organic Maps deneyimini geliştirmek için verilerinizi kullanabiliriz. Değişiklikler, uygulama yeniden başlatıldıktan sonra geçerli olur.</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index a54ea6ff07..d05c5794d7 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -30,7 +30,7 @@
 	<string name="later">Не зараз</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Пошук</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Пошук на мапі</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Геолокація вимкнена в налаштуваннях пристрою. Будь ласка, увімкніть її для зручного використання програми.</string>
@@ -455,6 +455,7 @@
 	<string name="kilometer">км</string>
 	<string name="kilometers_per_hour">км/год</string>
 	<string name="mile">ми</string>
+	<!-- A unit of measure -->
 	<string name="foot">фут</string>
 	<string name="miles_per_hour">ми/год</string>
 	<string name="hour">год</string>
@@ -561,6 +562,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d треків</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Налаштування супроводу</string>
 	<string name="crash_reports">Звіти про помилки</string>
 	<string name="crash_reports_description">Ми можемо використовувати ваші дані, щоб розвивати та покращувати Organic Maps. Зміни вступлять у силу після перезапуску програми</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 6531d82b7e..e57765c97b 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">Để sau</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Tìm kiếm</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Tìm kiếm Bản đồ</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Bạn hiện đang tắt tất cả Dịch vụ Định vị cho thiết bị hoặc ứng dụng này. Bạn vui lòng bật lại chúng trong Thiết lập.</string>
@@ -54,7 +54,7 @@
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
 	<string name="continue_download">Tiếp tục</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
-	<string name="download_country_failed">%s - descărcarea a eșuat</string>
+	<string name="download_country_failed">%s</string>
 	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Thêm Bộ Mới</string>
 	<!-- Bookmark Color dialog title -->
@@ -361,7 +361,7 @@
 	<string name="editor_example_values">Giá trị ví dụ</string>
 	<string name="editor_correct_mistake">Sửa lỗi</string>
 	<string name="editor_add_select_location">Vị trí</string>
-	<string name="editor_report_problem_desription_1">Xin mô tả chi tiết vấn đề để cộng đồng OpenStreeMap có thể sửa lỗi đó.</string>
+	<string name="editor_report_problem_desription_1">Xin mô tả chi tiết vấn đề để cộng đồng OpenStreetMap có thể sửa lỗi đó.</string>
 	<string name="editor_report_problem_desription_2">Hoặc bạn có thể tự sửa tại https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Gửi</string>
 	<string name="editor_report_problem_title">Vấn đề</string>
@@ -446,6 +446,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/giờ</string>
 	<string name="mile">dặm</string>
+	<!-- A unit of measure -->
 	<string name="foot">ft</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">giờ</string>
@@ -544,6 +545,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d các chặn đường</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Thiết lập theo dõi</string>
 	<string name="crash_reports">Báo cáo sự cố</string>
 	<string name="crash_reports_description">Chúng tôi có thể sử dụng dữ liệu của bạn để cải thiện trải nghiệm trên Organic Maps. Thay đổi sẽ có hiệu lực sau khi bạn khởi động lại ứng dụng.</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 2d49fde7bf..4021c7df74 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">稍後</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">搜尋</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">搜尋地圖</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">您目前裝置所有的定位服務或相關應用程式是處於停用的狀態，請從系統設定中選擇啟用。</string>
@@ -374,7 +374,7 @@
 	<string name="editor_example_values">範例值</string>
 	<string name="editor_correct_mistake">修正錯誤</string>
 	<string name="editor_add_select_location">位置</string>
-	<string name="editor_report_problem_desription_1">請詳細描述此問題以便 OpenStreeMap 社群修復此錯誤。</string>
+	<string name="editor_report_problem_desription_1">請詳細描述此問題以便 OpenStreetMap 社群修復此錯誤。</string>
 	<string name="editor_report_problem_desription_2">或者在 https://www.openstreetmap.org/ 上親自修復此錯誤</string>
 	<string name="editor_report_problem_send_button">發送</string>
 	<string name="editor_report_problem_title">問題</string>
@@ -389,7 +389,7 @@
 	<string name="day_off">沒有營業</string>
 	<string name="today">今天</string>
 	<string name="edit_opening_hours">編輯營業時間</string>
-	<string name="no_osm_account">沒有 OpenStreeMap 帳號嗎？</string>
+	<string name="no_osm_account">沒有 OpenStreetMap 帳號嗎？</string>
 	<string name="register_at_openstreetmap">註冊</string>
 	<string name="login">登入</string>
 	<string name="password">密碼</string>
@@ -460,6 +460,7 @@
 	<string name="kilometer">公里</string>
 	<string name="kilometers_per_hour">公里每小時</string>
 	<string name="mile">英哩</string>
+	<!-- A unit of measure -->
 	<string name="foot">英尺</string>
 	<string name="miles_per_hour">英哩每小時</string>
 	<string name="hour">小時</string>
@@ -563,6 +564,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d 軌跡</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">跟蹤設置</string>
 	<string name="crash_reports">錯誤報告</string>
 	<string name="crash_reports_description">我們可以使用您的數據來開發和改進Organic Maps。更改將再重新啟動 app 後生效。</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 96949b398b..25b5c5de83 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -27,7 +27,7 @@
 	<string name="later">稍后</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">搜索</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">搜索地图</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">您目前有此设备的所有位置服务或应用已禁用。请在设置中启用它们。</string>
@@ -371,7 +371,7 @@
 	<string name="editor_example_values">示例值</string>
 	<string name="editor_correct_mistake">纠正错误</string>
 	<string name="editor_add_select_location">位置</string>
-	<string name="editor_report_problem_desription_1">请详细描述此问题以便OpenStreeMap社区能够修复此错误。</string>
+	<string name="editor_report_problem_desription_1">请详细描述此问题以便OpenStreetMap社区能够修复此错误。</string>
 	<string name="editor_report_problem_desription_2">或者在https://www.openstreetmap.org/上亲自修复此错误。</string>
 	<string name="editor_report_problem_send_button">发送</string>
 	<string name="editor_report_problem_title">问题</string>
@@ -456,6 +456,7 @@
 	<string name="kilometer">公里</string>
 	<string name="kilometers_per_hour">公里每小时</string>
 	<string name="mile">英里</string>
+	<!-- A unit of measure -->
 	<string name="foot">英尺</string>
 	<string name="miles_per_hour">英里每小时</string>
 	<string name="hour">小時</string>
@@ -553,6 +554,7 @@
 	<plurals name="tracks">
 	  <item quantity="other">%d 跟踪</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">支持设置</string>
 	<string name="crash_reports">错误报告</string>
 	<string name="crash_reports_description">我们可以使用您的数据来开发和改进Organic Maps。更改将在重新启动应用程序后生效。</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index a8dd1ff036..c995a3cb33 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -30,7 +30,7 @@
 	<string name="later">Later</string>
 	<!-- View and button titles for accessibility -->
 	<string name="search">Search</string>
-	<!-- Search box placeholder text -->
+	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Search Map</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">You currently have all Location Services for this device or application disabled. Please enable them in Settings.</string>
@@ -391,7 +391,7 @@
 	<string name="editor_example_values">Example Values</string>
 	<string name="editor_correct_mistake">Correct mistake</string>
 	<string name="editor_add_select_location">Location</string>
-	<string name="editor_report_problem_desription_1">Please describe the problem in detail so that the OpenStreeMap community can fix the error.</string>
+	<string name="editor_report_problem_desription_1">Please describe the problem in detail so that the OpenStreetMap community can fix the error.</string>
 	<string name="editor_report_problem_desription_2">Or do it yourself at https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Send</string>
 	<string name="editor_report_problem_title">Issue</string>
@@ -479,6 +479,7 @@
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
+	<!-- A unit of measure -->
 	<string name="foot">ft</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">h</string>
@@ -589,6 +590,7 @@
 	  <item quantity="one">%d track</item>
 	  <item quantity="other">%d tracks</item>
 	</plurals>
+	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Tracking settings</string>
 	<string name="crash_reports">Crash report</string>
 	<string name="crash_reports_description">We may use your data to improve Organic Maps experience. Changes will take effect after you restart the app.</string>
diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index b6ff73c516..c7f86ad047 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -2721,8 +2721,8 @@
     tags = android,ios
     en = RV Facilities
     be = Для аўтадамоў
-    ru = Для автодомов
     ro = Pentru rulote
+    ru = Для автодомов
     tr = Karavan tesisleri
     uk = Для автобудинків
 
@@ -9499,7 +9499,7 @@
     pl = Dziś nieczynne
     pt = Fechado hoje
     pt-BR = Fechado hoje
-    ro = Închis astăzi 
+    ro = Închis astăzi
     ru = Сегодня закрыто
     sk = Dnes deň voľna
     sv = Stängt idag
@@ -19108,7 +19108,7 @@
     pl = Brak możliwości zbudowania trasy od bieżącej lokalizacji
     pt = Não foi possível calcular o percurso a partir da localização atual
     pt-BR = Desativar rota demarcada pela sua localização atual
-    ro = Traseul de la locul în care te afli nu poate fi alcătuit 
+    ro = Traseul de la locul în care te afli nu poate fi alcătuit
     ru = Невозможно построить маршрут от текущего местоположения
     sk = Z vašej aktuálnej polohy nie je možné vytvoriť trasu
     sv = Det gick inte att bygga rutten från nuvarande plats
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index bed8fffc40..f3be2c974c 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "ميل";
 
+/* A unit of measure */
 "foot" = "قدم";
 
 "miles_per_hour" = "ميل/ساعة";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index da3bf5da70..8b7e8f8965 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "міля";
 
+/* A unit of measure */
 "foot" = "фут";
 
 "miles_per_hour" = "міль/г";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 6b9bbd39bc..4451afcba9 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "ми";
 
+/* A unit of measure */
 "foot" = "фут";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 7fa837cba0..994313738d 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mil";
 
+/* A unit of measure */
 "foot" = "stopa";
 
 "miles_per_hour" = "mil/h";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 339961281e..9da9886582 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mil";
 
+/* A unit of measure */
 "foot" = "fod";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 8a76e72b93..8f66110b5a 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 7c1a6abf15..0dbc95cb1b 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index e391f1d07d..86db69c87d 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index a1aa89ce2b..090826442e 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index dca0a22a05..99f9971023 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 7e75f52056..896a88fde3 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "pie";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index a62a3f7639..40e04193c7 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "مایل";
 
+/* A unit of measure */
 "foot" = "فوت";
 
 "miles_per_hour" = "مایل بر ساعت (mph)";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 5dd376a9e7..a85f49868d 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index cf12ed1e6a..b708395ba1 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -743,7 +743,8 @@
 
 "mile" = "mi";
 
-"foot" = "pied";
+/* A unit of measure */
+"foot" = "ft";
 
 "miles_per_hour" = "mph";
 
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 61b9fa073a..ac255eb24c 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 81786f988f..d14d2ddb2a 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mf";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 1e29b4232b..f76e575323 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mil";
 
+/* A unit of measure */
 "foot" = "kaki";
 
 "miles_per_hour" = "mpj";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index d48be8b41b..f1723c0dfa 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -126,7 +126,7 @@
 "nightlife" = "Vita notturna";
 
 /* Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @children! */
-"children" = "Tempo libero";
+"children" = "Divertimento in famiglia";
 
 /* Search category for banks; any changes should be duplicated in categories.txt @bank! */
 "bank" = "Banca";
@@ -743,7 +743,8 @@
 
 "mile" = "mi";
 
-"foot" = "piede";
+/* A unit of measure */
+"foot" = "ft";
 
 "miles_per_hour" = "mph";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 1435891778..ddae31faf9 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "マイル";
 
+/* A unit of measure */
 "foot" = "フィート";
 
 "miles_per_hour" = "マイル毎時";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 4927c085f7..a9ac32356a 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "풋";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 4ea2c00869..4a3dcdc986 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "fot";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index befca1a54c..0b39b2c788 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mijl";
 
+/* A unit of measure */
 "foot" = "voet";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 1b799d1e99..95bfa7c418 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 0048f56dba..b2802c9f96 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index e7ecf31f0a..f60d605c3e 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index d06b03b395..350d740c04 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -7,7 +7,7 @@
 /********** Strings **********/
 
 /* Button text (should be short) */
-"cancel" = "Renunță";
+"cancel" = "Anulare";
 
 /* Button which interrupts country download */
 "cancel_download" = "Anulează descărcarea";
@@ -36,7 +36,7 @@
 "core_my_position" = "Poziția mea";
 
 /* Update maps later/Buy pro version later button text */
-"later" = "Mai tîrziu";
+"later" = "Mai târziu";
 
 /* View and button titles for accessibility */
 "search" = "Caută";
@@ -51,7 +51,7 @@
 "country_status_download_without_size" = "Descarcă harta";
 
 /* Message to display at the center of the screen when the country download has failed */
-"country_status_download_failed" = "Descărcarea nu a reușit";
+"country_status_download_failed" = "Descărcarea a eșuat";
 
 "about_menu_title" = "Despre Organic Maps";
 
@@ -66,10 +66,10 @@
 "add_new_set" = "Adaugă o listă nouă";
 
 /* Bookmark Color dialog title */
-"bookmark_color" = "Culoare Loc preferat";
+"bookmark_color" = "Culoare loc preferat";
 
 /* Add Bookmark list dialog - hint when the list name is empty */
-"bookmark_set_name" = "Dă un nume listei";
+"bookmark_set_name" = "Denumirea listei";
 
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Liste cu locuri preferate";
@@ -84,7 +84,7 @@
 "address" = "Adresa";
 
 /* Settings button in system menu */
-"settings" = "Preferințe";
+"settings" = "Setări";
 
 /* Measurement units title in settings activity */
 "measurement_units" = "Unități de măsură";
@@ -93,7 +93,7 @@
 /********** Search categories **********/
 
 /* Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @eat! */
-"eat" = "Unde să mănînci";
+"eat" = "Unde să mănânci";
 
 /* Search category for grocery stores; any changes should be duplicated in categories.txt @food! */
 "food" = "Alimentare";
@@ -108,7 +108,7 @@
 "parking" = "Parcare";
 
 /* Search category for clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @shopping! */
-"shopping" = "Magazine";
+"shopping" = "Shopping";
 
 /* Search category for places to stay; any changes should be duplicated in categories.txt @hotel! */
 "hotel" = "Hotel";
@@ -126,7 +126,7 @@
 "nightlife" = "Viață nocturnă";
 
 /* Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @children! */
-"children" = "Timp liber";
+"children" = "Divertisment cu copiii";
 
 /* Search category for banks; any changes should be duplicated in categories.txt @bank! */
 "bank" = "Bancă";
@@ -153,9 +153,9 @@
 "water" = "Apă";
 
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
-"rv" = "RV Facilities";
+"rv" = "Pentru rulote";
 
-"share_bookmarks_email_body" = "Bună!\n\nȚi-am atașat locurile mele preferate din aplicația Organic Maps. Deschide-le dacă ai instalat Organic Maps. Dacă nu, descarcă aplicația pentru iOS sau Android de aici: https://organicmaps.app/";
+"share_bookmarks_email_body" = "Bună!\n\nȚi-am atașat locurile mele preferate din aplicația Organic Maps. Deschide-le dacă ai instalată Organic Maps. Dacă nu, o poți descărca pentru iOS sau Android de aici: https://organicmaps.app/";
 
 /* message title of loading file */
 "load_kmz_title" = "Se încarcă locurile preferate";
@@ -252,14 +252,14 @@
 
 "duration_1_day" = "1 zi";
 
-"recent_track_help_text" = "Permite înregistrarea traseului parcurs pentru o anumită perioadă de timp și să îl vezi pe hartă. Reține: activarea acestei funcții crește consumul bateriei. Traseul va fi eliminat automat de pe hartă după expirarea intervalului de timp.";
+"recent_track_help_text" = "Permite înregistrarea traseului parcurs pentru o anumită perioadă de timp și urmărește-l pe hartă. Atenție: activarea acestei funcții crește consumul bateriei. Traseul va fi eliminat automat de pe hartă după expirarea intervalului de timp.";
 
 "placepage_distance" = "Distanță";
 
 "search_show_on_map" = "Vezi pe hartă";
 
 /* Text in menu */
-"website" = "Sit web";
+"website" = "Site web";
 
 /* Text in menu */
 "github" = "GitHub";
@@ -304,10 +304,10 @@
 "report_a_bug" = "Raportează o eroare";
 
 /* Alert text */
-"email_error_body" = "Nu a fost stabilită aplicația de e-mail. Stabilește-o sau utilizează alt mod de a ne contacta la %@.";
+"email_error_body" = "Aplicația de email nu a fost stabilită. Stabilește-o sau utilizează alt mod de a ne contacta la %@.";
 
 /* Alert title */
-"email_error_title" = "Eroare trimitere e-mail";
+"email_error_title" = "Eroare de trimitere e-mail";
 
 /* Settings item title */
 "pref_calibration_title" = "Calibrare busolă";
@@ -327,7 +327,7 @@
 /* Country queued for download */
 "downloader_queued" = "În așteptare";
 
-"downloader_near_me_subtitle" = "Lîngă mine";
+"downloader_near_me_subtitle" = "Lângă mine";
 
 "downloader_status_maps" = "Hărți";
 
@@ -341,13 +341,13 @@
 "downloader_status_outdated" = "Actualizează";
 
 /* Status of failed country in the list */
-"downloader_status_failed" = "Eșuată";
+"downloader_status_failed" = "Eșuat";
 
 /* Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode */
 "downloader_delete_map_while_routing_dialog" = "Pentru a șterge harta, oprește navigarea.";
 
 /* PointsInDifferentMWM */
-"routing_failed_cross_mwm_building" = "Se pot crea numai trasee cuprinse în întregime în cadrul unei hărți a unei singure regiuni.";
+"routing_failed_cross_mwm_building" = "Pot fi create numai trasee cuprinse de harta unei singure regiuni.";
 
 /* Context menu item for downloader. */
 "downloader_download_map" = "Descarcă harta";
@@ -362,7 +362,7 @@
 "routing_download_maps_along" = "Descarcă hărțile de pe traseu";
 
 /* Text for routing error dialog */
-"routing_requires_all_map" = "Crearea unui traseu necesită ca toate hărțile de la poziția ta pînă la destinație să fie descărcate și actualizate.";
+"routing_requires_all_map" = "Pentru a crea un traseu, este necesar ca toate hărțile, de la poziția ta până la destinație să fie descărcate și actualizate";
 
 /* bookmark button text */
 "bookmark" = "preferat";
@@ -425,15 +425,15 @@
 
 /********** Routing dialogs strings **********/
 
-"dialog_routing_disclaimer_title" = "Cînd parcurgi traseul, ai în vedere următoarele:";
+"dialog_routing_disclaimer_title" = "Când parcurgi traseul, ai în vedere următoarele:";
 
-"dialog_routing_disclaimer_priority" = "— Condiţiile de drum, legile şi semnele rutiere sînt mai importante decît indicațiile navigatorului;";
+"dialog_routing_disclaimer_priority" = "— Condiţiile de drum, legile şi semnele rutiere sunt mai importante decât indicațiile navigatorului;";
 
-"dialog_routing_disclaimer_precision" = "— Harta poate să conţină greşeli şi traseul sugerat poate să nu fie cel mai bun pentru a ajunge la destinaţie;";
+"dialog_routing_disclaimer_precision" = "— Harta poate conţine greşeli, iar traseul sugerat pentru a ajunge la destinaţie nu e întotdeauna cel mai bun;";
 
-"dialog_routing_disclaimer_recommendations" = "— Traseele sugerate au numai rol de recomandări;";
+"dialog_routing_disclaimer_recommendations" = "— Traseele sugerate sunt doar niște recomandări;";
 
-"dialog_routing_disclaimer_borders" = "— Ai grijă în zonele de graniță: traseele create de aplicația noastră ar putea, ocazional, să treacă granița prin locuri nepermise;";
+"dialog_routing_disclaimer_borders" = "— Ai grijă în zonele de graniță: traseele create de aplicația noastră pot trece granița prin locuri nepermise;";
 
 "dialog_routing_disclaimer_beware" = "Fii vigilent şi condu în siguranţă!";
 
@@ -449,17 +449,17 @@
 
 "dialog_routing_download_files" = "Descarcă fişierele necesare";
 
-"dialog_routing_download_and_update_all" = "Pentru calcularea traseului, descarcă şi actualizează toate hărţile şi informaţiile de stabilire a traseului pentru calea estimată.";
+"dialog_routing_download_and_update_all" = "Pentru calcularea traseului, descarcă şi actualizează toate hărţile şi informaţiile traseului pentru calea estimată.";
 
 "dialog_routing_unable_locate_route" = "Localizarea traseului a eşuat";
 
-"dialog_routing_change_start_or_end" = "Schimbă punctul de plecare sau destinaţia.";
+"dialog_routing_change_start_or_end" = "Modifică punctul de pornire sau destinaţia.";
 
-"dialog_routing_change_start" = "Schimbă punctul de plecare";
+"dialog_routing_change_start" = "Modifică punctul de pornire";
 
-"dialog_routing_start_not_determined" = "Traseul nu a fost creat. Localizarea punctului de plecare a eşuat.";
+"dialog_routing_start_not_determined" = "Traseul nu a fost creat. Localizarea punctului de pornire a eşuat.";
 
-"dialog_routing_select_closer_start" = "Alege un punct de plecare mai aproape de un drum.";
+"dialog_routing_select_closer_start" = "Alege un punct de pornire mai aproape de un drum.";
 
 "dialog_routing_change_end" = "Schimbă destinaţia";
 
@@ -499,7 +499,7 @@
 "routing_arrive" = "Sosire la %s";
 
 /* Text for routing::RouterResultCode::FileTooOld dialog. */
-"dialog_routing_download_and_update_maps" = "Pentru a crea un traseu,descarcă și actualizează toate hărțile de pe parcursul traseului.";
+"dialog_routing_download_and_update_maps" = "Pentru a crea un traseu, descarcă și actualizează toate hărțile de pe parcursul traseului.";
 
 "categories" = "Categorii";
 
@@ -509,13 +509,13 @@
 
 "search_not_found" = "Nu s-a găsit nimic.";
 
-"search_not_found_query" = "Caută altfel.";
+"search_not_found_query" = "Încearcă să modifici condițiile căutării.";
 
-"search_history_title" = "Cronologia căutărilor";
+"search_history_title" = "Istoricul căutărilor";
 
 "search_history_text" = "Arată căutările recente.";
 
-"clear_search" = "Șterge cronologia căutărilor";
+"clear_search" = "Șterge istoricul căutărilor";
 
 "p2p_your_location" = "Poziția ta";
 
@@ -525,9 +525,9 @@
 
 "p2p_to_here" = "La";
 
-"p2p_only_from_current" = "Navigația este disponibilă doar avînd ca punct de plecare poziția ta actuală.";
+"p2p_only_from_current" = "Navigația este disponibilă doar având ca punct de plecare poziția ta actuală.";
 
-"p2p_reroute_from_current" = "Vrei să planificăm un traseu din poziția ta actuală?";
+"p2p_reroute_from_current" = "Vrei să planifici un traseu din poziția ta actuală?";
 
 "editor_time_add" = "Adaugă planificare";
 
@@ -570,13 +570,13 @@
 
 "twentyfour_seven" = "24/7";
 
-"day_off_today" = "Astăzi închis";
+"day_off_today" = "Închis astăzi";
 
 "day_off" = "Închis";
 
 "today" = "Azi";
 
-"add_opening_hours" = "Adaugă ore de funcționare";
+"add_opening_hours" = "Adaugă orele de funcționare";
 
 "no_osm_account" = "Nu ai un cont OpenStreetMap?";
 
@@ -638,11 +638,11 @@
 
 "migration_download_error_dialog" = "Eroare de descărcare";
 
-"common_check_internet_connection_dialog" = "Verifică dacă aparatul tău este conectat la internet.";
+"common_check_internet_connection_dialog" = "Verifică dacă dispozitivul tău este conectat la internet.";
 
 "downloader_no_space_title" = "Spațiu insuficient";
 
-"downloader_no_space_message" = "Șterge datele care nu sînt necesare";
+"downloader_no_space_message" = "Șterge datele care nu sunt necesare";
 
 "editor_profile_changes" = "Modificări confirmate";
 
@@ -671,7 +671,7 @@
 "login_to_make_edits_visible" = "Autentifică-te pentru ca modificările pe care le-ai făcut să poată fi văzute și de alți utilizatori.";
 
 /* Error dialog no space */
-"migration_no_space_message" = "Ai nevoie de mai mult spațiu pentru a descărca. Trebuie să ștergi toate datele inutile.";
+"migration_no_space_message" = "Ai nevoie de mai mult spațiu pentru a descărca. Șterge datele care nu sunt necesare.";
 
 "editor_sharing_title" = "Am îmbunătățit hărțile Organic Maps";
 
@@ -696,7 +696,7 @@
 /* Place Page title for long tap */
 "core_placepage_unknown_place" = "Loc necunoscut";
 
-"editor_other_info" = "Trimite un mesaj către OSM";
+"editor_other_info" = "Trimite un mesaj către editorii OSM";
 
 "editor_detailed_description_hint" = "Comentariu detaliat";
 
@@ -722,13 +722,13 @@
 
 "current_location_unknown_error_title" = "Poziția actuală este necunoscută.";
 
-"current_location_unknown_error_message" = "S-a produs o eroare la căutarea poziției tale. Verifică dacă aparatul funcționează corect și încearcă din nou.";
+"current_location_unknown_error_message" = "S-a produs o eroare la căutarea poziției tale. Verifică dacă dispozitivul funcționează corect și încearcă din nou.";
 
-"location_services_disabled_header" = "Serviciile de localizare sînt dezactivate";
+"location_services_disabled_header" = "Serviciile de localizare sunt dezactivate";
 
-"location_services_disabled_message" = "Activează accesul la geolocalizare din reglările aparatului";
+"location_services_disabled_message" = "Activează accesul la geolocalizare din setările dispozitivului";
 
-"location_services_disabled_1" = "1. Deschide reglările";
+"location_services_disabled_1" = "1. Deschide setările";
 
 "location_services_disabled_2" = "2. Apasă pe Localizare";
 
@@ -743,7 +743,8 @@
 
 "mile" = "mi";
 
-"foot" = "picior";
+/* A unit of measure */
+"foot" = "ft";
 
 "miles_per_hour" = "mph";
 
@@ -811,7 +812,7 @@
 "recent_track_background_dialog_message" = "Organic Maps folosește poziția ta geografică pentru a înregistra cel mai recent traseu urmat.";
 
 /* Text under the version number in the Help dialog. TODO: Synchronize other translations with English. */
-"about_description" = "Organic Maps este o aplicație gratuită și cod sursă public care permite descărcarea hărților și navigare fără internet. Fără reclame. Fără urmărire. Dacă vezi o eroare pe hartă, te rugăm să o corectezi în OpenStreetMap. Proiectul este creat de entuziaști în timpul nostru liber, așa că avem nevoie de părerea și sprijinul tău.";
+"about_description" = "Organic Maps este o aplicație rapidă și gratuită fără reclame și urmărire. Hărțile sunt bazate pe datele OpenStreetMap.org oferite de utilizatori, de aceea chiar și tu poți corecta erorile și adăuga obiecte noi pe hartă. Organic Maps este un proiect creat de entuziaști în timpul lor liber. Părerea și sprijinul tău sunt foarte importante pentru noi";
 
 "general_settings" = "Opțiuni generale";
 
@@ -835,21 +836,21 @@
 "mobile_data" = "Internet mobil";
 
 /* NOTE to translators: please synchronize your translation with the English one. */
-"mobile_data_description" = "Internetul mobil este necesar pentru afişarea de informaţii detaliate despre locuri, precum fotografii, preţuri şi recenzii.";
+"mobile_data_description" = "Internetul mobil este necesar pentru a afișa informaţii detaliate despre locuri generale și cele preferate.";
 
 "mobile_data_option_never" = "Nu utiliza niciodată";
 
-"mobile_data_option_ask" = "Întreabă mereu";
+"mobile_data_option_ask" = "Întreabă întotdeauna";
 
 "traffic_update_maps_text" = "Pentru a afişa datele privind traficul, hărțile trebuie actualizate.";
 
-"big_font" = "Mărește literele pe hartă";
+"big_font" = "Mărește dimensiunea literelor pe hartă";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Pentru a afişa datele privind traficul, aplicația trebuie actualizată.";
 
 /* "traffic" as in "road congestion" */
-"traffic_data_unavailable" = "Datele privind traficul nu sînt disponibile";
+"traffic_data_unavailable" = "Datele privind traficul nu sunt disponibile";
 
 /* Settings: "Send general feedback" button */
 "feedback_general" = "Părere generală";
@@ -901,15 +902,15 @@
 
 "downloader_applying" = "Se aplică %s…";
 
-"bookmarks_error_message_share_general" = "Imposibil de trimis din cauza unei erori a aplicației";
+"bookmarks_error_message_share_general" = "Nu poate fi trimis din cauza unei erori a aplicației";
 
-"bookmarks_error_title_share_empty" = "Eroare la trimitere";
+"bookmarks_error_title_share_empty" = "Eroare de trimitere";
 
-"bookmarks_error_message_share_empty" = "Nu se poate trimite o listă goală";
+"bookmarks_error_message_share_empty" = "Nu poate fi trimisă o listă goală";
 
 "bookmarks_error_message_empty_list_name" = "Introdu numele listei";
 
-"bookmarks_error_title_list_name_already_taken" = "Acest nume este deja ales";
+"bookmarks_error_title_list_name_already_taken" = "Acest nume este deja folosit";
 
 "bookmarks_error_title_list_name_too_long" = "Acest nume e prea lung";
 
@@ -973,7 +974,7 @@
 
 "power_managment_title" = "Economisire a energiei";
 
-"power_managment_description" = "Dacă este pornit modul de economisire a energiei, aplicația va deconecta caracteristicile care consumă multă energie în funcție de nivelul de încărcare a bateriei";
+"power_managment_description" = "Dacă este pornit modul de economisire a energiei, aplicația va deconecta funcțiile care consumă multă energie în dependență de nivelul de încărcare a bateriei";
 
 "power_managment_setting_never" = "Niciodată";
 
@@ -987,15 +988,15 @@
 
 "avoid_tolls" = "Drumuri cu plată";
 
-"avoid_unpaved" = "Drum neasfaltat";
+"avoid_unpaved" = "Drumuri neasfaltate";
 
-"avoid_ferry" = "Trecere cu bac";
+"avoid_ferry" = "Treceri cu bac";
 
 "avoid_motorways" = "Autostrăzi";
 
-"unable_to_calc_alert_title" = "Imposibil de creat un traseu";
+"unable_to_calc_alert_title" = "Nu poate fi creat un traseu";
 
-"unable_to_calc_alert_subtitle" = "Din păcate, nu reușim să elaborăm un traseu cu opțiunile alese. Modifică-le și încearcă din nou.";
+"unable_to_calc_alert_subtitle" = "Din păcate, nu putem elabora un traseu cu opțiunile alese. Modifică-le și încearcă din nou.";
 
 "define_to_avoid_btn" = "Stabilește drumurile de evitat";
 
@@ -1021,7 +1022,7 @@
 
 "search_results" = "Rezultatul căutării";
 
-"then_turn" = "După";
+"then_turn" = "Apoi";
 
 "redirect_route_alert" = "Vrei să refaci traseul?";
 
@@ -1031,17 +1032,17 @@
 
 "trip_finished" = "Ai ajuns!";
 
-"keyboard_availability_alert" = "Tastatura nu este accesibilă în timpul deplasării";
+"keyboard_availability_alert" = "Tastatura nu poate fi folosită cât timp conduceți";
 
-"dialog_routing_change_start_carplay" = "Imposibil de alcătuit traseul de la locul în care te afli";
+"dialog_routing_change_start_carplay" = "Traseul de la locul în care te afli nu poate fi alcătuit";
 
-"dialog_routing_change_end_carplay" = "Imposibil de alcătuit traseul către destinația aleasă. Alege altă destinație.";
+"dialog_routing_change_end_carplay" = "Traseul către destinația aleasă nu poate fi alcătuit. Alege altă destinație.";
 
 "dialog_routing_check_gps_carplay" = "Nu este semnal GPS. Mergi la loc deschis.";
 
-"dialog_routing_unable_locate_route_carplay" = "Imposibil de alcătuit un traseu. Alege alte puncte ale traseului";
+"dialog_routing_unable_locate_route_carplay" = "Nu poate fi alcătuit un traseu. Alege alte puncte ale traseului";
 
-"dialog_routing_download_files_carplay" = "Pentru a crea un traseu, descarcă hărțile lipsă în aparatul tău";
+"dialog_routing_download_files_carplay" = "Pentru a crea un traseu, descarcă hărțile lipsă în dispozitivul tău";
 
 "dialog_routing_system_error_carplay" = "Eroare. Repornește aplicația.";
 
@@ -1067,7 +1068,7 @@
 
 "speedcams_alert_title_carplay_2" = "Info radare";
 
-"download_map_carplay" = "Descarcă hărțile în aplicația Organic Maps din aparatul tău";
+"download_map_carplay" = "Descarcă hărțile în aplicația Organic Maps din dispozitivul tău";
 
 "carplay_roundabout_exit" = "%s ieșire";
 
@@ -1075,30 +1076,30 @@
 "sort" = "Sortare…";
 
 /* iOS */
-"sort_default" = "Aranjare prestabilită";
+"sort_default" = "Sortare standard";
 
-"sort_type" = "Aranjare după tip";
+"sort_type" = "Sortează după tip";
 
-"sort_distance" = "Aranjare după distanță";
+"sort_distance" = "Sortează după distanță";
 
-"sort_date" = "Aranjare după dată";
+"sort_date" = "Sortează după dată";
 
-"week_ago_sorttype" = "Acum o săptămînă";
+"week_ago_sorttype" = "Acum o săptămână";
 
 "month_ago_sorttype" = "Acum o lună";
 
 "moremonth_ago_sorttype" = "Acum mai mult de o lună";
 
-"moreyear_ago_sorttype" = "Cu peste un an în urmă";
+"moreyear_ago_sorttype" = "Cu mai mult de un an în urmă";
 
-"near_me_sorttype" = "Lîngă mine";
+"near_me_sorttype" = "Lângă mine";
 
 "others_sorttype" = "Altele";
 
 
 /********** Bookmark types used for sorting **********/
 
-"food_places" = "Mîncare";
+"food_places" = "Mâncare";
 
 "tourist_places" = "Obiective turistice";
 
@@ -1152,7 +1153,7 @@
 
 "elevation_profile_ascent" = "Urcare";
 
-"elevation_profile_descent" = "Coborîre";
+"elevation_profile_descent" = "Coborâre";
 
 "elevation_profile_minaltitude" = "Înălțime minimă";
 
@@ -1162,7 +1163,7 @@
 
 "elevation_profile_time" = "Timp:";
 
-"isolines_toast_zooms_1_10" = "Mărește harta pentru a vedea contururile";
+"isolines_toast_zooms_1_10" = "Mărește harta pentru a vedea izoliniile";
 
 "downloader_updating_ios" = "Se actualizează";
 
@@ -1178,7 +1179,7 @@
 "whats_new_auto_update_button_size" = "Actualizează (%s)";
 
 /* Autoupdate dialog on start */
-"whats_new_auto_update_button_later" = "Actualizează manual mai tîrziu";
+"whats_new_auto_update_button_later" = "Actualizează manual mai târziu";
 
 /* Delete track button on track edit screen */
 "placepage_delete_track_button" = "Elimină traseul";
@@ -1247,7 +1248,7 @@
 
 "type.amenity.biergarten" = "Berărie";
 
-"type.amenity.brothel" = "Divertisment";
+"type.amenity.brothel" = "Bordel";
 
 "type.amenity.bureau_de_change" = "Schimb valutar";
 
@@ -2376,7 +2377,7 @@
 
 "type.natural.scrub" = "Boschet";
 
-"type.natural.spring" = "Primăvară";
+"type.natural.spring" = "Izvor";
 
 "type.natural.strait" = "Strâmtoare";
 
@@ -2668,7 +2669,7 @@
 
 "type.shop.bakery" = "Brutărie";
 
-"type.shop.beauty" = "Salon de infrumusetare";
+"type.shop.beauty" = "Salon de înfrumusețare";
 
 "type.shop.beverages" = "Băuturi";
 
@@ -2742,7 +2743,7 @@
 
 "type.shop.laundry" = "Spălătorie";
 
-"type.shop.mall" = "Mall-ul";
+"type.shop.mall" = "Mall";
 
 "type.shop.massage" = "Salon de masaj";
 
@@ -2796,7 +2797,7 @@
 
 "type.shop.video_games" = "Magazin de jocuri video";
 
-"type.shop.wine" = "Magazin de băuturi alcolice";
+"type.shop.wine" = "Vinărie";
 
 "type.sport" = "sport";
 
@@ -2870,7 +2871,7 @@
 
 "type.tourism.chalet" = "Cabană";
 
-"type.tourism.gallery" = "Obiective turistice";
+"type.tourism.gallery" = "Galerie";
 
 "type.tourism.guest_house" = "Pensiune";
 
@@ -2896,11 +2897,11 @@
 
 "type.tourism.resort" = "Stațiuni";
 
-"type.tourism.theme_park" = "Obiective turistice";
+"type.tourism.theme_park" = "Parc de distracții";
 
 "type.tourism.viewpoint" = "Punct de vedere";
 
-"type.tourism.wilderness_hut" = "Adăpost";
+"type.tourism.wilderness_hut" = "Cabană în pădure";
 
 "type.tourism.zoo" = "Grădină zoologică";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 2980f50639..999700e5fd 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "ми";
 
+/* A unit of measure */
 "foot" = "фут";
 
 "miles_per_hour" = "ми/ч";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index fe46a8e2d2..c06c342526 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "stopa";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 36f957f452..2e516d93ce 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mile";
 
+/* A unit of measure */
 "foot" = "fot";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index ebc45ee919..735d6621d5 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mi";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 381eb38264..68b7f910da 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "ไมล์";
 
+/* A unit of measure */
 "foot" = "ฟุต";
 
 "miles_per_hour" = "ไมล์/ชม.";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index eb1e22079a..9eaa5ca38c 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "mil";
 
+/* A unit of measure */
 "foot" = "fit";
 
 "miles_per_hour" = "saatte mil";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 4e20749ff3..43d8581773 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "ми";
 
+/* A unit of measure */
 "foot" = "фут";
 
 "miles_per_hour" = "ми/год";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index eea4606237..8942b10229 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "dặm";
 
+/* A unit of measure */
 "foot" = "ft";
 
 "miles_per_hour" = "mph";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 29cb51fea0..16487bbeaf 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -743,6 +743,7 @@
 
 "mile" = "英里";
 
+/* A unit of measure */
 "foot" = "英尺";
 
 "miles_per_hour" = "英里每小时";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 33a1d18bb1..07e5db8d8d 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -578,7 +578,7 @@
 
 "add_opening_hours" = "新增營業時間";
 
-"no_osm_account" = "沒有 OpenStreeMap 帳號嗎？";
+"no_osm_account" = "沒有 OpenStreetMap 帳號嗎？";
 
 "register_at_openstreetmap" = "註冊";
 
@@ -743,6 +743,7 @@
 
 "mile" = "英哩";
 
+/* A unit of measure */
 "foot" = "英尺";
 
 "miles_per_hour" = "英哩每小時";