diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 2fe875b6bf..60a877b63b 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -49,7 +49,8 @@
 	<string name="about_proposition_3">• سريع ، الحد الأدنى ، لا خردة</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">تطبيق مفتوح المصدر الذي أنشأه المتحمسون والمتطوعون.</string>
-	<string name="connection_settings">إعدادات الاتصال</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">إعدادات الموقع</string>
 	<string name="close">إغلاق</string>
 	<string name="unsupported_phone">أنت بحاجة الى OpenGL بأجهزة تسريع. لسوء الحظ جهازك لا يدعم هذه الخاصية.</string>
 	<string name="download">تنزيل</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 5162495584..8f8413cd54 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -49,7 +49,8 @@
 	<string name="about_proposition_3">• Хуткія, мінімалістычныя, без смецця</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Праграма з адкрытым зыходным кодам, створаная энтузіястамі і валанцёрамі.</string>
-	<string name="connection_settings">Налады падключэння</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Налады месцазнаходжання</string>
 	<string name="close">Закрыць</string>
 	<string name="unsupported_phone">Для працы праграмы неабходны апаратна паскораны OpenGL. Нажаль, ваша прылада не падтрымліваецца.</string>
 	<string name="download">Спампаваць</string>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 5214f3d38c..0d3ce23655 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -49,7 +49,8 @@
 	<string name="about_proposition_3">• Бързи, минималистични, без боклуци</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Приложение с отворен код, създадено от ентусиасти и доброволци.</string>
-	<string name="connection_settings">Настройки за свързване</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Настройки на местоположението</string>
 	<string name="close">Затваряне</string>
 	<string name="unsupported_phone">Приложението изисква хардуерно ускорение на OpenGL. За съжаление вашето устройство не се поддържа.</string>
 	<string name="download">Изтегляне</string>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index e13801cfcd..686ae47040 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -38,7 +38,8 @@
 	<string name="about_menu_title">Quant a l\'Organic Maps</string>
 	<!-- Text in About screen -->
 	<string name="about_proposition_2">• Estalvia la bateria, no utilitza dades de fons</string>
-	<string name="connection_settings">Paràmetres de connexió</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Paràmetres d\'ubicació</string>
 	<string name="close">Tanca</string>
 	<string name="unsupported_phone">L\'aplicació requereix acceleració per maquinari OpenGL. Malauradament, el vostre aparell no ho suporta.</string>
 	<string name="download">Baixa</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 329a59c54f..6c1e3e63ea 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Rychlé, minimalistické, žádný bloatware</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Otevřená aplikace vytvořená nadšenci a dobrovolníky.</string>
-	<string name="connection_settings">Nastavení připojení</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Nastavení polohy</string>
 	<string name="close">Zavřít</string>
 	<string name="unsupported_phone">Je vyžadována hardwarová akcelerace OpenGL. Bohužel, vaše zařízení není podporováno.</string>
 	<string name="download">Stáhnout</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 6856a6868d..64c4037963 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Hurtig, minimalistisk, intet skrammel</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Open source-applikation oprettet af entusiaster og frivillige.</string>
-	<string name="connection_settings">Forbindelsesindstillinger</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Indstillinger for placering</string>
 	<string name="close">Luk</string>
 	<string name="unsupported_phone">En hardware accelereret OpenGL er påkrævet. Din enhed er desværre ikke understøttet.</string>
 	<string name="download">Download</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 424ec72f0b..4e2917a917 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Schnell, minimalistisch, keine Bloatware</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Open-Source-Anwendung von Enthusiasten und Freiwilligen.</string>
-	<string name="connection_settings">Verbindungseinstellungen</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Standorteinstellungen</string>
 	<string name="close">Schließen</string>
 	<string name="unsupported_phone">Das Programm benötigt OpenGL, um zu funktionieren. Leider wird Ihr Gerät nicht unterstützt.</string>
 	<string name="download">Herunterladen</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 3e29b1fa87..2ba769c60e 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -47,7 +47,8 @@
 	<string name="about_proposition_3">• Γρήγορη, μινιμαλιστική, χωρίς σκουπίδια</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Εφαρμογή ανοιχτού κώδικα που δημιουργήθηκε από ενθουσιώδες και εθελοντές.</string>
-	<string name="connection_settings">Ρυθμίσεις σύνδεσης</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Ρυθμίσεις τοποθεσίας</string>
 	<string name="close">Κλείσιμο</string>
 	<string name="unsupported_phone">Η εφαρμογή απαιτεί OpenGL με επιτάχυνση υλικού. Δυστυχώς, η συσκευή σας δεν το υποστηρίζει.</string>
 	<string name="download">Λήψη</string>
diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml
index 3eb077f89a..5bd6d134ff 100644
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -3,6 +3,10 @@
 <!-- Generated by Twine -->
 <!-- Language: es-MX -->
 <resources>
+	<!-- SECTION: Strings -->
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Configuración de ubicación</string>
+
 	<!-- SECTION: Search categories -->
 	<!-- Search category for recycling; any changes should be duplicated in categories.txt @recycling! -->
 	<string name="recycling">Reciclaje</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index c5e746f520..0390db9994 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Rápido, minimalista, sin basura</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Aplicación de código abierto creada por entusiastas y voluntarios.</string>
-	<string name="connection_settings">Ajustes de conexión</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Ajustes de ubicación</string>
 	<string name="close">Cerrar</string>
 	<string name="unsupported_phone">La aplicación requiere OpenGL acelerado por hardware. Lamentablemente, su dispositivo no es compatible.</string>
 	<string name="download">Descargar</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index d5277311b9..91aece03b0 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -38,7 +38,8 @@
 	<string name="about_menu_title">Organic Maps kohta</string>
 	<!-- Text in About screen -->
 	<string name="about_proposition_2">• Säästab akut, ei kasuta taustaandmeid</string>
-	<string name="connection_settings">Ühenduse seaded</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Asukoha seaded</string>
 	<string name="close">Sulge</string>
 	<string name="unsupported_phone">Rakendus vajab riistvaralist OpenGL tuge. Kahjuks Sinu seade ei ole toetatud.</string>
 	<string name="download">Lae alla</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 9faba50380..4695397d03 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Azkarra, minimalista, zaborrik gabe</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Kode irekiko aplikazioa zaleek eta boluntarioek sortutakoa.</string>
-	<string name="connection_settings">Konexio ezarpenak</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Kokapen ezarpenak</string>
 	<string name="close">Itxi</string>
 	<string name="unsupported_phone">Aplikazioak hardwarez azeleratutako OpenGL behar du. Zoritxarrez, zure gailua ez da onartzen.</string>
 	<string name="download">Deskargatu</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index db53a40422..ce2c1d331d 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -49,7 +49,8 @@
 	<string name="about_proposition_3">• سریع ، مینیمالیستی ، بدون آشغال</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">برنامه منبع باز ایجاد شده توسط علاقه مندان و داوطلبان.</string>
-	<string name="connection_settings">تنظیمات اتصال</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">تنظیمات مکان</string>
 	<string name="close">بستن</string>
 	<string name="unsupported_phone">نیازمند است. متاسفانه دستگاه شما از آن پشتیبانی نمی‌کندOpenGLبرنامه برای اجرا به</string>
 	<string name="download">دانلود</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index fa6e38f5fa..cbcf07dc25 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -49,7 +49,8 @@
 	<string name="about_proposition_3">• Nopea, minimalistinen, ei roskaa</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Harrastajien ja vapaaehtoisten luoma avoimen lähdekoodin sovellus.</string>
-	<string name="connection_settings">Yhteysasetukset</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Sijaintiasetukset</string>
 	<string name="close">Sulje</string>
 	<string name="unsupported_phone">Laitteistokiihdytetty OpenGL vaaditaan. Valitettavasti laitteesi ei ole tuettu.</string>
 	<string name="download">Lataa</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index d6998b6db6..4241ce18ae 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -48,7 +48,8 @@
 	<string name="about_proposition_3">• Rapide, minimaliste, pas de superflu</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Application open source créée par des amateurs et des bénévoles.</string>
-	<string name="connection_settings">Paramètres de connexion</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Paramètres de localisation</string>
 	<string name="close">Fermer</string>
 	<string name="unsupported_phone">L\'accélération OpenGL matérielle est exigée. Malheureusement, votre appareil n\'est pas pris en charge.</string>
 	<string name="download">Télécharger</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 2e1fad8787..8608768745 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Gyors, minimalista, nincs szemét</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">A rajongók és az önkéntesek által létrehozott nyílt forráskódú alkalmazás.</string>
-	<string name="connection_settings">Helymeghatározási beállítások</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Helymeghatározási beállítások</string>
 	<string name="close">Bezár</string>
 	<string name="unsupported_phone">Hardware-s gyorsítású OpenGL szükséges. Sajnos az Ön eszköze nem támogatott.</string>
 	<string name="download">Letöltés</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index 94e71acf53..9b3ad2dd44 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -48,7 +48,8 @@
 	<string name="about_proposition_3">• Cepat, minimalis, tidak ada sampah</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Aplikasi open-source yang dibuat oleh penggemar dan sukarelawan.</string>
-	<string name="connection_settings">Pengaturan Koneksi</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Pengaturan lokasi</string>
 	<string name="close">Tutup</string>
 	<string name="unsupported_phone">OpenGL yang dipercepat oleh OpenGL diperlukan. Sayangnya, perangkat Anda tidak mendukung.</string>
 	<string name="download">Unduh</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index f5208ad328..43a2aa699b 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Veloce, minimalista, nessuna spazzatura</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Applicazione open source creata da appassionati e volontari.</string>
-	<string name="connection_settings">Impostazioni di connessione</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Impostazioni della posizione</string>
 	<string name="close">Chiudi</string>
 	<string name="unsupported_phone">È necessaria una accelerazione hardware OpenGL. Purtroppo, il tuo dispositivo non è supportato.</string>
 	<string name="download">Scarica</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index b8c11ade86..c5218af86b 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -42,7 +42,8 @@
 	<string name="about_proposition_3">• מהיר, מינימליסטי, ללא זבל</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">יישום קוד פתוח שנוצר על ידי חובבים ומתנדבים.</string>
-	<string name="connection_settings">הגדרות תקשורת</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">הגדרות מיקום</string>
 	<string name="close">סגור</string>
 	<string name="unsupported_phone">נדרש מאיץ חומרה OpenGL. לצערינו מכשיר זה אינו נתמך.</string>
 	<string name="download">הורד</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 6bbd58a4bf..b4023dd8f1 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">•速く、ミニマルな、ジャンクなし</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">愛好家とボランティアによって作成されたオープンソースアプリケーション。</string>
-	<string name="connection_settings">接続設定</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">ロケーション設定</string>
 	<string name="close">閉じる</string>
 	<string name="unsupported_phone">ハードウェアアクセラレーションされたOpenGLが必要です。残念ながらご利用中のデバイスではサポートされていません。</string>
 	<string name="download">ダウンロード</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index c4706ee96a..134e37d176 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• 빠르고 최소한의 정크가 없습니다</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">애호가와 자원 봉사자가 만든 오픈 소스 응용 프로그램.</string>
-	<string name="connection_settings">연결 설정</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">위치 설정</string>
 	<string name="close">닫기</string>
 	<string name="unsupported_phone">하드웨어 촉진 OpenGL이 요구됩니다. 애석하게도 귀하의 장치는 지원되지 않습니다.</string>
 	<string name="download">다운로드</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index e4672493ea..88602706a0 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -38,7 +38,8 @@
 	<string name="about_menu_title">Organic Maps बद्दल</string>
 	<!-- Text in About screen -->
 	<string name="about_proposition_2">• बॅटरी वाचवते, पार्श्वभूमी डेटा वापरत नाही</string>
-	<string name="connection_settings">जोडणी सेटिंग</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">स्थान सेटिंग्ज</string>
 	<string name="close">बंद</string>
 	<string name="unsupported_phone">ह्या ऍपला हार्डवेअर प्रवेगक OpenGL आवश्यक आहे. दुर्दैवाने, तुमच्या उपकरणाला ह्याचा आधार नाही.</string>
 	<string name="download">डाउनलोड करा</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 0b9c9d7228..470ecce5d3 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -48,7 +48,8 @@
 	<string name="about_proposition_3">• Rask, minimalistisk, ingen søppel</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Open source-applikasjon opprettet av entusiaster og frivillige.</string>
-	<string name="connection_settings">Tilkoblingsinnstillinger</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Innstillinger for plassering</string>
 	<string name="close">Lukk</string>
 	<string name="unsupported_phone">En maskinvareakselerert OpenGL kreves. Dessverre støttes ikke enheten din.</string>
 	<string name="download">Last ned</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 0fa5f9030a..bb81c7bad7 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Snel, minimalistisch, geen junk</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Open-source applicatie gemaakt door enthousiastelingen en vrijwilligers.</string>
-	<string name="connection_settings">Verbindingsinstellingen</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Locatie-instellingen</string>
 	<string name="close">Sluiten</string>
 	<string name="unsupported_phone">Een hardware geaccellereerde OpenGL is nodig. Jammer genoeg wordt uw apparaat niet ondersteund.</string>
 	<string name="download">Downloaden</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 94e8ec0df6..4766d14852 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Szybka, minimalistyczna, bez śmieci</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Aplikacja typu open source stworzona przez entuzjastów i wolontariuszy.</string>
-	<string name="connection_settings">Ustawienia połączenia</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Ustawienia lokalizacji</string>
 	<string name="close">Zamknij</string>
 	<string name="unsupported_phone">Wymagana jest sprzętowa akceleracja OpenGL. Aktualne urządzenie nie jest obsługiwane.</string>
 	<string name="download">Pobierz</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 42be30ba36..5838d5c1d2 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -44,7 +44,8 @@
 	<string name="about_proposition_2">• Baixo consumo de bateria, sem atualização em segundo plano</string>
 	<!-- Text in About screen -->
 	<string name="about_proposition_3">• Rápido, minimalista e sem recursos desnecessários</string>
-	<string name="connection_settings">Configurações de conexão</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Configurações de localização</string>
 	<string name="close">Fechar</string>
 	<string name="unsupported_phone">É necessário OpenGL acelerado por hardware. Infelizmente o seu dispositivo não é compatível.</string>
 	<string name="download">Baixar</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 0910f962cb..ae7db80a9a 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Rápido, minimalista e sem recursos desnecessários</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Aplicativo de código aberto criado por entusiastas e voluntários.</string>
-	<string name="connection_settings">Definições de ligação</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Definições de localização</string>
 	<string name="close">Fechar</string>
 	<string name="unsupported_phone">É necessário a acelaração OpenGL por hardware. Infelizmente o seu dispositivo não é compatível.</string>
 	<string name="download">Descarregar</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index d47e06f60e..5180b92fc7 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -12,7 +12,7 @@
 	<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. Atinge pentru a încearca din nou.</string>
+	<string name="download_has_failed">Descărcarea a eșuat. Atinge pentru a încerca 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 -->
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Rapid, minimalist, fără gunoi</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Aplicație open-source creată de entuziaști și voluntari.</string>
-	<string name="connection_settings">Opțiuni de conectare</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Setări de locație</string>
 	<string name="close">Închide</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>
@@ -80,7 +81,7 @@
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Denumire</string>
 	<!-- Editor title above street and house number -->
-	<string name="address">Adresa</string>
+	<string name="address">Adresă</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Listă</string>
 	<!-- Settings button in system menu -->
@@ -88,9 +89,9 @@
 	<!-- 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 -->
-	<string name="maps_storage_summary">Alege locul în care vrei să fie descărcate hărțile</string>
+	<string name="maps_storage_summary">Alege locul în care vrei să fie descărcate hărțile.</string>
 	<!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
-	<string name="maps_storage_downloaded">Hărţi</string>
+	<string name="maps_storage_downloaded">Hărți</string>
 	<!-- 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). -->
@@ -136,7 +137,7 @@
 	<!-- Search category for toilets; any changes should be duplicated in categories.txt @toilet! -->
 	<string name="toilet">Toaletă</string>
 	<!-- Search category for post offices; any changes should be duplicated in categories.txt @post! -->
-	<string name="post">Poştă</string>
+	<string name="post">Poștă</string>
 	<!-- Search category for police; any changes should be duplicated in categories.txt @police! -->
 	<string name="police">Poliția</string>
 	<!-- Search category for WiFi access; any changes should be duplicated in categories.txt @wifi! -->
@@ -287,7 +288,7 @@
 	<!-- 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">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>
+	<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 -->
@@ -330,31 +331,31 @@
 
 	<!-- 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 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_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_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>
-	<string name="dialog_routing_location_turn_wifi">Verifică semnalul GPS. Pentru a îmbunătăţi precizia localizării, activează Wi-Fi.</string>
+	<string name="dialog_routing_error_location_not_found">Crearea traseului a eșuat. Coordonatele GPS actuale nu au putut fi identificate.</string>
+	<string name="dialog_routing_location_turn_wifi">Verifică semnalul GPS. Pentru a îmbunătăți precizia localizării, activează Wi-Fi.</string>
 	<string name="dialog_routing_location_turn_on">Activează serviciile de localizare</string>
-	<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">Modifică punctul de pornire sau destinaţia.</string>
+	<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">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_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>
+	<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>
 	<string name="dialog_routing_change_intermediate">Punctul intermediar nu poate fi localizat.</string>
 	<string name="dialog_routing_intermediate_not_determined">Schimbă punctul intermediar.</string>
 	<string name="dialog_routing_system_error">Eroare de sistem</string>
-	<string name="dialog_routing_application_error">Crearea traseului a eşuat din cauza unei erori a aplicaţiei.</string>
+	<string name="dialog_routing_application_error">Crearea traseului a eșuat din cauza unei erori a aplicației.</string>
 	<string name="dialog_routing_try_again">Încearcă din nou</string>
-	<string name="dialog_routing_download_and_build_cross_route">Vrei să descarci harta şi să creezi un traseu mai bun care include mai multe hărți?</string>
+	<string name="dialog_routing_download_and_build_cross_route">Vrei să descarci harta și să creezi un traseu mai bun care include mai multe hărți?</string>
 	<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 -->
@@ -365,7 +366,7 @@
 	<!-- «Hide» context menu -->
 	<string name="hide">Ascunde</string>
 	<string name="categories">Categorii</string>
-	<string name="history">Cronologia</string>
+	<string name="history">Cronologie</string>
 	<string name="search_not_found">Nu s-a găsit nimic.</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>
@@ -394,7 +395,7 @@
 	<string name="editor_time_add_closed">Adaugă ore de închidere</string>
 	<string name="editor_time_title">Ore de deschidere</string>
 	<string name="editor_time_advanced">Mod Avansat</string>
-	<string name="editor_time_simple">Mod Simplu</string>
+	<string name="editor_time_simple">Mod simplu</string>
 	<string name="editor_hours_closed">Ore de închidere</string>
 	<string name="editor_example_values">Exemple</string>
 	<string name="editor_correct_mistake">Corectare greșeală</string>
@@ -523,16 +524,16 @@
 	<string name="accept">Acceptă</string>
 	<!-- For the first routing -->
 	<string name="decline">Refuză</string>
-	<string name="mobile_data_dialog">Folosești internetul mobil pentru a vedea informaţii detaliate?</string>
+	<string name="mobile_data_dialog">Folosești internetul mobil pentru a vedea informații detaliate?</string>
 	<string name="mobile_data_option_always">Folosește mereu</string>
 	<string name="mobile_data_option_today">Doar astăzi</string>
 	<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 a afișa informaţii detaliate despre locuri generale și cele preferate.</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ă întotdeauna</string>
-	<string name="traffic_update_maps_text">Pentru a afişa datele privind traficul, hărțile trebuie actualizate.</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 dimensiunea literelor pe hartă</string>
 	<string name="traffic_update_app">Actualizează Organic Maps</string>
 	<!-- "traffic" as in "road congestion" -->
@@ -616,7 +617,7 @@
 	<!-- 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 funcțiile care consumă multă energie în dependență 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>
@@ -626,7 +627,7 @@
 	<string name="avoid_tolls">Evitați drumurile cu taxă</string>
 	<string name="avoid_unpaved">Evitați drumurile neasfaltate</string>
 	<string name="avoid_ferry">Evitați traversările cu feribotul</string>
-	<string name="avoid_motorways">Evitați autostrada</string>
+	<string name="avoid_motorways">Evitați autostrăzile</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>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 50f3edd588..8ecd9f9f39 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -49,7 +49,8 @@
 	<string name="about_proposition_3">• Быстрые, минималистичные, без мусора</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Приложение с открытым исходным кодом, созданное энтузиастами и волонтерами.</string>
-	<string name="connection_settings">Настройки подключения</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Настройки местоположения</string>
 	<string name="close">Закрыть</string>
 	<string name="unsupported_phone">Для работы приложения необходим аппаратно ускоренный OpenGL. К сожалению, ваше устройство не поддерживается.</string>
 	<string name="download">Загрузить</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 0c8fcb81dc..9fbcf5fcd7 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Rýchle, minimalistické, žiadne nevyžiadané</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Aplikácia s otvoreným zdrojovým kódom vytvorené nadšencami a dobrovoľníkmi.</string>
-	<string name="connection_settings">Nastavenie pripojenia</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Nastavenia polohy</string>
 	<string name="close">Zavrieť</string>
 	<string name="unsupported_phone">Je vyžadovaná hardwarová akcelerácia OpenGL. Bohužial, vaše zariadenie nie je podporované.</string>
 	<string name="download">Stiahnuť</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index 901181a0a9..851733267d 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Snabb, minimalistisk, inget skräp</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Open-källansökan skapad av entusiaster och frivilliga.</string>
-	<string name="connection_settings">Anslutningsinställningar</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Inställningar för plats</string>
 	<string name="close">Stäng</string>
 	<string name="unsupported_phone">Hårdvaruaccelererad OpenGL krävs. Din enhet stöds tyvärr inte.</string>
 	<string name="download">Ladda ner</string>
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 751aabc65b..d48078d4be 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -14,6 +14,8 @@
 	<string name="about_proposition_3">• Haraka, minimalistic, hakuna taka</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Maombi ya chanzo-wazi iliyoundwa na wanaovutia na wanaojitolea.</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Mipangilio ya mahali</string>
 	<!-- Header of settings activity where user defines storage path -->
 	<string name="maps_storage">Hifadhi ramani kwenye</string>
 
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 1450bdc744..8974c47c7f 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -48,7 +48,8 @@
 	<string name="about_proposition_3">•เร็วเรียบง่ายไม่มีขยะ</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">แอปพลิเคชันโอเพนซอร์ซที่สร้างขึ้นโดยผู้ที่ชื่นชอบและอาสาสมัคร</string>
-	<string name="connection_settings">การตั้งค่าการเชื่อมต่อ</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">การตั้งค่าตำแหน่ง</string>
 	<string name="close">ปิด</string>
 	<string name="unsupported_phone">จำเป็นต้องใช้ฮาร์ดแวร์ที่เพิ่มความเร็ว OpenGL โชคไม่ดีที่อุปกรณ์ของคุณไม่รองรับ</string>
 	<string name="download">ดาวน์โหลด</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index d42e5b6b02..85c127f62c 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -48,7 +48,8 @@
 	<string name="about_proposition_3">• Hızlı, minimalist ve hafif</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Teknoloji tutkunları ve gönüllüler tarafından oluşturulan açık kaynaklı bir uygulama.</string>
-	<string name="connection_settings">Konum Ayarları</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Konum ayarları</string>
 	<string name="close">Kapat</string>
 	<string name="unsupported_phone">Hızlı donanıma sahip bir OpenGL gerekli. Ne yazık ki cihazınız desteklenmiyor.</string>
 	<string name="download">İndir</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 3916d6799b..09a374b898 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -49,7 +49,8 @@
 	<string name="about_proposition_3">• Швидкий, мінімалістичний, без зайвого сміття</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Програма з відкритим кодом, створена ентузіастами та волонтерами.</string>
-	<string name="connection_settings">Налаштування підключення</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Налаштування місцеположення</string>
 	<string name="close">Закрити</string>
 	<string name="unsupported_phone">Для роботи програми необхідний апаратно прискорений OpenGL. На жаль, ваш пристрій не підтримується.</string>
 	<string name="download">Завантажити</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index c36d125969..ea6440d4b0 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">• Nhanh chóng, tối giản, không có rác</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Ứng dụng nguồn mở được tạo bởi những người đam mê và tình nguyện viên.</string>
-	<string name="connection_settings">Thiết lập Kết nối</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Cài đặt vị trí</string>
 	<string name="close">Đóng</string>
 	<string name="unsupported_phone">Cần có OpenGL được tăng tốc phần cứng. Thật không may, thiết bị của bạn không được hỗ trợ.</string>
 	<string name="download">Tải xuống</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 183907e1c7..c2ae2b5aa6 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">•快速，簡約，沒有垃圾</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">由愛好者和志願者創建的開源應用程序。</string>
-	<string name="connection_settings">連線設定</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">位置設定</string>
 	<string name="close">關閉</string>
 	<string name="unsupported_phone">需要 OpenGL 硬體加速功能的支援。但很不幸的，您的裝置並不支援此功能！</string>
 	<string name="download">下載</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 23a09282b6..4136653a07 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -46,7 +46,8 @@
 	<string name="about_proposition_3">•快速，简约，没有垃圾</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">由爱好者和志愿者创建的开源应用程序。</string>
-	<string name="connection_settings">连接设置</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">位置设置</string>
 	<string name="close">关闭</string>
 	<string name="unsupported_phone">硬件加速的 OpenGL 是必需的。遗憾的是您的设备不支持此功能。</string>
 	<string name="download">下载</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index b3a513def1..d56838a5ae 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -49,7 +49,8 @@
 	<string name="about_proposition_3">• Fast, minimalist, no software bloat</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">Open-source application created by enthusiasts and volunteers.</string>
-	<string name="connection_settings">Connection Settings</string>
+	<!-- The button that opens system location settings -->
+	<string name="location_settings">Location Settings</string>
 	<string name="close">Close</string>
 	<string name="unsupported_phone">The app requires hardware accelerated OpenGL. Unfortunately, your device is not supported.</string>
 	<string name="download">Download</string>
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 79f3a0fce6..64e945efc8 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -81,7 +81,7 @@
 "core_my_places" = "Locurile mele";
 
 /* Editor title above street and house number */
-"address" = "Adresa";
+"address" = "Adresă";
 
 /* Settings button in system menu */
 "settings" = "Setări";
@@ -144,7 +144,7 @@
 "toilet" = "Toaletă";
 
 /* Search category for post offices; any changes should be duplicated in categories.txt @post! */
-"post" = "Poştă";
+"post" = "Poștă";
 
 /* Search category for police; any changes should be duplicated in categories.txt @police! */
 "police" = "Poliția";
@@ -337,7 +337,7 @@
 "downloader_downloaded_subtitle" = "Descărcate";
 
 /* Downloaded maps category */
-"downloader_available_maps" = "Disponibilă";
+"downloader_available_maps" = "Disponibile";
 
 /* Country queued for download */
 "downloader_queued" = "În așteptare";
@@ -378,7 +378,7 @@
 "routing_download_maps_along" = "Descarcă hărțile de pe traseu";
 
 /* Text for routing error dialog */
-"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";
+"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";
@@ -440,45 +440,45 @@
 
 "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 sunt 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 conţine greşeli, iar traseul sugerat pentru a ajunge la destinaţie nu e întotdeauna cel mai bun;";
+"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 sunt doar niște recomandări;";
 
 "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ţă!";
+"dialog_routing_disclaimer_beware" = "Fii vigilent și condu în siguranță!";
 
 "dialog_routing_check_gps" = "Verifică semnalul GPS";
 
-"dialog_routing_error_location_not_found" = "Crearea traseului a eşuat. Coordonatele GPS actuale nu au putut fi identificate.";
+"dialog_routing_error_location_not_found" = "Crearea traseului a eșuat. Coordonatele GPS actuale nu au putut fi identificate.";
 
-"dialog_routing_location_turn_wifi" = "Verifică semnalul GPS. Pentru a îmbunătăţi precizia localizării, activează Wi-Fi.";
+"dialog_routing_location_turn_wifi" = "Verifică semnalul GPS. Pentru a îmbunătăți precizia localizării, activează Wi-Fi.";
 
 "dialog_routing_location_turn_on" = "Activează serviciile de localizare";
 
-"dialog_routing_location_unknown_turn_on" = "Localizarea coordonatelor GPS curente a eşuat. Pentru a calcula traseul, activează serviciile de localizare.";
+"dialog_routing_location_unknown_turn_on" = "Localizarea coordonatelor GPS curente a eșuat. Pentru a calcula traseul, activează serviciile de localizare.";
 
-"dialog_routing_download_files" = "Descarcă fişierele necesare";
+"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 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_unable_locate_route" = "Localizarea traseului a eșuat";
 
-"dialog_routing_change_start_or_end" = "Modifică punctul de pornire sau destinaţia.";
+"dialog_routing_change_start_or_end" = "Modifică punctul de pornire sau destinația.";
 
 "dialog_routing_change_start" = "Modifică punctul de pornire";
 
-"dialog_routing_start_not_determined" = "Traseul nu a fost creat. Localizarea punctului de pornire 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 pornire mai aproape de un drum.";
 
-"dialog_routing_change_end" = "Schimbă destinaţia";
+"dialog_routing_change_end" = "Schimbă destinația";
 
-"dialog_routing_end_not_determined" = "Traseul nu a fost creat. Localizarea destinaţiei a eşuat.";
+"dialog_routing_end_not_determined" = "Traseul nu a fost creat. Localizarea destinației a eșuat.";
 
-"dialog_routing_select_closer_end" = "Alege un punct de destinaţie mai aproape de un drum.";
+"dialog_routing_select_closer_end" = "Alege un punct de destinație mai aproape de un drum.";
 
 "dialog_routing_change_intermediate" = "Punctul intermediar nu poate fi localizat.";
 
@@ -486,13 +486,13 @@
 
 "dialog_routing_system_error" = "Eroare de sistem";
 
-"dialog_routing_application_error" = "Crearea traseului a eşuat din cauza unei erori a aplicaţiei.";
+"dialog_routing_application_error" = "Crearea traseului a eșuat din cauza unei erori a aplicației.";
 
 "dialog_routing_try_again" = "Încearcă din nou";
 
 "not_now" = "Nu acum";
 
-"dialog_routing_download_and_build_cross_route" = "Vrei să descarci harta şi să creezi un traseu mai bun care include mai multe hărți?";
+"dialog_routing_download_and_build_cross_route" = "Vrei să descarci harta și să creezi un traseu mai bun care include mai multe hărți?";
 
 "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.";
 
@@ -516,7 +516,7 @@
 
 "categories" = "Categorii";
 
-"history" = "Cronologia";
+"history" = "Cronologie";
 
 "search_not_found" = "Nu s-a găsit nimic.";
 
@@ -563,7 +563,7 @@
 
 "editor_time_advanced" = "Mod Avansat";
 
-"editor_time_simple" = "Mod Simplu";
+"editor_time_simple" = "Mod simplu";
 
 "editor_hours_closed" = "Ore de închidere";
 
@@ -847,7 +847,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 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";
+"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";
 
@@ -860,7 +860,7 @@
 /* A noun - a button name used to show search results in list form */
 "search_in_table" = "Listă";
 
-"mobile_data_dialog" = "Folosești internetul mobil pentru a vedea informaţii detaliate?";
+"mobile_data_dialog" = "Folosești internetul mobil pentru a vedea informații detaliate?";
 
 "mobile_data_option_always" = "Folosește mereu";
 
@@ -871,18 +871,18 @@
 "mobile_data" = "Internet mobil";
 
 /* NOTE to translators: please synchronize your translation with the English one. */
-"mobile_data_description" = "Internetul mobil este necesar pentru a afișa informaţii detaliate despre locuri generale și cele preferate.";
+"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ă întotdeauna";
 
-"traffic_update_maps_text" = "Pentru a afişa datele privind traficul, hărțile trebuie actualizate.";
+"traffic_update_maps_text" = "Pentru a afișa datele privind traficul, hărțile trebuie actualizate.";
 
 "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_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 sunt disponibile";
@@ -1001,7 +1001,7 @@
 
 "power_managment_title" = "Economisire a energiei";
 
-"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_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ă";
 
@@ -1017,7 +1017,7 @@
 
 "avoid_ferry" = "Evitați traversările cu feribotul";
 
-"avoid_motorways" = "Evitați autostrada";
+"avoid_motorways" = "Evitați autostrăzile";
 
 "unable_to_calc_alert_title" = "Nu poate fi creat un traseu";
 
@@ -1065,7 +1065,7 @@
 
 "trip_finished" = "Ai ajuns!";
 
-"keyboard_availability_alert" = "Tastatura nu poate fi folosită cât timp conduceți";
+"keyboard_availability_alert" = "Tastatura nu poate fi folosită cât timp conduci";
 
 "dialog_routing_change_start_carplay" = "Traseul de la locul în care te afli nu poate fi alcătuit";