From f460230a3c7885fee448563e991e1a6dc225ecf0 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Sun, 15 Mar 2015 22:58:35 +0300
Subject: [PATCH] Fix internal names in phrases

---
 OsmAnd/res/values-be/phrases.xml | 64 ++++++++++++++++----------------
 OsmAnd/res/values-ca/phrases.xml | 14 +++----
 OsmAnd/res/values-cs/phrases.xml |  6 +--
 OsmAnd/res/values-da/phrases.xml | 64 ++++++++++++++++----------------
 OsmAnd/res/values-de/phrases.xml | 64 ++++++++++++++++----------------
 OsmAnd/res/values-fa/phrases.xml | 64 ++++++++++++++++----------------
 OsmAnd/res/values-fr/phrases.xml | 64 ++++++++++++++++----------------
 OsmAnd/res/values-gl/phrases.xml |  8 ++--
 OsmAnd/res/values-it/phrases.xml |  6 +--
 OsmAnd/res/values-ko/phrases.xml | 64 ++++++++++++++++----------------
 OsmAnd/res/values-nl/phrases.xml | 64 ++++++++++++++++----------------
 OsmAnd/res/values-pl/phrases.xml | 12 +++---
 OsmAnd/res/values-ru/phrases.xml | 64 ++++++++++++++++----------------
 OsmAnd/res/values-sc/phrases.xml | 34 ++++++++---------
 OsmAnd/res/values-sk/phrases.xml |  8 ++--
 OsmAnd/res/values-uk/phrases.xml |  2 +-
 OsmAnd/res/values/phrases.xml    | 64 ++++++++++++++++----------------
 17 files changed, 333 insertions(+), 333 deletions(-)

diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index 93b499b5d4..10836d1b13 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -66,7 +66,7 @@
 	<string name="poi_motorcycle">Матацыклы</string>
 	<string name="poi_musical_instrument">Музычныя інструмэнты</string>
 	<string name="poi_newsagent">Газэты і часопісы</string>
-	<string name="poi_optician_shop">Акуліст</string>
+	<string name="poi_optician">Акуліст</string>
 	<string name="poi_organic">Арганічныя прадукты харчаваньня</string>
 	<string name="poi_outdoor">Тавары для актыўнага адпачынку</string>
 	<string name="poi_paint">Фарбы</string>
@@ -583,19 +583,19 @@
 	<string name="poi_island">Выспа</string>
 	<string name="poi_islet">Выспа (невялікая)</string>
 
-	<string name="poi_seamark_anchorage">Якарная стаянка</string>
-	<string name="poi_seamark_anchor_berth">Якарны прычал</string>
-	<string name="poi_seamark_beacon">Бакен</string>
-	<string name="poi_seamark_beacon_special_purpose">Бакен адмысловага прызначэньня</string>
-	<string name="poi_seamark_berth">Прычал</string>
-	<string name="poi_seamark_buoy_installation">Знак ізаляванай небясьпекі</string>
-	<string name="poi_seamark_buoy_special_purpose">Адмысловы буй</string>
-	<string name="poi_seamark_fog_signal">Сыгнал пры смузе</string>
+	<string name="poi_anchorage">Якарная стаянка</string>
+	<string name="poi_anchor_berth">Якарны прычал</string>
+	<string name="poi_beacon">Бакен</string>
+	<string name="poi_beacon_special_purpose">Бакен адмысловага прызначэньня</string>
+	<string name="poi_berth">Прычал</string>
+	<string name="poi_buoy_installation">Знак ізаляванай небясьпекі</string>
+	<string name="poi_buoy_special_purpose">Адмысловы буй</string>
+	<string name="poi_fog_signal">Сыгнал пры смузе</string>
 	<string name="poi_seamark_harbour">Гавань</string>
-	<string name="poi_seamark_mooring">Прычал</string>
-	<string name="poi_seamark_notice">Апавяшчэньне (навігацыйны знак)</string>
-	<string name="poi_seamark_radio_station">Радыёстанцыя (навігацыйны знак)</string>
-	<string name="poi_seamark_signal_station_warning">Сыгнал небясьпекі</string>
+	<string name="poi_mooring">Прычал</string>
+	<string name="poi_notice">Апавяшчэньне (навігацыйны знак)</string>
+	<string name="poi_radio_station">Радыёстанцыя (навігацыйны знак)</string>
+	<string name="poi_signal_station_warning">Сыгнал небясьпекі</string>
 	<string name="poi_seamark_wreck">Караблекрушэньне (навігацыйны знак)</string>
 
 	<string name="poi_military">Вайсковае</string>
@@ -615,36 +615,36 @@
 	<string name="poi_slide">Жолаб</string>
 	<string name="poi_summer_toboggan">Летнія сані</string>
 	<string name="poi_seamark_rock">Скала (навігацыйны знак)</string>
-	<string name="poi_seamark_dry_dock">Сухі док</string>
-	<string name="poi_seamark_floating_dock">Плывучы док</string>
+	<string name="poi_dry_dock">Сухі док</string>
+	<string name="poi_floating_dock">Плывучы док</string>
 	<string name="poi_tower">Вежа</string>
 	<string name="poi_mast">Шчогла</string>
 	<string name="poi_radar">Радар</string>
 	<string name="poi_aquarium">Акварыюм</string>
-	<string name="poi_seamark_buoy_isolated_danger">Буй (ізаляваная небясьпека)</string>
-	<string name="poi_seamark_buoy_lateral">Латэральны буй</string>
-	<string name="poi_seamark_dyke">Дамба</string>
-	<string name="poi_seamark_beacon_cardinal">Кардынальны бакен</string>
-	<string name="poi_seamark_beacon_lateral">Латэральны бакен</string>
-	<string name="poi_seamark_buoy_cardinal">Кардынальны буй</string>
-	<string name="poi_seamark_radar_transponder">Радыёлакацыйны транспондар (навігацыйны знак)</string>
-	<string name="poi_seamark_pile">Навігацыйны знак на палях</string>
-	<string name="poi_seamark_signal_station_traffic">Сігнальная станцыя (трафік)</string>
-	<string name="poi_seamark_topmark">Топавая фігура (навігацыйны знак)</string>
+	<string name="poi_buoy_isolated_danger">Буй (ізаляваная небясьпека)</string>
+	<string name="poi_buoy_lateral">Латэральны буй</string>
+	<string name="poi_dyke">Дамба</string>
+	<string name="poi_beacon_cardinal">Кардынальны бакен</string>
+	<string name="poi_beacon_lateral">Латэральны бакен</string>
+	<string name="poi_buoy_cardinal">Кардынальны буй</string>
+	<string name="poi_radar_transponder">Радыёлакацыйны транспондар (навігацыйны знак)</string>
+	<string name="poi_pile">Навігацыйны знак на палях</string>
+	<string name="poi_signal_station_traffic">Сігнальная станцыя (трафік)</string>
+	<string name="poi_topmark">Топавая фігура (навігацыйны знак)</string>
 	<string name="poi_seamark_building">Будынак (арыентыр)</string>
 	<string name="poi_seamark_bridge">Мост (арыентыр)</string>
-	<string name="poi_seamark_buoy_safe_water">Бясьпечная вада (буй)</string>
-	<string name="poi_seamark_beacon_safe_water">Бясьпечная вада (бакен)</string>
-	<string name="poi_seamark_harbour_basin">Акваторыя порту</string>
-	<string name="poi_seamark_landmark">Берагавы знак</string>
+	<string name="poi_buoy_safe_water">Бясьпечная вада (буй)</string>
+	<string name="poi_beacon_safe_water">Бясьпечная вада (бакен)</string>
+	<string name="poi_harbour_basin">Акваторыя порту</string>
+	<string name="poi_landmark">Берагавы знак</string>
 	<string name="poi_seamark_light">Агонь маяка</string>
-	<string name="poi_seamark_daymark">Дзённы знак</string>
+	<string name="poi_daymark">Дзённы знак</string>
 	<string name="poi_seamark_light_major">Асноўны агонь маяка</string>
 	<string name="poi_seamark_light_minor">Малы агонь маяка</string>
 	<string name="poi_seamark_light_float">Агонь плывучага маяка</string>
-	<string name="poi_seamark_distance_mark">Пазнака дальнасьці</string>
+	<string name="poi_distance_mark">Пазнака дальнасьці</string>
 	<string name="poi_seamark_light_vessel">Агонь плывучага маяка (судна)</string>
-	<string name="poi_seamark_small_craft_facility">Лодкавая станцыя</string>
+	<string name="poi_small_craft_facility">Лодкавая станцыя</string>
 	<string name="poi_team_handball">Гандбол</string>
 	<string name="poi_shop">Крама</string>
 	<string name="poi_transportation">Транспарт</string>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 3e6a6c430d..36bc2097cd 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -22,7 +22,7 @@
 	<string name="poi_interior_decoration">Botiga d\'interiorisme</string>
 	<string name="poi_jewelry">Joieria</string>
 	<string name="poi_kiosk">Quiosc</string>
-	<string name="poi_optician_shop">Optometria</string>
+	<string name="poi_optician">Optometria</string>
 	<string name="poi_convenience">Botiga de queviures</string>
 	<string name="poi_deli">Delicadeses</string>
 	<string name="poi_shop_farm">Productes de granja</string>
@@ -81,7 +81,7 @@
 	<string name="poi_sports">Material esportiu</string>
 	<string name="poi_ticket">Taquilla</string>
 	<string name="poi_seamark_harbour">Port</string>
-	<string name="poi_seamark_fog_signal">Botzina de boira</string>
+	<string name="poi_fog_signal">Botzina de boira</string>
 	<string name="poi_cosmetics">Cosmètica</string>
 	<string name="poi_marketplace">Mercat</string>
 	<string name="poi_sewing">Merceria</string>
@@ -318,8 +318,8 @@
 	<string name="poi_charging_station">Estació de recàrrega</string>
 	<string name="poi_seamark_wreck">Restes de naufragi, senyal marítim</string>
 
-	<string name="poi_seamark_radio_station">Emissor de ràdio, senyal marítim</string>
-	<string name="poi_seamark_mooring">Amarratge</string>
+	<string name="poi_radio_station">Emissor de ràdio, senyal marítim</string>
+	<string name="poi_mooring">Amarratge</string>
 	<string name="poi_seamark_rock">Roca o corall, senyal marítim</string>
 	<string name="poi_rowing">Rem</string>
 	<string name="poi_rugby_union">Rugbi a 15</string>
@@ -358,7 +358,7 @@
 	<string name="poi_fountain">Font ornamental</string>
 	<string name="poi_historic_ruins">Runes històriques</string>
 	<string name="poi_historic_ship">Vaixell històric</string>
-	<string name="poi_seamark_signal_station_traffic"/>
-	<string name="poi_seamark_dyke">Dic</string>
-	<string name="poi_seamark_floating_dock">Moll flotant</string>
+	<string name="poi_signal_station_traffic"/>
+	<string name="poi_dyke">Dic</string>
+	<string name="poi_floating_dock">Moll flotant</string>
 	</resources>
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index 326d96a899..fa670970ba 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -35,7 +35,7 @@
 	<string name="poi_kiosk">Kiosek</string>
 	<string name="poi_kitchen">Kuchyňské studio</string>
 	<string name="poi_musical_instrument">Hudební nástroje</string>
-	<string name="poi_optician_shop">Optik</string>
+	<string name="poi_optician">Optik</string>
 	<string name="poi_pet">Zverimex</string>
 	<string name="poi_sports">Sportovní vybavení</string>
 	<string name="poi_toys">Hračkářství</string>
@@ -191,8 +191,8 @@
 	<string name="poi_fjord">Fjord</string>
 	<string name="poi_nature_reserve">Přírodní rezervace</string>
 	<string name="poi_island">Ostrov</string>
-	<string name="poi_seamark_anchorage">Kotviště</string>
-	<string name="poi_seamark_dry_dock">Suchý dok</string>
+	<string name="poi_anchorage">Kotviště</string>
+	<string name="poi_dry_dock">Suchý dok</string>
 	<string name="poi_seamark_harbour">Přístav</string>
 	<string name="poi_military_barracks">Kasárna</string>
 	<string name="poi_military_danger_area">Nebezpečná oblast</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index d2f8fe702e..c52138bd1e 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -63,7 +63,7 @@
         <string name="poi_motorcycle">Motorcykler</string>
         <string name="poi_musical_instrument">Musikinstrumenter</string>
         <string name="poi_newsagent">Nyhedsbureau</string>
-        <string name="poi_optician_shop">Optiker</string>
+        <string name="poi_optician">Optiker</string>
         <string name="poi_organic">Økologiske fødevarer</string>
         <string name="poi_outdoor">Friluftsudstyr</string>
         <string name="poi_paint">Malerværksted</string>
@@ -549,45 +549,45 @@
         <string name="poi_island">Ø</string>
         <string name="poi_islet">Holm</string>
 
-        <string name="poi_seamark_anchorage">Ankerplads</string>
-        <string name="poi_seamark_anchor_berth">Ankerplads</string>
-        <string name="poi_seamark_beacon">Båke</string>
-        <string name="poi_seamark_beacon_cardinal">Kompasbåke</string>
-        <string name="poi_seamark_beacon_lateral">Sidebåke</string>
-        <string name="poi_seamark_beacon_safe_water">Midtfarvandsbåke</string>
-        <string name="poi_seamark_beacon_special_purpose">Specialbåke</string>
-        <string name="poi_seamark_berth">Kajplads</string>
+        <string name="poi_anchorage">Ankerplads</string>
+        <string name="poi_anchor_berth">Ankerplads</string>
+        <string name="poi_beacon">Båke</string>
+        <string name="poi_beacon_cardinal">Kompasbåke</string>
+        <string name="poi_beacon_lateral">Sidebåke</string>
+        <string name="poi_beacon_safe_water">Midtfarvandsbåke</string>
+        <string name="poi_beacon_special_purpose">Specialbåke</string>
+        <string name="poi_berth">Kajplads</string>
         <string name="poi_seamark_building">Sømærke bygning</string>
         <string name="poi_seamark_bridge">Sømærke bro</string>
-        <string name="poi_seamark_buoy_cardinal">Kompastønde</string>
-        <string name="poi_seamark_buoy_installation">Installationstønde</string>
-        <string name="poi_seamark_buoy_isolated_danger">Tønde, isoleret fare</string>
-        <string name="poi_seamark_buoy_lateral">Sidetønde</string>
-        <string name="poi_seamark_buoy_safe_water">Midtfarvandstønde</string>
-        <string name="poi_seamark_buoy_special_purpose">Specialtønde</string>
-        <string name="poi_seamark_daymark">Dagmærke</string>
-        <string name="poi_seamark_distance_mark">Afstandsmærke</string>
-        <string name="poi_seamark_dry_dock">Tørdok</string>
-        <string name="poi_seamark_dyke">Dige</string>
-        <string name="poi_seamark_floating_dock">Flydedok</string>
-        <string name="poi_seamark_fog_signal">Tågesignal</string>
-        <string name="poi_seamark_harbour_basin">Havnebasin</string>
+        <string name="poi_buoy_cardinal">Kompastønde</string>
+        <string name="poi_buoy_installation">Installationstønde</string>
+        <string name="poi_buoy_isolated_danger">Tønde, isoleret fare</string>
+        <string name="poi_buoy_lateral">Sidetønde</string>
+        <string name="poi_buoy_safe_water">Midtfarvandstønde</string>
+        <string name="poi_buoy_special_purpose">Specialtønde</string>
+        <string name="poi_daymark">Dagmærke</string>
+        <string name="poi_distance_mark">Afstandsmærke</string>
+        <string name="poi_dry_dock">Tørdok</string>
+        <string name="poi_dyke">Dige</string>
+        <string name="poi_floating_dock">Flydedok</string>
+        <string name="poi_fog_signal">Tågesignal</string>
+        <string name="poi_harbour_basin">Havnebasin</string>
         <string name="poi_seamark_harbour">Havn</string>
-        <string name="poi_seamark_landmark">Vartegn</string>
+        <string name="poi_landmark">Vartegn</string>
         <string name="poi_seamark_light">Fyr, sømærke</string>
         <string name="poi_seamark_light_major">Større fyr, sømærke</string>
         <string name="poi_seamark_light_minor">Mindre fyr, sømærke</string>
         <string name="poi_seamark_light_float">Flydefyr, sømærke</string>
         <string name="poi_seamark_light_vessel">Fartøjslys, sømærke</string>
-        <string name="poi_seamark_mooring">Fortøjning</string>
-        <string name="poi_seamark_notice">Varsel, sømærke</string>
-        <string name="poi_seamark_pile">Pæl</string>
-        <string name="poi_seamark_radar_transponder">Radartransponder, sømærke</string>
-        <string name="poi_seamark_radio_station">Radiostation, sømærke</string>
-        <string name="poi_seamark_signal_station_traffic">Signalstation, trafik</string>
-        <string name="poi_seamark_signal_station_warning">Signalstation, advarsel</string>
-        <string name="poi_seamark_small_craft_facility">Faciliteter for lystbåde</string>
-        <string name="poi_seamark_topmark">Topbetegnelse, sømærke</string>
+        <string name="poi_mooring">Fortøjning</string>
+        <string name="poi_notice">Varsel, sømærke</string>
+        <string name="poi_pile">Pæl</string>
+        <string name="poi_radar_transponder">Radartransponder, sømærke</string>
+        <string name="poi_radio_station">Radiostation, sømærke</string>
+        <string name="poi_signal_station_traffic">Signalstation, trafik</string>
+        <string name="poi_signal_station_warning">Signalstation, advarsel</string>
+        <string name="poi_small_craft_facility">Faciliteter for lystbåde</string>
+        <string name="poi_topmark">Topbetegnelse, sømærke</string>
         <string name="poi_seamark_rock">Klippe, sømærke</string>
         <string name="poi_seamark_wreck">Vrag, sømærke</string>
 
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 6a51399149..edfed82676 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -333,7 +333,7 @@
 	<string name="poi_observatory">Sternwarte</string>
 	<string name="poi_occupational_therapist">Ergotherapeut</string>
 	<string name="poi_craft_optician">Optiker</string>
-	<string name="poi_optician_shop">Optiker</string>
+	<string name="poi_optician">Optiker</string>
 	<string name="poi_optometrist">Optiker</string>
 	<string name="poi_orchard">Obstplantage</string>
 	<string name="poi_organic">Biolebensmittel</string>
@@ -431,46 +431,46 @@
 	<string name="poi_scuba_diving">Sporttauchen</string>
 	<string name="poi_craft_sculptor">Bildhauer</string>
 	<string name="poi_seafood">Meeresfrüchte</string>
-	<string name="poi_seamark_anchor_berth">Ankerplatz</string>
-	<string name="poi_seamark_anchorage">Ankerplatz</string>
-	<string name="poi_seamark_beacon">Leuchtturm</string>
-	<string name="poi_seamark_beacon_cardinal">Hauptleuchtturm</string>
-	<string name="poi_seamark_beacon_lateral">Nebenleuchtturm</string>
-	<string name="poi_seamark_beacon_safe_water">Sicheres Gewässer-Leuchtturm</string>
-	<string name="poi_seamark_beacon_special_purpose">Sonderleuchtturm</string>
-	<string name="poi_seamark_berth">Ankerplatz</string>
+	<string name="poi_anchor_berth">Ankerplatz</string>
+	<string name="poi_anchorage">Ankerplatz</string>
+	<string name="poi_beacon">Leuchtturm</string>
+	<string name="poi_beacon_cardinal">Hauptleuchtturm</string>
+	<string name="poi_beacon_lateral">Nebenleuchtturm</string>
+	<string name="poi_beacon_safe_water">Sicheres Gewässer-Leuchtturm</string>
+	<string name="poi_beacon_special_purpose">Sonderleuchtturm</string>
+	<string name="poi_berth">Ankerplatz</string>
 	<string name="poi_seamark_bridge">Seezeichenbrücke</string>
 	<string name="poi_seamark_building">Seegebäude</string>
-	<string name="poi_seamark_buoy_cardinal">Hauptboje</string>
-	<string name="poi_seamark_buoy_installation">Installationsboje</string>
-	<string name="poi_seamark_buoy_isolated_danger">Boje, isolierte Gefahr</string>
-	<string name="poi_seamark_buoy_lateral">Nebenboje</string>
-	<string name="poi_seamark_buoy_safe_water">Sicheres Gewässer-Boje</string>
-	<string name="poi_seamark_buoy_special_purpose">Sonderboje</string>
-	<string name="poi_seamark_daymark">Tagzeichen</string>
-	<string name="poi_seamark_distance_mark">Entfernungsmarke</string>
-	<string name="poi_seamark_dry_dock">Trockendock</string>
-	<string name="poi_seamark_dyke">Damm</string>
-	<string name="poi_seamark_floating_dock">Schwimmdock</string>
-	<string name="poi_seamark_fog_signal">Nebelsignal</string>
+	<string name="poi_buoy_cardinal">Hauptboje</string>
+	<string name="poi_buoy_installation">Installationsboje</string>
+	<string name="poi_buoy_isolated_danger">Boje, isolierte Gefahr</string>
+	<string name="poi_buoy_lateral">Nebenboje</string>
+	<string name="poi_buoy_safe_water">Sicheres Gewässer-Boje</string>
+	<string name="poi_buoy_special_purpose">Sonderboje</string>
+	<string name="poi_daymark">Tagzeichen</string>
+	<string name="poi_distance_mark">Entfernungsmarke</string>
+	<string name="poi_dry_dock">Trockendock</string>
+	<string name="poi_dyke">Damm</string>
+	<string name="poi_floating_dock">Schwimmdock</string>
+	<string name="poi_fog_signal">Nebelsignal</string>
 	<string name="poi_seamark_harbour">Hafen</string>
-	<string name="poi_seamark_harbour_basin">Hafenbecken</string>
-	<string name="poi_seamark_landmark">Grenzstein</string>
+	<string name="poi_harbour_basin">Hafenbecken</string>
+	<string name="poi_landmark">Grenzstein</string>
 	<string name="poi_seamark_light">Leuchtseezeichen</string>
 	<string name="poi_seamark_light_float">Treibendes Leuchtseezeichen</string>
 	<string name="poi_seamark_light_major">Hauptleuchtseezeichen</string>
 	<string name="poi_seamark_light_minor">Nebenleuchtseezeichen</string>
 	<string name="poi_seamark_light_vessel">Schiffsleuchtseezeichen</string>
-	<string name="poi_seamark_mooring">Ankerplatz</string>
-	<string name="poi_seamark_notice">Hinweis</string>
-	<string name="poi_seamark_pile">Pfahl</string>
-	<string name="poi_seamark_radar_transponder">Radarsender</string>
-	<string name="poi_seamark_radio_station">Funkstation</string>
+	<string name="poi_mooring">Ankerplatz</string>
+	<string name="poi_notice">Hinweis</string>
+	<string name="poi_pile">Pfahl</string>
+	<string name="poi_radar_transponder">Radarsender</string>
+	<string name="poi_radio_station">Funkstation</string>
 	<string name="poi_seamark_rock">Felsen</string>
-	<string name="poi_seamark_signal_station_traffic">Signalstelle: Verkehr</string>
-	<string name="poi_seamark_signal_station_warning">Signalstelle: Warnung</string>
-	<string name="poi_seamark_small_craft_facility">Sportbooteinrichtung</string>
-	<string name="poi_seamark_topmark">Baken</string>
+	<string name="poi_signal_station_traffic">Signalstelle: Verkehr</string>
+	<string name="poi_signal_station_warning">Signalstelle: Warnung</string>
+	<string name="poi_small_craft_facility">Sportbooteinrichtung</string>
+	<string name="poi_topmark">Baken</string>
 	<string name="poi_seamark_wreck">Wrack</string>
 	<string name="poi_second_hand">Gebrauchtwaren</string>
 	<string name="poi_service_tyres">Reifenhändler</string>
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index 05438f549f..9087d397c0 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -66,7 +66,7 @@
 <string name="poi_motorcycle">فروشگاه موتور سیکلت</string>
 <string name="poi_musical_instrument">فروشگاه لوزم موسیقی</string>
 <string name="poi_newsagent">روزنامه فروشی</string>
-<string name="poi_optician_shop">عینک سازی</string>
+<string name="poi_optician">عینک سازی</string>
 <string name="poi_organic">مواد غذایی الی</string>
 <string name="poi_outdoor">بازار روز</string>
 <string name="poi_paint">رنگ فروشی</string>
@@ -593,45 +593,45 @@
 <string name="poi_island">جزیره</string>
 <string name="poi_islet">جزیره کوچک</string>
 
-<string name="poi_seamark_anchorage">لنگر گاه دریایی</string>
-<string name="poi_seamark_anchor_berth">اسکله لنگر دریایی</string>
-<string name="poi_seamark_beacon">فانوس دریایی</string>
-<string name="poi_seamark_beacon_cardinal">فانوس دریایی اصلی</string>
-<string name="poi_seamark_beacon_lateral">فانوس دریایی جانبی</string>
-<string name="poi_seamark_beacon_safe_water">فانوس دریایی آب سالم</string>
-<string name="poi_seamark_beacon_special_purpose">چراغ دریایی برای مقاصد خاص</string>
-<string name="poi_seamark_berth">اسکله</string>
+<string name="poi_anchorage">لنگر گاه دریایی</string>
+<string name="poi_anchor_berth">اسکله لنگر دریایی</string>
+<string name="poi_beacon">فانوس دریایی</string>
+<string name="poi_beacon_cardinal">فانوس دریایی اصلی</string>
+<string name="poi_beacon_lateral">فانوس دریایی جانبی</string>
+<string name="poi_beacon_safe_water">فانوس دریایی آب سالم</string>
+<string name="poi_beacon_special_purpose">چراغ دریایی برای مقاصد خاص</string>
+<string name="poi_berth">اسکله</string>
 <string name="poi_seamark_building">ساختمان دریایی</string>
 <string name="poi_seamark_bridge">پا دریایی</string>
-<string name="poi_seamark_buoy_cardinal">شناور اصلی</string>
-<string name="poi_seamark_buoy_installation">نصب شناور</string>
-<string name="poi_seamark_buoy_isolated_danger">شناور، خطر ایزوله</string>
-<string name="poi_seamark_buoy_lateral">شناور جانبی</string>
-<string name="poi_seamark_buoy_safe_water">شناور آب سالم</string>
-<string name="poi_seamark_buoy_special_purpose">شناور برای مقاصد خاص</string>
-<string name="poi_seamark_daymark">Daymark</string>
-<string name="poi_seamark_distance_mark">علامت گذاری فاصله</string>
-<string name="poi_seamark_dry_dock">محل تعمیر کشتی</string>
-<string name="poi_seamark_dyke">خاکریز</string>
-<string name="poi_seamark_floating_dock">حوضچه شناور تعمیر کشتی</string>
-<string name="poi_seamark_fog_signal">سیگنال مه شکن</string>
-<string name="poi_seamark_harbour_basin">حوضه بندرگاه</string>
+<string name="poi_buoy_cardinal">شناور اصلی</string>
+<string name="poi_buoy_installation">نصب شناور</string>
+<string name="poi_buoy_isolated_danger">شناور، خطر ایزوله</string>
+<string name="poi_buoy_lateral">شناور جانبی</string>
+<string name="poi_buoy_safe_water">شناور آب سالم</string>
+<string name="poi_buoy_special_purpose">شناور برای مقاصد خاص</string>
+<string name="poi_daymark">Daymark</string>
+<string name="poi_distance_mark">علامت گذاری فاصله</string>
+<string name="poi_dry_dock">محل تعمیر کشتی</string>
+<string name="poi_dyke">خاکریز</string>
+<string name="poi_floating_dock">حوضچه شناور تعمیر کشتی</string>
+<string name="poi_fog_signal">سیگنال مه شکن</string>
+<string name="poi_harbour_basin">حوضه بندرگاه</string>
 <string name="poi_seamark_harbour">بندرگاه</string>
-<string name="poi_seamark_landmark">لندمارک</string>
+<string name="poi_landmark">لندمارک</string>
 <string name="poi_seamark_light">]چراغ دریایی</string>
 <string name="poi_seamark_light_major">چراغ بزرگ دریایی</string>
 <string name="poi_seamark_light_minor">چراغ کوچک دریایی</string>
 <string name="poi_seamark_light_float">چراغ شناور دریایی</string>
 <string name="poi_seamark_light_vessel">چراغ کستی دریایی</string>
-<string name="poi_seamark_mooring">پهلوگیری</string>
-<string name="poi_seamark_notice">مقررات دریایی</string>
-<string name="poi_seamark_pile">ستون</string>
-<string name="poi_seamark_radar_transponder">فرستنده رادار دریایی</string>
-<string name="poi_seamark_radio_station">ایستگاه رادیویی دریایی</string>
-<string name="poi_seamark_signal_station_traffic">ایستگاه سیگنال ترافیکی</string>
-<string name="poi_seamark_signal_station_warning">ایستگاه سیگنال، هشدار دهنده</string>
-<string name="poi_seamark_small_craft_facility">تاسیسات صنایع کوچک</string>
-<string name="poi_seamark_topmark">Topmark, seamark</string>
+<string name="poi_mooring">پهلوگیری</string>
+<string name="poi_notice">مقررات دریایی</string>
+<string name="poi_pile">ستون</string>
+<string name="poi_radar_transponder">فرستنده رادار دریایی</string>
+<string name="poi_radio_station">ایستگاه رادیویی دریایی</string>
+<string name="poi_signal_station_traffic">ایستگاه سیگنال ترافیکی</string>
+<string name="poi_signal_station_warning">ایستگاه سیگنال، هشدار دهنده</string>
+<string name="poi_small_craft_facility">تاسیسات صنایع کوچک</string>
+<string name="poi_topmark">Topmark, seamark</string>
 <string name="poi_seamark_rock">سنگ دریایی</string>
 <string name="poi_seamark_wreck">کشتی شکسته دریایی</string>
 
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 3dda105153..14620dd707 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -37,10 +37,10 @@
 	<string name="poi_beach_resort">Station balnéaire</string>
 	<string name="poi_beachvolleyball">Beach-volley</string>
 	<string name="poi_beacon">Signal</string>
-	<string name="poi_seamark_beacon_cardinal">Balise cardinale</string>
-	<string name="poi_seamark_beacon_lateral">Balise latérale</string>
-	<string name="poi_seamark_beacon_safe_water">Marque d\'eaux saines</string>
-	<string name="poi_seamark_beacon_special_purpose">Marque spéciale</string>
+	<string name="poi_beacon_cardinal">Balise cardinale</string>
+	<string name="poi_beacon_lateral">Balise latérale</string>
+	<string name="poi_beacon_safe_water">Marque d\'eaux saines</string>
+	<string name="poi_beacon_special_purpose">Marque spéciale</string>
 	<string name="poi_beauty">Salon de beauté</string>
 	<string name="poi_beverages">Magasin de boissons</string>
 	<string name="poi_bicycle">Magasin de vélos</string>
@@ -60,11 +60,11 @@
 	<string name="poi_brothel">Maison de prostitution</string>
 	<string name="poi_religion_buddhist">Bouddhisme</string>
 	<string name="poi_military_bunker">Casemate</string>
-	<string name="poi_seamark_buoy_cardinal">Bouée cardinale (balise flottante)</string>
-	<string name="poi_seamark_buoy_installation">Bouée de chargement / déchargement</string>
-	<string name="poi_seamark_buoy_isolated_danger">Bouée de danger isolé (balise flottante)</string>
-	<string name="poi_seamark_buoy_lateral">Bouée latérale (balise flottante)</string>
-	<string name="poi_seamark_buoy_safe_water">Bouée d\'eaux saines (balise flottante)</string>
+	<string name="poi_buoy_cardinal">Bouée cardinale (balise flottante)</string>
+	<string name="poi_buoy_installation">Bouée de chargement / déchargement</string>
+	<string name="poi_buoy_isolated_danger">Bouée de danger isolé (balise flottante)</string>
+	<string name="poi_buoy_lateral">Bouée latérale (balise flottante)</string>
+	<string name="poi_buoy_safe_water">Bouée d\'eaux saines (balise flottante)</string>
 	<string name="poi_seamark_uoy_special_purpose">Marque spéciale (balise flottante)</string>
 	<string name="poi_bus_station">Gare routière</string>
 	<string name="poi_bus_stop">Arrêt de bus</string>
@@ -131,7 +131,7 @@
 	<string name="poi_drinking_water">Eau potable</string>
 	<string name="poi_driving_school">École de conduite</string>
 	<string name="poi_dry_cleaning">Pressing</string>
-	<string name="poi_seamark_dyke">Digue</string>
+	<string name="poi_dyke">Digue</string>
 	<string name="poi_craft_electrician">Électricien</string>
 	<string name="poi_electronics">Magasin d\'électronique</string>
 	<string name="poi_embassy">Ambassade</string>
@@ -150,7 +150,7 @@
 	<string name="poi_first_aid">Premiers secours</string>
 	<string name="poi_fishing">Zone de pêche</string>
 	<string name="poi_florist">Fleuriste</string>
-	<string name="poi_seamark_fog_signal">Signal de brume</string>
+	<string name="poi_fog_signal">Signal de brume</string>
 	<string name="poi_food_court">Aire de restauration</string>
 	<string name="poi_ford">Gué</string>
 	<string name="poi_fountain">Fontaine</string>
@@ -173,7 +173,7 @@
 	<string name="poi_hairdresser">Coiffeur</string>
 	<string name="poi_hamlet">Hameau</string>
 	<string name="poi_seamark_harbour">Port</string>
-	<string name="poi_seamark_harbour_basin">Bassin portuaire</string>
+	<string name="poi_harbour_basin">Bassin portuaire</string>
 	<string name="poi_hardware">Quincaillerie</string>
 	<string name="poi_hearing_aids">Audioprothésiste</string>
 	<string name="poi_helipad">Hélisurface</string>
@@ -200,7 +200,7 @@
 	<string name="poi_kiosk">Kiosque</string>
 	<string name="poi_korfbal">Korfball</string>
 	<string name="poi_landfill">Décharge</string>
-	<string name="poi_seamark_landmark">Point de repère</string>
+	<string name="poi_landmark">Point de repère</string>
 	<string name="poi_laundry">Laverie</string>
 	<string name="poi_lawyer">Juriste</string>
 	<string name="poi_level_crossing">Passage à niveau</string>
@@ -239,7 +239,7 @@
 	<string name="poi_newspaper">Presse</string>
 	<string name="poi_ngo">ONG</string>
 	<string name="poi_nightclub">Boîte de nuit</string>
-	<string name="poi_optician_shop">Opticien</string>
+	<string name="poi_optician">Opticien</string>
 	<string name="poi_organic">Magasin bio</string>
 	<string name="poi_orienteering">Course d\'orientation</string>
 	<string name="poi_outdoor">Magasin d\'activités de plein air</string>
@@ -274,7 +274,7 @@
 	<string name="poi_quarry">Carrière</string>
 	<string name="poi_raceway">Circuit</string>
 	<string name="poi_racquet">Sport de raquette</string>
-	<string name="poi_seamark_radar_transponder">Transpondeur radar (amer)</string>
+	<string name="poi_radar_transponder">Transpondeur radar (amer)</string>
 	<string name="poi_railway_halt">Gare ferroviaire (halte)</string>
 	<string name="poi_railway_platform">Quai de gare</string>
 	<string name="poi_railway_station">Gare ferroviaire</string>
@@ -339,7 +339,7 @@
 	<string name="poi_tobacco">Tabac</string>
 	<string name="poi_toboggan">Toboggan</string>
 	<string name="poi_toilets">Toilettes</string>
-	<string name="poi_seamark_topmark">Voyant maritime</string>
+	<string name="poi_topmark">Voyant maritime</string>
 	<string name="poi_town">Ville</string>
 	<string name="poi_toys">Magasin de jouets</string>
 	<string name="poi_leisure_track">Piste de sport</string>
@@ -460,12 +460,12 @@
 	<string name="poi_accountant">Comptable</string>
 	<string name="poi_bay">Baie</string>
 	<string name="poi_fjord">Fjord</string>
-	<string name="poi_seamark_anchorage">Mouillage</string>
-	<string name="poi_seamark_beacon">Balise</string>
+	<string name="poi_anchorage">Mouillage</string>
+	<string name="poi_beacon">Balise</string>
 	<string name="poi_seamark_building">Bâtiment remarquable (amer)</string>
-	<string name="poi_seamark_buoy_special_purpose">Marque spéciale (balise flottante)</string>
-	<string name="poi_seamark_dry_dock">Cale sèche</string>
-	<string name="poi_seamark_mooring">Mouillage</string>
+	<string name="poi_buoy_special_purpose">Marque spéciale (balise flottante)</string>
+	<string name="poi_dry_dock">Cale sèche</string>
+	<string name="poi_mooring">Mouillage</string>
 	<string name="poi_seamark_wreck">Épave</string>
 
 	<string name="poi_bag">Maroquinerie</string>
@@ -492,7 +492,7 @@
 	<string name="poi_prosecutor">Procureur</string>
 	<string name="poi_office_administrative">Centre administratif</string>
 	<string name="poi_seamark_rock">Rocher (amer)</string>
-	<string name="poi_seamark_distance_mark">Borne</string>
+	<string name="poi_distance_mark">Borne</string>
 	<string name="poi_craft_upholsterer">Tapissier</string>
 	<string name="poi_craft_tiler">Carreleur</string>
 	<string name="poi_craft_stonemason">Tailleur de pierre</string>
@@ -575,7 +575,7 @@
 	<string name="poi_club_automobile">Club automobile</string>
 	<string name="poi_club_history">Association du patrimoine</string>
 	<string name="poi_harbour">Port</string>
-	<string name="poi_seamark_floating_dock">Quai flottant</string>
+	<string name="poi_floating_dock">Quai flottant</string>
 	<string name="poi_military_range">Terrain militaire</string>
 	<string name="poi_rune_stone">Pierre runique</string>
 	<string name="poi_city_gate">Porte de ville</string>
@@ -586,12 +586,12 @@
 	<string name="poi_craft_tinsmith">Ferronnier</string>
 	<string name="poi_dock">Quai</string>
 	<string name="poi_mortuary">Funérarium</string>
-	<string name="poi_seamark_pile">Tourelle</string>
-	<string name="poi_seamark_anchor_berth">Zone de mouillage</string>
-	<string name="poi_seamark_berth">Zone</string>
+	<string name="poi_pile">Tourelle</string>
+	<string name="poi_anchor_berth">Zone de mouillage</string>
+	<string name="poi_berth">Zone</string>
 	<string name="poi_seamark_bridge">Pont remarquable (amer)</string>
-	<string name="poi_seamark_radio_station">Station radio (amer)</string>
-	<string name="poi_seamark_signal_station_traffic">Sémaphore</string>
+	<string name="poi_radio_station">Station radio (amer)</string>
+	<string name="poi_signal_station_traffic">Sémaphore</string>
 	<string name="poi_attraction_animal">Parc animalier</string>
 	<string name="poi_big_wheel">Grande roue</string>
 	<string name="poi_carousel">Carrousel</string>
@@ -620,10 +620,10 @@
 	<string name="poi_craft_window_construction">Construction de fenêtres</string>
 
 	<string name="poi_craft_computer">Assembleur d\'ordinateurs</string>
-	<string name="poi_seamark_daymark">Amer</string>
-	<string name="poi_seamark_notice">Signalétique maritime</string>
-	<string name="poi_seamark_signal_station_warning">Station de signaux, avertissements</string>
-	<string name="poi_seamark_small_craft_facility">Facilité pour petites embarcations</string>
+	<string name="poi_daymark">Amer</string>
+	<string name="poi_notice">Signalétique maritime</string>
+	<string name="poi_signal_station_warning">Station de signaux, avertissements</string>
+	<string name="poi_small_craft_facility">Facilité pour petites embarcations</string>
 	<string name="poi_military_nuclear_explosion_site">Site d\'essais nucléaires</string>
 <string name="poi_craft_carpet_layer">Couvreur de moquettes</string>
 	<string name="poi_craft_parquet_layer">Couvreur de parquets</string>
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index 466caa2f6d..5316b6aeae 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -368,10 +368,10 @@
 	<string name="poi_island">Illa</string>
 	<string name="poi_islet">Ínsua</string>
 
-	<string name="poi_seamark_anchorage">Ancoradoiro</string>
-	<string name="poi_seamark_dry_dock">Dique seco</string>
-	<string name="poi_seamark_floating_dock">Dique flotante</string>
-	<string name="poi_seamark_fog_signal">Serea de néboa</string>
+	<string name="poi_anchorage">Ancoradoiro</string>
+	<string name="poi_dry_dock">Dique seco</string>
+	<string name="poi_floating_dock">Dique flotante</string>
+	<string name="poi_fog_signal">Serea de néboa</string>
 	<string name="poi_seamark_harbour">Porto</string>
 	<string name="poi_military">Zona militar</string>
 	<string name="poi_military_airfield">Aeródromo militar</string>
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index d3228b0a83..8d3ed418c6 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -95,7 +95,7 @@
 	<string name="poi_mobile_phone">Negozio telefonia mobile</string>
 	<string name="poi_motorcycle">Negozio moto</string>
 	<string name="poi_musical_instrument">Strumenti musicali</string>
-	<string name="poi_optician_shop">Optometrista</string>
+	<string name="poi_optician">Optometrista</string>
 	<string name="poi_organic">Alimenti biologici</string>
 	<string name="poi_outdoor">Negozio articoli per l\'attività all\'aperto</string>
 	<string name="poi_paint">Negozio articoli per pittura</string>
@@ -250,7 +250,7 @@
 	<string name="poi_seamark_wreck">Relitto</string>
 
 	<string name="poi_seamark_rock">Scoglio</string>
-	<string name="poi_seamark_radar_transponder">Transponder radar marittimo</string>
+	<string name="poi_radar_transponder">Transponder radar marittimo</string>
 	<string name="poi_waterfall">Cascata</string>
 	<string name="poi_sinkhole">Dolina</string>
 	<string name="poi_glacier">Ghiacciaio</string>
@@ -551,7 +551,7 @@
 	<string name="poi_craft_basket_maker">Cestaio</string>
 	<string name="poi_cape">Capo</string>
 	<string name="poi_strait">Stretto</string>
-	<string name="poi_seamark_anchorage">Ancoraggio</string>
+	<string name="poi_anchorage">Ancoraggio</string>
 	<string name="poi_seamark_harbour">Porto</string>
 	<string name="poi_shop">Negozio</string>
 	<string name="poi_office">Ufficio</string>
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index 640d93b96a..46e5fd1652 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -64,7 +64,7 @@
 	<string name="poi_motorcycle">오토바이 가게</string>
 	<string name="poi_musical_instrument">악기</string>
 	<string name="poi_newsagent">통신사</string>
-	<string name="poi_optician_shop">검안</string>
+	<string name="poi_optician">검안</string>
 	<string name="poi_organic">유기농 식품</string>
 	<string name="poi_outdoor">아웃도어 가게</string>
 	<string name="poi_paint">페인트 샵</string>
@@ -579,45 +579,45 @@
 	<string name="poi_island">섬</string>
 	<string name="poi_islet">작은 섬</string>
 
-	<string name="poi_seamark_anchorage">앵커리지</string>
-	<string name="poi_seamark_anchor_berth">앵커 정박</string>
-	<string name="poi_seamark_beacon">신호</string>
-	<string name="poi_seamark_beacon_cardinal">심장 표지</string>
-	<string name="poi_seamark_beacon_lateral">측면 표지</string>
-	<string name="poi_seamark_beacon_safe_water">안전 수상 신호</string>
-	<string name="poi_seamark_beacon_special_purpose">특수 목적 신호</string>
-	<string name="poi_seamark_berth">부두</string>
+	<string name="poi_anchorage">앵커리지</string>
+	<string name="poi_anchor_berth">앵커 정박</string>
+	<string name="poi_beacon">신호</string>
+	<string name="poi_beacon_cardinal">심장 표지</string>
+	<string name="poi_beacon_lateral">측면 표지</string>
+	<string name="poi_beacon_safe_water">안전 수상 신호</string>
+	<string name="poi_beacon_special_purpose">특수 목적 신호</string>
+	<string name="poi_berth">부두</string>
 	<string name="poi_seamark_building">해안표시 빌딩</string>
 	<string name="poi_seamark_bridge">Seamark 다리</string>
-	<string name="poi_seamark_buoy_cardinal">심장 부표</string>
-	<string name="poi_seamark_buoy_installation">부표 설치</string>
-	<string name="poi_seamark_buoy_isolated_danger">부표, 고립된 위험</string>
-	<string name="poi_seamark_buoy_lateral">측면 부표</string>
-	<string name="poi_seamark_buoy_safe_water">안전 수상 부표</string>
-	<string name="poi_seamark_buoy_special_purpose">특수 목적 부표</string>
-	<string name="poi_seamark_daymark">Day 마크</string>
-	<string name="poi_seamark_distance_mark">거리 표시</string>
-	<string name="poi_seamark_dry_dock">드라이 도크</string>
-	<string name="poi_seamark_dyke">제방</string>
-	<string name="poi_seamark_floating_dock">플로팅 도크</string>
-	<string name="poi_seamark_fog_signal">안개 신호</string>
-	<string name="poi_seamark_harbour_basin">항구 분지</string>
+	<string name="poi_buoy_cardinal">심장 부표</string>
+	<string name="poi_buoy_installation">부표 설치</string>
+	<string name="poi_buoy_isolated_danger">부표, 고립된 위험</string>
+	<string name="poi_buoy_lateral">측면 부표</string>
+	<string name="poi_buoy_safe_water">안전 수상 부표</string>
+	<string name="poi_buoy_special_purpose">특수 목적 부표</string>
+	<string name="poi_daymark">Day 마크</string>
+	<string name="poi_distance_mark">거리 표시</string>
+	<string name="poi_dry_dock">드라이 도크</string>
+	<string name="poi_dyke">제방</string>
+	<string name="poi_floating_dock">플로팅 도크</string>
+	<string name="poi_fog_signal">안개 신호</string>
+	<string name="poi_harbour_basin">항구 분지</string>
 	<string name="poi_seamark_harbour">항구</string>
-	<string name="poi_seamark_landmark">랜드마크</string>
+	<string name="poi_landmark">랜드마크</string>
 	<string name="poi_seamark_light">빛, seamark</string>
 	<string name="poi_seamark_light_major">주요 빛, seamark</string>
 	<string name="poi_seamark_light_minor">작은 빛, seamark</string>
 	<string name="poi_seamark_light_float">깜박이는 빛, seamark</string>
 	<string name="poi_seamark_light_vessel">선박 조명, seamark</string>
-	<string name="poi_seamark_mooring">계류</string>
-	<string name="poi_seamark_notice">주의 사항, seamark</string>
-	<string name="poi_seamark_pile">더미</string>
-	<string name="poi_seamark_radar_transponder">레이다 트랜스폰더, seamark</string>
-	<string name="poi_seamark_radio_station">무선국, seamark</string>
-	<string name="poi_seamark_signal_station_traffic">신호 센터, 교통</string>
-	<string name="poi_seamark_signal_station_warning">신호 센터, 경고</string>
-	<string name="poi_seamark_small_craft_facility">작은 공예 시설</string>
-	<string name="poi_seamark_topmark">톱 마크, seamark</string>
+	<string name="poi_mooring">계류</string>
+	<string name="poi_notice">주의 사항, seamark</string>
+	<string name="poi_pile">더미</string>
+	<string name="poi_radar_transponder">레이다 트랜스폰더, seamark</string>
+	<string name="poi_radio_station">무선국, seamark</string>
+	<string name="poi_signal_station_traffic">신호 센터, 교통</string>
+	<string name="poi_signal_station_warning">신호 센터, 경고</string>
+	<string name="poi_small_craft_facility">작은 공예 시설</string>
+	<string name="poi_topmark">톱 마크, seamark</string>
 	<string name="poi_seamark_rock">바위, seamark</string>
 	<string name="poi_seamark_wreck">난파선, seamark</string>
 
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index 84a9e50bee..16548d54e5 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -66,7 +66,7 @@
 	<string name="poi_motorcycle">Motorwinkel</string>
 	<string name="poi_musical_instrument">Muziekinstrumentenwinkel</string>
 	<string name="poi_newsagent">Persagentschap</string>
-	<string name="poi_optician_shop">Opticien</string>
+	<string name="poi_optician">Opticien</string>
 	<string name="poi_organic">Biologische voedingswinkel</string>
 	<string name="poi_outdoor">Buitensportwinkel</string>
 	<string name="poi_paint">Verfwinkel</string>
@@ -395,7 +395,7 @@
 	<string name="poi_island">Eiland</string>
 	<string name="poi_islet">Eilandje</string>
 
-	<string name="poi_seamark_dyke">Dijk</string>
+	<string name="poi_dyke">Dijk</string>
 	<string name="poi_seamark_harbour">Haven</string>
 	<string name="poi_traffic_calming_chicane">Chicane</string>
 	<string name="poi_traffic_calming_rumble_strip">Rammelstrook</string>
@@ -638,43 +638,43 @@
 	<string name="poi_stone">Natuursteen</string>
 	<string name="poi_cape">Kaap</string>
 	<string name="poi_strait">Zeestraat</string>
-	<string name="poi_seamark_anchorage">Ankerplaats</string>
-	<string name="poi_seamark_anchor_berth">Aanlegplaats</string>
-	<string name="poi_seamark_beacon">Baken</string>
-	<string name="poi_seamark_beacon_cardinal">Kardinale betonning</string>
-	<string name="poi_seamark_beacon_lateral">Laterale betonning</string>
-	<string name="poi_seamark_beacon_safe_water">Betonning voor veilig vaarwater</string>
-	<string name="poi_seamark_beacon_special_purpose">Speciale betonning</string>
-	<string name="poi_seamark_berth">Ligplaats</string>
+	<string name="poi_anchorage">Ankerplaats</string>
+	<string name="poi_anchor_berth">Aanlegplaats</string>
+	<string name="poi_beacon">Baken</string>
+	<string name="poi_beacon_cardinal">Kardinale betonning</string>
+	<string name="poi_beacon_lateral">Laterale betonning</string>
+	<string name="poi_beacon_safe_water">Betonning voor veilig vaarwater</string>
+	<string name="poi_beacon_special_purpose">Speciale betonning</string>
+	<string name="poi_berth">Ligplaats</string>
 	<string name="poi_seamark_building">Zeemarkering: gebouw</string>
 	<string name="poi_seamark_bridge">Zeemarkering: brug</string>
-	<string name="poi_seamark_buoy_cardinal">Kardinale boei</string>
-	<string name="poi_seamark_buoy_installation">Aanmeer boei</string>
-	<string name="poi_seamark_buoy_isolated_danger">Betonning voor geïsoleerd gevaar</string>
-	<string name="poi_seamark_buoy_lateral">Laterale boei</string>
-	<string name="poi_seamark_buoy_safe_water">Midvaarwaterboei</string>
-	<string name="poi_seamark_buoy_special_purpose">Speciale betonning</string>
-	<string name="poi_seamark_daymark">Dagmerk</string>
-	<string name="poi_seamark_distance_mark">Afstand markering</string>
-	<string name="poi_seamark_dry_dock">Drookdok</string>
-	<string name="poi_seamark_floating_dock">Drijvend dok</string>
-	<string name="poi_seamark_fog_signal">Misthoorn</string>
-	<string name="poi_seamark_harbour_basin">Havenkom</string>
-	<string name="poi_seamark_landmark">Herkenningspunt</string>
+	<string name="poi_buoy_cardinal">Kardinale boei</string>
+	<string name="poi_buoy_installation">Aanmeer boei</string>
+	<string name="poi_buoy_isolated_danger">Betonning voor geïsoleerd gevaar</string>
+	<string name="poi_buoy_lateral">Laterale boei</string>
+	<string name="poi_buoy_safe_water">Midvaarwaterboei</string>
+	<string name="poi_buoy_special_purpose">Speciale betonning</string>
+	<string name="poi_daymark">Dagmerk</string>
+	<string name="poi_distance_mark">Afstand markering</string>
+	<string name="poi_dry_dock">Drookdok</string>
+	<string name="poi_floating_dock">Drijvend dok</string>
+	<string name="poi_fog_signal">Misthoorn</string>
+	<string name="poi_harbour_basin">Havenkom</string>
+	<string name="poi_landmark">Herkenningspunt</string>
 	<string name="poi_seamark_light">Zeemarkering: lichtbaken</string>
 	<string name="poi_seamark_light_major">Zeemarkering: wallicht</string>
 	<string name="poi_seamark_light_minor">Zeemarkering: lichtopstand</string>
 	<string name="poi_seamark_light_float">Zeemarkering: lichtboei</string>
 	<string name="poi_seamark_light_vessel">Zeemarkering: lichtschip</string>
-	<string name="poi_seamark_mooring">Aanlegplaats</string>
-	<string name="poi_seamark_notice">Zeemarkering: opmerking</string>
-	<string name="poi_seamark_pile">Aanlegpaal</string>
-	<string name="poi_seamark_radar_transponder">Zeemarkering: radartransponder</string>
-	<string name="poi_seamark_radio_station">Zeemarkering: radio baken</string>
-	<string name="poi_seamark_signal_station_traffic">Zeemarkering: verkeerssignaal station</string>
-	<string name="poi_seamark_signal_station_warning">Zeemarkering: waarschuwingssignaal station</string>
-	<string name="poi_seamark_small_craft_facility">Pleziervaartuig voorziening</string>
-	<string name="poi_seamark_topmark">Zeemarkering: top-markering</string>
+	<string name="poi_mooring">Aanlegplaats</string>
+	<string name="poi_notice">Zeemarkering: opmerking</string>
+	<string name="poi_pile">Aanlegpaal</string>
+	<string name="poi_radar_transponder">Zeemarkering: radartransponder</string>
+	<string name="poi_radio_station">Zeemarkering: radio baken</string>
+	<string name="poi_signal_station_traffic">Zeemarkering: verkeerssignaal station</string>
+	<string name="poi_signal_station_warning">Zeemarkering: waarschuwingssignaal station</string>
+	<string name="poi_small_craft_facility">Pleziervaartuig voorziening</string>
+	<string name="poi_topmark">Zeemarkering: top-markering</string>
 	<string name="poi_seamark_rock">Zeemarkering: Rotsen</string>
 	<string name="poi_seamark_wreck">Zeemarkering: wrak</string>
 
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 61266cb4fb..8ce5c3031a 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -64,7 +64,7 @@
 	<string name="poi_motorcycle">Motocykle</string>
 	<string name="poi_musical_instrument">Instrumenty muzyczne</string>
 	<string name="poi_newsagent">Kiosk gazetowy</string>
-	<string name="poi_optician_shop">Optyk</string>
+	<string name="poi_optician">Optyk</string>
 	<string name="poi_organic">Żywność ekologiczna</string>
 	<string name="poi_outdoor">Art. wyposażenia zewnętrznego</string>
 	<string name="poi_paint">Farby</string>
@@ -444,12 +444,12 @@
 	<string name="poi_island">Wyspa</string>
 	<string name="poi_islet">Wysepka</string>
 
-	<string name="poi_seamark_beacon">Latarnia</string>
-	<string name="poi_seamark_berth">Miejsce do cumowania</string>
-	<string name="poi_seamark_dry_dock">Suchy dok</string>
-	<string name="poi_seamark_floating_dock">Dok pływający</string>
+	<string name="poi_beacon">Latarnia</string>
+	<string name="poi_berth">Miejsce do cumowania</string>
+	<string name="poi_dry_dock">Suchy dok</string>
+	<string name="poi_floating_dock">Dok pływający</string>
 	<string name="poi_seamark_harbour">Port</string>
-	<string name="poi_seamark_landmark">Punkt orientacyjny</string>
+	<string name="poi_landmark">Punkt orientacyjny</string>
 	<string name="poi_military">Wojsko</string>
 	<string name="poi_military_airfield">Lotnisko wojskowe</string>
 	<string name="poi_military_bunker">Bunkier wojskowy</string>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 7e4bed7760..741d07608f 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -64,7 +64,7 @@
 	<string name="poi_motorcycle">Мотоциклы</string>
 	<string name="poi_musical_instrument">Музыкальные инструменты</string>
 	<string name="poi_newsagent">Журнальный киоск</string>
-	<string name="poi_optician_shop">Оптика</string>
+	<string name="poi_optician">Оптика</string>
 	<string name="poi_organic">Натуральные продукты</string>
 	<string name="poi_outdoor">Товары для активного отдыха</string>
 	<string name="poi_paint">Краски</string>
@@ -551,45 +551,45 @@
 	<string name="poi_island">Остров</string>
 	<string name="poi_islet">Остров (небольшой)</string>
 
-	<string name="poi_seamark_anchorage">Якорная стоянка</string>
-	<string name="poi_seamark_anchor_berth">Якорный причал</string>
-	<string name="poi_seamark_beacon">Бакен</string>
-	<string name="poi_seamark_beacon_cardinal">Кардинальный бакен</string>
-	<string name="poi_seamark_beacon_lateral">Латеральный бакен</string>
-	<string name="poi_seamark_beacon_safe_water">Бакен безопасности</string>
-	<string name="poi_seamark_beacon_special_purpose">Бакен специального назначения</string>
-	<string name="poi_seamark_berth">Причал</string>
+	<string name="poi_anchorage">Якорная стоянка</string>
+	<string name="poi_anchor_berth">Якорный причал</string>
+	<string name="poi_beacon">Бакен</string>
+	<string name="poi_beacon_cardinal">Кардинальный бакен</string>
+	<string name="poi_beacon_lateral">Латеральный бакен</string>
+	<string name="poi_beacon_safe_water">Бакен безопасности</string>
+	<string name="poi_beacon_special_purpose">Бакен специального назначения</string>
+	<string name="poi_berth">Причал</string>
 	<string name="poi_seamark_building">Здание</string>
 	<string name="poi_seamark_bridge">Мост</string>
-	<string name="poi_seamark_buoy_cardinal">Кардинальный буй</string>
-	<string name="poi_seamark_buoy_installation">Знак изолированной опасности</string>
-	<string name="poi_seamark_buoy_isolated_danger">Буй (изолированная опасность)</string>
-	<string name="poi_seamark_buoy_lateral">Латеральный буй</string>
-	<string name="poi_seamark_buoy_safe_water">Буй</string>
-	<string name="poi_seamark_buoy_special_purpose">Специальный буй</string>
-	<string name="poi_seamark_daymark">Дневной маяк</string>
-	<string name="poi_seamark_distance_mark">Отметка расстояния</string>
-	<string name="poi_seamark_dry_dock">Сухой док</string>
-	<string name="poi_seamark_dyke"/>
-	<string name="poi_seamark_floating_dock">Плавучий док</string>
-	<string name="poi_seamark_fog_signal">Сигнал при тумане</string>
-	<string name="poi_seamark_harbour_basin">Акватория гавани</string>
+	<string name="poi_buoy_cardinal">Кардинальный буй</string>
+	<string name="poi_buoy_installation">Знак изолированной опасности</string>
+	<string name="poi_buoy_isolated_danger">Буй (изолированная опасность)</string>
+	<string name="poi_buoy_lateral">Латеральный буй</string>
+	<string name="poi_buoy_safe_water">Буй</string>
+	<string name="poi_buoy_special_purpose">Специальный буй</string>
+	<string name="poi_daymark">Дневной маяк</string>
+	<string name="poi_distance_mark">Отметка расстояния</string>
+	<string name="poi_dry_dock">Сухой док</string>
+	<string name="poi_dyke"/>
+	<string name="poi_floating_dock">Плавучий док</string>
+	<string name="poi_fog_signal">Сигнал при тумане</string>
+	<string name="poi_harbour_basin">Акватория гавани</string>
 	<string name="poi_seamark_harbour">Гавань</string>
-	<string name="poi_seamark_landmark">Ориентир</string>
+	<string name="poi_landmark">Ориентир</string>
 	<string name="poi_seamark_light">Маяк</string>
 	<string name="poi_seamark_light_major"/>
 	<string name="poi_seamark_light_minor"/>
 	<string name="poi_seamark_light_float"/>
 	<string name="poi_seamark_light_vessel"/>
-	<string name="poi_seamark_mooring">Причал</string>
-	<string name="poi_seamark_notice">Уведомление</string>
-	<string name="poi_seamark_pile"/>
-	<string name="poi_seamark_radar_transponder"/>
-	<string name="poi_seamark_radio_station">Радиостанция</string>
-	<string name="poi_seamark_signal_station_traffic">Сигнальная станция</string>
-	<string name="poi_seamark_signal_station_warning">Сигнал опасности</string>
-	<string name="poi_seamark_small_craft_facility">Лодочная станция</string>
-	<string name="poi_seamark_topmark"/>
+	<string name="poi_mooring">Причал</string>
+	<string name="poi_notice">Уведомление</string>
+	<string name="poi_pile"/>
+	<string name="poi_radar_transponder"/>
+	<string name="poi_radio_station">Радиостанция</string>
+	<string name="poi_signal_station_traffic">Сигнальная станция</string>
+	<string name="poi_signal_station_warning">Сигнал опасности</string>
+	<string name="poi_small_craft_facility">Лодочная станция</string>
+	<string name="poi_topmark"/>
 	<string name="poi_seamark_rock">Скала</string>
 	<string name="poi_seamark_wreck">Кораблекрушение</string>
 
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index fd6df1d423..8a50977dc2 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -62,7 +62,7 @@
 	<string name="poi_motorcycle">Butega de mototzicletas</string>
 	<string name="poi_musical_instrument">Istrumentos musicales</string>
 	<string name="poi_newsagent">Agentzia de imprenta</string>
-	<string name="poi_optician_shop">Optometrista</string>
+	<string name="poi_optician">Optometrista</string>
 	<string name="poi_organic">Alimentos biològicos</string>
 	<string name="poi_outdoor">Artìculos pro s\'atividade a s\'abertu</string>
 	<string name="poi_paint">Butega de artìculos pro sa pintadura</string>
@@ -459,7 +459,7 @@
 	<string name="poi_island">Ìsula</string>
 	<string name="poi_islet">Ìsuledda</string>
 
-	<string name="poi_seamark_radar_transponder">Transponder radar marìtimu</string>
+	<string name="poi_radar_transponder">Transponder radar marìtimu</string>
 	<string name="poi_seamark_rock">Iscòlliu</string>
 	<string name="poi_military">Àrea militare</string>
 	<string name="poi_military_airfield">Aeroportu militare</string>
@@ -527,16 +527,16 @@
 	<string name="poi_accountant">Istùdiu contàbile</string>
 	<string name="poi_cape">Ispuntone/promontòriu</string>
 	<string name="poi_reef">Costera</string>
-	<string name="poi_seamark_anchorage">Ancoràggiu</string>
-	<string name="poi_seamark_beacon">Faru/fogu de sinnalatzione</string>
-	<string name="poi_seamark_berth">Atracu</string>
-	<string name="poi_seamark_dyke">Àrgine</string>
-	<string name="poi_seamark_floating_dock">Pontinu gallegiante</string>
-	<string name="poi_seamark_fog_signal">Nautòfonu</string>
+	<string name="poi_anchorage">Ancoràggiu</string>
+	<string name="poi_beacon">Faru/fogu de sinnalatzione</string>
+	<string name="poi_berth">Atracu</string>
+	<string name="poi_dyke">Àrgine</string>
+	<string name="poi_floating_dock">Pontinu gallegiante</string>
+	<string name="poi_fog_signal">Nautòfonu</string>
 	<string name="poi_seamark_harbour">Portu</string>
-	<string name="poi_seamark_landmark">Puntu de riferimentu</string>
-	<string name="poi_seamark_mooring">Ormègiu</string>
-	<string name="poi_seamark_pile">Palu de ancoràgiu</string>
+	<string name="poi_landmark">Puntu de riferimentu</string>
+	<string name="poi_mooring">Ormègiu</string>
+	<string name="poi_pile">Palu de ancoràgiu</string>
 	<string name="poi_seamark_wreck">Relitu</string>
 
 	<string name="poi_nursing_home">Domo de cura</string>
@@ -557,17 +557,17 @@
 	<string name="poi_craft_metal_construction">Costrutziones metàllicas</string>
 	<string name="poi_craft_parquet_layer">Assentadore de parquet</string>
 	<string name="poi_craft_tiler">Assentadore de regiolas</string>
-	<string name="poi_seamark_radio_station">Istatzione ràdio (in mare)</string>
+	<string name="poi_radio_station">Istatzione ràdio (in mare)</string>
 	<string name="poi_seamark_light">Lughe (in mare)</string>
 	<string name="poi_seamark_light_major">Lughe manna (in mare)</string>
 	<string name="poi_seamark_light_minor">Lughe minore (in mare)</string>
 	<string name="poi_seamark_light_float">Lughe gallegiante (in mare)</string>
 	<string name="poi_seamark_light_vessel">Lughe de nave ancorada</string>
-	<string name="poi_seamark_notice">Cartellu de informatziones (in mare)</string>
-	<string name="poi_seamark_signal_station_traffic">Istatzione de sinnalatzione, tràficu (in mare)</string>
-	<string name="poi_seamark_signal_station_warning">Istatzione de sinnalatzione, avertimentu de perìgulu (in mare)</string>
-	<string name="poi_seamark_small_craft_facility">Servìtzios pro barcas minores</string>
-	<string name="poi_seamark_topmark">Miràgliu</string>
+	<string name="poi_notice">Cartellu de informatziones (in mare)</string>
+	<string name="poi_signal_station_traffic">Istatzione de sinnalatzione, tràficu (in mare)</string>
+	<string name="poi_signal_station_warning">Istatzione de sinnalatzione, avertimentu de perìgulu (in mare)</string>
+	<string name="poi_small_craft_facility">Servìtzios pro barcas minores</string>
+	<string name="poi_topmark">Miràgliu</string>
 	<string name="poi_motor_sport">Isport a motore</string>
 	<string name="poi_craft_carpet_layer">Assentadore de moquette</string>
 	<string name="poi_motorway_junction">Illoidura autostradale</string>
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index 29fb6d545d..93c9c8c59e 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -85,7 +85,7 @@
 	<string name="poi_motorcycle">Motocykle</string>
 	<string name="poi_musical_instrument">Hudobné nástroje</string>
 	<string name="poi_newsagent">Novinový obchod</string>
-	<string name="poi_optician_shop">Očná optika</string>
+	<string name="poi_optician">Očná optika</string>
 	<string name="poi_organic">Zdravá výživa</string>
 	<string name="poi_outdoor">Turistický obchod</string>
 	<string name="poi_paint">Farby-laky</string>
@@ -498,9 +498,9 @@
 	<string name="poi_island">Ostrov</string>
 	<string name="poi_islet">Ostrovček</string>
 
-	<string name="poi_seamark_anchorage">Kotvisko</string>
-	<string name="poi_seamark_anchor_berth">Kotviace miesto</string>
-	<string name="poi_seamark_beacon">Signálny bod</string>
+	<string name="poi_anchorage">Kotvisko</string>
+	<string name="poi_anchor_berth">Kotviace miesto</string>
+	<string name="poi_beacon">Signálny bod</string>
 	<string name="poi_military_landuse">Vojenský priestor</string>
 	<string name="poi_military_airfield">Vojenské letisko</string>
 	<string name="poi_military_bunker">Bunker</string>
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index 236bd95dd2..b3905bfe8a 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -64,7 +64,7 @@
 	<string name="poi_motorcycle">Мотоцикли</string>
 	<string name="poi_musical_instrument">Музичні інструменти</string>
 	<string name="poi_newsagent">Газети та журнали</string>
-	<string name="poi_optician_shop">Окуліст</string>
+	<string name="poi_optician">Окуліст</string>
 	<string name="poi_organic">Органічні продукти харчування</string>
 	<string name="poi_outdoor">Товари для активного відпочинку</string>
 	<string name="poi_paint">Фарби</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index fbaf6ad865..36a7d19677 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -87,7 +87,7 @@
 	<string name="poi_motorcycle">Motorcycle shop</string>
 	<string name="poi_musical_instrument">Musical instruments</string>
 	<string name="poi_newsagent">Newsagency</string>
-	<string name="poi_optician_shop">Optometrist</string>
+	<string name="poi_optician">Optometrist</string>
 	<string name="poi_organic">Organic food</string>
 	<string name="poi_outdoor">Outdoor store</string>
 	<string name="poi_paint">Paint shop</string>
@@ -630,45 +630,45 @@
 	<string name="poi_island">Island</string>
 	<string name="poi_islet">Islet</string>
 
-	<string name="poi_seamark_anchorage">Anchorage</string>
-	<string name="poi_seamark_anchor_berth">Anchor berth</string>
-	<string name="poi_seamark_beacon">Beacon</string>
-	<string name="poi_seamark_beacon_cardinal">Cardinal beacon</string>
-	<string name="poi_seamark_beacon_lateral">Lateral beacon</string>
-	<string name="poi_seamark_beacon_safe_water">Safe water beacon</string>
-	<string name="poi_seamark_beacon_special_purpose">Special purpose beacon</string>
-	<string name="poi_seamark_berth">Berth</string>
+	<string name="poi_anchorage">Anchorage</string>
+	<string name="poi_anchor_berth">Anchor berth</string>
+	<string name="poi_beacon">Beacon</string>
+	<string name="poi_beacon_cardinal">Cardinal beacon</string>
+	<string name="poi_beacon_lateral">Lateral beacon</string>
+	<string name="poi_beacon_safe_water">Safe water beacon</string>
+	<string name="poi_beacon_special_purpose">Special purpose beacon</string>
+	<string name="poi_berth">Berth</string>
 	<string name="poi_seamark_building">Seamark building</string>
 	<string name="poi_seamark_bridge">Seamark bridge</string>
-	<string name="poi_seamark_buoy_cardinal">Cardinal buoy</string>
-	<string name="poi_seamark_buoy_installation">Installation buoy</string>
-	<string name="poi_seamark_buoy_isolated_danger">Buoy, isolated danger</string>
-	<string name="poi_seamark_buoy_lateral">Lateral buoy</string>
-	<string name="poi_seamark_buoy_safe_water">Safe water buoy</string>
-	<string name="poi_seamark_buoy_special_purpose">Special purpose buoy</string>
-	<string name="poi_seamark_daymark">Daymark</string>
-	<string name="poi_seamark_distance_mark">Distance mark</string>
-	<string name="poi_seamark_dry_dock">Dry dock</string>
-	<string name="poi_seamark_dyke">Dyke</string>
-	<string name="poi_seamark_floating_dock">Floating dock</string>
-	<string name="poi_seamark_fog_signal">Fog signal</string>
-	<string name="poi_seamark_harbour_basin">Harbour basin</string>
+	<string name="poi_buoy_cardinal">Cardinal buoy</string>
+	<string name="poi_buoy_installation">Installation buoy</string>
+	<string name="poi_buoy_isolated_danger">Buoy, isolated danger</string>
+	<string name="poi_buoy_lateral">Lateral buoy</string>
+	<string name="poi_buoy_safe_water">Safe water buoy</string>
+	<string name="poi_buoy_special_purpose">Special purpose buoy</string>
+	<string name="poi_daymark">Daymark</string>
+	<string name="poi_distance_mark">Distance mark</string>
+	<string name="poi_dry_dock">Dry dock</string>
+	<string name="poi_dyke">Dyke</string>
+	<string name="poi_floating_dock">Floating dock</string>
+	<string name="poi_fog_signal">Fog signal</string>
+	<string name="poi_harbour_basin">Harbour basin</string>
 	<string name="poi_seamark_harbour">Harbour</string>
-	<string name="poi_seamark_landmark">Landmark</string>
+	<string name="poi_landmark">Landmark</string>
 	<string name="poi_seamark_light">Light, seamark</string>
 	<string name="poi_seamark_light_major">Major light, seamark</string>
 	<string name="poi_seamark_light_minor">Minor light, seamark</string>
 	<string name="poi_seamark_light_float">Float light, seamark</string>
 	<string name="poi_seamark_light_vessel">Vessel light, seamark</string>
-	<string name="poi_seamark_mooring">Mooring</string>
-	<string name="poi_seamark_notice">Notice, seamark</string>
-	<string name="poi_seamark_pile">Pile</string>
-	<string name="poi_seamark_radar_transponder">Radar transponder, seamark</string>
-	<string name="poi_seamark_radio_station">Radio station, seamark</string>
-	<string name="poi_seamark_signal_station_traffic">Signal station, traffic</string>
-	<string name="poi_seamark_signal_station_warning">Signal station, warning</string>
-	<string name="poi_seamark_small_craft_facility">Small craft facility</string>
-	<string name="poi_seamark_topmark">Topmark, seamark</string>
+	<string name="poi_mooring">Mooring</string>
+	<string name="poi_notice">Notice, seamark</string>
+	<string name="poi_pile">Pile</string>
+	<string name="poi_radar_transponder">Radar transponder, seamark</string>
+	<string name="poi_radio_station">Radio station, seamark</string>
+	<string name="poi_signal_station_traffic">Signal station, traffic</string>
+	<string name="poi_signal_station_warning">Signal station, warning</string>
+	<string name="poi_small_craft_facility">Small craft facility</string>
+	<string name="poi_topmark">Topmark, seamark</string>
 	<string name="poi_seamark_rock">Rock, seamark</string>
 	<string name="poi_seamark_wreck">Wreck, seamark</string>