From 9b26040d400651ce3341000d9cd9413495b6290a Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 17 Jun 2018 16:46:49 +0200
Subject: [PATCH] Update phrases

---
 OsmAnd/res/values-be/phrases.xml     |  8 +++-----
 OsmAnd/res/values-cs/phrases.xml     |  6 +-----
 OsmAnd/res/values-da/phrases.xml     |  7 ++-----
 OsmAnd/res/values-de/phrases.xml     |  6 ++----
 OsmAnd/res/values-el/phrases.xml     |  8 +++-----
 OsmAnd/res/values-eo/phrases.xml     |  7 ++-----
 OsmAnd/res/values-es-rAR/phrases.xml |  6 ++----
 OsmAnd/res/values-es-rUS/phrases.xml |  6 ++----
 OsmAnd/res/values-es/phrases.xml     |  6 ++----
 OsmAnd/res/values-eu/phrases.xml     |  6 ++----
 OsmAnd/res/values-hu/phrases.xml     |  4 +---
 OsmAnd/res/values-is/phrases.xml     |  6 ++----
 OsmAnd/res/values-it/phrases.xml     |  6 ++----
 OsmAnd/res/values-nl/phrases.xml     |  3 +--
 OsmAnd/res/values-pl/phrases.xml     |  8 +++-----
 OsmAnd/res/values-pt-rBR/phrases.xml |  6 ++----
 OsmAnd/res/values-ru/phrases.xml     |  8 +++-----
 OsmAnd/res/values-sc/phrases.xml     |  6 ++----
 OsmAnd/res/values-sk/phrases.xml     |  6 ++----
 OsmAnd/res/values-sr/phrases.xml     |  3 +--
 OsmAnd/res/values-sv/phrases.xml     |  7 +++----
 OsmAnd/res/values-zh-rTW/phrases.xml |  2 --
 OsmAnd/res/values/phrases.xml        | 12 +++++-------
 23 files changed, 48 insertions(+), 95 deletions(-)

diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index d10de3b8c8..754f0080fa 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -127,7 +127,7 @@
 	<string name="poi_service_tyres">Шынамантаж</string>
 	<string name="poi_vehicle_inspection">Пункт тэхагляду</string>
 	<string name="poi_car_wash">Аўтамыйка</string>
-	<string name="poi_fuel">Запраўка</string>
+	<string name="poi_fuel">Запраўка;АЗС;Аўтазаправачная станцыя</string>
 	<string name="poi_electricity_combined_charging">Зарадная станцыя</string>
 	<string name="poi_vehicle_ramp">Рамонтная эстакада/яма</string>
 	<string name="poi_compressed_air">Кампрэсар для падпампоўкі шын</string>
@@ -458,7 +458,7 @@
 	<string name="poi_theatre">Тэатр, канцэртная заля</string>
 	<string name="poi_theatre_genre_circus">Цырк</string>
 	<string name="poi_dance_floor">Танцпляцоўка</string>
-	<string name="poi_nightclub">Начны клюб</string>
+	<string name="poi_nightclub">Начны клюб;Дыска</string>
 	<string name="poi_stripclub">Стрыпклюб</string>
 	<string name="poi_beach_resort">Пляжны комплекс</string>
 	<string name="poi_dog_park">Пляцоўка для выгулу сабак</string>
@@ -3425,7 +3425,7 @@
 
 <string name="poi_motorcycle_sales_yes">Продаж</string>
 	<string name="poi_motorcycle_sales_no">Продаж: не</string>
-	<string name="poi_motorcycle_sales_yes_used">Продаж: так; ужывалыя</string>
+	<string name="poi_motorcycle_sales_yes_used">Продаж: так, ужывалыя</string>
 	<string name="poi_motorcycle_sales_used">Продаж: ужывалыя</string>
 	<string name="poi_motorcycle_rental_yes">Арэнда</string>
 	<string name="poi_motorcycle_rental_no">Арэнда: не</string>
@@ -3828,9 +3828,7 @@
 
 <string name="poi_barbecue_grill">Мангал: так</string>
 
-<string name="synonyms_poi_fuel">АЗС;Аўтазаправачная станцыя</string>
 
-	<string name="synonyms_poi_nightclub">Дыска</string>
 	<string name="poi_water_utility">Офіс водазабяспячэння</string>
 
 <string name="poi_amusement_arcade">Гульнявая зала</string>
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index cf2da87172..05815f9c95 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -641,7 +641,7 @@
 	<string name="poi_community_centre">Kulturní středisko</string>
 	<string name="poi_social_centre">Společenské centrum</string>
 	<string name="poi_dance_floor">Taneční parket</string>
-	<string name="poi_nightclub">Noční klub</string>
+	<string name="poi_nightclub">Noční klub;Diskotéka</string>
 	<string name="poi_stripclub">Striptýzový klub</string>
 	<string name="poi_beach_resort">Plážový areál</string>
 	<string name="poi_dog_park">Výběh pro psy</string>
@@ -3576,10 +3576,6 @@
 	<string name="poi_operational_status_needs_maintenance">Vyžaduje údržbu</string>
 
 	<string name="poi_service_car">Autoservis</string>
-
-<string name="synonyms_poi_fuel">Čerpací stanice</string>
-
-	<string name="synonyms_poi_nightclub">Diskotéka</string>
 	<string name="poi_water_purification_none">Žádné</string>
 	<string name="poi_water_purification_chlorine">Chlór</string>
 	<string name="poi_water_purification_reverse_osmosis">Reverzní osmóza</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 048488e4c1..3e39e26acd 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -123,7 +123,7 @@
         <string name="poi_service_tyres">Dækservice</string>
         <string name="poi_vehicle_inspection">Bilsyn</string>
         <string name="poi_car_wash">Bilvask</string>
-        <string name="poi_fuel">Tankstation</string>
+        <string name="poi_fuel">Tankstation;Benzintank;Servicestation</string>
         <string name="poi_electricity_combined_charging">Ladestation</string>
         <string name="poi_vehicle_ramp">Kørerampe</string>
         <string name="poi_compressed_air">Trykluft</string>
@@ -415,7 +415,7 @@
         <string name="poi_theatre">Teater</string>
         <string name="poi_theatre_genre_circus">Cirkus</string>
         <string name="poi_dance_floor">Dansested</string>
-        <string name="poi_nightclub">Natklub</string>
+        <string name="poi_nightclub">Natklub;Diskotek;Disko;Disco</string>
         <string name="poi_stripclub">Stripklub</string>
         <string name="poi_beach_resort">Badeby</string>
         <string name="poi_dog_park">Hundeskov</string>
@@ -3865,9 +3865,6 @@
 <string name="poi_flooring">Gulvbutik</string>
 	<string name="poi_pottery">Keramik</string>
 
-<string name="synonyms_poi_fuel">Tankstation;Benzintank;Servicestation</string>
-
-	<string name="synonyms_poi_nightclub">Diskotek;Disko;Disco</string>
 	<string name="poi_whitewater_rapid_name">Strømfaldets navn</string>
 
 	<string name="poi_outpost">Butikkens leveringssted</string>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 83d950f872..b54794063e 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -213,7 +213,7 @@
 	<string name="poi_fort">Festung</string>
 	<string name="poi_fountain">Brunnen</string>
 	<string name="poi_frame">Bilderrahmengeschäft</string>
-	<string name="poi_fuel">Tankstelle</string>
+	<string name="poi_fuel">Tankstelle;Tankanlage;Tankstation</string>
 	<string name="poi_funeral_directors">Bestatter</string>
 	<string name="poi_funicular">Seilbahn</string>
 	<string name="poi_furniture">Möbelgeschäft</string>
@@ -328,7 +328,7 @@
 	<string name="poi_newsagent">Zeitungshändler</string>
 	<string name="poi_newspaper">Zeitungsbüro</string>
 	<string name="poi_ngo">NGO</string>
-	<string name="poi_nightclub">Diskothek</string>
+	<string name="poi_nightclub">Diskothek;Disco;Disko</string>
 	<string name="poi_nursing_home">Pflegeheim</string>
 	<string name="poi_observatory">Sternwarte</string>
 	<string name="poi_occupational_therapist">Ergotherapeut/in</string>
@@ -3788,9 +3788,7 @@
 
 	<string name="poi_barbecue_grill">Barbecue-Grill: ja</string>
 
-<string name="synonyms_poi_fuel">Tankstelle;Tankanlage;Tankstation</string>
 
-	<string name="synonyms_poi_nightclub">Disco;Disko;Diskothek</string>
 	<string name="poi_amusement_arcade">Spielhalle</string>
 	<string name="poi_adult_gaming_centre">Spielkasino für Erwachsene</string>
 
diff --git a/OsmAnd/res/values-el/phrases.xml b/OsmAnd/res/values-el/phrases.xml
index da7f74620a..d20e6e81d5 100644
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@@ -301,9 +301,8 @@
 	<string name="poi_service_tyres">Ελαστικά</string>
 	<string name="poi_vehicle_inspection">ΚΤΕΟ</string>
 	<string name="poi_car_wash">Πλυντήριο αυτοκινήτων</string>
-	<string name="poi_fuel">Πρατήριο καυσίμων</string>
-	<string name="synonyms_poi_fuel">Πρατήριο καυσίμων;Βενζινάδικο</string>
-
+	<string name="poi_fuel">Πρατήριο καυσίμων;Βενζινάδικο</string>
+	
 	<string name="poi_fuel_diesel">Ντίζελ</string>
 	<string name="poi_fuel_gtl_diesel">Ντίζελ GTL</string>
 	<string name="poi_fuel_hgv_diesel">Ντίζελ HGV</string>
@@ -919,8 +918,7 @@
 	<string name="poi_theatre_genre_circus">Τσίρκο</string>
 	<string name="poi_gallery">Πινακοθήκη</string>
 	<string name="poi_dance_floor">Πίστα χορού</string>
-	<string name="poi_nightclub">Νυκτερινό κέντρο</string>
-	<string name="synonyms_poi_nightclub">Ντίσκο</string>
+	<string name="poi_nightclub">Νυκτερινό κέντρο;Ντίσκο</string>
 	<string name="poi_stripclub">Στριπτιζάδικο</string>
 	<string name="poi_beach_resort">Παραλιακό θέρετρο</string>
 	<string name="poi_dog_park">Πάρκο σκύλων</string>
diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml
index 8db8a4facd..0c150a6b90 100644
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@@ -142,7 +142,7 @@
 	<string name="poi_glaziery">Pordoj-k-fenestroj-vendejo</string>
 	<string name="poi_newsagent">Gazet-vendejo</string>
 	<string name="poi_fire_hydrant">Hidranto</string>
-	<string name="poi_fuel">Benzinejo</string>
+	<string name="poi_fuel">Benzinejo;benzinvendejo;benzinejo;benzinstacio;fuelejo;brulaĵvendejo;dizelpetrolvendejo</string>
 	<string name="poi_car_wash">Aŭtomobil-purigejo</string>
 	<string name="poi_bus_stop">Haltejo aŭtobusa</string>
 	<string name="poi_bridge">Ponto</string>
@@ -308,7 +308,7 @@
 	<string name="poi_religion_muslim">Islamo</string>
 	<string name="poi_theatre">Teatrejo</string>
 	<string name="poi_theatre_genre_circus">Cirko</string>
-	<string name="poi_nightclub">Noktoklubejo</string>
+	<string name="poi_nightclub">Noktoklubejo;noktoklubo;dancejo;diskoteko;diskejo;noktaklubo;noktklubo</string>
 	<string name="poi_playground">Infana ludejo</string>
 	<string name="poi_bank">Bankejo</string>
 	<string name="poi_beach">Sablobordo</string>
@@ -3796,11 +3796,8 @@
 
 <string name="poi_barbecue_grill">Rostigilo: jes</string>
 
-<string name="synonyms_poi_fuel">benzinvendejo;benzinejo;benzinstacio;fuelejo;brulaĵvendejo;dizelpetrolvendejo</string>
-
 	<string name="poi_water_utility">Oficejo de akvokonduka firmao</string>
 
-<string name="synonyms_poi_nightclub">noktoklubo;dancejo;diskoteko;diskejo;noktaklubo;noktklubo</string>
 	<string name="poi_amusement_arcade">Salono de ludoj</string>
 	<string name="poi_adult_gaming_centre">Salono de hazardaj ludoj</string>
 
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 8d0b22809b..008c972bc4 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -170,7 +170,7 @@
 	<string name="poi_service_tyres">Neumáticos</string>
 	<string name="poi_vehicle_inspection">Inspección de vehículos</string>
 	<string name="poi_car_wash">Lavadero de automóviles</string>
-	<string name="poi_fuel">Estación de servicio</string>
+	<string name="poi_fuel">Estación de servicio;Gasolinera;Estación de combustible;Servicentro</string>
 	<string name="poi_fuel_diesel">Euro diésel (grado 3; euro V)</string>
 	<string name="poi_fuel_gtl_diesel">Diésel GTL</string>
 	<string name="poi_fuel_hgv_diesel">Diésel de vehículos pesados</string>
@@ -594,7 +594,7 @@
 	<string name="poi_theatre_genre_circus">Circo</string>
 	<string name="poi_gallery">Galería de arte</string>
 	<string name="poi_dance_floor">Pista de baile</string>
-	<string name="poi_nightclub">Boliche</string>
+	<string name="poi_nightclub">Boliche;Disco;_Discoteca;Antro;Club nocturno</string>
 	<string name="poi_stripclub">Club de striptease</string>
 	<string name="poi_ski_resort">Estación de esquí</string>
 	<string name="poi_beach_resort">Balneario</string>
@@ -3842,9 +3842,7 @@
 
 <string name="poi_barbecue_grill">Parrilla de barbacoa: sí</string>
 
-<string name="synonyms_poi_fuel">Gasolinera;Estación de servicio;Estación de combustible;Servicentro</string>
 
-	<string name="synonyms_poi_nightclub">Disco;Boliche;Discoteca;Antro;Club nocturno</string>
 	<string name="poi_water_utility">Oficina de servicio de agua</string>
 
 <string name="poi_amusement_arcade">Salón recreativo</string>
diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index ff48f82912..99f7a088a3 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -164,7 +164,7 @@
 	<string name="poi_service_tyres">Neumáticos</string>
 	<string name="poi_vehicle_inspection">Inspección de vehículos</string>
 	<string name="poi_car_wash">Lavadero de automóviles</string>
-	<string name="poi_fuel">Gasolinera</string>
+	<string name="poi_fuel">Gasolinera;Estación de servicio;Estación de combustible;Servicentro;Bencinera</string>
 	<string name="poi_fuel_diesel">Diésel (Euro)</string>
 	<string name="poi_fuel_gtl_diesel">Diésel GTL</string>
 	<string name="poi_fuel_hgv_diesel">Diésel de vehículos pesados</string>
@@ -561,7 +561,7 @@
 	<string name="poi_theatre_genre_circus">Circo</string>
 	<string name="poi_gallery">Galería de arte</string>
 	<string name="poi_dance_floor">Pista de baile</string>
-	<string name="poi_nightclub">Club nocturno</string>
+	<string name="poi_nightclub">Club nocturno;Disco;Boliche;Discoteca;Antro</string>
 	<string name="poi_stripclub">Club de striptease</string>
 	<string name="poi_ski_resort">Estación de esquí</string>
 	<string name="poi_beach_resort">Balneario</string>
@@ -3601,9 +3601,7 @@
 
 	<string name="poi_barbecue_grill">Parrilla de barbacoa: sí</string>
 
-<string name="synonyms_poi_fuel">Gasolinera;Estación de servicio;Estación de combustible;Servicentro;Bencinera</string>
 
-	<string name="synonyms_poi_nightclub">Disco;Boliche;Discoteca;Antro;Club nocturno</string>
 	<string name="poi_water_utility">Oficina de servicio de agua</string>
 
 <string name="poi_amusement_arcade">Salón recreativo</string>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index fdbd493c1e..41b5c4077e 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -120,7 +120,7 @@
 	<string name="poi_car_repair">Taller mecánico</string>
 	<string name="poi_vehicle_inspection">Inspección de vehículos</string>
 	<string name="poi_car_wash">Lavadero de automóviles</string>
-	<string name="poi_fuel">Gasolinera</string>
+	<string name="poi_fuel">Gasolinera;Estación de servicio;Estación de combustible;Servicentro;Bencinera</string>
 	<string name="poi_fuel_diesel">Diésel</string>
 	<string name="poi_fuel_gtl_diesel">Diésel GTL</string>
 	<string name="poi_fuel_biodiesel">Biodiésel</string>
@@ -320,7 +320,7 @@
 	<string name="poi_social_centre">Centro social</string>
 	<string name="poi_theatre">Teatro</string>
 	<string name="poi_theatre_genre_circus">Circo</string>
-	<string name="poi_nightclub">Club nocturno</string>
+	<string name="poi_nightclub">Club nocturno;Disco;Boliche;Discoteca;Antro</string>
 	<string name="poi_stripclub">Club de striptease</string>
 	<string name="poi_dog_park">Parque canino</string>
 	<string name="poi_leisure_fishing">Lugar de pesca</string>
@@ -3774,9 +3774,7 @@
 	<string name="poi_socket_cee_blue_output_filter">Salida CEE azul</string>
 	<string name="poi_socket_schuko_output_filter">Salida Schuko</string>
 
-<string name="synonyms_poi_fuel">Gasolinera;Estación de servicio;Estación de combustible;Servicentro;Bencinera</string>
 
-	<string name="synonyms_poi_nightclub">Disco;Boliche;Discoteca;Antro;Club nocturno</string>
 	<string name="poi_socket_cee_blue_yes">CEE azul</string>
 	<string name="poi_socket_cee_red_16a_yes">CEE rojo 16A</string>
 	<string name="poi_socket_cee_red_32a_yes">CEE rojo 32A</string>
diff --git a/OsmAnd/res/values-eu/phrases.xml b/OsmAnd/res/values-eu/phrases.xml
index 804063c304..c1d6ba8fe7 100644
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@@ -119,7 +119,7 @@
 
 	<string name="poi_service_tyres">Pneumatikoak</string>
 	<string name="poi_car_wash">Auto garbiketa</string>
-	<string name="poi_fuel">Gasolindegia</string>
+	<string name="poi_fuel">Gasolindegia;Zerbitzu estazioa;Erregai estazioa;Petrolio estazioa</string>
 	<string name="poi_fuel_diesel">Diesel</string>
 	<string name="poi_fuel_gtl_diesel">GTL diesel gasolioa</string>
 	<string name="poi_fuel_biodiesel">Biodiesel</string>
@@ -997,7 +997,7 @@
 	<string name="poi_theatre_genre_circus">Zirkoa</string>
 	<string name="poi_gallery">Arte galeria</string>
 	<string name="poi_dance_floor">Dantzarako pista</string>
-	<string name="poi_nightclub">Gau kluba</string>
+	<string name="poi_nightclub">Gau kluba;Disco;Disko</string>
 	<string name="poi_stripclub">Striptease kluba</string>
 	<string name="poi_ski_resort">Ski estazioa</string>
 	<string name="poi_dog_park">Txakur parkea</string>
@@ -3193,7 +3193,6 @@
 
 	<string name="poi_service_car">Kotxe zerbitzua</string>
 
-<string name="synonyms_poi_nightclub">Disco;Disko</string>
 	<string name="poi_glacier_type">Glaziar mota</string>
 
 <string name="poi_outdoor_seating_no">Kanpoko eserlekurik ez</string>
@@ -3210,7 +3209,6 @@
 	<string name="poi_resource_aggregate">Agregatua</string>
 	<string name="poi_checkpoint_type">Kontrol-postu mota</string>
 
-<string name="synonyms_poi_fuel">Gasolindegia; Zerbitzu estazioa;Erregai estazioa;Petrolio estazioa</string>
 
 	<string name="poi_tactile_paving_no">Ukimenezko zoladura gabe</string>
 	<string name="poi_capacity_disabled_no">Ez dago ezinduentzako toki berezirik</string>
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index 41bf31c359..b47ec66196 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -55,7 +55,7 @@
 	<string name="poi_car_repair">Autószerelő</string>
 	<string name="poi_service_tyres">Autógumi-szerelő</string>
 	<string name="poi_car_wash">Autómosó</string>
-	<string name="poi_fuel">Benzinkút</string>
+	<string name="poi_fuel">Benzinkút;Töltőállomás;Gázolajtöltő-állomás</string>
 	<string name="poi_electricity_combined_charging">Elektromos töltőállomás</string>
 	<string name="poi_compressed_air">Sűrített levegő</string>
 	<string name="poi_parking">Parkoló</string>
@@ -3798,9 +3798,7 @@
 
 <string name="poi_service_car">Autós szolgáltatás</string>
 
-<string name="synonyms_poi_fuel">Benzinkút;Töltőállomás;Gázolajtöltő-állomás</string>
 
-	<string name="synonyms_poi_nightclub">Diszkó;Disco;Night club</string>
 	<string name="poi_barbecue_grill">Barbecue, grill</string>
 
 	<string name="poi_water_utility">Vízmű irodája</string>
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index 658f7ccd9c..3b9420e09a 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -275,7 +275,7 @@
 
 	<string name="poi_service_tyres">Hjólbarðar</string>
 	<string name="poi_car_wash">Bílaþvottastöð</string>
-	<string name="poi_fuel">Bensínstöð</string>
+	<string name="poi_fuel">Bensínstöð;Eldsneytisáfylling;Eldsneytisafgreiðsla</string>
 	<string name="poi_fuel_diesel">Dísel</string>
 	<string name="poi_fuel_biodiesel">Lífdísel</string>
 	<string name="poi_fuel_octane_80">80 oktan</string>
@@ -2142,7 +2142,7 @@
 	<string name="poi_piste_ice_skate">Skautar</string>
 	<string name="poi_social_centre">Félagsmiðstöð</string>
 	<string name="poi_gallery">Listagallerí</string>
-	<string name="poi_nightclub">Næturklúbbur</string>
+	<string name="poi_nightclub">Næturklúbbur;Diskótek;Diskó</string>
 	<string name="poi_beach_resort">Strandbær</string>
 	<string name="poi_dog_park">Hundagarður</string>
 	<string name="poi_recreation_ground">Leikvöllur</string>
@@ -3716,7 +3716,6 @@
 
 <string name="poi_barbecue_grill">Steikingargrill: já</string>
 
-<string name="synonyms_poi_fuel">Bensínstöð;Eldsneytisáfylling;Eldsneytisafgreiðsla</string>
 
 	<string name="poi_denomination_congregational">Safnaðar (congregational)</string>
 	<string name="poi_health_specialty_podology_yes">Fótaheilsa</string>
@@ -3776,7 +3775,6 @@
 	<string name="poi_cuisine_sagardotegia">Sagardotegia eplavínstaður</string>
 	<string name="poi_water_utility">Vatnsveituskrifstofa</string>
 
-<string name="synonyms_poi_nightclub">Diskótek;Diskó</string>
 	<string name="poi_amusement_arcade">Spilasalur</string>
 	<string name="poi_adult_gaming_centre">Spilasalur fyrir fullorðna</string>
 
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index 950b6bfed5..d1f9c4e78b 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -57,7 +57,7 @@
 	<string name="poi_service_tyres">Gommista</string>
 	<string name="poi_vehicle_inspection">Centro revisioni</string>
 	<string name="poi_car_wash">Autolavaggio</string>
-	<string name="poi_fuel">Stazione di servizio</string>
+	<string name="poi_fuel">Stazione di servizio;Distributore; Pompa benzina</string>
 	<string name="poi_electricity_combined_charging">Stazione di ricarica</string>
 	<string name="poi_compressed_air">Aria compressa</string>
 	<string name="poi_parking">Parcheggio</string>
@@ -436,7 +436,7 @@
 	<string name="poi_theatre">Teatro</string>
 	<string name="poi_theatre_genre_circus">Circo</string>
 	<string name="poi_dance_floor">Sala da ballo</string>
-	<string name="poi_nightclub">Discoteca</string>
+	<string name="poi_nightclub">Discoteca;Disko;Disco;Club notturno</string>
 	<string name="poi_stripclub">Strip club</string>
 	<string name="poi_hunting_stand">Postazione di caccia</string>
 	<string name="poi_miniature_golf">Mini golf</string>
@@ -2439,7 +2439,6 @@
 	<string name="poi_climbing_style">Stile arrampicata</string>
 	<string name="poi_glacier_type">Tipo di ghiacciaio</string>
 
-<string name="synonyms_poi_fuel">Distributore; Pompa benzina</string>
 
 	<string name="poi_power_cable_distribution_cabinet">Armadio distribuzione elettrica</string>
 	<string name="poi_lighting_tower">Torre faro</string>
@@ -2479,7 +2478,6 @@
 
 	<string name="poi_recycling_foil">Pellicola</string>
 	<string name="poi_prosecutor">Procuratore</string>
-	<string name="synonyms_poi_nightclub">Discoteca;Disko;Disco;Club notturno</string>
 	<string name="poi_religion_unitarian_universalist">Universalismo unitariano</string>
 	<string name="poi_payment_cheque_no">Assegni non accettati</string>
 	<string name="poi_payment_routex_no">Carte carburanti Routex non accettate</string>
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index ee432fec78..a8d35db9e4 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -119,7 +119,7 @@
 	<string name="poi_traffic_calming_cushion">Rijbaankussen</string>
 	<string name="poi_traffic_signals">Verkeerslicht</string>
 
-	<string name="poi_fuel">Tankstation</string>
+	<string name="poi_fuel">Tankstation;Benzinestation;Benzinetankstation;Benzinepomp</string>
 	<string name="poi_parking">Parkeerplaats</string>
 	<string name="poi_motorcycle_parking">Motorparkeerplaats</string>
 	<string name="poi_parking_entrance">Parkeerplaats-toegang</string>
@@ -2494,7 +2494,6 @@
 	<string name="poi_climbing_style">Klimstijl</string>
 	<string name="poi_glacier_type">Soort gletsjer</string>
 
-<string name="synonyms_poi_fuel">Tankstation;Benzinestation;Benzinetankstation;Benzinepomp</string>
 
 	<string name="poi_wiki_lang_sh">Servo-Kroatische wiki</string>
 	<string name="poi_animal_shelter_wildlife">Wilde dieren</string>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 359d3dce01..e66acb180f 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -123,7 +123,7 @@
 	<string name="poi_service_tyres">Opony</string>
 	<string name="poi_vehicle_inspection">Stacja diagnostyczna</string>
 	<string name="poi_car_wash">Myjnia samochodowa</string>
-	<string name="poi_fuel">Stacja benzynowa</string>
+	<string name="poi_fuel">Stacja benzynowa;Stacja paliw;CPN;Tanksztela</string>
 	<string name="poi_electricity_combined_charging">Stacja ładowania</string>
 	<string name="poi_vehicle_ramp">Podnośnik</string>
 	<string name="poi_compressed_air">Kompresor</string>
@@ -361,7 +361,7 @@
 	<string name="poi_theatre">Teatr</string>
 	<string name="poi_theatre_genre_circus">Cyrk</string>
 	<string name="poi_dance_floor">Parkiet taneczny</string>
-	<string name="poi_nightclub">Klub nocny</string>
+	<string name="poi_nightclub">Klub nocny;Disco;Dyskoteka;Nightclub</string>
 	<string name="poi_leisure_fishing">Miejsce połowów</string>
 	<string name="poi_harbour">Port</string>
 	<string name="poi_miniature_golf">Miniaturowy golf</string>
@@ -3752,9 +3752,7 @@
 	<string name="poi_circumference">Obwód</string>
 	<string name="poi_diameter_crown">Średnica korony</string>
 
-	<string name="synonyms_poi_fuel">Stacja paliw;CPN;Tanksztela</string>
-
-	<string name="synonyms_poi_nightclub">Disco;Dyskoteka;Nightclub</string>
+	
 	<string name="poi_flooring">Sklep z podłogami</string>
 	<string name="poi_pottery">Garncarz</string>
 
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index 59da5e5954..91a8fece57 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -177,7 +177,7 @@
 	<string name="poi_service_tyres">Pneus</string>
 	<string name="poi_vehicle_inspection">Inspeção veicular</string>
 	<string name="poi_car_wash">Lavagem de carro</string>
-	<string name="poi_fuel">Posto de combustível</string>
+	<string name="poi_fuel">Posto de combustível;Posto de abastecimento;Posto de gasolina;Bomba de gasolina</string>
 	<string name="poi_fuel_diesel">Diesel</string>
 	<string name="poi_fuel_gtl_diesel">Diesel GPL</string>
 	<string name="poi_fuel_hgv_diesel">Diesel de veículos pesados</string>
@@ -601,7 +601,7 @@
 	<string name="poi_theatre_genre_circus">Circo</string>
 	<string name="poi_gallery">Galeria de arte</string>
 	<string name="poi_dance_floor">Pista de dança</string>
-	<string name="poi_nightclub">Danceteria</string>
+	<string name="poi_nightclub">Danceteria;Casa noturna;Boate</string>
 	<string name="poi_stripclub">Clube de striptease</string>
 	<string name="poi_ski_resort">Resort de esqui</string>
 	<string name="poi_beach_resort">Resort de praia</string>
@@ -3787,9 +3787,7 @@
 	<string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
 	<string name="poi_whitewater_rapid_name">Nome das corredeiras</string>
 
-<string name="synonyms_poi_fuel">Posto de abastecimento;Posto de gasolina;Bomba de gasolina</string>
 
-	<string name="synonyms_poi_nightclub">Casa noturna;Boate</string>
 	<string name="poi_climbing_multipitch_yes">Rotas multi-pitch: sim</string>
 	<string name="poi_climbing_multipitch_no">Rotas multi-pitch: não</string>
 	<string name="poi_socket_cee_red_16a_yes">CEE vermelha 16A</string>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index c9949f96e1..a0b34f0aad 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -154,7 +154,7 @@
 	<string name="poi_service_tyres">Шиномонтаж</string>
 	<string name="poi_vehicle_inspection">Пункт техосмотра</string>
 	<string name="poi_car_wash">Автомойка</string>
-	<string name="poi_fuel">Автомобильная заправка</string>
+	<string name="poi_fuel">Автомобильная заправка;Автозаправка;Бензоколонка;АЗС;Бензозаправка</string>
 	<string name="poi_electricity_combined_charging">Зарядная станция</string>
 	<string name="poi_vehicle_ramp">Ремонтная эстакада/яма</string>
 	<string name="poi_compressed_air">Подкачка шин</string>
@@ -548,8 +548,7 @@
 	<string name="poi_theatre">Театр, концертный зал</string>
 	<string name="poi_theatre_genre_circus">Цирк</string>
 	<string name="poi_dance_floor">Танцплощадка</string>
-	<string name="poi_nightclub">Ночной клуб</string>
-	<string name="synonyms_poi_nightclub">Диско</string>
+	<string name="poi_nightclub">Ночной клуб;Диско</string>
 	<string name="poi_stripclub">Стрипклуб</string>
 	<string name="poi_beach_resort">Пляжный комплекс</string>
 	<string name="poi_dog_park">Площадка для выгула собак</string>
@@ -3749,8 +3748,7 @@
 	<string name="poi_water_utility">Офис водоснабжения</string>
 	<string name="poi_energy_supplier">Офис поставщика электроэнергии</string>
 
-	<string name="synonyms_poi_fuel">Автомобильная заправка;Автозаправка;Бензоколонка;АЗС;Бензозаправка</string>
-
+	
 	<string name="poi_amusement_arcade">Игровой зал</string>
 	<string name="poi_adult_gaming_centre">Игровой зал для взрослых</string>
 
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index 235a4d3bf3..044a60b31e 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -372,7 +372,7 @@
 	<string name="poi_theatre">Teatru</string>
 	<string name="poi_theatre_genre_circus">Circu</string>
 	<string name="poi_dance_floor">Discoteca</string>
-	<string name="poi_nightclub">Nightclub</string>
+	<string name="poi_nightclub">Nightclub;Discoteca;Club noturnu;Nightclub</string>
 	<string name="poi_marina">Marina (portu minore)</string>
 	<string name="poi_swimming_pool">Piscina</string>
 	<string name="poi_park">Parcu</string>
@@ -548,7 +548,7 @@
 	<string name="poi_traffic_calming_table">Dossu a mesa</string>
 	<string name="poi_traffic_calming_choker">Restringhimentu de carrutzada rallentadore</string>
 	<string name="poi_car_wash">Autosabunadore</string>
-	<string name="poi_fuel">Rifornidore de carburante</string>
+	<string name="poi_fuel">Rifornidore de carburante;Distribudore de benzina;Istatzione de benzina;Istatzione de rifornimentu;Istatzione de servìtziu</string>
 	<string name="poi_skiing">Iscì</string>
 	<string name="poi_wreck">Relitu navale</string>
 	<string name="poi_alpine_hut">Pinnetu alpinu</string>
@@ -2987,9 +2987,7 @@
 	<string name="poi_service_car">Servìtziu pro sas automòbiles</string>
 	<string name="poi_glacier_type">Casta de astràrgiu</string>
 
-<string name="synonyms_poi_fuel">Rifornidore de carburante;Distribudore de benzina;Istatzione de benzina;Istatzione de rifornimentu;Istatzione de servìtziu</string>
 
-	<string name="synonyms_poi_nightclub">Discoteca;Club noturnu;Nightclub</string>
 	<string name="poi_lock_basin">Batzinu de serrada</string>
 	<string name="poi_counselling_type_addiction_yes">Consulèntzia professionale (dipendèntzia): eja</string>
 	<string name="poi_counselling_type_addiction_no">Consulèntzia professionale (dipendèntzia): nono</string>
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index 988ac1a37c..d8dacee46b 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -137,7 +137,7 @@
 	<string name="poi_service_tyres">Pneuservis</string>
 	<string name="poi_vehicle_inspection">Kontrola vozidla (technická/emisná)</string>
 	<string name="poi_car_wash">Autoumyváreň</string>
-	<string name="poi_fuel">Benzínová pumpa</string>
+	<string name="poi_fuel">Benzínová pumpa;Čerpacia stanica</string>
 	<string name="poi_electricity_combined_charging">Nabíjacia stanica</string>
 	<string name="poi_vehicle_ramp">Servisná rampa na auto</string>
 	<string name="poi_compressed_air">Stlačený vzduch</string>
@@ -423,7 +423,7 @@
 	<string name="poi_theatre">Divadlo</string>
 	<string name="poi_theatre_genre_circus">Cirkus</string>
 	<string name="poi_dance_floor">Tanečný parket</string>
-	<string name="poi_nightclub">Nočný zábavný klub</string>
+	<string name="poi_nightclub">Nočný zábavný klub;Diskotéka</string>
 	<string name="poi_stripclub">Striptízový klub</string>
 	<string name="poi_beach_resort">Plážový areál</string>
 	<string name="poi_dog_park">Výbeh pre psy</string>
@@ -3257,9 +3257,7 @@
 	<string name="poi_service_car">Služby pre autá</string>
 	<string name="poi_glacier_type">Typ ľadovca</string>
 
-<string name="synonyms_poi_fuel">Čerpacia stanica</string>
 
-	<string name="synonyms_poi_nightclub">Diskotéka</string>
 	<string name="poi_leisure_common">Obecná odpočinková zóna</string>
 	<string name="poi_architecture_new_objectivity">Architektúra: nový objektivizmus</string>
 	<string name="poi_architecture_timber_frame">Architektúra: drevená kostra</string>
diff --git a/OsmAnd/res/values-sr/phrases.xml b/OsmAnd/res/values-sr/phrases.xml
index 0674cd921a..a7af1afe75 100644
--- a/OsmAnd/res/values-sr/phrases.xml
+++ b/OsmAnd/res/values-sr/phrases.xml
@@ -731,8 +731,7 @@
 	<string name="poi_theatre_genre_circus">Циркус</string>
 	<string name="poi_gallery">Уметничка галерија</string>
 	<string name="poi_dance_floor">Подијум за игру</string>
-	<string name="poi_nightclub">Ноћни клуб</string>
-	<string name="synonyms_poi_nightclub">Диско клуб</string>
+	<string name="poi_nightclub">Ноћни клуб;Диско клуб</string>
 	<string name="poi_stripclub">Стриптиз</string>
 	<string name="poi_ski_resort">Ски омдаралиште</string>
 	<string name="poi_beach_resort">Морско одмаралиште</string>
diff --git a/OsmAnd/res/values-sv/phrases.xml b/OsmAnd/res/values-sv/phrases.xml
index d02a31fe8e..251b24438c 100644
--- a/OsmAnd/res/values-sv/phrases.xml
+++ b/OsmAnd/res/values-sv/phrases.xml
@@ -295,7 +295,7 @@
 	<string name="poi_service_tyres">Däck</string>
 	<string name="poi_vehicle_inspection">Bilprovning</string>
 	<string name="poi_car_wash">Biltvätt</string>
-	<string name="poi_fuel">Bensinstation</string>
+	<string name="poi_fuel">Bensinstation;Bränslestation;Bränsle</string>
 	<string name="poi_fuel_diesel">Diesel</string>
 	<string name="poi_fuel_gtl_diesel">GTL-diesel</string>
 	<string name="poi_fuel_hgv_diesel">HGV-diesel</string>
@@ -887,7 +887,7 @@
 	<string name="poi_theatre_genre_circus">Cirkus</string>
 	<string name="poi_gallery">Konstgalleri</string>
 	<string name="poi_dance_floor">Dansgolv</string>
-	<string name="poi_nightclub">Nattklubb</string>
+	<string name="poi_nightclub">Nattklubb;Disco;Disko</string>
 	<string name="poi_stripclub">Strippklubb</string>
 	<string name="poi_ski_resort">Vintersemesteranläggning</string>
 	<string name="poi_beach_resort">Strandsemesteranläggning</string>
@@ -1956,7 +1956,7 @@
 	<string name="poi_barbecue_grill">Grill: ja</string>
 
 <string name="poi_buoy_safe_water">Mittledsboj</string>
-	<string name="synonyms_poi_fuel">Bensinstation;Bränslestation;Bränsle</string>
+	
 
 	<string name="poi_buoy_special_purpose">Specialboj</string>
 	<string name="poi_daymark">Båk</string>
@@ -2415,7 +2415,6 @@
 
 	<string name="poi_historic_civilization_ancient_roman">Civilisation: det antika romerska (753 F.KR – 284 E.KR.)</string>
 	<string name="poi_historic_civilization_nuragic">Civilisation: nuragherkulturen (18 F.KR – 2 E.KR)</string>
-	<string name="synonyms_poi_nightclub">Disco;Disko</string>
 	<string name="poi_social_facility_outreach">Uppsökande</string>
 	<string name="poi_historic_civilization_etruscan">Civilisation: etruskisk (500-talet F.Kr. - 1300-talet E.Kr.)</string>
 	<string name="poi_historic_civilization_prehistoric">Civilisation: förhistorisk</string>
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 8f25eecbc8..c46abaa967 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -3818,11 +3818,9 @@
 
 <string name="poi_barbecue_grill">烤肉架：是的</string>
 
-<string name="synonyms_poi_fuel">加油站;加油站;加油站;加油站</string>
 
 	<string name="poi_water_utility">自來水公司辦事處</string>
 
-<string name="synonyms_poi_nightclub">Disco;Disko</string>
 	<string name="poi_amusement_arcade">電子遊樂場</string>
 	<string name="poi_adult_gaming_centre">成人遊戲中心</string>
 
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 89a6053908..3fb134830f 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -315,8 +315,7 @@
 	<string name="poi_service_tyres">Tires</string>
 	<string name="poi_vehicle_inspection">Vehicle inspection</string>
 	<string name="poi_car_wash">Car wash</string>
-	<string name="poi_fuel">Gas station</string>
-	<string name="synonyms_poi_fuel">Gas station;Gasoline station;Filling station;Petrol station</string>
+	<string name="poi_fuel">Gas station;Gasoline station;Filling station;Petrol station</string>
 
 	<string name="poi_fuel_diesel">Diesel</string>
 	<string name="poi_fuel_gtl_diesel">GTL diesel</string>
@@ -921,8 +920,7 @@
 	<string name="poi_theatre_genre_circus">Circus</string>
 	<string name="poi_gallery">Art gallery</string>
 	<string name="poi_dance_floor">Dance floor</string>
-	<string name="poi_nightclub">Nightclub</string>
-	<string name="synonyms_poi_nightclub">Disco;Disko</string>
+	<string name="poi_nightclub">Nightclub;Disco;Disko</string>
 	<string name="poi_stripclub">Stripclub</string>
 	<string name="poi_ski_resort">Ski resort</string>
 	<string name="poi_beach_resort">Beach resort</string>
@@ -2356,7 +2354,7 @@
 	<string name="poi_social_facility_for_drug_addicted">Drug addicted</string>
 	<string name="poi_social_facility_for_unemployed">Unemployed</string>
 	<string name="poi_social_facility_for_diseased">Diseased</string>
-	<string name="poi_social_facility_for_child_juvenile">Child;juvenile</string>
+	<string name="poi_social_facility_for_child_juvenile">Child juvenile</string>
 
 	<string name="poi_theatre_genre_philharmonic">Philharmonic</string>
 	<string name="poi_theatre_genre_musical">Musical</string>
@@ -2502,7 +2500,7 @@
 	<string name="poi_material_plastic">Material: plastic</string>
 	<string name="poi_material_sandstone">Material: sandstone</string>
 	<string name="poi_material_granite_stone">Material: granite stone</string>
-	<string name="poi_material_metal_wood">Material: metal;wood</string>
+	<string name="poi_material_metal_wood">Material: metal, wood</string>
 	<string name="poi_material_glass">Material: glass</string>
 	<string name="poi_material_bronze">Material: bronze</string>
 	<string name="poi_material_earth">Material: earth</string>
@@ -3407,7 +3405,7 @@
 
 	<string name="poi_motorcycle_sales_yes">Sales</string>
 	<string name="poi_motorcycle_sales_no">Sales: no</string>
-	<string name="poi_motorcycle_sales_yes_used">Sales: yes; used</string>
+	<string name="poi_motorcycle_sales_yes_used">Sales: yes, used</string>
 	<string name="poi_motorcycle_sales_used">Sales: used</string>
 	<string name="poi_motorcycle_rental_yes">Rental</string>
 	<string name="poi_motorcycle_rental_no">Rental: no</string>