diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
index 0374e5d33..954963bf6 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -431,8 +431,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
     // Details
     View mBlockLevels = view.findViewById(R.id.block_levels);
-    mBuildingLevels = findInputAndInitBlock(mBlockLevels, R.drawable.ic_floor,
-        getString(R.string.editor_storey_number, Editor.nativeGetMaxEditableBuildingLevels()));
+    mBuildingLevels = findInputAndInitBlock(mBlockLevels, R.drawable.ic_floor, R.string.editor_building_levels);
     mBuildingLevels.setInputType(InputType.TYPE_CLASS_NUMBER);
     mInputBuildingLevels = mBlockLevels.findViewById(R.id.custom_input);
     View blockPhone = view.findViewById(R.id.block_phone);
diff --git a/android/app/src/main/res/values-af/strings.xml b/android/app/src/main/res/values-af/strings.xml
index 9ffc06452..de8bf0616 100644
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -484,7 +484,6 @@
     <string name="download_over_mobile_header">Laai af oor ’n mobieledataverbinding?</string>
     <string name="download_over_mobile_message">Dit kan behoorlik duur wees met sommige planne of indien dooldata aktief is.</string>
     <string name="error_enter_correct_house_number">Voer ’n geldige gebounommer in</string>
-    <string name="editor_storey_number">Aantal verdiepings (maksimum van %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Die aantal verdiepings mag nie %d oorskry nie</string>
     <string name="editor_zip_code">Poskode</string>
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index cd85c8976..eae6439dd 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -510,7 +510,6 @@
     <string name="download_over_mobile_header">تنزيل باستخدام بيانات الجوال؟</string>
     <string name="download_over_mobile_message">قد يكون هذا مكلفاً جداً في بعض الاحيان أو عند التجوال.</string>
     <string name="error_enter_correct_house_number">أدخل رقم بناء صحيح</string>
-    <string name="editor_storey_number">عدد الطوابق (بحد أقصى %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">يجب ألا يتجاوز عدد طوابق المبنى %d</string>
     <string name="editor_zip_code">الرمز البريدي</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index 1f386478d..03c6b8074 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -499,7 +499,6 @@
     <string name="download_over_mobile_header">Mobil şəbəkə vasitəsilə endirilsin?</string>
     <string name="download_over_mobile_message">Bəzi planlarda və ya rouminqlə bu olduqca bahalı hesab oluna bilərr.</string>
     <string name="error_enter_correct_house_number">Etibarlı bina nömrəsini daxil edin</string>
-    <string name="editor_storey_number">Mərtəbə sayı (maks. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Mərtəbələrin sayı %d-dən çox olmamalıdır</string>
     <string name="editor_zip_code">Poçt kodu</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index e8ffe922d..eed7ceaaa 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -495,7 +495,6 @@
     <string name="download_over_mobile_header">Спампаваць праз мабільны інтэрнэт?</string>
     <string name="download_over_mobile_message">Гэта можа быць даволі дорага з некаторымі тарыфнымі планамі або ў роўмінгу.</string>
     <string name="error_enter_correct_house_number">Увядзіце правільны нумар дома</string>
-    <string name="editor_storey_number">Колькасць паверхаў (максімум %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Колькасць паверхаў павінна быць не больш за %d</string>
     <string name="editor_zip_code">Паштовы індэкс</string>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 9ef949d7b..4a1b213be 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -465,7 +465,6 @@
     <string name="download_over_mobile_header">Изтегляне чрез мобилни данни?</string>
     <string name="download_over_mobile_message">Това може да бъде значително скъпо при някои планове или при роуминг.</string>
     <string name="error_enter_correct_house_number">Въведете валиден номер на сграда</string>
-    <string name="editor_storey_number">Брой етажи (максимум %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Броят на етажите не трябва да надвишава %d</string>
     <string name="editor_zip_code">Пощенски код</string>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index 9757a565f..64a3ca912 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -498,7 +498,6 @@
     <string name="download_over_mobile_header">Voleu baixar-ho a través d’una connexió de xarxa mòbil?</string>
     <string name="download_over_mobile_message">Podria ser força car amb algunes tarifes o amb itinerància de dades.</string>
     <string name="error_enter_correct_house_number">Introduïu un número d’edifici vàlid</string>
-    <string name="editor_storey_number">Nombre de plantes (màxim %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">El nombre de plantes no pot excedir de %d</string>
     <string name="editor_zip_code">Codi postal</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index b6aa4dad6..07b554f85 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -479,7 +479,6 @@
     <string name="download_over_mobile_header">Stáhnout pomocí připojení přes mobilní síť?</string>
     <string name="download_over_mobile_message">Toto by mohlo být s některými tarify nebo roamingem výrazně dražší.</string>
     <string name="error_enter_correct_house_number">Zadejte správné číslo domu</string>
-    <string name="editor_storey_number">Počet poschodí (max. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Opravte počet poschodí, max. %d</string>
     <string name="editor_zip_code">PSČ</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index c15409862..8a4184e05 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -475,7 +475,6 @@
     <string name="download_over_mobile_header">Download ved brug af mobilnetværksforbindelse?</string>
     <string name="download_over_mobile_message">Dette kan være meget dyrt med nogle abonnementer eller ved roaming.</string>
     <string name="error_enter_correct_house_number">Indtast et gyldigt bygningsnummer</string>
-    <string name="editor_storey_number">Antal etager (maks %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Antallet af etager må ikke overstige %d etager</string>
     <string name="editor_zip_code">Postnummer</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 54ee71fef..2844c5c13 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -497,7 +497,6 @@
     <string name="download_over_mobile_header">Über eine Mobilfunknetzverbindung herunterladen?</string>
     <string name="download_over_mobile_message">Das könnte mit einigen Tarifen oder beim Roaming sehr teuer werden.</string>
     <string name="error_enter_correct_house_number">Richtige Hausnummer eingeben</string>
-    <string name="editor_storey_number">Anzahl der Etagen (maximal %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Das Gebäude kann nicht mehr als %d Etagen haben</string>
     <string name="editor_zip_code">Postleitzahl</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 8b9f0978e..a0f951e5c 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -500,7 +500,6 @@
     <string name="download_over_mobile_header">Να γίνει λήψη μέσω δικτύου κινητής τηλεφωνίας;</string>
     <string name="download_over_mobile_message">Αυτό μπορεί να είναι πολύ ακριβό για μερικά πακέτα ή στην περίπτωση roaming.</string>
     <string name="error_enter_correct_house_number">Εισαγάγετε έναν έγκυρο αριθμό κτιρίου</string>
-    <string name="editor_storey_number">Αριθμός ορόφων (μέγιστο %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Ο αριθμός των ορόφων δεν πρέπει να υπερβαίνει τους %d</string>
     <string name="editor_zip_code">Ταχυδρομικός κώδικας</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 31c707dfe..3816cd66e 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -499,7 +499,6 @@
     <string name="download_over_mobile_header">¿Descargar con conexión de red móvil?</string>
     <string name="download_over_mobile_message">Podría ser muy caro con ciertos planes o con itinerancia de datos.</string>
     <string name="error_enter_correct_house_number">Introducir el número de domicilio correcto</string>
-    <string name="editor_storey_number">Número de plantas (máx. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">El número de plantas no debe superar %d</string>
     <string name="editor_zip_code">Código postal</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 946f5a1e8..b4c4f5eb1 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -491,7 +491,6 @@
     <string name="download_over_mobile_header">Kas laadime alla mobiilivõrgu kaudu?</string>
     <string name="download_over_mobile_message">See võib mõningate lepingute või rändluse korral olla märgatavalt kallim.</string>
     <string name="error_enter_correct_house_number">Sisesta kehtiv majanumber</string>
-    <string name="editor_storey_number">Korruste arv (maks. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Korruste arv ei või olla üle %d</string>
     <string name="editor_zip_code">Postiindeks</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 03ea82b4a..6716939ae 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -497,7 +497,6 @@
     <string name="download_over_mobile_header">Deskargatu sare mugikorreko konexioarekin?</string>
     <string name="download_over_mobile_message">Oso garestia izan daiteke roaming plan batzuekin edo datu-ibiltaritzarekin.</string>
     <string name="error_enter_correct_house_number">Sartu etxeko zenbaki baliozkoa</string>
-    <string name="editor_storey_number">Solairu kopurua (gehienez %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Solairu kopurua ez da %d-tik gorakoa izan behar</string>
     <string name="editor_zip_code">Posta kodea</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 802f47ba8..c34a96328 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -470,7 +470,6 @@
     <string name="download_over_mobile_header">دانلود بر روی یک شبکه دیتای موبایل؟</string>
     <string name="download_over_mobile_message">این کار می تواند برای شما در بعضی طرح‌ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد.</string>
     <string name="error_enter_correct_house_number">وارد کردن شماره ساختمان معتبر</string>
-    <string name="editor_storey_number">تعداد طبقات ( حداکثر %d )</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">تعداد طبقات نباید بیش از %d باشد</string>
     <string name="editor_zip_code">کدپستی</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index b32f7a440..34f7aceea 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -501,7 +501,6 @@
     <string name="download_over_mobile_header">Lataa käyttämällä puhelinverkkoyhteyttä?</string>
     <string name="download_over_mobile_message">Tämä vaihtoehto saattaa olla huomattavasti kalliimpi tietyillä sopimuksilla tai roaming-yhteydellä.</string>
     <string name="error_enter_correct_house_number">Syötä oikea talon numero</string>
-    <string name="editor_storey_number">Kerrosten määrä (maks. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Kerrosten määrä saa olla korkeintaan %d</string>
     <string name="editor_zip_code">Postinumero</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index 9e40fac41..6ca81e6c9 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -504,7 +504,6 @@
     <string name="download_over_mobile_header">Téléchargement avec une connexion réseau cellulaire ?</string>
     <string name="download_over_mobile_message">Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement.</string>
     <string name="error_enter_correct_house_number">Saisir un numéro de maison correct</string>
-    <string name="editor_storey_number">Nombre d\'étages (max %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Le nombre d\'étages ne doit pas dépasser %d</string>
     <string name="editor_zip_code">Code postal</string>
diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml
index 5e641859a..3ee859d66 100644
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -354,7 +354,6 @@
     <string name="download_over_mobile_header">Descargar con conexión de rede móbil?</string>
     <string name="download_over_mobile_message">Podería ser moi caro con certos plans ou con itinerancia de datos.</string>
     <string name="error_enter_correct_house_number">Introducir o número de domicilio correcto</string>
-    <string name="editor_storey_number">Número de plantas (máx. %d)</string>
     <string name="error_enter_correct_storey_number">O número de plantas non debe superar %d</string>
     <string name="error_enter_correct_zip_code">Introduza un código postal válido</string>
     <string name="editor_about_osm">As súas edicións cárganse na base de datos pública <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Por favor, non engada información persoal ou protexida por dereitos de autor.</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 51fc60b89..aeb302a70 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -487,7 +487,6 @@
     <string name="download_over_mobile_header">Biztosan letölti mobilhálózati kapcsolaton keresztül?</string>
     <string name="download_over_mobile_message">Ez egyes díjcsomagok vagy roaming esetén jelentős költségekkel járhat.</string>
     <string name="error_enter_correct_house_number">Adjon meg egy érvényes házszámot</string>
-    <string name="editor_storey_number">Emeletek száma (legfeljebb: %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Ez az épület legfeljebb %d emeletes lehet</string>
     <string name="editor_zip_code">Irányítószám</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index 1dd29cfcd..c29b44741 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -475,7 +475,6 @@
     <string name="download_over_mobile_header">Unduh dengan menggunakan koneksi jaringan seluler?</string>
     <string name="download_over_mobile_message">Ini bisa menjadi jauh mahal pada beberapa paket atau jika roaming.</string>
     <string name="error_enter_correct_house_number">Masukkan nomor rumah yang benar</string>
-    <string name="editor_storey_number">Jumlah lantai (maksimum %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Edit bangunan dengan maksimum %d lantai</string>
     <string name="editor_zip_code">Kode Pos</string>
diff --git a/android/app/src/main/res/values-is/strings.xml b/android/app/src/main/res/values-is/strings.xml
index 384f5c3fc..18267311c 100644
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -431,7 +431,6 @@
     <string name="editor_time_allday">Allan sólarhringinn (24 klst)</string>
     <string name="select_cuisine">Veldu matreiðsluhefð</string>
     <string name="error_enter_correct_house_number">Settu inn gilt númer byggingar</string>
-    <string name="editor_storey_number">Fjöldi hæða (hámark %d)</string>
     <string name="error_enter_correct_storey_number">Fjöldi hæða getur ekki verið meiri en %d</string>
     <string name="downloader_no_downloaded_maps_title">Þú hefur ekki sótt nein kort</string>
     <string name="current_location_unknown_error_title">Fyrirliggjandi staðsetning er óþekkt.</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index bce62c1a3..945e8bac2 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -485,7 +485,6 @@
     <string name="download_over_mobile_header">Vuoi scaricare utilizzando una connessione di rete cellulare?</string>
     <string name="download_over_mobile_message">Questa operazione potrebbe essere piuttosto costosa con alcuni piani telefonici o se in roaming.</string>
     <string name="error_enter_correct_house_number">Inserisci un numero civico valido</string>
-    <string name="editor_storey_number">Numero di piani (massimo %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Il numero di piani non deve superare %d</string>
     <string name="editor_zip_code">Codice postale</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 3838b48fa..a6b52b254 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -491,7 +491,6 @@
     <string name="download_over_mobile_header">להוריד באמצעות חיבור אינטרנט סלולרי?</string>
     <string name="download_over_mobile_message">זה עשוי להיות יקר עם חבילות גלישה מסוימות או בנדידה.</string>
     <string name="error_enter_correct_house_number">הזן מספר בית תקין</string>
-    <string name="editor_storey_number">מספר קומות (מקסימום: %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">מספר הקומות לא יכול להיות גבוה מ-%d</string>
     <string name="editor_zip_code">מיקוד</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index f1b99b42a..27b371984 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -501,7 +501,6 @@
     <string name="download_over_mobile_header">モバイル通信でダウンロードしますか？</string>
     <string name="download_over_mobile_message">プランによって、またはローミングしている場合、非常に高額になる可能性があります。</string>
     <string name="error_enter_correct_house_number">正しい番地を入力してください</string>
-    <string name="editor_storey_number">フロアの数（最大%d）</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">最高%d階までのビルを編集</string>
     <string name="editor_zip_code">郵便番号</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index faf7c9202..d7b2fe986 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -473,7 +473,6 @@
     <string name="download_over_mobile_header">셀룰러 네트워크 접속을 사용하여 다운로드하시겠습니까?</string>
     <string name="download_over_mobile_message">이는 일부 플랜이나 로밍할 경우에 비싸다고 간주될 수 있습니다.</string>
     <string name="error_enter_correct_house_number">올바른 집 번호 입력</string>
-    <string name="editor_storey_number">층 수(최대 %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">최대 %d층까지 입력하세요</string>
     <string name="editor_zip_code">우편번호</string>
diff --git a/android/app/src/main/res/values-lt/strings.xml b/android/app/src/main/res/values-lt/strings.xml
index ccac739c3..c47a55783 100644
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -488,7 +488,6 @@
     <string name="download_over_mobile_header">Atsisiųsti naudojant mobilųjį ryšį?</string>
     <string name="download_over_mobile_message">Tai gali būti itin brangu, naudojantis kai kuriais planais ar tarptinkliniu ryšiu.</string>
     <string name="error_enter_correct_house_number">Įveskite leistiną pastato numerį</string>
-    <string name="editor_storey_number">Aukštų skaičius (daugiausia %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Aukštų skaičius negali viršyti %d</string>
     <string name="editor_zip_code">Pašto kodas</string>
diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml
index f6f7764ba..d6ddddf76 100644
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -500,7 +500,6 @@
     <string name="download_over_mobile_header">Vai lejupielādēt arī mobilajā tīklā?</string>
     <string name="download_over_mobile_message">Ja lietojat ierobežotus datus vai viesabonēšanu, tas var izmaksāt dārgi.</string>
     <string name="error_enter_correct_house_number">Ierakstiet derīgu ēkas numuru</string>
-    <string name="editor_storey_number">Stāvu skaits (maks. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Stāvu skaits nedrīkst pārsniegt %d</string>
     <string name="editor_zip_code">Pasta indekss</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index d5a489de5..84ad1145b 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -466,7 +466,6 @@
     <string name="download_over_mobile_header">मोबाईल डेटा वापरून डाउनलोड करायचे?</string>
     <string name="download_over_mobile_message">रोमिंग वर असल्यास हे बरेच महाग पडू शकते.</string>
     <string name="error_enter_correct_house_number">एक वैध बिल्डिंग क्रमांक प्रविष्ट करा</string>
-    <string name="editor_storey_number">मजल्यांची संख्या (कमाल %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">मजल्यांची संख्या %d पेक्षा जास्त नसावी</string>
     <string name="editor_zip_code">पिनकोड</string>
diff --git a/android/app/src/main/res/values-mt/strings.xml b/android/app/src/main/res/values-mt/strings.xml
index ba84fd491..a6191f121 100644
--- a/android/app/src/main/res/values-mt/strings.xml
+++ b/android/app/src/main/res/values-mt/strings.xml
@@ -343,7 +343,6 @@
     <string name="downloader_of">%1$d ta\' %2$d</string>
     <string name="download_over_mobile_header">Niżżel fuq konnessjoni tan-netwerk ċellulari?</string>
     <string name="error_enter_correct_house_number">Daħħal numru tal-bini validu</string>
-    <string name="editor_storey_number">Numru ta’ sulari (massimu ta’ %d)</string>
     <string name="error_enter_correct_storey_number">In-numru ta’ sulari m’ għandux jaqbeż il-%d</string>
     <string name="editor_zip_code">Kodiċi ZIP</string>
     <string name="error_enter_correct_zip_code">Daħħal kodiċi ZIP validu</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 2a6c6346d..70a1337ea 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -499,7 +499,6 @@
     <string name="download_over_mobile_header">Last ned med mobildata?</string>
     <string name="download_over_mobile_message">Dette kan medføre store kostnader med enkelte dataplaner eller om du roamer.</string>
     <string name="error_enter_correct_house_number">Skriv riktig husnummer</string>
-    <string name="editor_storey_number">Antall etasjer (maks. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Rediger bygningen med maks. %d etasjer</string>
     <string name="editor_zip_code">Postnummer</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index de6179aa2..3d36ab6da 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -495,7 +495,6 @@
     <string name="download_over_mobile_header">Downloaden via een mobiele gegevensverbinding?</string>
     <string name="download_over_mobile_message">Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn.</string>
     <string name="error_enter_correct_house_number">Voer een geldig huisnummer in</string>
-    <string name="editor_storey_number">Aantal verdiepingen (max. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Het gebouw mag niet meer dan %d verdiepingen hebben</string>
     <string name="editor_zip_code">Postcode</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index f80c61f4f..75147cb78 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -499,7 +499,6 @@
     <string name="download_over_mobile_header">Czy pobrać, używając połączenia z siecią komórkową?</string>
     <string name="download_over_mobile_message">Może to być kosztowne przy niektórych planach taryfowych lub w roamingu.</string>
     <string name="error_enter_correct_house_number">Wprowadź poprawny numer domu</string>
-    <string name="editor_storey_number">Liczba kondygnacji (maks. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Liczba kondygnacji nie może przekraczać %d</string>
     <string name="editor_zip_code">Kod pocztowy</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 69f57d0a4..e274ef988 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -446,7 +446,6 @@
     <string name="download_over_mobile_header">Baixar usando uma conexão de rede celular?</string>
     <string name="download_over_mobile_message">Isto pode ser muito caro com alguns planos ou se você estiver em roaming.</string>
     <string name="error_enter_correct_house_number">Informe o número correto do endereço</string>
-    <string name="editor_storey_number">Número de andares (máx. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">O número de andares não pode ser maior que %d</string>
     <string name="editor_zip_code">CEP</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index aead12d3f..5cf6120f8 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -480,7 +480,6 @@
     <string name="download_over_mobile_header">Descarregar utilizando uma conexão de rede de telemóveis?</string>
     <string name="download_over_mobile_message">Isto pode ser muito caro com alguns planos ou em roaming.</string>
     <string name="error_enter_correct_house_number">Introduza um número de endereço correto</string>
-    <string name="editor_storey_number">Número de pisos (máx. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">O número de pisos não pode ser maior que %d</string>
     <string name="editor_zip_code">Código Postal</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index c7ca1595c..d6341bc2d 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -485,7 +485,6 @@
     <string name="download_over_mobile_header">Vrei să descarci prin rețeaua de telefonie mobilă?</string>
     <string name="download_over_mobile_message">Aceasta poate fi destul de costisitoare în cazul unor abonamente sau în roaming.</string>
     <string name="error_enter_correct_house_number">Introdu un număr corect</string>
-    <string name="editor_storey_number">Număr de etaje (maximum %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Numărul de etaje nu trebuie să depășească %d</string>
     <string name="editor_zip_code">Cod poștal</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 6bcddcf12..08c2e5243 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -504,7 +504,6 @@
     <string name="download_over_mobile_header">Загрузить через сотовую связь?</string>
     <string name="download_over_mobile_message">На некоторых тарифных планах или в роуминге это может привести к значительным расходам.</string>
     <string name="error_enter_correct_house_number">Введите корректный номер дома</string>
-    <string name="editor_storey_number">Количество этажей (максимум %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Количество этажей не должно превышать %d</string>
     <string name="editor_zip_code">Почтовый индекс</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 659156eb8..a027c464e 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -497,7 +497,6 @@
     <string name="download_over_mobile_header">Sťahovať prostredníctvom pripojenia na mobilnú sieť?</string>
     <string name="download_over_mobile_message">V prípade niektorých plánov alebo použitím roamingu by to mohlo byť značne nákladné.</string>
     <string name="error_enter_correct_house_number">Zadajte správne číslo domu</string>
-    <string name="editor_storey_number">Počet poschodí (max %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Počet poschodí nesmie byť väčší ako %d</string>
     <string name="editor_zip_code">PSČ</string>
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index ad2c89865..745ee1b9a 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -490,7 +490,6 @@
     <string name="download_over_mobile_header">Преузимање преко мобилне мреже?</string>
     <string name="download_over_mobile_message">Ово може бити значајно скупље у оквиру одређених пакета или у ромингу.</string>
     <string name="error_enter_correct_house_number">Унесте исправан кућни број</string>
-    <string name="editor_storey_number">Број спратова (макс. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Број спратова не сме да прелази %d</string>
     <string name="editor_zip_code">Поштански број</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index f5b4db187..a4f714393 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -471,7 +471,6 @@
     <string name="download_over_mobile_header">Ladda ned med mobildata?</string>
     <string name="download_over_mobile_message">Detta kan vara mycket dyrt med vissa abonnemang och vid roaming.</string>
     <string name="error_enter_correct_house_number">Ange giltigt husnummer</string>
-    <string name="editor_storey_number">Antal våningar (max %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Redigera byggnaden med max %d våningar</string>
     <string name="editor_zip_code">Postnr</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index f915517ee..504025b49 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -475,7 +475,6 @@
     <string name="download_over_mobile_header">ดาวน์โหลดโดยใช้การเชื่อมต่อเครือข่ายมือถือ?</string>
     <string name="download_over_mobile_message">มันอาจมีราคาสูงมากหากใช้แผนโทรศัพท์บางประเภทหรือหากทำการโรมมิ่ง</string>
     <string name="error_enter_correct_house_number">กรอกบ้านเลขที่ให้ถูกต้อง</string>
-    <string name="editor_storey_number">จำนวนชั้น (มากสุด %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">แก้ไขอาคารที่มีจำนวนชั้นมากกว่า %d</string>
     <string name="editor_zip_code">รหัสไปรษณีย์</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index d72927d5d..7d0fd2306 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -499,7 +499,6 @@
     <string name="download_over_mobile_header">Hücresel bir ağ bağlantısı kullanarak indirilsin mi?</string>
     <string name="download_over_mobile_message">Bu işlem, bazı planlarda veya dolaşımda oldukça pahalı olabilir.</string>
     <string name="error_enter_correct_house_number">Geçerli bir bina numarası girin</string>
-    <string name="editor_storey_number">Kat sayısı (en çok %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Kat sayısı %d\'i geçmemelidir</string>
     <string name="editor_zip_code">Posta Kodu</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 69e6fca96..95b435fb7 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -501,7 +501,6 @@
     <string name="download_over_mobile_header">Завантажити за допомогою мобільної мережі?</string>
     <string name="download_over_mobile_message">Це може бути задорого за деякими планами або за умовами роумінгу.</string>
     <string name="error_enter_correct_house_number">Введіть правильний номер будинку</string>
-    <string name="editor_storey_number">Кількість поверхів (максимум %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Редагуйте будівлі висотою максимум %d поверхів</string>
     <string name="editor_zip_code">Поштовий індекс</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index ea81210ed..baa0eb3c0 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -473,7 +473,6 @@
     <string name="download_over_mobile_header">Tải xuống qua kết nối mạng di động?</string>
     <string name="download_over_mobile_message">Như vậy sẽ rất đắt tiền với một số gói dữ liệu hoặc khi chuyển vùng.</string>
     <string name="error_enter_correct_house_number">Nhập số nhà chính xác</string>
-    <string name="editor_storey_number">Số tầng (tối đa %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Sửa tòa nhà có tối đa %d tầng</string>
     <string name="editor_zip_code">Mã ZIP</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 8d1825a1e..3ba504db3 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -510,7 +510,6 @@
     <string name="download_over_mobile_header">用行動數據連線下載嗎？</string>
     <string name="download_over_mobile_message">如果您使用行動數據或漫遊來進行下載，將可能導致額外的費用。</string>
     <string name="error_enter_correct_house_number">輸入正確的門牌號碼</string>
-    <string name="editor_storey_number">樓層數量（最多 %d 層）</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">最多可編輯 %d 層的建築</string>
     <string name="editor_zip_code">郵遞區號</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 1c630bf32..56d38fcc5 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -510,7 +510,6 @@
     <string name="download_over_mobile_header">用手机网络连接下载吗？</string>
     <string name="download_over_mobile_message">如果您使用移动数据或漫游来进行下载，将可能导致额外的费用。</string>
     <string name="error_enter_correct_house_number">输入正确的门牌号码</string>
-    <string name="editor_storey_number">楼层数量 (最多 %d 层)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">最多可编辑 %d 层的建筑</string>
     <string name="editor_zip_code">邮政编码</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 05b87cf99..508c27592 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -548,7 +548,7 @@
     <string name="download_over_mobile_header">Download over a cellular network connection?</string>
     <string name="download_over_mobile_message">This could be considerably expensive with some plans or if roaming.</string>
     <string name="error_enter_correct_house_number">Enter a valid building number</string>
-    <string name="editor_storey_number">Number of floors (maximum of %d)</string>
+    <string name="editor_building_levels">Floors (inc. ground floor, excl. roof)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">The number of floors must non exceed %d</string>
     <string name="editor_zip_code">ZIP Code</string>