diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 7502deb2c9..e7bc749748 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -475,7 +475,9 @@
 	<string name="postal_code">الرمز البريدي</string>
 	<string name="cuisine">المطبخ</string>
 	<string name="select_cuisine">اختر المطبخ</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">اسم المستخدم</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">البريد الإلكتروني أو اسم المستخدم</string>
 	<string name="editor_add_phone">إضافة رقم هاتف</string>
 	<string name="level">طابق</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index df89b7cb32..dc93da72bc 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -462,7 +462,9 @@
 	<string name="postal_code">Poçt kodu</string>
 	<string name="cuisine">Mətbəx</string>
 	<string name="select_cuisine">Mətbəx seçin</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">İstifadəçi adı</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">E-poçt və ya istifadəçi adı</string>
 	<string name="editor_add_phone">Telefon əlavə edin</string>
 	<string name="level">Mərtəbə</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 6b91d9c411..2753107293 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -461,7 +461,9 @@
 	<string name="postal_code">Паштовы індэкс</string>
 	<string name="cuisine">Кухня</string>
 	<string name="select_cuisine">Выбраць кухню</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Імя карыстальніка</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email або імя карыстальніка</string>
 	<string name="level">Паверх</string>
 	<string name="downloader_delete_map_dialog">Усе вашы праўкі мапы будуць выдаленыя разам з мапай.</string>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index c5a0e48b2d..096ba0cc9f 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -429,7 +429,9 @@
 	<string name="postal_code">Пощенски код</string>
 	<string name="cuisine">Кухня</string>
 	<string name="select_cuisine">Избор на кухня</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Потребителско име</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Имейл или потребителско име</string>
 	<string name="level">Етаж</string>
 	<string name="downloader_delete_map_dialog">Всички ваши редакции на картата ще бъдат изтрити заедно с нея.</string>
@@ -718,8 +720,6 @@
 	<string name="button_layer_outdoor">Активен отдих</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Уеб браузърът не е наличен</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Оторизацията на OpenStreetMap е временно недостъпна поради нови ограничения в Google Play 😾\nНашият екип работи по разрешаването на този проблем. Моля, бъдете търпеливи 🙏</string>
 	<string name="volume">Сила на звука</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Експортиране на всички отметки и следи</string>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index d8d3ca749f..8d7dcab43f 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -455,7 +455,9 @@
 	<string name="postal_code">Codi postal</string>
 	<string name="cuisine">Cuina</string>
 	<string name="select_cuisine">Trieu una cuina</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Nom d\'usuari</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Adreça electrònica o nom d\'usuari</string>
 	<string name="editor_add_phone">Afegeix un telèfon</string>
 	<string name="level">Planta</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index d81df0aa5c..962458e88d 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -443,7 +443,9 @@
 	<string name="postal_code">PSČ</string>
 	<string name="cuisine">Kuchyně</string>
 	<string name="select_cuisine">Vybrat kuchyni</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Uživatelské jméno</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email nebo uživatelské jméno</string>
 	<string name="level">Podlaží</string>
 	<string name="downloader_delete_map_dialog">Zároveň s touto mapou budou odstraněny také všechny změny na této mapě.</string>
@@ -763,8 +765,6 @@
 	<string name="button_layer_outdoor">Pěší turistika</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Webový prohlížeč není k dispozici</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Autorizace OpenStreetMap je dočasně nedostupná kvůli novým omezením v Google Play 😾\nNáš tým pracuje na vyřešení tohoto problému. Buďte prosím trpěliví 🙏</string>
 	<string name="volume">Hlasitost</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Export všech záložek a stop</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index ef264b05c3..7415b9eb94 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -439,7 +439,9 @@
 	<string name="postal_code">Postnummer</string>
 	<string name="cuisine">Køkken</string>
 	<string name="select_cuisine">Vælg køkken</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Brugernavn</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email eller brugernavn</string>
 	<string name="level">Etage</string>
 	<string name="downloader_delete_map_dialog">Alle kortændringer vil blive slettet sammen med kortet.</string>
@@ -753,8 +755,6 @@
 	<string name="button_layer_outdoor">Vandring</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Webbrowser er ikke tilgængelig</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">OpenStreetMap-godkendelse er midlertidigt utilgængelig på grund af nye begrænsninger i Google Play 😾\nVores team arbejder på at løse dette problem. Vær venligst tålmo$ig 🙏</string>
 	<string name="volume">Lydstyrke</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Eksporter alle bogmærker og spor</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index ae45ce18e9..dcb18e2ca5 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -458,7 +458,9 @@
 	<string name="postal_code">Postleitzahl</string>
 	<string name="cuisine">Küche</string>
 	<string name="select_cuisine">Küche auswählen</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Benutzername</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email oder Benutzername</string>
 	<string name="editor_add_phone">Telefon hinzufügen</string>
 	<string name="level">Stockwerk</string>
@@ -798,8 +800,6 @@
 	<string name="button_layer_outdoor">Wandern</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Webbrowser ist nicht verfügbar</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Die OpenStreetMap-Autorisierung ist aufgrund neuer Einschränkungen in Google Play vorübergehend nicht verfügbar 😾\nUnser Team arbeitet daran, dieses Problem zu beheben. Bitte habe etwas Geduld 🙏</string>
 	<string name="volume">Lautstärke</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Alle Lesezeichen und Tracks exportieren</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 4f19cef6c1..247e5cf2cc 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -440,7 +440,9 @@
 	<string name="choose_street">Επιλέξτε μια οδό</string>
 	<string name="cuisine">Κουζίνα</string>
 	<string name="select_cuisine">Επιλέξτε κουζίνα</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Όνομα χρήστη</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email ή όνομα χρήστη</string>
 	<string name="level">Όροφος</string>
 	<string name="downloader_delete_map_dialog">Όλες οι αλλαγές που έχετε κάνει στο χάρτη θα διαγραφούν μαζί με το χάρτη.</string>
@@ -740,8 +742,6 @@
 	<string name="button_layer_outdoor">Πεζοπορία</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Το πρόγραμμα περιήγησης στο Web δεν είναι διαθέσιμο</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Η εξουσιοδότηση του OpenStreetMap δεν είναι προσωρινά διαθέσιμη λόγω νέων περιορισμών στο Google Play 😾\nΗ ομάδα μας εργάζεται για την επίλυση αυτού του προβλήματος. Παρακαλούμε να είστε υπομονετικοί 🙏</string>
 	<string name="volume">Ένταση ήχου</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Εξαγωγή όλων των σελιδοδεικτών και των διαδρομών</string>
diff --git a/android/app/src/main/res/values-en-rGB/strings.xml b/android/app/src/main/res/values-en-rGB/strings.xml
index 398b784cd9..58d51573c4 100644
--- a/android/app/src/main/res/values-en-rGB/strings.xml
+++ b/android/app/src/main/res/values-en-rGB/strings.xml
@@ -34,8 +34,6 @@
 	<string name="transit_not_found">Metro navigation in this region is not available yet</string>
 	<string name="dialog_pedestrian_route_is_long_header">Metro route is not found</string>
 	<string name="dialog_pedestrian_route_is_long_message">Please choose a start or end point closer to a metro station</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">OpenStreetMap authorization is temporary unavailable due to new restrictions in Google Play 😾\nOur team is working to resolve this issue. Please be patient 🙏</string>
 
 	<!-- SECTION: Types -->
 	<string name="type.amenity.arts_centre">Arts Centre</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 50645411e3..212955224c 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -462,7 +462,9 @@
 	<string name="postal_code">Código postal</string>
 	<string name="cuisine">Cocina</string>
 	<string name="select_cuisine">Seleccionar cocina</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Nombre de usuario</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email ó usuario</string>
 	<string name="editor_add_phone">Añadir teléfono</string>
 	<string name="level">Piso</string>
@@ -802,8 +804,6 @@
 	<string name="button_layer_outdoor">Senderismo</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">El navegador web no está disponible</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">La autorización de OpenStreetMap no está disponible temporalmente debido a nuevas restricciones en Google Play 😾🙏nNuestro equipo está trabajando para resolver este problema. Por favor, ten paciencia 🙏</string>
 	<string name="volume">Volumen</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Exportar todos los Marcadores y Tracks</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 5bd159b3e5..d698c722d8 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -454,7 +454,9 @@
 	<string name="postal_code">Postiindeks</string>
 	<string name="cuisine">Köök</string>
 	<string name="select_cuisine">Vali köök</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Kasutajanimi</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">E-post või kasutajanimi</string>
 	<string name="editor_add_phone">Lisa telefon</string>
 	<string name="level">Korrus</string>
@@ -789,8 +791,6 @@
 	<string name="button_layer_outdoor">Matkamine</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Veebibrauser ei ole saadaval</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">OpenStreetMapi autoriseerimine on ajutiselt kättesaamatu Google Play uute piirangute tõttu 😾\nMeie meeskond töötab selle probleemi lahendamise kallal. Palun olge kannatlik 🙏</string>
 	<string name="volume">Helitugevus</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Ekspordi kõik järjehoidjad ja lood</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 23a492174c..194e8c5549 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -460,7 +460,9 @@
 	<string name="postal_code">Posta kodea</string>
 	<string name="cuisine">Sukaldea</string>
 	<string name="select_cuisine">Aukeratu sukaldea</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Erabiltzaile izena</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Posta elektronikoa edo erabiltzailea</string>
 	<string name="editor_add_phone">Gehitu telefonoa</string>
 	<string name="level">Solairua</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 0e88d649b6..961f82fd98 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -434,7 +434,9 @@
 	<string name="postal_code">کد پستی</string>
 	<string name="cuisine">غذا‌خوری</string>
 	<string name="select_cuisine">انتخاب غذاخوری</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">نام کاربری</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">ایمیل یا نام کاربری</string>
 	<string name="level">طبقه</string>
 	<string name="downloader_delete_map_dialog">تمام ویرایش‌های که بر روی نقشه انجام داده اید به همراه نقشه حذف شد.</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index e1bcd994eb..cfea484618 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -464,7 +464,9 @@
 	<string name="postal_code">Postinumero</string>
 	<string name="cuisine">Ruokalaji</string>
 	<string name="select_cuisine">Valitse ruokalaji</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Käyttäjätunnus</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Sähköposti tai käyttäjätunnus</string>
 	<string name="editor_add_phone">Lisää puhelinnumero</string>
 	<string name="level">Kerros</string>
@@ -800,8 +802,6 @@
 	<string name="button_layer_outdoor">Vaellus</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Verkkoselain ei ole käytettävissä</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">OpenStreetMap-valtuutus ei ole tilapäisesti käytettävissä Google Playn uusien rajoitusten vuoksi 😾\nTiimimme työskentelee tämän ongelman ratkaisemiseksi. Ole kärsivällinen 🙏</string>
 	<string name="volume">Äänenvoimakkuus</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Vie kaikki kirjanmerkit ja kappaleet</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index c52db2fd1f..0a704037bb 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -464,7 +464,9 @@
 	<string name="postal_code">Code postal</string>
 	<string name="cuisine">Cuisine</string>
 	<string name="select_cuisine">Sélectionner une cuisine</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Nom d\'utilisateur</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email ou nom d\'utilisateur</string>
 	<string name="editor_add_phone">Ajouter un numéro de téléphone</string>
 	<string name="level">Étage</string>
@@ -803,8 +805,6 @@
 	<string name="button_layer_outdoor">Randonnée</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Le navigateur Web n\'est pas disponible</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">L\'authentification à OpenStreetMap est temporairement indisponible en raison de nouvelles restrictions de Google Play 😾\nNotre équipe travaille à la résolution de ce problème. Merci de faire preuve de patience 🙏</string>
 	<string name="volume">Volume</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Exporter tous les signets et toutes les pistes</string>
diff --git a/android/app/src/main/res/values-hi/strings.xml b/android/app/src/main/res/values-hi/strings.xml
index 1d1f2ccc79..9615deffbe 100644
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -336,6 +336,8 @@
 	<!-- Editable House Number text field (in address block). -->
 	<string name="house_number">भवन का नंबर</string>
 	<string name="details">विवरण</string>
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">उपयोगकर्ता नाम</string>
 	<string name="editor_add_phone">फोन नंबर डालें</string>
 	<string name="level">मंजिल</string>
 	<string name="downloader_search_field_hint">मानचित्र ढूंढें</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 4aec7f0997..f863a5f4bb 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -451,7 +451,9 @@
 	<string name="postal_code">Irányítószám</string>
 	<string name="cuisine">Konyha</string>
 	<string name="select_cuisine">Válassz Konyhát</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Felhasználónév</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email vagy felhasználónév</string>
 	<string name="level">Szint</string>
 	<string name="downloader_delete_map_dialog">A térképekkel együtt minden rajtuk végzett módosítás is törlésre kerül.</string>
@@ -771,8 +773,6 @@
 	<string name="button_layer_outdoor">Túrázás</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">A webböngésző nem elérhető</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Az OpenStreetMap-es hitelesítés átmenetileg nem elérhető a Google Play új korlátozásai miatt 😾\nCsapatunk dolgozik a probléma megoldásán. Kérjük, legyen türelemmel 🙏</string>
 	<string name="volume">Hangerő</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Az összes könyvjelző és sáv exportálása</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index 1a108e28b4..150cf84ed1 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -439,7 +439,9 @@
 	<string name="postal_code">Kode Pos</string>
 	<string name="cuisine">Masakan</string>
 	<string name="select_cuisine">Pilih Masakan</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Nama pengguna</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Surel atau nama pengguna</string>
 	<string name="level">Tingkat</string>
 	<string name="downloader_delete_map_dialog">Semua perubahan peta akan dihapus bersama dengan peta.</string>
@@ -753,8 +755,6 @@
 	<string name="button_layer_outdoor">Pendakian</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Browser web tidak tersedia</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Otorisasi OpenStreetMap untuk sementara tidak tersedia karena adanya pembatasan baru di Google Play 😾\nTim kami sedang bekerja untuk menyelesaikan masalah ini. Mohon bersabar 🙏</string>
 	<string name="volume">Volume</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Mengekspor semua Penanda dan Trek</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 0a3d7d6b2c..c9049d9023 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -448,7 +448,9 @@
 	<string name="postal_code">Codice postale</string>
 	<string name="cuisine">Cucina</string>
 	<string name="select_cuisine">Seleziona la cucina</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Nome utente</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">E-mail o nome utente</string>
 	<string name="editor_add_phone">Aggiungi numero</string>
 	<string name="level">Piano</string>
@@ -781,8 +783,6 @@
 	<string name="button_layer_outdoor">Escursioni</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Il browser web non è disponibile</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">L\'autorizzazione di OpenStreetMap è temporaneamente non disponibile a causa delle nuove restrizioni di Google Play 😾\nIl nostro team sta lavorando per risolvere questoproblema. Ti preghiamo di essere paziente 🙏</string>
 	<string name="volume">Volume</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Esporta tutti i segnalibri e le tracce</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 64b4c4f28c..578231dd5e 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -454,7 +454,9 @@
 	<string name="postal_code">מיקוד</string>
 	<string name="cuisine">סגנון בישול</string>
 	<string name="select_cuisine">בחר סיגנון בישול</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">שם משתמש</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">דוא\"ל או שם משתמש</string>
 	<string name="editor_add_phone">הוסף טלפון</string>
 	<string name="level">קומה</string>
@@ -789,8 +791,6 @@
 	<string name="button_layer_outdoor">טיול רגלי</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">דפדפן אינטרנט אינו זמין</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">התחברות ל-OpenStreetMap לא אפשרית באופן זמני עקב הגבלות חדשות ב-Google Play 😾\nהצוות שלנו עובד על מנת לפתור את הבעיה. אנא התאזרו בסבלנות 🙏</string>
 	<string name="volume">כרך</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">ייצא את כל הסימניות והרצועות</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 2579278cc2..f6d3e93e47 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -464,7 +464,9 @@
 	<string name="postal_code">郵便番号</string>
 	<string name="cuisine">料理</string>
 	<string name="select_cuisine">料理を選択</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">ユーザー名</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">メールアドレスまたはユーザー名</string>
 	<string name="editor_add_phone">電話番号を追加</string>
 	<string name="level">階</string>
@@ -798,8 +800,6 @@
 	<string name="button_layer_outdoor">ハイキング</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">ウェブブラウザが利用できない</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">GooglePlayの新しい制限のため、OpenStreetMapの認証が一時的に利用できない。しばらくお待ちください🙏。</string>
 	<string name="volume">音量</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">すべてのブックマークとトラックをエクスポートする</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index a80d251128..200487add1 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -437,7 +437,9 @@
 	<string name="postal_code">우편 번호</string>
 	<string name="cuisine">요리</string>
 	<string name="select_cuisine">요리 선택</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">사용자 이름</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">이메일 또는 사용자 이름</string>
 	<string name="level">층</string>
 	<string name="downloader_delete_map_dialog">모든 지도의 변경 사항은 지도와 함께 삭제됩니다.</string>
@@ -750,8 +752,6 @@
 	<string name="button_layer_outdoor">하이킹</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">웹 브라우저를 사용할 수 없습니다.</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">구글플레이의 새로운 제한 사항으로 인해 일시적으로 오픈스트리트맵 인증을 사용할 수 없습니다 😾\n팀에서 이 문제를 해결하기 위해 노력하고 있습니다. 잠시만 기다려주세요 🙏</string>
 	<string name="volume">볼륨</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">모든 북마크 및 트랙 내보내기</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index b6082be9d6..3ce262b743 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -433,7 +433,9 @@
 	<string name="postal_code">पिनकोड</string>
 	<string name="cuisine">पाककृती</string>
 	<string name="select_cuisine">पाककृती निवडा</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">वापरकर्तानाव</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">ईमेल किंवा वापरकर्तानाव</string>
 	<string name="editor_add_phone">फोन जोडा</string>
 	<string name="level">मजला</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 6c22249aad..9737535f71 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -462,7 +462,9 @@
 	<string name="postal_code">Postnummer</string>
 	<string name="cuisine">Matrett</string>
 	<string name="select_cuisine">Velg matrett</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Brukernavn</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">E-postadresse eller brukernavn</string>
 	<string name="editor_add_phone">Legg til telefon</string>
 	<string name="level">Gulv</string>
@@ -795,8 +797,6 @@
 	<string name="button_layer_outdoor">Fotturer</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Nettleser er ikke tilgjengelig</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">OpenStreetMap-autorisasjon er midlertidig utilgjengelig på grunn av nye restriksjoner i Google Play 😾\nVårt team jobber med å løse dette problemet. Vennligst vær tålmodig 🙏</string>
 	<string name="volume">Volum</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Eksporter alle bokmerker og spor</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index b64f8f297c..207668cd62 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -458,7 +458,9 @@
 	<string name="postal_code">Postcode</string>
 	<string name="cuisine">Keuken</string>
 	<string name="select_cuisine">Selecteer Keuken</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Gebruikersnaam</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Emailadres of gebruikersnaam</string>
 	<string name="editor_add_phone">Telefoonnummer toevoegen</string>
 	<string name="level">Etage</string>
@@ -795,8 +797,6 @@
 	<string name="button_layer_outdoor">Wandelen</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Webbrowser is niet beschikbaar</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">OpenStreetMap-autorisatie is tijdelijk niet beschikbaar vanwege nieuwe beperkingen in Google Play 😾 Ons team werkt eraan om dit probleem op te lossen. Even geduld 🙏</string>
 	<string name="volume">Volume</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Alle bladwijzers en tracks exporteren</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 7cf4fb403e..0b0356c2e8 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -462,7 +462,9 @@
 	<string name="postal_code">Kod pocztowy</string>
 	<string name="cuisine">Kuchnia</string>
 	<string name="select_cuisine">Wybierz kuchnię</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Nazwa użytkownika</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email lub nazwa użytkownika</string>
 	<string name="editor_add_phone">Dodaj numer telefonu</string>
 	<string name="level">Kondygnacja</string>
@@ -800,8 +802,6 @@
 	<string name="button_layer_outdoor">Turystyka piesza</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Przeglądarka internetowa jest niedostępna</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Autoryzacja OpenStreetMap jest tymczasowo niedostępna z powodu nowych ograniczeń w Google Play 😾\nNasz zespół pracuje nad rozwiązaniem tego problemu. Prosimy o cierpliwość 🙏</string>
 	<string name="volume">Głośność</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Eksportuj wszystkie zakładki i ścieżki</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 f787c1fc68..a1d89b6846 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -438,7 +438,9 @@
 	<string name="postal_code">CEP</string>
 	<string name="cuisine">Culinária</string>
 	<string name="select_cuisine">Selecione a culinária</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Nome de usuário</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email ou nome de usuário</string>
 	<string name="downloader_delete_map_dialog">Todas as edições no mapa serão excluídas juntamente com o mapa.</string>
 	<string name="downloader_update_maps">Atualizar mapas</string>
@@ -757,8 +759,6 @@
 	<string name="aa_connected_to_car_notification_title">Conectado ao carro</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">O navegador da Web não está disponível</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">A autorização do OpenStreetMap está temporariamente indisponível devido a novas restrições no Google Play 😾\nNossa equipe está trabalhando para resolver esse problema. Por favor, seja paciente 🙏</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Exportar todos os favoritos e trilhas</string>
 	<!-- button in (app) TTS settings, to open the system TTS settings. -->
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 900370f4de..555a299679 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -444,7 +444,9 @@
 	<string name="postal_code">Código postal</string>
 	<string name="cuisine">Culinária</string>
 	<string name="select_cuisine">Selecione a culinária</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Nome de utilizador</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email ou nome de utilizador</string>
 	<string name="level">Andar</string>
 	<string name="downloader_delete_map_dialog">Todas as alterações ao mapa serão eliminadas juntamente com o mapa.</string>
@@ -764,8 +766,6 @@
 	<string name="button_layer_outdoor">Caminhadas</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">O navegador de Internet não está disponível</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">A autorização do OpenStreetMap está temporariamente indisponível devido a novas restrições no Google Play 😾\nA nossa equipa está a trabalhar para resolver este problema. Por favor, sê paciente 🙏</string>
 	<string name="volume">Volume</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Exportar todos os favoritos e trilhos</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index 184aebecaa..8f79ae93f2 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -448,7 +448,9 @@
 	<string name="postal_code">Cod poștal</string>
 	<string name="cuisine">Bucătărie</string>
 	<string name="select_cuisine">Alege bucătăria</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Nume utilizator</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">E-mail sau nume de utilizator</string>
 	<string name="editor_add_phone">Adaugă un număr</string>
 	<string name="level">Etaj</string>
@@ -778,8 +780,6 @@
 	<string name="button_layer_outdoor">Drumeție</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Browserul web nu este disponibil</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Autorizarea OpenStreetMap este temporar indisponibilă din cauza noilor restricții din Google Play 😾\nEchipa noastră lucrează pentru a rezolva această problemă. Vă rugăm să aveți răbdare 🙏</string>
 	<string name="volume">Volum</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Exportați toate marcajele și piesele</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index cc85a4de10..99f7fc97b8 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -465,7 +465,9 @@
 	<string name="postal_code">Почтовый индекс</string>
 	<string name="cuisine">Кухня</string>
 	<string name="select_cuisine">Выбрать кухню</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Имя пользователя</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Эл. почта или имя пользователя</string>
 	<string name="editor_add_phone">Добавить телефон</string>
 	<string name="level">Этаж</string>
@@ -811,8 +813,6 @@
 	<string name="button_layer_outdoor">Активный отдых</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Веб-браузер недоступен</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Авторизация OpenStreetMap временно недоступна из-за новых ограничений в Google Play 😾\nНаша команда работает над решением этой проблемы. Пожалуйста, будьте терпеливы 🙏</string>
 	<string name="volume">Громкость</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Экспортировать все метки и треки</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index c8122e7f42..d24be6f729 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -460,7 +460,9 @@
 	<string name="postal_code">PSČ</string>
 	<string name="cuisine">Kuchyňa</string>
 	<string name="select_cuisine">Vyberte si kuchyňu</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Používateľské meno</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email alebo používateľské meno</string>
 	<string name="editor_add_phone">Pridať telefónne číslo</string>
 	<string name="level">Podlaha</string>
@@ -792,8 +794,6 @@
 	<string name="button_layer_outdoor">Turistika</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Webový prehliadač nie je k dispozícii</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Autorizácia OpenStreetMap je dočasne nedostupná kvôli novým obmedzeniam v Google Play 😾\nNáš tím pracuje na vyriešení tohto problému. Buďte prosím trpezliví 🙏</string>
 	<string name="volume">Hlasitosť</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Export všetkých záložiek a stôp</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index 7e62674d97..70efd9cb2f 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -435,7 +435,9 @@
 	<string name="postal_code">Postkod</string>
 	<string name="cuisine">Kök</string>
 	<string name="select_cuisine">Välj kök</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Användarnamn</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">E-postadress eller användarnamn</string>
 	<string name="level">Våningsplan</string>
 	<string name="downloader_delete_map_dialog">Alla kartändringar kommer att raderas tillsammans med kartan.</string>
@@ -751,8 +753,6 @@
 	<string name="button_layer_outdoor">Vandring</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Webbläsaren är inte tillgänglig</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">OpenStreetMap-auktorisering är tillfälligt otillgänglig på grund av nya begränsningar i Google Play 😾\nVårt team arbetar med att lösa detta problem. Vänligen ha tålamod 🙏</string>
 	<string name="volume">Volym</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Exportera alla bokmärken och spår</string>
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 384fa4fb8b..4c8648c139 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -89,6 +89,8 @@
 
 	<!-- SECTION: Strings for downloading map from search -->
 	<string name="login_osm">Ingia kwa OpenStreetMap</string>
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Jina la mtumiaji</string>
 	<string name="level">Ghorofa</string>
 	<!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
 	<string name="osm_presentation">Data ya OpenStreetMap iliyoundwa na jumuiya kufikia %s. Pata maelezo zaidi kuhusu jinsi ya kuhariri na kusasisha ramani katika OpenStreetMap.org</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index b439ca25a2..f6583bb256 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -439,7 +439,9 @@
 	<string name="postal_code">รหัสไปรษณีย์</string>
 	<string name="cuisine">ประเภทอาหาร</string>
 	<string name="select_cuisine">เลือกประเภทอาหาร</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">ชื่อผู้ใช้</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">อีเมลหรือชื่อผู้ใช้</string>
 	<string name="level">ชั้น</string>
 	<string name="downloader_delete_map_dialog">การเปลี่ยนแปลงแผนที่ทั้งหมดจะถูกลบไปพร้อมกับแผนที่</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index cece7f813f..b0f6eaa49f 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -462,7 +462,9 @@
 	<string name="postal_code">Posta kodu</string>
 	<string name="cuisine">Mutfak</string>
 	<string name="select_cuisine">Mutfak Seç</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Kullanıcı Adı</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">E-posta veya kullanıcı adı</string>
 	<string name="editor_add_phone">Telefon Ekle</string>
 	<string name="level">Zemin</string>
@@ -802,8 +804,6 @@
 	<string name="button_layer_outdoor">Yürüyüş</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Web tarayıcısı mevcut değil</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Google Play\'deki yeni kısıtlamalar nedeniyle OpenStreetMap yetkilendirmesi geçici olarak kullanılamıyor 😾\nEkibimiz bu sorunu çözmek için çalışıyor. Lütfen sabırlı olun 🙏</string>
 	<string name="volume">Ses</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Tüm Yer İmlerini ve Parçaları Dışa Aktar</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 9f7f539aba..1ae06c4f71 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -465,7 +465,9 @@
 	<string name="postal_code">Поштовий індекс</string>
 	<string name="cuisine">Кухня</string>
 	<string name="select_cuisine">Вибрати кухню</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Ім\'я користувача</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Ел. пошта або ім\'я користувача</string>
 	<string name="level">Поверх</string>
 	<string name="downloader_delete_map_dialog">Разом з мапою будуть видалені й внесені Вами правки на цій мапі.</string>
@@ -802,8 +804,6 @@
 	<string name="button_layer_outdoor">Активний відпочинок</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Веб-браузер недоступний</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">Авторизація на OpenStreetMap тимчасово недоступна через нові обмеження в Google Play 😾\nНаша команда працює над вирішенням цієї проблеми. Будь ласка, наберіться терпіння 🙏</string>
 	<string name="volume">Гучність</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Експортувати всі мітки та маршрути</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 033c92f107..e43e4a484c 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -437,7 +437,9 @@
 	<string name="postal_code">Mã bưu chính</string>
 	<string name="cuisine">Ẩm thực</string>
 	<string name="select_cuisine">Chọn Ẩm thực</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">tên tài khoản</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email hoặc tên người dùng</string>
 	<string name="level">Tầng</string>
 	<string name="downloader_delete_map_dialog">Tất cả những thay đổi của bản đồ sẽ bị xóa cùng với bản đồ đó.</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 3931c9d194..b3869afad5 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -450,7 +450,9 @@
 	<string name="postal_code">郵遞區號</string>
 	<string name="cuisine">料理</string>
 	<string name="select_cuisine">選擇料理</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">使用者名稱</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">電子郵件或使用者名稱</string>
 	<string name="editor_add_phone">新增電話號碼</string>
 	<string name="level">樓層</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 34fa47ef87..b031aa6f42 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -447,7 +447,9 @@
 	<string name="postal_code">邮政编码</string>
 	<string name="cuisine">菜肴</string>
 	<string name="select_cuisine">选择菜肴</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">用户名</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">邮箱或用户名</string>
 	<string name="editor_add_phone">新增电话号码</string>
 	<string name="level">楼层</string>
@@ -764,8 +766,6 @@
 	<string name="button_layer_outdoor">徒步旅行</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">网络浏览器不可用</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">由于 Google Play 的新限制，OpenStreetMap 授权暂时不可用 😾n我们的团队正在努力解决这个问题。请耐心等待 🙏</string>
 	<string name="volume">音量</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">导出所有书签和曲目</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index a075e2257c..e3c4af0100 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -487,7 +487,9 @@
 	<string name="postal_code">Postal Code</string>
 	<string name="cuisine">Cuisine</string>
 	<string name="select_cuisine">Select cuisine</string>
-	<!-- login text field -->
+	<!-- OSM Login text field hint, used only for Google Play -->
+	<string name="username">Username</string>
+	<!-- OSM login text field hint -->
 	<string name="email_or_username">Email or username</string>
 	<string name="editor_add_phone">Add Phone</string>
 	<string name="level">Floor</string>
@@ -833,8 +835,6 @@
 	<string name="button_layer_outdoor">Outdoors</string>
 	<!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
 	<string name="browser_not_available">Web browser is not available</string>
-	<!-- Text displayed in a dialog when OSM authorization is disabled -->
-	<string name="osm_login_not_available">OpenStreetMap authorization is temporary unavailable due to new restrictions in Google Play 😾\nOur team is working to resolve this issue. Please be patient 🙏</string>
 	<string name="volume">Volume</string>
 	<!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
 	<string name="bookmarks_export">Export all Bookmarks and Tracks</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 9c83ddc610..0efe0b2334 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "اختر المطبخ";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "البريد الإلكتروني أو اسم المستخدم";
 
 "phone" = "رقم الهاتف";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
index 86c8f4112a..fa2c53ba31 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Mətbəx seçin";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "E-poçt və ya istifadəçi adı";
 
 "phone" = "Telefon";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index deb51649d9..eb3c15aa56 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Выбраць кухню";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email або імя карыстальніка";
 
 "phone" = "Тэлефон";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 6d59d287c0..a06b599e3b 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Избор на кухня";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Имейл или потребителско име";
 
 "phone" = "Телефон";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index ff9d74ef6e..bc66bcdf2a 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Trieu una cuina";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Adreça electrònica o nom d'usuari";
 
 "phone" = "Telèfon";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 0eb137c1bc..d37d52c62a 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Vybrat kuchyni";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email nebo uživatelské jméno";
 
 "phone" = "Telefon";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 156aef7756..1583a0c37b 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Vælg køkken";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email eller brugernavn";
 
 "phone" = "Telefon";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 3a9613061a..204f075fd5 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Küche auswählen";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email oder Benutzername";
 
 "phone" = "Telefon";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 3db2f118ec..f99a5f4d26 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Επιλέξτε κουζίνα";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email ή όνομα χρήστη";
 
 "phone" = "Τηλέφωνο";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 88770842f9..30fc7e1c4c 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Select cuisine";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email or username";
 
 "phone" = "Phone";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index c0418026d6..3cc846b37c 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Select cuisine";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email or username";
 
 "phone" = "Phone";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 9d20f93849..4def1be1d0 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Seleccionar cocina";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email ó usuario";
 
 "phone" = "Teléfono";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 326d25883c..5fd9f604ca 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Seleccionar cocina";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email ó usuario";
 
 "phone" = "Teléfono";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index cde7494912..7f6f009309 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Vali köök";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "E-post või kasutajanimi";
 
 "phone" = "Telefon";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 3b04d179cf..d8d39d5e70 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Aukeratu sukaldea";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Posta elektronikoa edo erabiltzailea";
 
 "phone" = "Telefonoa";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 2abde0af28..964a1cd95b 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "انتخاب غذاخوری";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "ایمیل یا نام کاربری";
 
 "phone" = "تلفن";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index e4cbf56433..92b816755b 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Valitse ruokalaji";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Sähköposti tai käyttäjätunnus";
 
 "phone" = "Puhelinnumero";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 4fa91fc730..14d18180f1 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Sélectionner une cuisine";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email ou nom d'utilisateur";
 
 "phone" = "Numéro de téléphone";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 6c121b39ce..86ccd1f5c1 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "בחר סיגנון בישול";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "דוא\"ל או שם משתמש";
 
 "phone" = "טלפון";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
index e142cefa39..1c33a4a940 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Select cuisine";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email or username";
 
 "phone" = "Phone";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 409a01f9ce..cc59c5e6f4 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Válassz Konyhát";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email vagy felhasználónév";
 
 "phone" = "Telefonszám";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 7bef32092d..546845e90c 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Pilih Masakan";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Surel atau nama pengguna";
 
 "phone" = "Telepon";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index e7d4859c32..7f2bcb72bd 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Seleziona la cucina";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "E-mail o nome utente";
 
 "phone" = "Telefono";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 1f822009c1..b309d2a61d 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "料理を選択";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "メールアドレスまたはユーザー名";
 
 "phone" = "電話";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 70d66e33c1..b0c2ba5baa 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "요리 선택";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "이메일 또는 사용자 이름";
 
 "phone" = "전화";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index d1a280873b..f523d065c3 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "पाककृती निवडा";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "ईमेल किंवा वापरकर्तानाव";
 
 "phone" = "फोन";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 99f19b29e4..5845003e56 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Velg matrett";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "E-postadresse eller brukernavn";
 
 "phone" = "Telefon";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 2b5bbffe04..6f9b8a2ece 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Selecteer Keuken";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Emailadres of gebruikersnaam";
 
 "phone" = "Telefoonnummer";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index fd8c7336c0..e62d4984d1 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Wybierz kuchnię";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email lub nazwa użytkownika";
 
 "phone" = "Telefon";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 4d347a13c7..a46428fbe0 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Selecione a culinária";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email ou nome de usuário";
 
 "phone" = "Telefone";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 86b7370e15..5b17f60199 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Selecione a culinária";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email ou nome de utilizador";
 
 "phone" = "Telefone";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 8ef954f6a4..748a87953a 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Alege bucătăria";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "E-mail sau nume de utilizator";
 
 "phone" = "Telefon";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index c7634c2445..ba68cfe133 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Выбрать кухню";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Эл. почта или имя пользователя";
 
 "phone" = "Телефон";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 13cc4d9a26..1c898798c9 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Vyberte si kuchyňu";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email alebo používateľské meno";
 
 "phone" = "Telefón";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 80d11cff02..fe58a0b92f 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Välj kök";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "E-postadress eller användarnamn";
 
 "phone" = "Telefon";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 66f453f884..d31746a6b1 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Select cuisine";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email or username";
 
 "phone" = "Phone";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index f9b973bc69..341f8bb1ad 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "เลือกประเภทอาหาร";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "อีเมลหรือชื่อผู้ใช้";
 
 "phone" = "โทรศัพท์";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 223c23c44f..90b0a3f1b7 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Mutfak Seç";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "E-posta veya kullanıcı adı";
 
 "phone" = "Telefon";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 1de85c9cc2..c9457027c2 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Вибрати кухню";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Ел. пошта або ім'я користувача";
 
 "phone" = "Телефон";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 1b90f54d20..5a07ec35a9 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "Chọn Ẩm thực";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "Email hoặc tên người dùng";
 
 "phone" = "Điện thoại";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index fce7f380da..7a304126a1 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "选择菜肴";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "邮箱或用户名";
 
 "phone" = "电话";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 3a939df1ca..393dbae70f 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -687,7 +687,7 @@
 
 "select_cuisine" = "選擇料理";
 
-/* login text field */
+/* OSM login text field hint */
 "email_or_username" = "電子郵件或使用者名稱";
 
 "phone" = "電話";