diff --git a/android/app/src/main/res/values-af/types_strings.xml b/android/app/src/main/res/values-af/types_strings.xml
index f2d0abfc3..ea8fe0ded 100644
--- a/android/app/src/main/res/values-af/types_strings.xml
+++ b/android/app/src/main/res/values-af/types_strings.xml
@@ -567,7 +567,6 @@
     <string name="type.landuse.education">Opvoedkundige fasiliteit</string>
     <string name="type.landuse.farmland">Landbougrond</string>
     <string name="type.landuse.farmyard">Plaaswerf</string>
-    <string name="type.landuse.field">Veld</string>
     <string name="type.landuse.forest">Woud</string>
     <string name="type.landuse.forest.coniferous">Naaldwoud</string>
     <string name="type.landuse.forest.deciduous">Loofwoud</string>
diff --git a/android/app/src/main/res/values-ar/types_strings.xml b/android/app/src/main/res/values-ar/types_strings.xml
index 948d1fad1..0ef8a2ab3 100644
--- a/android/app/src/main/res/values-ar/types_strings.xml
+++ b/android/app/src/main/res/values-ar/types_strings.xml
@@ -594,7 +594,6 @@
     <string name="type.landuse.construction">منطقة بناء</string>
     <string name="type.landuse.education">مؤسسة تعليمية</string>
     <string name="type.landuse.farmland">حقل</string>
-    <string name="type.landuse.field">حقل</string>
     <string name="type.landuse.flowerbed">مشتل أزهار</string>
     <string name="type.landuse.forest">غابة</string>
     <string name="type.landuse.forest.coniferous">غابة صنوبرية</string>
diff --git a/android/app/src/main/res/values-az/types_strings.xml b/android/app/src/main/res/values-az/types_strings.xml
index e24d120db..67b8676a1 100644
--- a/android/app/src/main/res/values-az/types_strings.xml
+++ b/android/app/src/main/res/values-az/types_strings.xml
@@ -585,7 +585,6 @@
     <string name="type.landuse.construction">Struktur</string>
     <string name="type.landuse.farmland">Kənd Təsərrüfatı Torpaqları</string>
     <string name="type.landuse.farmyard">Ferma rayonu</string>
-    <string name="type.landuse.field">Ərazi</string>
     <string name="type.landuse.flowerbed">Çiçəklik</string>
     <string name="type.landuse.forest">Meşə</string>
     <string name="type.landuse.forest.coniferous">Şam meşəsi</string>
diff --git a/android/app/src/main/res/values-ca/types_strings.xml b/android/app/src/main/res/values-ca/types_strings.xml
index 203e6ba86..1020e76f4 100644
--- a/android/app/src/main/res/values-ca/types_strings.xml
+++ b/android/app/src/main/res/values-ca/types_strings.xml
@@ -872,7 +872,6 @@
     <string name="type.cuisine.french">Francesa</string>
     <string name="type.cuisine.russian">Rusa</string>
     <string name="type.landuse.forest.coniferous">Bosc de coníferes</string>
-    <string name="type.landuse.field">Camp</string>
     <string name="type.man_made.works">Fàbrica</string>
     <string name="type.cuisine.georgian">Georgiana</string>
     <string name="type.cuisine.german">Alemanya</string>
diff --git a/android/app/src/main/res/values-cs/types_strings.xml b/android/app/src/main/res/values-cs/types_strings.xml
index cdcd8df80..67cf05e74 100644
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -1212,7 +1212,6 @@
     <string name="type.internet_access">Internet</string>
     <string name="type.junction.roundabout">Kruhový objezd</string>
     <string name="type.landuse.brownfield">Brownfield</string>
-    <string name="type.landuse.field">Pole</string>
     <string name="type.landuse.greenfield">Nezastavěná plocha</string>
     <string name="type.landuse.greenhouse_horticulture">Skleník</string>
     <string name="type.landuse.industrial">Průmyslová oblast</string>
diff --git a/android/app/src/main/res/values-da/types_strings.xml b/android/app/src/main/res/values-da/types_strings.xml
index 5f8f7de33..1eabd75a1 100644
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -1233,7 +1233,6 @@
     <string name="type.landuse.construction">Byggeplads</string>
     <string name="type.landuse.education">Uddannelsesområde</string>
     <string name="type.landuse.farmyard">Gårdanlæg</string>
-    <string name="type.landuse.field">Mark</string>
     <string name="type.landuse.garages">Garager</string>
     <string name="type.landuse.greenfield">Ubebygget område</string>
     <string name="type.landuse.industrial">Industriområde</string>
diff --git a/android/app/src/main/res/values-de/types_strings.xml b/android/app/src/main/res/values-de/types_strings.xml
index defd131a9..ca622a484 100644
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -583,7 +583,6 @@
     <string name="type.landuse.education">Bildungseinrichtung</string>
     <string name="type.landuse.farmland">Agrarland</string>
     <string name="type.landuse.farmyard">Bauernhof</string>
-    <string name="type.landuse.field">Feld</string>
     <string name="type.landuse.flowerbed">Blumenbeet</string>
     <string name="type.landuse.forest">Wald</string>
     <string name="type.landuse.forest.coniferous">Nadelwald</string>
diff --git a/android/app/src/main/res/values-es/types_strings.xml b/android/app/src/main/res/values-es/types_strings.xml
index 17d6abf34..1dd9bc293 100644
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -600,7 +600,6 @@
     <string name="type.landuse.education">Instalaciones educativas</string>
     <string name="type.landuse.farmland">Tierras agrícolas</string>
     <string name="type.landuse.farmyard">Granja</string>
-    <string name="type.landuse.field">Campo</string>
     <string name="type.landuse.flowerbed">Cama de flores</string>
     <string name="type.landuse.forest">Bosque</string>
     <string name="type.landuse.forest.coniferous">Bosque de coníferas</string>
diff --git a/android/app/src/main/res/values-et/types_strings.xml b/android/app/src/main/res/values-et/types_strings.xml
index 6a232912c..2bc60ccf2 100644
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -598,7 +598,6 @@
     <string name="type.landuse.education">Haridusasutuse maaala</string>
     <string name="type.landuse.farmland">Põllumaa</string>
     <string name="type.landuse.farmyard">Taluõu</string>
-    <string name="type.landuse.field">Põld</string>
     <string name="type.landuse.flowerbed">Lillepeenar</string>
     <string name="type.landuse.forest">Majandusmets</string>
     <string name="type.landuse.forest.coniferous">Okaspuumets</string>
diff --git a/android/app/src/main/res/values-eu/types_strings.xml b/android/app/src/main/res/values-eu/types_strings.xml
index 7098e9650..231d4379d 100644
--- a/android/app/src/main/res/values-eu/types_strings.xml
+++ b/android/app/src/main/res/values-eu/types_strings.xml
@@ -1249,7 +1249,6 @@
     <string name="type.landuse.brownfield">Industrialde ohia</string>
     <string name="type.landuse.education">Hezkuntza-azpiegitura</string>
     <string name="type.landuse.farmyard">Eskorta</string>
-    <string name="type.landuse.field">Soroa</string>
     <string name="type.landuse.greenfield">Eraikitzeko eremua</string>
     <string name="type.landuse.greenhouse_horticulture">Negutegia</string>
     <string name="type.landuse.industrial">Industria-gunea</string>
diff --git a/android/app/src/main/res/values-fi/types_strings.xml b/android/app/src/main/res/values-fi/types_strings.xml
index eb37d4e0d..720c61ade 100644
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -588,7 +588,6 @@
     <string name="type.landuse.education">Koulutuslaitos</string>
     <string name="type.landuse.farmland">Maatalousmaa</string>
     <string name="type.landuse.farmyard">Maatila</string>
-    <string name="type.landuse.field">Kenttä</string>
     <string name="type.landuse.flowerbed">Kukkapenkki</string>
     <string name="type.landuse.forest">Metsä</string>
     <string name="type.landuse.forest.coniferous">Havumetsä</string>
diff --git a/android/app/src/main/res/values-fr/types_strings.xml b/android/app/src/main/res/values-fr/types_strings.xml
index c5ff3da85..ab188ab1d 100644
--- a/android/app/src/main/res/values-fr/types_strings.xml
+++ b/android/app/src/main/res/values-fr/types_strings.xml
@@ -582,7 +582,6 @@
     <string name="type.landuse.education">Établissements éducatifs</string>
     <string name="type.landuse.farmland">Terrains agricoles</string>
     <string name="type.landuse.farmyard">Ferme</string>
-    <string name="type.landuse.field">Champ</string>
     <string name="type.landuse.flowerbed">Plate-bande</string>
     <string name="type.landuse.forest">Forêt</string>
     <string name="type.landuse.forest.coniferous">Forêt de conifères</string>
diff --git a/android/app/src/main/res/values-gl/types_strings.xml b/android/app/src/main/res/values-gl/types_strings.xml
index e65e560cd..b2a76ffad 100644
--- a/android/app/src/main/res/values-gl/types_strings.xml
+++ b/android/app/src/main/res/values-gl/types_strings.xml
@@ -548,7 +548,6 @@
     <string name="type.landuse.education">Instalacións educativas</string>
     <string name="type.landuse.farmland">Terras agrícolas</string>
     <string name="type.landuse.farmyard">Granja</string>
-    <string name="type.landuse.field">Campo</string>
     <string name="type.landuse.flowerbed">Cama de flores</string>
     <string name="type.landuse.forest">Bosque</string>
     <string name="type.landuse.forest.coniferous">Bosque de coníferas</string>
diff --git a/android/app/src/main/res/values-hi/types_strings.xml b/android/app/src/main/res/values-hi/types_strings.xml
index 6ebee0bbd..446250208 100644
--- a/android/app/src/main/res/values-hi/types_strings.xml
+++ b/android/app/src/main/res/values-hi/types_strings.xml
@@ -350,7 +350,6 @@
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
     <string name="type.landuse.cemetery.christian">ईसाई कब्रिस्तान</string>
     <string name="type.landuse.commercial">वाणिज्य क्षेत्र</string>
-    <string name="type.landuse.field">क्षेत्र</string>
     <string name="type.landuse.forest">वन</string>
     <string name="type.landuse.forest.mixed">मिश्रित वन</string>
     <string name="type.landuse.grass">घास</string>
diff --git a/android/app/src/main/res/values-hu/types_strings.xml b/android/app/src/main/res/values-hu/types_strings.xml
index 2c324da38..270936753 100644
--- a/android/app/src/main/res/values-hu/types_strings.xml
+++ b/android/app/src/main/res/values-hu/types_strings.xml
@@ -1247,7 +1247,6 @@
     <string name="type.landuse.allotments">Kiskertek</string>
     <string name="type.landuse.brownfield">Barnamezős terület</string>
     <string name="type.landuse.construction">Építési terület</string>
-    <string name="type.landuse.field">Mező</string>
     <string name="type.landuse.garages">Garázssor</string>
     <string name="type.landuse.greenfield">Zöldmezős terület</string>
     <string name="type.landuse.greenhouse_horticulture">Üvegház</string>
diff --git a/android/app/src/main/res/values-is/types_strings.xml b/android/app/src/main/res/values-is/types_strings.xml
index 946f5821b..f31ab5dfa 100644
--- a/android/app/src/main/res/values-is/types_strings.xml
+++ b/android/app/src/main/res/values-is/types_strings.xml
@@ -1050,7 +1050,6 @@
     <string name="type.highway.footway.area">Svæði fyrir fótgangandi</string>
     <string name="type.highway.pedestrian.area">Svæði fyrir fótgangandi</string>
     <string name="type.historic.tank">Sögulegur skriðdreki</string>
-    <string name="type.landuse.field">Akur</string>
     <string name="type.place.ocean">Úthaf</string>
     <string name="type.shop.bathroom_furnishing">Baðherbergisinnréttingar</string>
     <string name="type.shop.garden_centre">Garðvöruverslun</string>
diff --git a/android/app/src/main/res/values-it/types_strings.xml b/android/app/src/main/res/values-it/types_strings.xml
index 8cf0103cc..807026e6c 100644
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -1331,7 +1331,6 @@
     <string name="type.public_transport.platform">Banchina</string>
     <string name="type.railway.abandoned.tunnel">Tunnel ferroviario abbandonato</string>
     <string name="type.railway.light_rail.tunnel">Tunnel metropolitana</string>
-    <string name="type.landuse.field">Campo</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.landuse.greenfield">Zona selvaggia</string>
     <string name="type.railway.light_rail.bridge">Ponte metropolitana</string>
diff --git a/android/app/src/main/res/values-iw/types_strings.xml b/android/app/src/main/res/values-iw/types_strings.xml
index 4e76a2197..7fdf2d05e 100644
--- a/android/app/src/main/res/values-iw/types_strings.xml
+++ b/android/app/src/main/res/values-iw/types_strings.xml
@@ -610,7 +610,6 @@
     <string name="type.landuse.education">קריית חינוך</string>
     <string name="type.landuse.farmland">אדמה חקלאית</string>
     <string name="type.landuse.farmyard">חצר חקלאית</string>
-    <string name="type.landuse.field">שדה</string>
     <string name="type.landuse.flowerbed">ערוגת פרחים</string>
     <string name="type.landuse.forest">יער</string>
     <string name="type.landuse.forest.coniferous">יער מחטניים</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 35c887c2f..91260edbc 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -824,7 +824,7 @@
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">音声合成システムの設定</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
-    <string name="pref_tts_no_system_tts">音声合成の設定が見つからなかった。</string>
+    <string name="pref_tts_no_system_tts">音声合成の設定が見つからなかった、お使いのデバイスがサポートしていますか？</string>
     <string name="drive_through">ドライブスルー</string>
     <string name="clear_the_search">検索をクリアする</string>
     <string name="zoom_in">ズームイン</string>
diff --git a/android/app/src/main/res/values-ja/types_strings.xml b/android/app/src/main/res/values-ja/types_strings.xml
index 39aeece88..2d2e75a3f 100644
--- a/android/app/src/main/res/values-ja/types_strings.xml
+++ b/android/app/src/main/res/values-ja/types_strings.xml
@@ -1368,7 +1368,6 @@
     <string name="type.hwtag.yesbicycle">自転車通行許可タグ</string>
     <string name="type.hwtag.yescar">自動車通行許可タグ</string>
     <string name="type.hwtag.yesfoot">歩行者通行許可タグ</string>
-    <string name="type.landuse.field">農地</string>
     <string name="type.man_made.storage_tank">貯蔵タンク</string>
     <string name="type.leisure.beach_resort">ビーチリゾート</string>
     <string name="type.aerialway.j.bar">Jバーリフト</string>
@@ -1384,5 +1383,19 @@
     <string name="type.psurface.unpaved_bad">未舗装路面（悪い）</string>
     <string name="type.psurface.unpaved_good">未舗装路面（良い）</string>
     <string name="type.railway.subway.tunnel">地下鉄路線（トンネル）</string>
-    <string name="type.piste_type.downhill">\\ダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill">ダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.easy.area">初級者向けのダウンヒルスキー場</string>
+    <string name="type.piste_type.downhill.intermediate">中級者向けのダウンヒルスキーコース</string>
+    <string name="type.boundary.administrative.2">国境</string>
+    <string name="type.fee.yes">￥</string>
+    <string name="type.piste_type.downhill.novice">初心者向けのダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.novice.area">初心者向けのダウンヒルスキー場</string>
+    <string name="type.mountain_pass">峠</string>
+    <string name="type.piste_type.downhill.advanced">上級者向けのダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.advanced.area">上級者向けのダウンヒルスキー場</string>
+    <string name="type.piste_type.downhill.easy">初級者向けのダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.expert">エキスパート向けのダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.expert.area">エキスパート向けのダウンヒルスキー場</string>
+    <string name="type.piste_type.downhill.freeride">フリーライド用のダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.intermediate.area">中級者向けのダウンヒルスキー場</string>
 </resources>
diff --git a/android/app/src/main/res/values-mr/types_strings.xml b/android/app/src/main/res/values-mr/types_strings.xml
index 9a287a5bd..3e9eb5951 100644
--- a/android/app/src/main/res/values-mr/types_strings.xml
+++ b/android/app/src/main/res/values-mr/types_strings.xml
@@ -502,7 +502,6 @@
     <string name="type.landuse.construction">बांधकाम</string>
     <string name="type.landuse.education">शैक्षणिक सुविधा</string>
     <string name="type.landuse.farmland">शेतजमीन</string>
-    <string name="type.landuse.field">क्षेत्र</string>
     <string name="type.landuse.flowerbed">फ्लॉवरबेड</string>
     <string name="type.landuse.forest">वन</string>
     <string name="type.landuse.forest.coniferous">शंकुमंत जंगल</string>
diff --git a/android/app/src/main/res/values-nl/types_strings.xml b/android/app/src/main/res/values-nl/types_strings.xml
index f37999de8..3c9d2d267 100644
--- a/android/app/src/main/res/values-nl/types_strings.xml
+++ b/android/app/src/main/res/values-nl/types_strings.xml
@@ -594,7 +594,6 @@
     <string name="type.landuse.education">Educatieve voorzieningen</string>
     <string name="type.landuse.farmland">Landbouwgrond</string>
     <string name="type.landuse.farmyard">Boerenerf</string>
-    <string name="type.landuse.field">Veld</string>
     <string name="type.landuse.flowerbed">Bloemenbed</string>
     <string name="type.landuse.forest">Bos</string>
     <string name="type.landuse.forest.coniferous">Naaldbos</string>
diff --git a/android/app/src/main/res/values-pl/types_strings.xml b/android/app/src/main/res/values-pl/types_strings.xml
index 2f8e7c27c..e3f7efc9d 100644
--- a/android/app/src/main/res/values-pl/types_strings.xml
+++ b/android/app/src/main/res/values-pl/types_strings.xml
@@ -594,7 +594,6 @@
     <string name="type.landuse.education">Placówki oświatowe</string>
     <string name="type.landuse.farmland">Grunt rolny</string>
     <string name="type.landuse.farmyard">Obejście gospodarskie</string>
-    <string name="type.landuse.field">Pole</string>
     <string name="type.landuse.flowerbed">Kwietnik</string>
     <string name="type.landuse.forest">Las</string>
     <string name="type.landuse.forest.coniferous">Las iglasty</string>
diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/app/src/main/res/values-pt-rBR/types_strings.xml
index 40532325d..f6121c22d 100644
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -516,7 +516,6 @@
     <string name="type.landuse.education">Instituições educacionais</string>
     <string name="type.landuse.farmland">Campo agrícola</string>
     <string name="type.landuse.farmyard">Pátio de fazenda</string>
-    <string name="type.landuse.field">Campo</string>
     <string name="type.landuse.flowerbed">Canteiro de flores</string>
     <string name="type.landuse.forest">Floresta</string>
     <string name="type.landuse.forest.coniferous">Floresta de coníferas</string>
diff --git a/android/app/src/main/res/values-pt/types_strings.xml b/android/app/src/main/res/values-pt/types_strings.xml
index 3e53304d5..4bf01351e 100644
--- a/android/app/src/main/res/values-pt/types_strings.xml
+++ b/android/app/src/main/res/values-pt/types_strings.xml
@@ -582,7 +582,6 @@
     <string name="type.landuse.construction">Construção</string>
     <string name="type.landuse.farmland">Campo agrícola</string>
     <string name="type.landuse.farmyard">Pátio de quinta</string>
-    <string name="type.landuse.field">Campo</string>
     <string name="type.landuse.flowerbed">Canteiro de flores</string>
     <string name="type.landuse.forest">Floresta</string>
     <string name="type.landuse.forest.coniferous">Floresta de coníferas</string>
diff --git a/android/app/src/main/res/values-ru/types_strings.xml b/android/app/src/main/res/values-ru/types_strings.xml
index 808f0701b..29d1e875d 100644
--- a/android/app/src/main/res/values-ru/types_strings.xml
+++ b/android/app/src/main/res/values-ru/types_strings.xml
@@ -600,7 +600,6 @@
     <string name="type.landuse.education">Образовательные учреждения</string>
     <string name="type.landuse.farmland">Сельскохозяйственная земля</string>
     <string name="type.landuse.farmyard">Сельскохозяйственная земля</string>
-    <string name="type.landuse.field">Поле</string>
     <string name="type.landuse.flowerbed">Клумба</string>
     <string name="type.landuse.forest">Лес</string>
     <string name="type.landuse.forest.coniferous">Хвойный лес</string>
diff --git a/android/app/src/main/res/values-sk/types_strings.xml b/android/app/src/main/res/values-sk/types_strings.xml
index afbb6e4d3..c2ded8974 100644
--- a/android/app/src/main/res/values-sk/types_strings.xml
+++ b/android/app/src/main/res/values-sk/types_strings.xml
@@ -587,7 +587,6 @@
     <string name="type.landuse.education">Vzdelávacia inštitúcia</string>
     <string name="type.landuse.farmland">Poľnohospodárska pôda</string>
     <string name="type.landuse.farmyard">Poľnohospodárske budovy</string>
-    <string name="type.landuse.field">Pole</string>
     <string name="type.landuse.flowerbed">Záhon</string>
     <string name="type.landuse.forest">Les</string>
     <string name="type.landuse.forest.coniferous">Ihličnatý les</string>
diff --git a/android/app/src/main/res/values-sr/types_strings.xml b/android/app/src/main/res/values-sr/types_strings.xml
index 1ebe08828..900a6fcd6 100644
--- a/android/app/src/main/res/values-sr/types_strings.xml
+++ b/android/app/src/main/res/values-sr/types_strings.xml
@@ -599,7 +599,6 @@
     <string name="type.landuse.education">Образовна установа</string>
     <string name="type.landuse.farmland">Пољопривредно земљиште</string>
     <string name="type.landuse.farmyard">Пољопривредно земљиште</string>
-    <string name="type.landuse.field">Поље</string>
     <string name="type.landuse.flowerbed">Цветно острво</string>
     <string name="type.landuse.forest">Шума</string>
     <string name="type.landuse.forest.coniferous">Четинарска шума</string>
diff --git a/android/app/src/main/res/values-sv/types_strings.xml b/android/app/src/main/res/values-sv/types_strings.xml
index fb42359c1..165026b9f 100644
--- a/android/app/src/main/res/values-sv/types_strings.xml
+++ b/android/app/src/main/res/values-sv/types_strings.xml
@@ -1210,7 +1210,6 @@
     <string name="type.landuse">Markanvändning</string>
     <string name="type.landuse.construction">Byggarbetsplats</string>
     <string name="type.landuse.farmyard">Gård</string>
-    <string name="type.landuse.field">Åkermark</string>
     <string name="type.landuse.garages">Garage</string>
     <string name="type.landuse.greenhouse_horticulture">Växthus</string>
     <string name="type.landuse.industrial">Industriområde</string>
diff --git a/android/app/src/main/res/values-tr/types_strings.xml b/android/app/src/main/res/values-tr/types_strings.xml
index 048a2d0c9..d6ee0db9f 100644
--- a/android/app/src/main/res/values-tr/types_strings.xml
+++ b/android/app/src/main/res/values-tr/types_strings.xml
@@ -591,7 +591,6 @@
     <string name="type.landuse.construction">Yapı</string>
     <string name="type.landuse.farmland">Tarım Arazileri</string>
     <string name="type.landuse.farmyard">Çiftlik Bölgesi</string>
-    <string name="type.landuse.field">Alan</string>
     <string name="type.landuse.flowerbed">Çiçeklik</string>
     <string name="type.landuse.forest">Orman</string>
     <string name="type.landuse.forest.coniferous">Çam Ormanı</string>
diff --git a/android/app/src/main/res/values-uk/types_strings.xml b/android/app/src/main/res/values-uk/types_strings.xml
index 24b3c3047..2ecfada80 100644
--- a/android/app/src/main/res/values-uk/types_strings.xml
+++ b/android/app/src/main/res/values-uk/types_strings.xml
@@ -597,7 +597,6 @@
     <string name="type.landuse.education">Освітній заклади</string>
     <string name="type.landuse.farmland">Сільськогосподарська земля</string>
     <string name="type.landuse.farmyard">Сільськогосподарська земля</string>
-    <string name="type.landuse.field">Поле</string>
     <string name="type.landuse.flowerbed">Квітник</string>
     <string name="type.landuse.forest">Ліс</string>
     <string name="type.landuse.forest.coniferous">Хвойний ліс</string>
diff --git a/android/app/src/main/res/values-zh-rHK/types_strings.xml b/android/app/src/main/res/values-zh-rHK/types_strings.xml
index 0c17cde45..688894129 100644
--- a/android/app/src/main/res/values-zh-rHK/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rHK/types_strings.xml
@@ -595,7 +595,6 @@
     <string name="type.landuse.education">教育設施</string>
     <string name="type.landuse.farmland">農業用地</string>
     <string name="type.landuse.farmyard">農家庭院</string>
-    <string name="type.landuse.field">田地</string>
     <string name="type.landuse.flowerbed">花壇</string>
     <string name="type.landuse.forest">樹林</string>
     <string name="type.landuse.forest.coniferous">樹林</string>
@@ -1283,4 +1282,17 @@
     <string name="type.attraction.bumper_car">碰碰車</string>
     <string name="type.leisure.track">賽道</string>
     <string name="type.mapswithme">mapswithme</string>
+    <string name="type.leisure.track.area">賽道</string>
+    <string name="type.railway">鐵路要素</string>
+    <string name="type.amenity.studio">影樓</string>
+    <string name="type.fee.yes">$</string>
+    <string name="type.amenity.love_hotel">情侶酒店</string>
+    <string name="type.recycling.cardboard">卡紙</string>
+    <string name="type.recycling.cans">金屬罐</string>
+    <string name="type.recycling.shoes">鞋</string>
+    <string name="type.recycling.green_waste">園林/有機廢物</string>
+    <string name="type.recycling.cartons">紙皮箱</string>
+    <string name="type.barrier.guard_rail">安全護欄</string>
+    <string name="type.highway.ladder">梯</string>
+    <string name="type.route.ferry">航線</string>
 </resources>
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 f808ba98e..e759b409c 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -893,4 +893,7 @@
     <string name="bluesky">Bluesky</string>
     <string name="pref_left_button_disable">停用</string>
     <string name="pref_left_button_title">左側按鈕設定</string>
+    <string name="editor_level">樓層（0 為地面層）</string>
+    <string name="editor_building_levels">樓層（含地面層，不含屋頂）</string>
+    <string name="error_enter_correct_level">請輸入有效的樓層數</string>
 </resources>
diff --git a/android/app/src/main/res/values-zh-rTW/types_strings.xml b/android/app/src/main/res/values-zh-rTW/types_strings.xml
index 668a625d3..cec7dafbf 100644
--- a/android/app/src/main/res/values-zh-rTW/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/types_strings.xml
@@ -121,4 +121,7 @@
     <string name="type.piste_type.nordic">北歐滑雪道</string>
     <string name="type.piste_type.sled.area">雪橇滑道區</string>
     <string name="type.piste_type.sled">雪橇滑道</string>
+    <string name="type.fee.no">免費</string>
+    <string name="type.healthcare.laboratory">醫學實驗室</string>
+    <string name="type.fee.yes">$</string>
 </resources>
diff --git a/android/app/src/main/res/values-zh/types_strings.xml b/android/app/src/main/res/values-zh/types_strings.xml
index a5b49f72f..165e47757 100644
--- a/android/app/src/main/res/values-zh/types_strings.xml
+++ b/android/app/src/main/res/values-zh/types_strings.xml
@@ -596,7 +596,6 @@
     <string name="type.landuse.education">教育设施</string>
     <string name="type.landuse.farmland">农业用地</string>
     <string name="type.landuse.farmyard">农家庭院</string>
-    <string name="type.landuse.field">田地</string>
     <string name="type.landuse.flowerbed">花坛</string>
     <string name="type.landuse.forest">森林</string>
     <string name="type.landuse.forest.coniferous">针叶林</string>
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
index ef3aff78f..21375400c 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
@@ -215,7 +215,7 @@
 "type.boundary.administrative" = "行政境界";
 
 /* Borders between countries. */
-"type.boundary.administrative.2" = "National Border";
+"type.boundary.administrative.2" = "国境";
 
 /* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
 "type.boundary.administrative.3" = "行政界";
@@ -371,7 +371,7 @@
 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "正面玄関";
 "type.entrance.exit" = "終了する";
-"type.fee.yes" = "$";
+"type.fee.yes" = "￥";
 "type.fee.no" = "無料";
 "type.healthcare.laboratory" = "医療研究所";
 "type.healthcare.physiotherapist" = "理学療法士";
@@ -777,7 +777,7 @@
 "type.mapswithme.grid" = "mapswithme-グリッド";
 "type.military" = "軍事";
 "type.military.bunker" = "掩蔽壕";
-"type.mountain_pass" = "Mountain Pass";
+"type.mountain_pass" = "峠";
 "type.natural" = "自然";
 
 /* A rocky land cover. */
@@ -1445,19 +1445,19 @@
 "type.aerialway.platter" = "シュレップリフト";
 "type.aerialway.rope_tow" = "ロープトウ";
 "type.aerialway.t.bar" = "Tバーリフト";
-"type.piste_type.downhill" = "\\ダウンヒルスキーコース";
+"type.piste_type.downhill" = "ダウンヒルスキーコース";
 "type.piste_type.downhill.area" = "ダウンヒルスキー場";
-"type.piste_type.downhill.advanced" = "Downhill Ski Run";
-"type.piste_type.downhill.advanced.area" = "Downhill Ski Run";
-"type.piste_type.downhill.easy" = "Downhill Ski Run";
-"type.piste_type.downhill.easy.area" = "Downhill Ski Run";
-"type.piste_type.downhill.expert" = "Downhill Ski Run";
-"type.piste_type.downhill.expert.area" = "Downhill Ski Run";
-"type.piste_type.downhill.freeride" = "Downhill Ski Run";
-"type.piste_type.downhill.intermediate" = "Downhill Ski Run";
-"type.piste_type.downhill.intermediate.area" = "Downhill Ski Run";
-"type.piste_type.downhill.novice" = "Downhill Ski Run";
-"type.piste_type.downhill.novice.area" = "Downhill Ski Run";
+"type.piste_type.downhill.advanced" = "上級者向けのダウンヒルスキーコース";
+"type.piste_type.downhill.advanced.area" = "上級者向けのダウンヒルスキー場";
+"type.piste_type.downhill.easy" = "初級者向けのダウンヒルスキーコース";
+"type.piste_type.downhill.easy.area" = "初級者向けのダウンヒルスキー場";
+"type.piste_type.downhill.expert" = "エキスパート向けのダウンヒルスキーコース";
+"type.piste_type.downhill.expert.area" = "エキスパート向けのダウンヒルスキー場";
+"type.piste_type.downhill.freeride" = "フリーライド用のダウンヒルスキーコース";
+"type.piste_type.downhill.intermediate" = "中級者向けのダウンヒルスキーコース";
+"type.piste_type.downhill.intermediate.area" = "中級者向けのダウンヒルスキー場";
+"type.piste_type.downhill.novice" = "初心者向けのダウンヒルスキーコース";
+"type.piste_type.downhill.novice.area" = "初心者向けのダウンヒルスキー場";
 "type.piste_type.nordic" = "ノルディックスキーコース";
 "type.piste_type.sled" = "トボガンコース";
 "type.piste_type.sled.area" = "そりコース";