From 2aa81799854118164ce60c7bc1afd11157aac130 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Mon, 25 Aug 2025 21:35:45 +0200
Subject: [PATCH] [android]Remove OSM Auth in app

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../organicmaps/editor/OsmLoginFragment.java  | 54 +------------------
 .../res/layout-land/fragment_osm_login.xml    | 49 ++---------------
 .../main/res/layout/fragment_osm_login.xml    | 47 +---------------
 .../app/src/main/res/values-af/strings.xml    |  3 --
 .../app/src/main/res/values-ar/strings.xml    |  3 --
 .../app/src/main/res/values-ast/strings.xml   |  1 -
 .../app/src/main/res/values-az/strings.xml    |  3 --
 .../app/src/main/res/values-be/strings.xml    |  3 --
 .../app/src/main/res/values-bg/strings.xml    |  3 --
 .../app/src/main/res/values-bn/strings.xml    |  3 --
 .../app/src/main/res/values-ca/strings.xml    |  3 --
 .../app/src/main/res/values-cs/strings.xml    |  3 --
 .../app/src/main/res/values-cy/strings.xml    |  1 -
 .../app/src/main/res/values-da/strings.xml    |  3 --
 .../app/src/main/res/values-de/strings.xml    |  4 --
 .../app/src/main/res/values-el/strings.xml    |  3 --
 .../app/src/main/res/values-es/strings.xml    |  3 --
 .../app/src/main/res/values-et/strings.xml    |  3 --
 .../app/src/main/res/values-eu/strings.xml    |  3 --
 .../app/src/main/res/values-fa/strings.xml    |  3 --
 .../app/src/main/res/values-fi/strings.xml    |  3 --
 .../app/src/main/res/values-fr/strings.xml    |  4 --
 .../app/src/main/res/values-gl/strings.xml    |  3 --
 .../app/src/main/res/values-gsw/strings.xml   |  3 --
 .../app/src/main/res/values-hr/strings.xml    |  1 -
 .../app/src/main/res/values-hu/strings.xml    |  3 --
 .../app/src/main/res/values-in/strings.xml    |  3 --
 .../app/src/main/res/values-is/strings.xml    |  3 --
 .../app/src/main/res/values-it/strings.xml    |  3 --
 .../app/src/main/res/values-iw/strings.xml    |  3 --
 .../app/src/main/res/values-ja/strings.xml    |  3 --
 .../app/src/main/res/values-ko/strings.xml    |  3 --
 .../app/src/main/res/values-lt/strings.xml    |  3 --
 .../app/src/main/res/values-lv/strings.xml    |  3 --
 .../app/src/main/res/values-mr/strings.xml    |  3 --
 .../app/src/main/res/values-mt/strings.xml    |  2 -
 .../app/src/main/res/values-nb/strings.xml    |  3 --
 .../app/src/main/res/values-nl/strings.xml    |  3 --
 .../app/src/main/res/values-pl/strings.xml    |  3 --
 .../src/main/res/values-pt-rBR/strings.xml    |  3 --
 .../app/src/main/res/values-pt/strings.xml    |  3 --
 .../app/src/main/res/values-ro/strings.xml    |  3 --
 .../app/src/main/res/values-ru/strings.xml    |  3 --
 .../app/src/main/res/values-sk/strings.xml    |  3 --
 .../app/src/main/res/values-sr/strings.xml    |  3 --
 .../app/src/main/res/values-sv/strings.xml    |  3 --
 .../app/src/main/res/values-th/strings.xml    |  3 --
 .../app/src/main/res/values-tr/strings.xml    |  3 --
 .../app/src/main/res/values-uk/strings.xml    |  3 --
 .../app/src/main/res/values-vi/strings.xml    |  3 --
 .../src/main/res/values-zh-rTW/strings.xml    |  3 --
 .../app/src/main/res/values-zh/strings.xml    |  3 --
 android/app/src/main/res/values/strings.xml   |  3 --
 .../app/organicmaps/sdk/editor/OsmOAuth.cpp   | 18 -------
 54 files changed, 7 insertions(+), 306 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
index 782f149e6..e15289b01 100644
--- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -15,24 +14,16 @@ import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.util.Constants;
-import app.organicmaps.sdk.util.DateUtils;
 import app.organicmaps.sdk.util.concurrency.ThreadPool;
 import app.organicmaps.sdk.util.concurrency.UiThread;
-import app.organicmaps.util.InputUtils;
-import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.textfield.TextInputEditText;
 
 public class OsmLoginFragment extends BaseMwmToolbarFragment
 {
-  private ProgressBar mProgress;
   private MaterialButton mLoginButton;
-  private MaterialButton mLostPasswordButton;
-  private TextInputEditText mLoginInput;
-  private TextInputEditText mPasswordInput;
 
   @Nullable
   @Override
@@ -46,28 +37,10 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
   {
     super.onViewCreated(view, savedInstanceState);
     getToolbarController().setTitle(R.string.login);
-    mLoginInput = view.findViewById(R.id.osm_username);
-    mPasswordInput = view.findViewById(R.id.osm_password);
     mLoginButton = view.findViewById(R.id.login);
-    mLostPasswordButton = view.findViewById(R.id.lost_password);
     MaterialButton registerButton = view.findViewById(R.id.register);
     registerButton.setOnClickListener((v) -> Utils.openUrl(requireActivity(), Constants.Url.OSM_REGISTER));
-    mProgress = view.findViewById(R.id.osm_login_progress);
-
-    // TODO(@pastk): remove unused flow with users entering credentials into app's form
-    // Hide login and password inputs and Forgot password button
-    UiUtils.hide(view.findViewById(R.id.osm_username_container), view.findViewById(R.id.osm_password_container),
-                 mLostPasswordButton);
-
     mLoginButton.setOnClickListener((v) -> loginWithBrowser());
-    /* login via in-app form
-    else
-    {
-      mLoginButton.setOnClickListener((v) -> login());
-      mLostPasswordButton.setOnClickListener((v) -> Utils.openUrl(requireActivity(),
-    Constants.Url.OSM_RECOVER_PASSWORD));
-    }
-    */
 
     String code = readOAuth2CodeFromArguments();
     if (code != null && !code.isEmpty())
@@ -86,42 +59,17 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
     return arguments.getString(OsmLoginActivity.EXTRA_OAUTH2CODE);
   }
 
-  private void login()
-  {
-    InputUtils.hideKeyboard(mLoginInput);
-    final String username = mLoginInput.getText().toString().trim();
-    final String password = mPasswordInput.getText().toString();
-    enableInput(false);
-    UiUtils.show(mProgress);
-    mLoginButton.setText("");
-
-    ThreadPool.getWorker().execute(() -> {
-      final String oauthToken = OsmOAuth.nativeAuthWithPassword(username, password);
-      final String username1 = (oauthToken == null) ? null : OsmOAuth.nativeGetOsmUsername(oauthToken);
-      UiThread.run(() -> processAuth(oauthToken, username1));
-    });
-  }
-
   private void loginWithBrowser()
   {
     Utils.openUri(requireContext(), Uri.parse(OsmOAuth.nativeGetOAuth2Url()), R.string.browser_not_available);
   }
 
-  private void enableInput(boolean enable)
-  {
-    mPasswordInput.setEnabled(enable);
-    mLoginInput.setEnabled(enable);
-    mLoginButton.setEnabled(enable);
-    mLostPasswordButton.setEnabled(enable);
-  }
-
   private void processAuth(String oauthToken, String username)
   {
     if (!isAdded())
       return;
 
-    enableInput(true);
-    UiUtils.hide(mProgress);
+    mLoginButton.setEnabled(true);
     mLoginButton.setText(R.string.login_osm);
     if (oauthToken == null)
       onAuthFail();
diff --git a/android/app/src/main/res/layout-land/fragment_osm_login.xml b/android/app/src/main/res/layout-land/fragment_osm_login.xml
index e26096a73..3b4aec8e6 100644
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -27,7 +27,7 @@
       tools:ignore="ScrollViewSize">
       <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="horizontal">
         <LinearLayout
           android:layout_width="0dp"
@@ -77,33 +77,8 @@
           android:layout_height="match_parent"
           android:layout_weight="1"
           android:orientation="vertical"
+          android:gravity="center"
           android:padding="@dimen/margin_base">
-          <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/osm_username_container"
-            style="@style/MwmWidget.Editor.CustomTextInput"
-            android:layout_marginEnd="@dimen/margin_half"
-            android:textColorHint="?android:textColorSecondary"
-            app:endIconMode="custom">
-            <com.google.android.material.textfield.TextInputEditText
-              android:id="@+id/osm_username"
-              style="@style/MwmWidget.Editor.FieldLayout.EditText"
-              android:autofillHints="emailAddress"
-              android:hint="@string/email_or_username" />
-          </com.google.android.material.textfield.TextInputLayout>
-          <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/osm_password_container"
-            style="@style/MwmWidget.Editor.CustomTextInput"
-            android:textColorHint="?android:textColorSecondary"
-            app:endIconMode="password_toggle"
-            app:endIconTint="?android:textColorSecondary">
-            <com.google.android.material.textfield.TextInputEditText
-              android:id="@+id/osm_password"
-              style="@style/MwmWidget.Editor.FieldLayout.EditText"
-              android:layout_marginTop="@dimen/margin_base"
-              android:autofillHints="password"
-              android:hint="@string/password"
-              android:inputType="textPassword" />
-          </com.google.android.material.textfield.TextInputLayout>
           <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -113,25 +88,9 @@
               style="@style/MwmWidget.M3.Button.Primary"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:text="@string/login_osm" />
-            <ProgressBar
-              android:id="@+id/osm_login_progress"
-              android:layout_width="@dimen/editor_auth_btn_height"
-              android:layout_height="@dimen/editor_auth_btn_height"
-              android:layout_gravity="center"
-              android:elevation="@dimen/design_fab_elevation"
-              android:visibility="gone" />
+              android:text="@string/login_osm"
+              android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
           </FrameLayout>
-          <com.google.android.material.button.MaterialButton
-            android:id="@+id/lost_password"
-            style="@style/MwmWidget.Button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="end"
-            android:background="?clickableBackground"
-            android:padding="@dimen/margin_half"
-            android:text="@string/forgot_password"
-            android:textAppearance="@style/MwmTextAppearance.Body3" />
           <com.google.android.material.divider.MaterialDivider
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml
index f5b150f8a..cc76e1f51 100644
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -63,31 +63,6 @@
           app:layout_constraintStart_toEndOf="@+id/osm_logo"
           app:layout_constraintTop_toTopOf="parent" />
       </androidx.constraintlayout.widget.ConstraintLayout>
-      <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/osm_username_container"
-        style="@style/MwmWidget.Editor.CustomTextInput"
-        android:hint="@string/email_or_username"
-        android:textColorHint="?android:textColorSecondary"
-        app:endIconMode="custom">
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/osm_username"
-          style="@style/MwmWidget.Editor.FieldLayout.EditText"
-          android:autofillHints="emailAddress" />
-      </com.google.android.material.textfield.TextInputLayout>
-      <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/osm_password_container"
-        style="@style/MwmWidget.Editor.CustomTextInput"
-        android:layout_marginTop="@dimen/margin_base"
-        android:hint="@string/password"
-        android:textColorHint="?android:textColorSecondary"
-        app:endIconMode="password_toggle"
-        app:endIconTint="?android:textColorSecondary">
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/osm_password"
-          style="@style/MwmWidget.Editor.FieldLayout.EditText"
-          android:autofillHints="password"
-          android:inputType="textPassword" />
-      </com.google.android.material.textfield.TextInputLayout>
       <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -97,27 +72,9 @@
           style="@style/MwmWidget.M3.Button.Primary"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:text="@string/login_osm" />
-        <ProgressBar
-          android:id="@+id/osm_login_progress"
-          android:layout_width="@dimen/editor_auth_btn_height"
-          android:layout_height="@dimen/editor_auth_btn_height"
-          android:layout_gravity="center"
-          android:elevation="@dimen/design_fab_elevation"
-          android:visibility="gone" />
+          android:text="@string/login_osm"
+          android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
       </FrameLayout>
-      <com.google.android.material.button.MaterialButton
-        android:id="@+id/lost_password"
-        style="@style/MwmWidget.M3.Button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:background="?clickableBackground"
-        android:padding="@dimen/margin_half"
-        android:text="@string/forgot_password"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        android:textColor="@color/text_dark"
-          tools:visibility="invisible"/>
       <com.google.android.material.divider.MaterialDivider
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/values-af/strings.xml b/android/app/src/main/res/values-af/strings.xml
index 5615a257e..820715566 100644
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -407,8 +407,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Nie ingeteken nie</string>
     <string name="login_osm">Teken aan op OpenStreetMap</string>
-    <string name="password">Wagwoord</string>
-    <string name="forgot_password">Het u u wagwoord vergeet?</string>
     <string name="logout">Teken af</string>
     <string name="edit_place">Wysig plek</string>
     <string name="add_language">Voeg ’n taal toe</string>
@@ -427,7 +425,6 @@
     <string name="cuisine">Kookkuns</string>
     <string name="select_cuisine">Kies kookkuns</string>
     <!-- login text field -->
-    <string name="email_or_username">E-posadres of gebruikersnaam</string>
     <string name="editor_add_phone">Voeg telefoonnomer toe</string>
     <string name="level">Verdieping</string>
     <string name="downloader_delete_map_dialog">Alle wysigings aan kaarte word saam met die kaart geskrap.</string>
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index f08610d20..5e43b1f16 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -433,8 +433,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">لم يتم تسجيل الدخول</string>
     <string name="login_osm">تسجيل الدخول الى OpenStreetMap</string>
-    <string name="password">كلمة المرور</string>
-    <string name="forgot_password">هل نسيت كلمة المرور؟</string>
     <string name="logout">تسجيل الخروج</string>
     <string name="edit_place">تعديل المكان</string>
     <string name="add_language">إضافة لغة</string>
@@ -453,7 +451,6 @@
     <string name="cuisine">المطبخ</string>
     <string name="select_cuisine">اختر المطبخ</string>
     <!-- login text field -->
-    <string name="email_or_username">البريد الإلكتروني أو اسم المستخدم</string>
     <string name="editor_add_phone">إضافة رقم هاتف</string>
     <string name="level">طابق</string>
     <string name="downloader_delete_map_dialog">سيتم حذف جميع التغييرات بالخريطة بالإضافة إلى حذف الخريطة نفسها.</string>
diff --git a/android/app/src/main/res/values-ast/strings.xml b/android/app/src/main/res/values-ast/strings.xml
index 37c4e795d..d49d8b970 100644
--- a/android/app/src/main/res/values-ast/strings.xml
+++ b/android/app/src/main/res/values-ast/strings.xml
@@ -105,7 +105,6 @@
     <string name="bookmarks_import">Importar marcadores y trayeutos</string>
     <string name="track_recording">Grabando’l trayeutu</string>
     <string name="edit_track">Editar trayeutu</string>
-    <string name="password">Contraseña</string>
     <string name="trip_finished">Aportesti.</string>
     <string name="details">Detalles</string>
     <string name="placepage_edit_bookmark_button">Editar marcador</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index 904e776c9..90defae7b 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -425,8 +425,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Giriş edilməyib</string>
     <string name="login_osm">OpenStreetMap-a daxil olun</string>
-    <string name="password">Parol</string>
-    <string name="forgot_password">Parolu unutmusunuz?</string>
     <string name="logout">Çıxış</string>
     <string name="edit_place">Məkanı Redaktə edin</string>
     <string name="add_language">Dil əlavə edin</string>
@@ -445,7 +443,6 @@
     <string name="cuisine">Mətbəx</string>
     <string name="select_cuisine">Mətbəx seçin</string>
     <!-- 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>
     <string name="downloader_delete_map_dialog">Bütün xəritə dəyişiklikləri xəritə ilə birlikdə silinəcək.</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 2f5d4dd60..fd5b100e4 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -419,8 +419,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Не ўвайшлі ў сістэму</string>
     <string name="login_osm">Увайсці ў OpenStreetMap</string>
-    <string name="password">Пароль</string>
-    <string name="forgot_password">Забылі пароль?</string>
     <string name="logout">Выйсці</string>
     <string name="edit_place">Правіць месца</string>
     <string name="add_language">Дадаць мову</string>
@@ -439,7 +437,6 @@
     <string name="cuisine">Кухня</string>
     <string name="select_cuisine">Выбраць кухню</string>
     <!-- login text field -->
-    <string name="email_or_username">Email або імя карыстальніка</string>
     <string name="level">Паверх</string>
     <string name="downloader_delete_map_dialog">Разам з картай будуць выдалены і ўсе вашы праўкі карты.</string>
     <string name="downloader_update_maps">Абнавіць карты</string>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index f5576d714..d173eaec4 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -397,8 +397,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Не е влязъл в системата</string>
     <string name="login_osm">Влезте в OpenStreetMap</string>
-    <string name="password">Парола</string>
-    <string name="forgot_password">Забравили сте паролата си?</string>
     <string name="logout">Изход</string>
     <string name="edit_place">Редакция на място</string>
     <string name="add_language">Добавяне на език</string>
@@ -417,7 +415,6 @@
     <string name="cuisine">Кухня</string>
     <string name="select_cuisine">Избор на кухня</string>
     <!-- login text field -->
-    <string name="email_or_username">Имейл или потребителско име</string>
     <string name="level">Етаж</string>
     <string name="downloader_delete_map_dialog">Всички ваши редакции на картата ще бъдат изтрити заедно с нея.</string>
     <string name="downloader_update_maps">Обновяване на карти</string>
diff --git a/android/app/src/main/res/values-bn/strings.xml b/android/app/src/main/res/values-bn/strings.xml
index b83caf8f7..da8e00b7e 100644
--- a/android/app/src/main/res/values-bn/strings.xml
+++ b/android/app/src/main/res/values-bn/strings.xml
@@ -244,7 +244,6 @@
     <string name="closes_in">%s-এর মধ্যে বন্ধ হবে</string>
     <string name="no_osm_account">আপনার ওপেনস্ট্রিটম্যাপ অ্যাকাউন্ট নেই?</string>
     <string name="logout">লগ আউট করুন</string>
-    <string name="forgot_password">পাসওয়ার্ড ভুলে গেছেন?</string>
     <string name="edit_place">স্থানটি পরিবর্তন করুন</string>
     <string name="add_language">একটি ভাষা যোগ করুন</string>
     <string name="street">রাস্তা</string>
@@ -285,7 +284,6 @@
     <string name="history">ইতিহাস</string>
     <string name="p2p_start">চালু করুন</string>
     <string name="editor_time_from">থেকে</string>
-    <string name="password">পাসওয়ার্ড</string>
     <string name="day_off">বন্ধ</string>
     <string name="closed">বন্ধ</string>
     <string name="social_media">সামাজিক মাধ্যম</string>
@@ -306,7 +304,6 @@
     <string name="choose_street">একটি রাস্তা বেছে নিন</string>
     <string name="cuisine">রন্ধনপ্রণালী</string>
     <string name="select_cuisine">রন্ধনপ্রণালী নির্বাচন করুন</string>
-    <string name="email_or_username">ইমাইল বা ইউইজারনেম</string>
     <string name="editor_add_phone">ফোন নম্বর যোগ করুন</string>
     <string name="downloader_update_maps">মানচিত্রগুলি আপডেট করুন</string>
     <string name="downloader_mwm_migration_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 b7da16bf8..331efbb96 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -424,8 +424,6 @@
     <string name="login">Inicia sessió</string>
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">No heu iniciat sessió</string>
-    <string name="password">Contrasenya</string>
-    <string name="forgot_password">Heu oblidat la contrasenya?</string>
     <string name="logout">Tanca la sessió</string>
     <string name="edit_place">Edita el lloc</string>
     <string name="add_language">Afegeix una llengua</string>
@@ -444,7 +442,6 @@
     <string name="cuisine">Cuina</string>
     <string name="select_cuisine">Trieu una cuina</string>
     <!-- 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>
     <string name="downloader_delete_map_dialog">Totes les vostres edicions del mapa se suprimiran conjuntament amb aquest.</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index f9b807501..340f36437 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -416,8 +416,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Nejste přihlášeni</string>
     <string name="login_osm">Přihlásit se do OpenStreetMap</string>
-    <string name="password">Heslo</string>
-    <string name="forgot_password">Zapomenuté heslo?</string>
     <string name="logout">Odhlášení</string>
     <string name="edit_place">Upravit místo</string>
     <string name="add_language">Přidat jazyk</string>
@@ -436,7 +434,6 @@
     <string name="cuisine">Kuchyně</string>
     <string name="select_cuisine">Vybrat kuchyni</string>
     <!-- login text field -->
-    <string name="email_or_username">E-mail 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>
     <string name="downloader_update_maps">Aktualizujte mapy</string>
diff --git a/android/app/src/main/res/values-cy/strings.xml b/android/app/src/main/res/values-cy/strings.xml
index b6d469521..35cfb9beb 100644
--- a/android/app/src/main/res/values-cy/strings.xml
+++ b/android/app/src/main/res/values-cy/strings.xml
@@ -112,7 +112,6 @@
     <string name="day_off">Ar gau</string>
     <string name="closed">Ar gau</string>
     <string name="login">Mewngofnodi</string>
-    <string name="password">Cyfrinair</string>
     <string name="street">Stryd</string>
     <string name="details">Manylion</string>
     <string name="cuisine">Bwyd</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index a45596fcd..009a8244f 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -412,8 +412,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Ikke logget ind</string>
     <string name="login_osm">Log ind på OpenStreetMap</string>
-    <string name="password">Adgangskode</string>
-    <string name="forgot_password">Glemt adgangskode?</string>
     <string name="logout">Log ud</string>
     <string name="edit_place">Redigér stedet</string>
     <string name="add_language">Tilføj et sprog</string>
@@ -432,7 +430,6 @@
     <string name="cuisine">Køkken</string>
     <string name="select_cuisine">Vælg køkken</string>
     <!-- login text field -->
-    <string name="email_or_username">E-mail eller brugernavn</string>
     <string name="level">Etage</string>
     <string name="downloader_delete_map_dialog">Alle dine kortændringer vil blive slettet sammen med kortet</string>
     <string name="downloader_update_maps">Opdatér kort</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index f6853e771..f41e4af13 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -423,8 +423,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Nicht angemeldet</string>
     <string name="login_osm">Bei OpenStreetMap anmelden</string>
-    <string name="password">Passwort</string>
-    <string name="forgot_password">Passwort vergessen?</string>
     <string name="logout">Abmelden</string>
     <string name="edit_place">Eintrag bearbeiten</string>
     <string name="add_language">Eine Sprache hinzufügen</string>
@@ -442,8 +440,6 @@
     <string name="choose_street">Eine Straße wählen</string>
     <string name="cuisine">Küche</string>
     <string name="select_cuisine">Küche auswählen</string>
-    <!-- login text field -->
-    <string name="email_or_username">Email oder Benutzername</string>
     <string name="editor_add_phone">Telefonnummer hinzufügen</string>
     <string name="level">Stockwerk</string>
     <!-- Building level -->
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 8ce93e6dc..09c7d8300 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -425,8 +425,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Δεν έχετε συνδεθεί</string>
     <string name="login_osm">Συνδεθείτε στο OpenStreetMap</string>
-    <string name="password">Κωδικός πρόσβασης</string>
-    <string name="forgot_password">Ξαχάσατε τον κωδικό πρόσβασης;</string>
     <string name="logout">Αποσύνδεση</string>
     <string name="edit_place">Επεξεργασία τοποθεσίας</string>
     <string name="add_language">Προσθήκη γλώσσας</string>
@@ -445,7 +443,6 @@
     <string name="cuisine">Κουζίνα</string>
     <string name="select_cuisine">Επιλέξτε κουζίνα</string>
     <!-- login text field -->
-    <string name="email_or_username">Email ή όνομα χρήστη</string>
     <string name="editor_add_phone">Προσθήκη Τηλεφώνου</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 44e5c366f..026c82eb5 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -427,8 +427,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">No se ha iniciado sesión</string>
     <string name="login_osm">Acceder a OpenStreetMap</string>
-    <string name="password">Contraseña</string>
-    <string name="forgot_password">¿Has olvidado tu contraseña?</string>
     <string name="logout">Cerrar sesión</string>
     <string name="edit_place">Editar el lugar</string>
     <string name="add_language">Añadir un idioma</string>
@@ -447,7 +445,6 @@
     <string name="cuisine">Cocina</string>
     <string name="select_cuisine">Seleccionar cocina</string>
     <!-- login text field -->
-    <string name="email_or_username">Correo electrónico o usuario</string>
     <string name="editor_add_phone">Añadir teléfono</string>
     <string name="level">Piso</string>
     <string name="downloader_delete_map_dialog">Todas las ediciones hechas al mapa se eliminarán junto con este</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 623934adc..8d67e6911 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -419,8 +419,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Pole sisse logitud</string>
     <string name="login_osm">Logi sisse OpenStreetMappi</string>
-    <string name="password">Salasõna</string>
-    <string name="forgot_password">Unustasid oma salasõna?</string>
     <string name="logout">Logi välja</string>
     <string name="edit_place">Muuda kohta</string>
     <string name="add_language">Lisa keel</string>
@@ -439,7 +437,6 @@
     <string name="cuisine">Köök</string>
     <string name="select_cuisine">Vali köök</string>
     <!-- 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>
     <string name="downloader_delete_map_dialog">Kõik sinu kaardimuudatused kustutatakse koos kaardiga</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 90bafcc4a..4662785a3 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -425,8 +425,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Saioa hasi gabe</string>
     <string name="login_osm">Hasi saioa OpenStreetMap-en</string>
-    <string name="password">Pasahitza</string>
-    <string name="forgot_password">Pasahitza ahaztu duzu?</string>
     <string name="logout">Saioa itxi</string>
     <string name="edit_place">Editatu tokia</string>
     <string name="add_language">Gehitu hizkuntza bat</string>
@@ -445,7 +443,6 @@
     <string name="cuisine">Sukaldea</string>
     <string name="select_cuisine">Aukeratu sukaldea</string>
     <!-- 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>
     <string name="downloader_delete_map_dialog">Mapan egin dituzun aldaketa guztiak maparekin batera ezabatuko dira</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 2e1cd57e4..fdcc82beb 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -402,8 +402,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">وارد نشده‌اید</string>
     <string name="login_osm">شوید OpenStreetMap وارد</string>
-    <string name="password">رمز عبور</string>
-    <string name="forgot_password">رمز عبور خود را فراموش کردید؟</string>
     <string name="logout">خروج از حساب</string>
     <string name="edit_place">ویرایش مکان</string>
     <string name="add_language">افزودن یک زبان</string>
@@ -422,7 +420,6 @@
     <string name="cuisine">غذا‌خوری</string>
     <string name="select_cuisine">انتخاب غذاخوری</string>
     <!-- login text field -->
-    <string name="email_or_username">ایمیل یا نام کاربری</string>
     <string name="level">طبقه</string>
     <string name="downloader_delete_map_dialog">تمام ویرایش‌های که بر روی نقشه انجام داده اید به همراه نقشه حذف شد</string>
     <string name="downloader_update_maps">بروزرسانی نقشه‌ها</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 3f5f7ac7d..a24fec08c 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -426,8 +426,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Et ole kirjautunut sisään</string>
     <string name="login_osm">Kirjaudu OpenStreetMapiin</string>
-    <string name="password">Salasana</string>
-    <string name="forgot_password">Unohtuiko salasana?</string>
     <string name="logout">Kirjaudu ulos</string>
     <string name="edit_place">Muokkaa kohdetta</string>
     <string name="add_language">Lisää kieli</string>
@@ -446,7 +444,6 @@
     <string name="cuisine">Ruokalaji</string>
     <string name="select_cuisine">Valitse ruokalaji</string>
     <!-- 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>
     <string name="downloader_delete_map_dialog">Kaikki karttaan tehdyt muutokset poistetaan kartan mukana</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index da32e0e33..bc0dbaaa1 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -427,8 +427,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Non connecté•e</string>
     <string name="login_osm">Se connecter à OpenStreetMap</string>
-    <string name="password">Mot de passe</string>
-    <string name="forgot_password">Mot de passe oublié ?</string>
     <string name="logout">Déconnexion</string>
     <string name="edit_place">Modifier le lieu</string>
     <string name="add_language">Ajouter une langue</string>
@@ -446,8 +444,6 @@
     <string name="choose_street">Choisir une rue</string>
     <string name="cuisine">Cuisine</string>
     <string name="select_cuisine">Sélectionner un type de cuisine</string>
-    <!-- login text field -->
-    <string name="email_or_username">Courriel ou nom d’utilisateur</string>
     <string name="editor_add_phone">Ajouter un numéro de téléphone</string>
     <string name="level">Étage</string>
     <!-- Building level -->
diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml
index 1e8b69f35..ed63c2c38 100644
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -141,7 +141,6 @@
     <string name="history">Historial</string>
     <string name="dialog_routing_location_turn_on">Activar servizos de localización</string>
     <string name="prefs_group_information">Información</string>
-    <string name="password">Contrasinal</string>
     <string name="placepage_add_business_button">Engadir organización</string>
     <string name="category_atm">Caixeiro automático</string>
     <string name="prefs_group_route">Navegación</string>
@@ -304,7 +303,6 @@
     <string name="closes_in">Pecha en %s</string>
     <string name="no_osm_account">Non ten conta en OpenStreetMap?</string>
     <string name="login_osm">Acceder a OpenStreetMap</string>
-    <string name="forgot_password">Esqueceu o seu contrasinal?</string>
     <string name="logout">Pechar sesión</string>
     <string name="edit_place">Editar o lugar</string>
     <string name="add_language">Engadir un idioma</string>
@@ -313,7 +311,6 @@
     <string name="street">Rúa</string>
     <string name="empty_street_name_error">Por favor, introduza un nome de rúa</string>
     <string name="choose_language">Elixir un idioma</string>
-    <string name="email_or_username">Correo electrónico ou usuario</string>
     <string name="level_value_generic">Nivel: %s</string>
     <string name="downloader_delete_map_dialog">Todas as edicións feitas ao mapa eliminaranse xunto con este</string>
     <string name="choose_street">Elixa unha cale</string>
diff --git a/android/app/src/main/res/values-gsw/strings.xml b/android/app/src/main/res/values-gsw/strings.xml
index a0e457bc7..ef61fda09 100644
--- a/android/app/src/main/res/values-gsw/strings.xml
+++ b/android/app/src/main/res/values-gsw/strings.xml
@@ -28,7 +28,6 @@
     <string name="about_developed_by_enthusiasts">Vollständig open-source, nöd gwünnorientiert, transparenti Entscheidigsfindig und Finanze.</string>
     <string name="dialog_routing_change_start_or_end">Bitte pass din Startpunkt oder dis Ziil a.</string>
     <string name="daily">Täglich</string>
-    <string name="email_or_username">E-Mail oder Benutzername</string>
     <string name="autodownload">Charte automatisch abelade</string>
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) isch es Gmeinschaftsprojekt zum Erstelle vonere freie und offene Charte. Es isch d Hauptquelle für Chartedate in CoMaps und funktioniert ähnlich wie Wikipedia. Du chasch Ort hinzuefüege oder bearbeite, wo denn Millione vo Nutzende uf de ganze Welt zur Verfüegig stönd. \nTritt de Gmeinschaft bii und hilf mit, d Charte für alli besser z mache!</string>
     <string name="editor_building_levels">Etage (inkl. Erdgschoss, ohni Dach)</string>
@@ -368,8 +367,6 @@
     <string name="login">Bi OpenStreetMap aamelde</string>
     <string name="not_signed_in">Nöd aagmolde</string>
     <string name="login_osm">Bi OpenStreetMap aamelde</string>
-    <string name="password">Passwort</string>
-    <string name="forgot_password">Passwort vergesse?</string>
     <string name="logout">Abmelde</string>
     <string name="edit_place">Iitrag bearbeite</string>
     <string name="add_language">E Spraach hinzuefüege</string>
diff --git a/android/app/src/main/res/values-hr/strings.xml b/android/app/src/main/res/values-hr/strings.xml
index f1c1b45bc..217c46314 100644
--- a/android/app/src/main/res/values-hr/strings.xml
+++ b/android/app/src/main/res/values-hr/strings.xml
@@ -103,7 +103,6 @@
     <string name="privacy">Privatnost</string>
     <string name="power_managment_setting_never">Nikada</string>
     <string name="editor_reset_edits_button">Odbaci</string>
-    <string name="password">Lozinka</string>
     <string name="details">Detalji</string>
     <string name="privacy_policy">Politika privatnosti</string>
     <string name="editor_edit_place_category_title">Kategorija</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 016ef0965..61b74842c 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -416,8 +416,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Nincs bejelentkezve</string>
     <string name="login_osm">Jelentkezzen be az OpenStreetMap fiókjába</string>
-    <string name="password">Jelszó</string>
-    <string name="forgot_password">Elfelejtette a jelszavát?</string>
     <string name="logout">Kijelentkezés</string>
     <string name="edit_place">Hely szerkesztése</string>
     <string name="add_language">Nyelv hozzáadása</string>
@@ -434,7 +432,6 @@
     <string name="cuisine">Konyha</string>
     <string name="select_cuisine">Konyha kiválasztása</string>
     <!-- login text field -->
-    <string name="email_or_username">E-mail-cím vagy felhasználónév</string>
     <string name="level">Szint</string>
     <string name="downloader_delete_map_dialog">A térképpel együtt az Ön összes térképszerkesztése törlődik</string>
     <string name="downloader_update_maps">Térképek frissítése</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index 7d04267f5..55b31cebc 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -410,8 +410,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Belum masuk</string>
     <string name="login_osm">Masuk ke OpenStreetMap</string>
-    <string name="password">Kata sandi</string>
-    <string name="forgot_password">Lupa kata sandi?</string>
     <string name="logout">Keluar</string>
     <string name="edit_place">Sunting tempat</string>
     <string name="add_language">Tambahkan bahasa</string>
@@ -428,7 +426,6 @@
     <string name="cuisine">Masakan</string>
     <string name="select_cuisine">Pilih Masakan</string>
     <!-- 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>
     <string name="downloader_update_maps">Perbarui peta</string>
diff --git a/android/app/src/main/res/values-is/strings.xml b/android/app/src/main/res/values-is/strings.xml
index 58cb72ec9..af7e8eda9 100644
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -50,7 +50,6 @@
     <string name="closed">Lokað</string>
     <string name="login">Skrá inn</string>
     <string name="login_osm">Skrá inn á OpenStreetMap</string>
-    <string name="password">Lykilorð</string>
     <string name="street">Gata</string>
     <string name="details">Nánar</string>
     <string name="building">Bygging</string>
@@ -178,10 +177,8 @@
     <string name="day_off">Lokað</string>
     <string name="no_osm_account">Ertu ekki með OpenStreetMap-aðgang?</string>
     <string name="not_signed_in">Ekki skráð/ur inn</string>
-    <string name="forgot_password">Gleymdirðu lykilorðinu?</string>
     <string name="logout">Skrá út</string>
     <string name="edit_place">Breyta stað</string>
-    <string name="email_or_username">Tölvupóstur eða notandanafn</string>
     <string name="editor_add_phone">Bæta við símanúmeri</string>
     <string name="level">Hæð</string>
     <string name="editor_edit_place_name_hint">Nafn staðarins</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index fac5381a5..72e4c9f08 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -421,8 +421,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Accesso non effettuato</string>
     <string name="login_osm">Accedi a OpenStreetMap</string>
-    <string name="password">Password</string>
-    <string name="forgot_password">Hai dimenticato la password?</string>
     <string name="logout">Esci</string>
     <string name="edit_place">Modifica il luogo</string>
     <string name="add_language">Aggiungi una lingua</string>
@@ -441,7 +439,6 @@
     <string name="cuisine">Cucina</string>
     <string name="select_cuisine">Seleziona la cucina</string>
     <!-- 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>
     <string name="downloader_delete_map_dialog">Tutte le tue modifiche alla mappa saranno cancellate insieme a essa</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 756477e92..3c51603a1 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -419,8 +419,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">לא מחובר</string>
     <string name="login_osm">היכנס ל-OpenStreetMap</string>
-    <string name="password">סיסמה</string>
-    <string name="forgot_password">שכחת סיסמה?</string>
     <string name="logout">התנתק</string>
     <string name="edit_place">ערוך מקום</string>
     <string name="add_language">הוסף שפה</string>
@@ -439,7 +437,6 @@
     <string name="cuisine">סגנון בישול</string>
     <string name="select_cuisine">בחר סיגנון בישול</string>
     <!-- login text field -->
-    <string name="email_or_username">דוא\"ל או שם משתמש</string>
     <string name="editor_add_phone">הוסף טלפון</string>
     <string name="level">קומה</string>
     <string name="downloader_delete_map_dialog">כל העריכות שלך במפה יימחקו יחד עם המפה.</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 962f59e21..350247a37 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -429,8 +429,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">サインインしていません</string>
     <string name="login_osm">OpenStreetMapにログイン</string>
-    <string name="password">パスワード</string>
-    <string name="forgot_password">パスワードをお忘れですか？</string>
     <string name="logout">ログアウト</string>
     <string name="edit_place">場所を編集</string>
     <string name="add_language">言語を追加</string>
@@ -449,7 +447,6 @@
     <string name="cuisine">料理</string>
     <string name="select_cuisine">料理を選択</string>
     <!-- login text field -->
-    <string name="email_or_username">メールアドレスまたはユーザー名</string>
     <string name="editor_add_phone">電話番号を追加</string>
     <string name="level">階</string>
     <string name="downloader_delete_map_dialog">すべてのマップの変更はマップとともに削除されます。</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 867693ea9..54c72e146 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -410,8 +410,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">로그인되지 않음</string>
     <string name="login_osm">OpenStreetMap에 로그인</string>
-    <string name="password">암호</string>
-    <string name="forgot_password">암호를 잊으 셨나요?</string>
     <string name="logout">로그 아웃</string>
     <string name="edit_place">장소 편집</string>
     <string name="add_language">언어 추가</string>
@@ -428,7 +426,6 @@
     <string name="cuisine">요리</string>
     <string name="select_cuisine">요리 선택</string>
     <!-- login text field -->
-    <string name="email_or_username">이메일 또는 사용자 이름</string>
     <string name="level">층</string>
     <string name="downloader_delete_map_dialog">모든 지도의 변경 사항은 지도와 함께 삭제됩니다.</string>
     <string name="downloader_update_maps">지도 업데이트</string>
diff --git a/android/app/src/main/res/values-lt/strings.xml b/android/app/src/main/res/values-lt/strings.xml
index d230ceefe..811216c0a 100644
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -413,8 +413,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Neprisijungta</string>
     <string name="login_osm">Prisijungti prie „OpenStreetMap“</string>
-    <string name="password">Slaptažodis</string>
-    <string name="forgot_password">Pamiršote slaptažodį?</string>
     <string name="logout">Atsijungti</string>
     <string name="edit_place">Taisyti vietą</string>
     <string name="add_language">Pridėti kalbą</string>
@@ -433,7 +431,6 @@
     <string name="cuisine">Virtuvė</string>
     <string name="select_cuisine">Pasirinkite virtuvę</string>
     <!-- login text field -->
-    <string name="email_or_username">El. paštas arba naudotojo vardas</string>
     <string name="editor_add_phone">Pridėti telefono numerį</string>
     <string name="level">Aukštas</string>
     <string name="downloader_delete_map_dialog">Visi jūsų žemėlapio pakeitimai bus pašalinti kartu su žemėlapiu</string>
diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml
index ed164f2f9..31fe86906 100644
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -425,8 +425,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Neierakstījāties</string>
     <string name="login_osm">Ierakstīties OpenStreetMap</string>
-    <string name="password">Parole</string>
-    <string name="forgot_password">Vai aizmirsāt paroli?</string>
     <string name="logout">Izrakstīties</string>
     <string name="edit_place">Rediģēt vietu</string>
     <string name="add_language">Pievienot valodu</string>
@@ -445,7 +443,6 @@
     <string name="cuisine">Virtuve</string>
     <string name="select_cuisine">Atlasiet virtuvi</string>
     <!-- login text field -->
-    <string name="email_or_username">E-pasts vai lietotājvārds</string>
     <string name="editor_add_phone">Pievienot tālruni</string>
     <string name="level">Stāvs</string>
     <!-- Building level -->
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index e1429f8b9..22153700f 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -402,8 +402,6 @@
     <string name="login">लॉग इन</string>
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">साइन इन केलेले नाही</string>
-    <string name="password">पासवर्ड</string>
-    <string name="forgot_password">पासवर्ड विसरलात?</string>
     <string name="logout">लॉग आऊट</string>
     <string name="edit_place">ठिकाण संपादित करा</string>
     <string name="add_language">भाषा जोडा</string>
@@ -422,7 +420,6 @@
     <string name="cuisine">पाककृती</string>
     <string name="select_cuisine">पाककृती निवडा</string>
     <!-- login text field -->
-    <string name="email_or_username">ईमेल किंवा वापरकर्तानाव</string>
     <string name="editor_add_phone">फोन जोडा</string>
     <string name="level">मजला</string>
     <string name="downloader_delete_map_dialog">तुमचे सर्व नकाशा संपादने नकाशासह पुसले जातील.</string>
diff --git a/android/app/src/main/res/values-mt/strings.xml b/android/app/src/main/res/values-mt/strings.xml
index 0f71f36fe..89b4e8407 100644
--- a/android/app/src/main/res/values-mt/strings.xml
+++ b/android/app/src/main/res/values-mt/strings.xml
@@ -298,7 +298,6 @@
     <string name="register_at_openstreetmap">Irreġistra f’ OpenStreetMap</string>
     <string name="not_signed_in">Mhux imdaħħal</string>
     <string name="login">Illoggja</string>
-    <string name="forgot_password">Insejt il-password tiegħek?</string>
     <string name="street">Triq</string>
     <string name="house_number">Numru tal-bini</string>
     <string name="building">Bini</string>
@@ -307,7 +306,6 @@
     <string name="choose_language">Agħżel lingwa</string>
     <string name="cuisine">Kċina</string>
     <string name="select_cuisine">Agħżel il-kċina</string>
-    <string name="email_or_username">E-mejl jew isem l-utent</string>
     <string name="downloader_mwm_migration_dialog">Biex toħloq rotta, trid taġġorna l-mapep kollha u mbagħad terġa ’tippjana r-rotta.</string>
     <string name="downloader_no_space_title">Mhux biżżejjed spazju</string>
     <string name="downloader_no_space_message">Ħassar kwalunkwe dejta mhux neċessarja</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 14693aae0..cea8b9d43 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -425,8 +425,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Ikke logget inn</string>
     <string name="login_osm">Logg på OpenStreetMap</string>
-    <string name="password">Passord</string>
-    <string name="forgot_password">Glemt passordet?</string>
     <string name="logout">Logg ut</string>
     <string name="edit_place">Rediger stedet</string>
     <string name="add_language">Legg til et språk</string>
@@ -445,7 +443,6 @@
     <string name="cuisine">Matrett</string>
     <string name="select_cuisine">Velg matrett</string>
     <!-- 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>
     <string name="downloader_delete_map_dialog">Alle endringer i kartet vil slettes sammen med kartet.</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index d3b91a51e..76aec07bf 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -423,8 +423,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Niet ingelogd</string>
     <string name="login_osm">Log in bij OpenStreetMap</string>
-    <string name="password">Wachtwoord</string>
-    <string name="forgot_password">Wachtwoord vergeten?</string>
     <string name="logout">Log uit</string>
     <string name="edit_place">Locatie bewerken</string>
     <string name="add_language">Taal toevoegen</string>
@@ -443,7 +441,6 @@
     <string name="cuisine">Keuken</string>
     <string name="select_cuisine">Selecteer keuken</string>
     <!-- login text field -->
-    <string name="email_or_username">E-mailadres of gebruikersnaam</string>
     <string name="editor_add_phone">Telefoonnummer toevoegen</string>
     <string name="level">Verdieping</string>
     <string name="downloader_delete_map_dialog">Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 755160858..19594310f 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -427,8 +427,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Nie zalogowano</string>
     <string name="login_osm">Zaloguj się do OpenStreetMap</string>
-    <string name="password">Hasło</string>
-    <string name="forgot_password">Nie pamiętasz hasła?</string>
     <string name="logout">Wyloguj</string>
     <string name="edit_place">Edytuj miejsce</string>
     <string name="add_language">Dodaj język</string>
@@ -447,7 +445,6 @@
     <string name="cuisine">Kuchnia</string>
     <string name="select_cuisine">Wybierz kuchnię</string>
     <!-- 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>
     <string name="downloader_delete_map_dialog">Wszystkie zmiany dotyczące mapy zostaną usunięte wraz z nią.</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 ddf19aab1..f306fb66b 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -384,8 +384,6 @@
     <string name="register_at_openstreetmap">Abra uma conta no OpenStreetMap</string>
     <string name="login">Login</string>
     <string name="login_osm">Entrar no OpenStreetMap</string>
-    <string name="password">Senha</string>
-    <string name="forgot_password">Esqueceu sua senha?</string>
     <string name="logout">Encerrar sessão</string>
     <string name="edit_place">Editar o local</string>
     <string name="add_language">Adicionar um idioma</string>
@@ -402,7 +400,6 @@
     <string name="cuisine">Culinária</string>
     <string name="select_cuisine">Selecione a culinária</string>
     <!-- login text field -->
-    <string name="email_or_username">Email ou nome de usuário</string>
     <string name="downloader_delete_map_dialog">Todas as suas edições no mapa serão excluídas juntamente com o mapa</string>
     <string name="downloader_update_maps">Atualizar mapas</string>
     <string name="downloader_mwm_migration_dialog">Para criar um itinerário é necessário atualizar todos os mapas e, em seguida, planejá-lo novamente.</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index b6ac5aef9..8e3929906 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -419,8 +419,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Sessão não iniciada</string>
     <string name="login_osm">Entrar no OpenStreetMap</string>
-    <string name="password">Palavra-chave</string>
-    <string name="forgot_password">Esqueceu-se da palavra-chave?</string>
     <string name="logout">Terminar sessão</string>
     <string name="edit_place">Editar o local</string>
     <string name="add_language">Adicionar um idioma</string>
@@ -437,7 +435,6 @@
     <string name="cuisine">Culinária</string>
     <string name="select_cuisine">Selecione a culinária</string>
     <!-- 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>
     <string name="downloader_update_maps">Atualizar mapas</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index dfb5f2d87..53ff25bb0 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -419,8 +419,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Neautentificat</string>
     <string name="login_osm">Conectați-vă la OpenStreetMap</string>
-    <string name="password">Parola</string>
-    <string name="forgot_password">Ai uitat parola?</string>
     <string name="logout">Deconectare</string>
     <string name="edit_place">Modifică locul</string>
     <string name="add_language">Adaugă o limbă</string>
@@ -439,7 +437,6 @@
     <string name="cuisine">Bucătărie</string>
     <string name="select_cuisine">Alege bucătăria</string>
     <!-- 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>
     <string name="downloader_delete_map_dialog">Toate modificările aduse hărții vor fi șterse împreună cu harta.</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 8eed5f14c..6163d82e8 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -427,8 +427,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Не выполнен вход</string>
     <string name="login_osm">Войти в OpenStreetMap</string>
-    <string name="password">Пароль</string>
-    <string name="forgot_password">Забыли пароль?</string>
     <string name="logout">Выйти</string>
     <string name="edit_place">Редактировать место</string>
     <string name="add_language">Добавить язык</string>
@@ -447,7 +445,6 @@
     <string name="cuisine">Кухня</string>
     <string name="select_cuisine">Выбрать кухню</string>
     <!-- login text field -->
-    <string name="email_or_username">Эл. почта или имя пользователя</string>
     <string name="editor_add_phone">Добавить телефон</string>
     <string name="level">Этаж</string>
     <!-- Building level -->
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index dfad87cbb..ec2f2fb79 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -423,8 +423,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Nie ste prihlásený</string>
     <string name="login_osm">Prihláste sa do OpenStreetMap</string>
-    <string name="password">Heslo</string>
-    <string name="forgot_password">Zabudli ste heslo?</string>
     <string name="logout">Odhlásiť sa</string>
     <string name="edit_place">Upraviť miesto</string>
     <string name="add_language">Pridať jazyk</string>
@@ -443,7 +441,6 @@
     <string name="cuisine">Kuchyňa</string>
     <string name="select_cuisine">Vyberte si kuchyňu</string>
     <!-- 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>
     <string name="downloader_delete_map_dialog">Všetky zmeny týkajúce sa mapy budú vymazané spolu s mapou.</string>
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index cf7444d90..a3e072f9f 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -420,8 +420,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Нисте пријављени</string>
     <string name="login_osm">Пријава на OpenStreetMap</string>
-    <string name="password">Лозинка</string>
-    <string name="forgot_password">Заборављена лозинка?</string>
     <string name="logout">Одјави се</string>
     <string name="edit_place">Измени место</string>
     <string name="add_language">Додај језик</string>
@@ -438,7 +436,6 @@
     <string name="cuisine">Кухиња</string>
     <string name="select_cuisine">Изаберите кухињу</string>
     <!-- login text field -->
-    <string name="email_or_username">Email или корисничко име</string>
     <string name="editor_add_phone">Додај број телефона</string>
     <string name="level">Спрат</string>
     <!-- Building level -->
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index b53cc307f..5516158b8 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -410,8 +410,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Inte inloggad</string>
     <string name="login_osm">Logga in på OpenStreetMap</string>
-    <string name="password">Lösenord</string>
-    <string name="forgot_password">Glömt lösenord?</string>
     <string name="logout">Logga ut</string>
     <string name="edit_place">Ändra platsen</string>
     <string name="add_language">Lägg till ett språk</string>
@@ -428,7 +426,6 @@
     <string name="cuisine">Mat</string>
     <string name="select_cuisine">Välj mat</string>
     <!-- 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>
     <string name="downloader_update_maps">Uppdatera kartor</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index b85723d35..dc9e50c6d 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -410,8 +410,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">ยังไม่ได้ลงชื่อเข้าใช้</string>
     <string name="login_osm">เข้าสู่ระบบ OpenStreetMap</string>
-    <string name="password">รหัสผ่าน</string>
-    <string name="forgot_password">ลืมรหัสผ่าน?</string>
     <string name="logout">ออกจากระบบ</string>
     <string name="edit_place">แก้ไขสถานที่</string>
     <string name="add_language">เพิ่มภาษา</string>
@@ -428,7 +426,6 @@
     <string name="cuisine">ประเภทอาหาร</string>
     <string name="select_cuisine">เลือกประเภทอาหาร</string>
     <!-- login text field -->
-    <string name="email_or_username">อีเมลหรือชื่อผู้ใช้</string>
     <string name="level">ชั้น</string>
     <string name="downloader_delete_map_dialog">การเปลี่ยนแปลงแผนที่ทั้งหมดจะถูกลบไปพร้อมกับแผนที่</string>
     <string name="downloader_update_maps">อัปเดตแผนที่</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 153fa6564..bea83671e 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -423,8 +423,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Giriş yapılmadı</string>
     <string name="login_osm">OpenStreetMap\'e giriş yap</string>
-    <string name="password">Şifre</string>
-    <string name="forgot_password">Şifrenizi mi unuttunuz?</string>
     <string name="logout">Oturumu kapat</string>
     <string name="edit_place">Yeri Düzenle</string>
     <string name="add_language">Dil ekle</string>
@@ -443,7 +441,6 @@
     <string name="cuisine">Mutfak</string>
     <string name="select_cuisine">Mutfak Seç</string>
     <!-- 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">Kat</string>
     <!-- Building level -->
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index b4ca03c34..6bed6e62f 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -427,8 +427,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Не ввійшли</string>
     <string name="login_osm">Увійдіть до OpenStreetMap</string>
-    <string name="password">Пароль</string>
-    <string name="forgot_password">Забули пароль?</string>
     <string name="logout">Вийти</string>
     <string name="edit_place">Редагувати місце</string>
     <string name="add_language">Додати мову</string>
@@ -447,7 +445,6 @@
     <string name="cuisine">Кухня</string>
     <string name="select_cuisine">Вибрати кухню</string>
     <!-- login text field -->
-    <string name="email_or_username">Ел. пошта або ім\'я користувача</string>
     <string name="level">Поверх</string>
     <string name="downloader_delete_map_dialog">Разом з мапою будуть видалені й внесені Вами правки на цій мапі.</string>
     <string name="downloader_update_maps">Оновити мапи</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 65175ab80..82b315f3b 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -410,8 +410,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Chưa đăng nhập</string>
     <string name="login_osm">Đăng nhập vào OpenStreetMap</string>
-    <string name="password">Mật khẩu</string>
-    <string name="forgot_password">Quên mật khẩu?</string>
     <string name="logout">Đăng xuất</string>
     <string name="edit_place">Chỉnh sửa địa điểm</string>
     <string name="add_language">Thêm ngôn ngữ</string>
@@ -428,7 +426,6 @@
     <string name="cuisine">Ẩm thực</string>
     <string name="select_cuisine">Chọn Ẩm thực</string>
     <!-- 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>
     <string name="downloader_update_maps">Cập nhật các 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 e5a78a871..6b1c6e86e 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -433,8 +433,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">未登入</string>
     <string name="login_osm">登錄 OpenStreetMap</string>
-    <string name="password">密碼</string>
-    <string name="forgot_password">忘記密碼？</string>
     <string name="logout">登出</string>
     <string name="edit_place">編輯地點</string>
     <string name="add_language">新增語言</string>
@@ -453,7 +451,6 @@
     <string name="cuisine">料理</string>
     <string name="select_cuisine">選擇料理</string>
     <!-- login text field -->
-    <string name="email_or_username">電子郵件或使用者名稱</string>
     <string name="editor_add_phone">新增電話號碼</string>
     <string name="level">樓層</string>
     <!-- Building level -->
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index a0158c30f..578e9c02c 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -433,8 +433,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">未登录</string>
     <string name="login_osm">登录 OpenStreetMap</string>
-    <string name="password">密码</string>
-    <string name="forgot_password">忘记密码？</string>
     <string name="logout">登出</string>
     <string name="edit_place">编辑地点</string>
     <string name="add_language">添加语言</string>
@@ -453,7 +451,6 @@
     <string name="cuisine">菜肴</string>
     <string name="select_cuisine">选择菜肴</string>
     <!-- login text field -->
-    <string name="email_or_username">电子邮件或用户名</string>
     <string name="editor_add_phone">新增电话号码</string>
     <string name="level">楼层</string>
     <!-- Building level -->
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index a138b279e..deef4dcec 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -476,8 +476,6 @@
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Not signed in</string>
     <string name="login_osm">Login to OpenStreetMap</string>
-    <string name="password">Password</string>
-    <string name="forgot_password">Forgot your password?</string>
     <string name="logout">Log Out</string>
     <string name="edit_place">Edit Place</string>
     <string name="add_language">Add a language</string>
@@ -496,7 +494,6 @@
     <string name="cuisine">Cuisine</string>
     <string name="select_cuisine">Select cuisine</string>
     <!-- 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>
     <!-- Building level -->
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp
index 6dbfb257a..206ee05b9 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp
@@ -31,24 +31,6 @@ JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOAut
   return ToJavaString(env, auth.BuildOAuth2Url());
 }
 
-JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jclass clazz,
-                                                                                          jstring login,
-                                                                                          jstring password)
-{
-  OsmOAuth auth = OsmOAuth::ServerAuth();
-  try
-  {
-    if (auth.AuthorizePassword(ToNativeString(env, login), ToNativeString(env, password)))
-      return ToJavaString(env, auth.GetAuthToken());
-    LOG(LWARNING, ("nativeAuthWithPassword: invalid login or password."));
-  }
-  catch (std::exception const & ex)
-  {
-    LOG(LWARNING, ("nativeAuthWithPassword error ", ex.what()));
-  }
-  return nullptr;
-}
-
 JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env, jclass,
                                                                                             jstring oauth2code)
 {