diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index 3c61974a09..b17c16b6e8 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -68,6 +68,7 @@
 	<string name="bookmarks_error_message_list_name_already_taken">Por favor elige otro nombre</string>
 	<string name="bookmarks_error_title_list_name_too_long">Este nombre es demasiado largo</string>
 	<string name="please_wait">Por favor, espere…</string>
+	<string name="phone_number">Número de teléfono</string>
 	<string name="bookmarks_detect_title">Se detectaron archivos nuevos</string>
 	<plurals name="bookmarks_detect_message">
 	  <item quantity="one">Se encontró %d archivo. Lo verás después de la conversión.</item>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index df863eaae6..8f89ba4034 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -902,7 +902,7 @@
 	<string name="type.amenity.taxi">تاکسی</string>
 	<string name="type.amenity.telephone">تلفن خانه</string>
 	<string name="type.amenity.theatre">سرگرمی</string>
-	<string name="type.amenity.toilets">دستشویی^</string>
+	<string name="type.amenity.toilets">دستشویی</string>
 	<string name="type.amenity.townhall">گردشگری</string>
 	<string name="type.amenity.university">دانشگاه</string>
 	<string name="type.amenity.vending_machine.cigarettes">ماشین سیگار فروشی</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index f095cd64e2..b5b7c14c88 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -646,6 +646,28 @@
 	<string name="common_check_internet_connection_dialog_title">Ingen internettforbindelse</string>
 	<string name="error_system_message">En ukjent feil oppstod</string>
 	<string name="restore">Restaurere</string>
+	<plurals name="objects">
+	  <item quantity="other">%d sted</item>
+	</plurals>
+	<plurals name="places">
+	  <item quantity="other">%d steder</item>
+	</plurals>
+	<plurals name="tracks">
+	  <item quantity="other">%d stier</item>
+	</plurals>
+	<string name="subtittle_opt_out">Turinnstillinger</string>
+	<string name="crash_reports">Krasjrapport</string>
+	<string name="crash_reports_description">Vi kan bruke dine data for å forbedre Organic Maps-opplevelsen. Endringer vil bli aktive når du restarter appen.</string>
+	<string name="privacy_policy">Personvernpolitikk</string>
+	<string name="terms_of_use">Bruksbetingelser</string>
+	<string name="button_layer_traffic">Trafikk</string>
+	<string name="button_layer_subway">T-bane</string>
+	<string name="layers_title">Kartlag</string>
+	<string name="subway_data_unavailable">T-banekart er utilgjengelig</string>
+	<string name="bookmarks_empty_list_title">Denne listen er tom</string>
+	<string name="bookmarks_empty_list_message">For å legge til et bokmerke, trykk et sted på kartet og trykk så stjerneikonet</string>
+	<string name="category_desc_more">…mer</string>
+	<string name="title_error_downloading_bookmarks">Det oppsto en feil</string>
 	<string name="export_file">Eksporter fil</string>
 	<string name="list_settings">Liste Innstillinger</string>
 	<string name="delete_list">Slett liste</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 896619f28d..c33801b262 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -844,6 +844,7 @@
 	<string name="type.aeroway.helipad">Heliponto</string>
 	<string name="type.aeroway.runway">Pista de aeroporto ou aeródromo</string>
 	<string name="type.aeroway.taxiway">Pista de rolagem</string>
+	<string name="type.aeroway.terminal">Aerogare de passageiros</string>
 	<string name="type.amenity">Amenidades</string>
 	<string name="type.amenity.arts_centre">Centros de arte</string>
 	<string name="type.amenity.atm">Caixa eletrônico</string>
@@ -1043,6 +1044,7 @@
 	<string name="type.cuisine.greek">Cozinha grega</string>
 	<string name="type.cuisine.grill">Grelhada</string>
 	<string name="type.cuisine.heuriger">Heuriger</string>
+	<string name="type.cuisine.hotdog">Cachorro-quente</string>
 	<string name="type.cuisine.hungarian">Cozinha húngara</string>
 	<string name="type.cuisine.ice_cream">Sorvete</string>
 	<string name="type.cuisine.indian">Cozinha indiana</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 88e6a6c2c8..991e4c2384 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -393,6 +393,8 @@
 	<string name="search_history_title">История поиска</string>
 	<string name="search_history_text">Быстрый доступ к последним поисковым запросам.</string>
 	<string name="clear_search">Очистить историю поиска</string>
+	<!-- Place Page link to Wikipedia article (if map object has it). -->
+	<string name="read_in_wikipedia">Википедия</string>
 	<string name="p2p_your_location">Ваше местоположение</string>
 	<string name="p2p_start">Начать</string>
 	<string name="p2p_from_here">Отсюда</string>
@@ -660,9 +662,9 @@
 	<string name="profile">Профиль OpenStreetMap</string>
 	<string name="bookmarks_detect_title">Обнаружены новые файлы</string>
 	<plurals name="bookmarks_detect_message">
-	  <item quantity="few">%d файла были найдены. Вы увидете их после конвертации.</item>
-	  <item quantity="one">%d файл был найден. Вы увидете его после конвертации.</item>
-	  <item quantity="other">%d файлов было найдено. Вы увидете их после конвертации.</item>
+	  <item quantity="few">%d файла были найдены. Вы увидите их после конвертации.</item>
+	  <item quantity="one">%d файл был найден. Вы увидите его после конвертации.</item>
+	  <item quantity="other">%d файлов было найдено. Вы увидите их после конвертации.</item>
 	</plurals>
 	<string name="button_convert">Конвертировать</string>
 	<string name="bookmarks_convert_error_title">Ошибка</string>
@@ -675,19 +677,16 @@
 	  <item quantity="few">%d объекта</item>
 	  <item quantity="one">%d объект</item>
 	  <item quantity="other">%d объектов</item>
-	  <item quantity="two">%d объекта</item>
 	</plurals>
 	<plurals name="places">
 	  <item quantity="few">%d места</item>
 	  <item quantity="one">%d место</item>
 	  <item quantity="other">%d мест</item>
-	  <item quantity="two">%d места</item>
 	</plurals>
 	<plurals name="tracks">
 	  <item quantity="few">%d трека</item>
 	  <item quantity="one">%d трек</item>
 	  <item quantity="other">%d треков</item>
-	  <item quantity="two">%d трека</item>
 	</plurals>
 	<string name="subtittle_opt_out">Настройки сопровождения</string>
 	<string name="crash_reports">Отчеты об ошибках</string>
@@ -699,7 +698,7 @@
 	<string name="layers_title">Слои карты</string>
 	<string name="subway_data_unavailable">Карта метро недоступна</string>
 	<string name="bookmarks_empty_list_title">Список пустой</string>
-	<string name="bookmarks_empty_list_message">Чтобы добавить новую метку, нажмите на значок звездочки в карточке объекта</string>
+	<string name="bookmarks_empty_list_message">Чтобы добавить метку, нажмите на место на карте, а затем на иконку звёздочки</string>
 	<string name="category_desc_more">…еще</string>
 	<string name="title_error_downloading_bookmarks">Произошла ошибка</string>
 	<string name="popular_place">Популярно</string>
@@ -1326,6 +1325,7 @@
 	<string name="type.leisure.swimming_pool">Плавательный бассейн</string>
 	<string name="type.leisure.track">Беговая дорожка</string>
 	<string name="type.leisure.water_park">Аквапарк</string>
+	<string name="type.leisure.beach_resort">Пляжный курорт</string>
 	<string name="type.man_made">Искусственное сооружение</string>
 	<string name="type.man_made.breakwater">Волнорез</string>
 	<string name="type.man_made.cairn">Тур</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index c0897cd93b..d0864b64f9 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -1234,6 +1234,7 @@
 	<string name="type.natural.strait">Boğaz</string>
 	<string name="type.natural.tree">Arbre</string>
 	<string name="type.natural.volcano">Volcan</string>
+	<string name="type.natural.water">Su</string>
 	<string name="type.natural.wetland">Sulak alan</string>
 	<string name="type.office">Ofis</string>
 	<string name="type.office.company">Şirket bürosu</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 02dfe6789e..d551b1497d 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -386,6 +386,8 @@
 	<string name="search_history_title">Історія пошуку</string>
 	<string name="search_history_text">Швидкий доступ до недавніх результатів пошуку.</string>
 	<string name="clear_search">Очистити історію пошуку</string>
+	<!-- Place Page link to Wikipedia article (if map object has it). -->
+	<string name="read_in_wikipedia">Вікіпедія</string>
 	<string name="p2p_your_location">Ваше місцезнаходження</string>
 	<string name="p2p_start">Почати рух</string>
 	<string name="p2p_from_here">Звідси</string>
@@ -648,9 +650,9 @@
 	<string name="profile">Профіль OpenStreetMap</string>
 	<string name="bookmarks_detect_title">Виявлено нові файли</string>
 	<plurals name="bookmarks_detect_message">
+	  <item quantity="few">%d файлу були знайдені. Ви побачите їх після конвертації.</item>
 	  <item quantity="one">%d файл був знайдений. Ви побачите його після перетворення.</item>
 	  <item quantity="other">%d файлів було знайдено. Ви побачите їх після конвертації.</item>
-	  <item quantity="two">%d файлу були знайдені. Ви побачите їх після конвертації.</item>
 	</plurals>
 	<string name="button_convert">Конвертувати</string>
 	<string name="bookmarks_convert_error_title">Помилка</string>
@@ -1266,6 +1268,7 @@
 	<string name="type.leisure.swimming_pool">Басейн для плавання</string>
 	<string name="type.leisure.track">Бігова доріжка</string>
 	<string name="type.leisure.water_park">Аквапарк</string>
+	<string name="type.leisure.beach_resort">Пляжний курорт</string>
 	<string name="type.man_made">Штучна споруда</string>
 	<string name="type.man_made.breakwater">Хвилеріз</string>
 	<string name="type.man_made.cairn">Тур</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 59b1555ff1..3e8466291d 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1351,6 +1351,7 @@
 	<string name="type.leisure.swimming_pool">Swimming Pool</string>
 	<string name="type.leisure.track">Track</string>
 	<string name="type.leisure.water_park">Water Park</string>
+	<string name="type.leisure.beach_resort">Beach Resort</string>
 	<string name="type.man_made">Man Made</string>
 	<string name="type.man_made.breakwater">Breakwater</string>
 	<string name="type.man_made.cairn">Cairn</string>
@@ -1408,7 +1409,7 @@
 	<string name="type.natural.tree_row">Tree Row</string>
 	<string name="type.natural.vineyard">Vineyard</string>
 	<string name="type.natural.volcano">Volcano</string>
-	<string name="type.natural.water">Water body</string>
+	<string name="type.natural.water">Waterbody</string>
 	<string name="type.natural.wetland">Wetland</string>
 	<string name="type.natural.wetland.bog">Wetland</string>
 	<string name="type.natural.wetland.marsh">Wetland</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 7ff00c043a..06a585c767 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "ملاهي مائية";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index bb42401b51..df8aa990a5 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Water Park";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 45fd5acb73..6d113442df 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Water Park";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 8851d00ec1..3a2fd8aaa4 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Aquacentrum";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 344b642f25..ade3130de7 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Vandpark";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 4eefa2a1e7..f53adb6294 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Aquapark";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "künstliche Anlage";
 
 "type.man_made.breakwater" = "Wellenbrecher";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index b91946bd8f..868d866e77 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Υδάτινο πάρκο";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 424b0d43e8..c4c7d578e8 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Water Park";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
@@ -2563,7 +2565,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water body";
+"type.natural.water" = "Waterbody";
 
 "type.natural.wetland" = "Wetland";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 42a3263f70..ea0ee02345 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Water Park";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
@@ -2563,7 +2565,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water body";
+"type.natural.water" = "Waterbody";
 
 "type.natural.wetland" = "Wetland";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index e42f195eee..cfd878931d 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1143,7 +1143,7 @@
 
 "please_wait" = "Por favor, espere…";
 
-"phone_number" = "Phone number";
+"phone_number" = "Número de teléfono";
 
 "profile" = "OpenStreetMap profile";
 
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Water Park";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
@@ -2563,7 +2565,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water body";
+"type.natural.water" = "Waterbody";
 
 "type.natural.wetland" = "Tierra pantanosa";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index ac2b1521f5..1f6f621e5a 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Parque acuático";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 468b17e152..64833bea0d 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -1703,7 +1703,7 @@
 
 "type.amenity.theatre" = "سرگرمی";
 
-"type.amenity.toilets" = "دستشویی^";
+"type.amenity.toilets" = "دستشویی";
 
 "type.amenity.townhall" = "گردشگری";
 
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "گردشگری";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 634a7ca781..b52dc7af8a 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Vesipuisto";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 88d2d29569..6c49143cfe 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Centre aquatique";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Brise-lames";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 6d0e63f602..904fd23a1c 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Aquapark";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 6966dacd90..cc690a0cb5 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Taman air";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index e2154acd46..828add8dca 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Parco acquatico";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 0274d95517..b5d19fe048 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "ウォーターパーク";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "構造物";
 
 "type.man_made.breakwater" = "防波堤";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 5057f23b99..58c4d060fa 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "워터파크";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index d21e51b67e..a0553bc1e6 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1163,31 +1163,31 @@
 
 "restore" = "Restaurere";
 
-"subtittle_opt_out" = "Tracking settings";
+"subtittle_opt_out" = "Turinnstillinger";
 
-"crash_reports" = "Crash report";
+"crash_reports" = "Krasjrapport";
 
-"crash_reports_description" = "We may use your data to improve Organic Maps experience. Changes will take effect after you restart the app.";
+"crash_reports_description" = "Vi kan bruke dine data for å forbedre Organic Maps-opplevelsen. Endringer vil bli aktive når du restarter appen.";
 
-"privacy_policy" = "Privacy policy";
+"privacy_policy" = "Personvernpolitikk";
 
-"terms_of_use" = "Terms of use";
+"terms_of_use" = "Bruksbetingelser";
 
-"button_layer_traffic" = "Traffic";
+"button_layer_traffic" = "Trafikk";
 
-"button_layer_subway" = "Subway";
+"button_layer_subway" = "T-bane";
 
-"layers_title" = "Map layers";
+"layers_title" = "Kartlag";
 
-"subway_data_unavailable" = "Subway map is unavailable";
+"subway_data_unavailable" = "T-banekart er utilgjengelig";
 
-"bookmarks_empty_list_title" = "This list is empty";
+"bookmarks_empty_list_title" = "Denne listen er tom";
 
-"bookmarks_empty_list_message" = "To add a bookmark, tap a place on the map and then tap the star icon";
+"bookmarks_empty_list_message" = "For å legge til et bokmerke, trykk et sted på kartet og trykk så stjerneikonet";
 
-"category_desc_more" = "…more";
+"category_desc_more" = "…mer";
 
-"title_error_downloading_bookmarks" = "An error occurred";
+"title_error_downloading_bookmarks" = "Det oppsto en feil";
 
 "popular_place" = "Popular";
 
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Vannpark";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
index a777be4385..80180f03d5 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
@@ -52,7 +52,7 @@
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
       <key>other</key>
-      <string>%d objects</string>
+      <string>%d sted</string>
     </dict>
   </dict>
 
@@ -67,7 +67,7 @@
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
       <key>other</key>
-      <string>%d places</string>
+      <string>%d steder</string>
     </dict>
   </dict>
 
@@ -82,7 +82,7 @@
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
       <key>other</key>
-      <string>%d tracks</string>
+      <string>%d stier</string>
     </dict>
   </dict>
 </dict>
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index f80032160e..255c83d812 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Waterpark";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 5730abbf9a..256ff30ef8 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Park wodny";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Falochron";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 4f3704985d..214d34258d 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1515,7 +1515,7 @@
 
 "type.aeroway.taxiway" = "Pista de rolagem";
 
-"type.aeroway.terminal" = "Terminal";
+"type.aeroway.terminal" = "Aerogare de passageiros";
 
 "type.amenity" = "Amenidades";
 
@@ -1917,7 +1917,7 @@
 
 "type.cuisine.heuriger" = "Heuriger";
 
-"type.cuisine.hotdog" = "Hotdog";
+"type.cuisine.hotdog" = "Cachorro-quente";
 
 "type.cuisine.hungarian" = "Cozinha húngara";
 
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Parque aquático";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Construção humana";
 
 "type.man_made.breakwater" = "Molhe";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index a54fb83f51..1f4597a66b 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Parque aquático";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Construção humana";
 
 "type.man_made.breakwater" = "Molhe";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 88e831e843..7d46fae889 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Parc acvatic";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 24897e91b3..175db932d4 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -656,7 +656,7 @@
 "clear_search" = "Очистить историю поиска";
 
 /* Place Page link to Wikipedia article (if map object has it). */
-"read_in_wikipedia" = "Wikipedia";
+"read_in_wikipedia" = "Википедия";
 
 "p2p_your_location" = "Ваше местоположение";
 
@@ -1183,7 +1183,7 @@
 
 "bookmarks_empty_list_title" = "Список пустой";
 
-"bookmarks_empty_list_message" = "Чтобы добавить новую метку, нажмите на значок звездочки в карточке объекта";
+"bookmarks_empty_list_message" = "Чтобы добавить метку, нажмите на место на карте, а затем на иконку звёздочки";
 
 "category_desc_more" = "…еще";
 
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Аквапарк";
 
+"type.leisure.beach_resort" = "Пляжный курорт";
+
 "type.man_made" = "Искусственное сооружение";
 
 "type.man_made.breakwater" = "Волнорез";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
index 95488f6d94..63bedd81dd 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
@@ -39,11 +39,11 @@
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
       <key>few</key>
-      <string>%d файла были найдены. Вы увидете их после конвертации.</string>
+      <string>%d файла были найдены. Вы увидите их после конвертации.</string>
       <key>one</key>
-      <string>%d файл был найден. Вы увидете его после конвертации.</string>
+      <string>%d файл был найден. Вы увидите его после конвертации.</string>
       <key>other</key>
-      <string>%d файлов было найдено. Вы увидете их после конвертации.</string>
+      <string>%d файлов было найдено. Вы увидите их после конвертации.</string>
     </dict>
   </dict>
 
@@ -63,8 +63,6 @@
       <string>%d объект</string>
       <key>other</key>
       <string>%d объектов</string>
-      <key>two</key>
-      <string>%d объекта</string>
     </dict>
   </dict>
 
@@ -84,8 +82,6 @@
       <string>%d место</string>
       <key>other</key>
       <string>%d мест</string>
-      <key>two</key>
-      <string>%d места</string>
     </dict>
   </dict>
 
@@ -105,8 +101,6 @@
       <string>%d трек</string>
       <key>other</key>
       <string>%d треков</string>
-      <key>two</key>
-      <string>%d трека</string>
     </dict>
   </dict>
 </dict>
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index dff2059582..1fd8ade987 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Vodný park";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 1415a27851..adcd32dc6d 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Äventyrspark";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 7f0efcb03b..8dd5f52ad6 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "สวนน้ำ";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 5818881647..ae94f7f0f9 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Centre aquatique";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
@@ -2563,7 +2565,7 @@
 
 "type.natural.volcano" = "Volcan";
 
-"type.natural.water" = "Water body";
+"type.natural.water" = "Su";
 
 "type.natural.wetland" = "Sulak alan";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 22f36c05fa..a20dc8c702 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -656,7 +656,7 @@
 "clear_search" = "Очистити історію пошуку";
 
 /* Place Page link to Wikipedia article (if map object has it). */
-"read_in_wikipedia" = "Wikipedia";
+"read_in_wikipedia" = "Вікіпедія";
 
 "p2p_your_location" = "Ваше місцезнаходження";
 
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Аквапарк";
 
+"type.leisure.beach_resort" = "Пляжний курорт";
+
 "type.man_made" = "Штучна споруда";
 
 "type.man_made.breakwater" = "Хвилеріз";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict
index ff77f00187..9e73dd2285 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict
@@ -34,12 +34,12 @@
       <string>NSStringPluralRuleType</string>
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
+      <key>few</key>
+      <string>%d файлу були знайдені. Ви побачите їх після конвертації.</string>
       <key>one</key>
       <string>%d файл був знайдений. Ви побачите його після перетворення.</string>
       <key>other</key>
       <string>%d файлів було знайдено. Ви побачите їх після конвертації.</string>
-      <key>two</key>
-      <string>%d файлу були знайдені. Ви побачите їх після конвертації.</string>
     </dict>
   </dict>
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 6385842623..731af77bef 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "Công Viên Nước";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 25f67c60fd..2a2f0cd0aa 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "水上乐园";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "人造要素";
 
 "type.man_made.breakwater" = "防波堤";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 6a283607f5..520ee4090a 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -2449,6 +2449,8 @@
 
 "type.leisure.water_park" = "水上樂園";
 
+"type.leisure.beach_resort" = "Beach Resort";
+
 "type.man_made" = "Man Made";
 
 "type.man_made.breakwater" = "Breakwater";