diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 24b7a59c1a..1cb818d7c1 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -473,9 +473,7 @@
 	<string name="postal_code">الرمز البريدي</string>
 	<string name="cuisine">المطبخ</string>
 	<string name="select_cuisine">اختر المطبخ</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">اسم المستخدم</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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 8269e3fb91..7c30ea6496 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -460,9 +460,7 @@
 	<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>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">İstifadəçi adı</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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 09b5376d72..be23b51006 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -459,9 +459,7 @@
 	<string name="postal_code">Паштовы індэкс</string>
 	<string name="cuisine">Кухня</string>
 	<string name="select_cuisine">Выбраць кухню</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Імя карыстальніка</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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 65e361d5cf..9dcff790d8 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -427,9 +427,7 @@
 	<string name="postal_code">Пощенски код</string>
 	<string name="cuisine">Кухня</string>
 	<string name="select_cuisine">Избор на кухня</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Потребителско име</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index a2e3920b2c..d90f994b5c 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -453,9 +453,7 @@
 	<string name="postal_code">Codi postal</string>
 	<string name="cuisine">Cuina</string>
 	<string name="select_cuisine">Trieu una cuina</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Nom d\'usuari</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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 fca3ed69c1..59db1197c0 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -441,9 +441,7 @@
 	<string name="postal_code">PSČ</string>
 	<string name="cuisine">Kuchyně</string>
 	<string name="select_cuisine">Vybrat kuchyni</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Uživatelské jméno</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 96f4ab8f2d..09c3e1302a 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -437,9 +437,7 @@
 	<string name="postal_code">Postnummer</string>
 	<string name="cuisine">Køkken</string>
 	<string name="select_cuisine">Vælg køkken</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Brugernavn</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 8821a2e15c..a76adc182b 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -456,9 +456,7 @@
 	<string name="postal_code">Postleitzahl</string>
 	<string name="cuisine">Küche</string>
 	<string name="select_cuisine">Küche auswählen</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Benutzername</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<string name="email_or_username">Email oder Benutzername</string>
 	<string name="editor_add_phone">Telefon hinzufügen</string>
 	<string name="level">Stockwerk</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 5d5fac3110..4d35c0bc5a 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -438,9 +438,7 @@
 	<string name="choose_street">Επιλέξτε μια οδό</string>
 	<string name="cuisine">Κουζίνα</string>
 	<string name="select_cuisine">Επιλέξτε κουζίνα</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Όνομα χρήστη</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 33714869ba..f761bb18e6 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -460,9 +460,7 @@
 	<string name="postal_code">Código postal</string>
 	<string name="cuisine">Cocina</string>
 	<string name="select_cuisine">Seleccionar cocina</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Nombre de usuario</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<string name="email_or_username">Email ó usuario</string>
 	<string name="editor_add_phone">Añadir teléfono</string>
 	<string name="level">Piso</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index d58ab653cd..586f341c02 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -452,9 +452,7 @@
 	<string name="postal_code">Postiindeks</string>
 	<string name="cuisine">Köök</string>
 	<string name="select_cuisine">Vali köök</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Kasutajanimi</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<string name="email_or_username">E-post või kasutajanimi</string>
 	<string name="editor_add_phone">Lisa telefon</string>
 	<string name="level">Korrus</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index ee49d6b282..a4f45c6d7f 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -458,9 +458,7 @@
 	<string name="postal_code">Posta kodea</string>
 	<string name="cuisine">Sukaldea</string>
 	<string name="select_cuisine">Aukeratu sukaldea</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Erabiltzaile izena</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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 0f21f073a4..33cdca6221 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -432,9 +432,7 @@
 	<string name="postal_code">کد پستی</string>
 	<string name="cuisine">غذا‌خوری</string>
 	<string name="select_cuisine">انتخاب غذاخوری</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">نام کاربری</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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 a111c3e87d..218efb5077 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -462,9 +462,7 @@
 	<string name="postal_code">Postinumero</string>
 	<string name="cuisine">Ruokalaji</string>
 	<string name="select_cuisine">Valitse ruokalaji</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Käyttäjätunnus</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index c5b5c3ea73..43d1c7df2a 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -462,9 +462,7 @@
 	<string name="postal_code">Code postal</string>
 	<string name="cuisine">Cuisine</string>
 	<string name="select_cuisine">Sélectionner une cuisine</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Nom d\'utilisateur</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-hi/strings.xml b/android/app/src/main/res/values-hi/strings.xml
index 5a216c1e49..555f96ca1e 100644
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -355,8 +355,6 @@
 	<!-- 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_mwm_migration_dialog">मार्ग बनाने के लिए, आपको सभी मानचित्र अपडेट करने होंगे और फिर मार्ग की दोबारा योजना बनानी होगी।</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index edd78d5c47..dc93411384 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -449,9 +449,7 @@
 	<string name="postal_code">Irányítószám</string>
 	<string name="cuisine">Konyha</string>
 	<string name="select_cuisine">Válassz Konyhát</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Felhasználónév</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index e7f85c0036..97cbecf59f 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -437,9 +437,7 @@
 	<string name="postal_code">Kode Pos</string>
 	<string name="cuisine">Masakan</string>
 	<string name="select_cuisine">Pilih Masakan</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Nama pengguna</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 7b7450a08a..581c15250d 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -446,9 +446,7 @@
 	<string name="postal_code">Codice postale</string>
 	<string name="cuisine">Cucina</string>
 	<string name="select_cuisine">Seleziona la cucina</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Nome utente</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<string name="email_or_username">E-mail o nome utente</string>
 	<string name="editor_add_phone">Aggiungi numero</string>
 	<string name="level">Piano</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 6b7405b27d..86b1a31b07 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -452,9 +452,7 @@
 	<string name="postal_code">מיקוד</string>
 	<string name="cuisine">סגנון בישול</string>
 	<string name="select_cuisine">בחר סיגנון בישול</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">שם משתמש</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index f202972dd2..62ea0567b6 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -462,9 +462,7 @@
 	<string name="postal_code">郵便番号</string>
 	<string name="cuisine">料理</string>
 	<string name="select_cuisine">料理を選択</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">ユーザー名</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 7dc548868a..ec34815f4d 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -435,9 +435,7 @@
 	<string name="postal_code">우편 번호</string>
 	<string name="cuisine">요리</string>
 	<string name="select_cuisine">요리 선택</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">사용자 이름</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index d3f480c882..388d755ba2 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -431,9 +431,7 @@
 	<string name="postal_code">पिनकोड</string>
 	<string name="cuisine">पाककृती</string>
 	<string name="select_cuisine">पाककृती निवडा</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">वापरकर्तानाव</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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 a2a214a2a1..9200dba8a0 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -460,9 +460,7 @@
 	<string name="postal_code">Postnummer</string>
 	<string name="cuisine">Matrett</string>
 	<string name="select_cuisine">Velg matrett</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Brukernavn</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<string name="email_or_username">E-postadresse eller brukernavn</string>
 	<string name="editor_add_phone">Legg til telefon</string>
 	<string name="level">Gulv</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 2c048aa590..9684734f3e 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -456,9 +456,7 @@
 	<string name="postal_code">Postcode</string>
 	<string name="cuisine">Keuken</string>
 	<string name="select_cuisine">Selecteer Keuken</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Gebruikersnaam</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<string name="email_or_username">Emailadres of gebruikersnaam</string>
 	<string name="editor_add_phone">Telefoonnummer toevoegen</string>
 	<string name="level">Etage</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 205eadd727..21c7158284 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -460,9 +460,7 @@
 	<string name="postal_code">Kod pocztowy</string>
 	<string name="cuisine">Kuchnia</string>
 	<string name="select_cuisine">Wybierz kuchnię</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Nazwa użytkownika</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
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 0f63232998..18d1da201c 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -436,9 +436,7 @@
 	<string name="postal_code">CEP</string>
 	<string name="cuisine">Culinária</string>
 	<string name="select_cuisine">Selecione a culinária</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Nome de usuário</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 4c09f6b4fe..60a42562d9 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -442,9 +442,7 @@
 	<string name="postal_code">Código postal</string>
 	<string name="cuisine">Culinária</string>
 	<string name="select_cuisine">Selecione a culinária</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Nome de utilizador</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index ef52c317d9..9d4bce4cef 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -446,9 +446,7 @@
 	<string name="postal_code">Cod poștal</string>
 	<string name="cuisine">Bucătărie</string>
 	<string name="select_cuisine">Alege bucătăria</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Nume utilizator</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index a4794165c1..9c2377af57 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -463,9 +463,7 @@
 	<string name="postal_code">Почтовый индекс</string>
 	<string name="cuisine">Кухня</string>
 	<string name="select_cuisine">Выбрать кухню</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Имя пользователя</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 3f9b690489..2e5a28ee81 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -458,9 +458,7 @@
 	<string name="postal_code">PSČ</string>
 	<string name="cuisine">Kuchyňa</string>
 	<string name="select_cuisine">Vyberte si kuchyňu</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Používateľské meno</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index ecb1c01a99..4b485f0e4b 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -433,9 +433,7 @@
 	<string name="postal_code">Postkod</string>
 	<string name="cuisine">Kök</string>
 	<string name="select_cuisine">Välj kök</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Användarnamn</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 6a533a19d1..cc8f170e8e 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -91,8 +91,6 @@
 
 	<!-- 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 704287b119..28f9fbe0c8 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -437,9 +437,7 @@
 	<string name="postal_code">รหัสไปรษณีย์</string>
 	<string name="cuisine">ประเภทอาหาร</string>
 	<string name="select_cuisine">เลือกประเภทอาหาร</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">ชื่อผู้ใช้</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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 bf1daaba77..374354b3c2 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -460,9 +460,7 @@
 	<string name="postal_code">Posta kodu</string>
 	<string name="cuisine">Mutfak</string>
 	<string name="select_cuisine">Mutfak Seç</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Kullanıcı Adı</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index c4ac75a364..dca440b985 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -463,9 +463,7 @@
 	<string name="postal_code">Поштовий індекс</string>
 	<string name="cuisine">Кухня</string>
 	<string name="select_cuisine">Вибрати кухню</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Ім\'я користувача</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index a725fec92c..c95645abb3 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -435,9 +435,7 @@
 	<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>
-	<!-- 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 -->
+	<!-- login text field -->
 	<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 d5b16f20bd..40ac8a76ce 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -448,9 +448,7 @@
 	<string name="postal_code">郵遞區號</string>
 	<string name="cuisine">料理</string>
 	<string name="select_cuisine">選擇料理</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">使用者名稱</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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 16704d0372..edef5678cb 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -445,9 +445,7 @@
 	<string name="postal_code">邮政编码</string>
 	<string name="cuisine">菜肴</string>
 	<string name="select_cuisine">选择菜肴</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">用户名</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<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/strings.xml b/android/app/src/main/res/values/strings.xml
index 86d0c697b7..2fe62c463b 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -485,9 +485,7 @@
 	<string name="postal_code">Postal Code</string>
 	<string name="cuisine">Cuisine</string>
 	<string name="select_cuisine">Select cuisine</string>
-	<!-- OSM Login text field hint, used only for Google Play -->
-	<string name="username">Username</string>
-	<!-- OSM login text field hint -->
+	<!-- login text field -->
 	<string name="email_or_username">Email or username</string>
 	<string name="editor_add_phone">Add Phone</string>
 	<string name="level">Floor</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index c2552cef7d..c31fd13f45 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "اختر المطبخ";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "البريد الإلكتروني أو اسم المستخدم";
 
 "phone" = "رقم الهاتف";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
index 1c8dbacaa1..bee8370960 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Mətbəx seçin";
 
-/* OSM login text field hint */
+/* login text field */
 "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 a82a8857e5..f76d19d1c4 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Выбраць кухню";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "Email або імя карыстальніка";
 
 "phone" = "Тэлефон";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 5c0b53f4ae..a744420b36 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Избор на кухня";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "Имейл или потребителско име";
 
 "phone" = "Телефон";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 7ee4fbcd4b..f62b47633b 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Trieu una cuina";
 
-/* OSM login text field hint */
+/* login text field */
 "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 302066329d..445da1dd58 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Vybrat kuchyni";
 
-/* OSM login text field hint */
+/* login text field */
 "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 67aff98115..b5873a9146 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Vælg køkken";
 
-/* OSM login text field hint */
+/* login text field */
 "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 49c3d97181..cd3d279295 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Küche auswählen";
 
-/* OSM login text field hint */
+/* login text field */
 "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 8085d96399..203cc2a44b 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Επιλέξτε κουζίνα";
 
-/* OSM login text field hint */
+/* login text field */
 "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 193a5460e3..1e421ad821 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Select cuisine";
 
-/* OSM login text field hint */
+/* login text field */
 "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 ea027aa95f..cf2128a20e 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Select cuisine";
 
-/* OSM login text field hint */
+/* login text field */
 "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 a8a331eff4..c178381f27 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Seleccionar cocina";
 
-/* OSM login text field hint */
+/* login text field */
 "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 afbaed9ae3..cbf8806be0 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Seleccionar cocina";
 
-/* OSM login text field hint */
+/* login text field */
 "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 64b31cfc1e..785217f7ca 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Vali köök";
 
-/* OSM login text field hint */
+/* login text field */
 "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 0a0a67164c..d9411d4b33 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Aukeratu sukaldea";
 
-/* OSM login text field hint */
+/* login text field */
 "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 a342e2f890..1ef3213d44 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "انتخاب غذاخوری";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "ایمیل یا نام کاربری";
 
 "phone" = "تلفن";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 1b4dd112dd..1b322a0482 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Valitse ruokalaji";
 
-/* OSM login text field hint */
+/* login text field */
 "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 9e61da0cd3..a3e6059877 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Sélectionner une cuisine";
 
-/* OSM login text field hint */
+/* login text field */
 "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 c1011a85e4..4c82a772b4 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "בחר סיגנון בישול";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "דוא\"ל או שם משתמש";
 
 "phone" = "טלפון";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
index f14fb3afc4..86e6594c40 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Select cuisine";
 
-/* OSM login text field hint */
+/* login text field */
 "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 09f05beccb..e20518d6fd 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Válassz Konyhát";
 
-/* OSM login text field hint */
+/* login text field */
 "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 3849d74990..a4ab0464a9 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Pilih Masakan";
 
-/* OSM login text field hint */
+/* login text field */
 "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 f11dfc84bd..9184ec2881 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Seleziona la cucina";
 
-/* OSM login text field hint */
+/* login text field */
 "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 cfa522c664..8ec2974a62 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "料理を選択";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "メールアドレスまたはユーザー名";
 
 "phone" = "電話";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index ed7ed03e69..2c7e9cb0d8 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "요리 선택";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "이메일 또는 사용자 이름";
 
 "phone" = "전화";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 408b95440c..6861b09b67 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "पाककृती निवडा";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "ईमेल किंवा वापरकर्तानाव";
 
 "phone" = "फोन";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 729643d92d..4381ace5c9 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Velg matrett";
 
-/* OSM login text field hint */
+/* login text field */
 "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 8ddade063d..b3a8322425 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Selecteer Keuken";
 
-/* OSM login text field hint */
+/* login text field */
 "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 fbd04eddec..2d3b01f981 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Wybierz kuchnię";
 
-/* OSM login text field hint */
+/* login text field */
 "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 0ff945323d..a8a2a7950c 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Selecione a culinária";
 
-/* OSM login text field hint */
+/* login text field */
 "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 486c0c0195..56fb343b45 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Selecione a culinária";
 
-/* OSM login text field hint */
+/* login text field */
 "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 d1bd1238d5..5965a7346e 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Alege bucătăria";
 
-/* OSM login text field hint */
+/* login text field */
 "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 7360163adb..1b79fbdad9 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Выбрать кухню";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "Эл. почта или имя пользователя";
 
 "phone" = "Телефон";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index f83533da75..276b6251ab 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Vyberte si kuchyňu";
 
-/* OSM login text field hint */
+/* login text field */
 "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 c9c0fc7834..12eb31347b 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Välj kök";
 
-/* OSM login text field hint */
+/* login text field */
 "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 e0e61f7234..7a8330919a 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Select cuisine";
 
-/* OSM login text field hint */
+/* login text field */
 "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 6594a63a8c..de66288ffa 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "เลือกประเภทอาหาร";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "อีเมลหรือชื่อผู้ใช้";
 
 "phone" = "โทรศัพท์";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 9acd3de0e9..99eafb2d30 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Mutfak Seç";
 
-/* OSM login text field hint */
+/* login text field */
 "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 bdb8a0faac..2426c50a40 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Вибрати кухню";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "Ел. пошта або ім'я користувача";
 
 "phone" = "Телефон";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index e1725720ba..33fdb88dbb 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "Chọn Ẩm thực";
 
-/* OSM login text field hint */
+/* login text field */
 "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 1f4485606d..f66aac9ede 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "选择菜肴";
 
-/* OSM login text field hint */
+/* login text field */
 "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 56ec4ea213..80f1cee652 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -664,7 +664,7 @@
 
 "select_cuisine" = "選擇料理";
 
-/* OSM login text field hint */
+/* login text field */
 "email_or_username" = "電子郵件或使用者名稱";
 
 "phone" = "電話";