diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index a93c452fe2..4955d3c2f6 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -3769,27 +3769,27 @@
 
 	<string name="poi_socket">Раздым</string>
 
-<string name="poi_osmand_socket_cee_blue_yes">CEE блакітны</string>
-	<string name="poi_osmand_socket_cee_red_16a_yes">CEE чырвоны 16A</string>
-	<string name="poi_osmand_socket_cee_red_32a_yes">CEE чырвоны 32A</string>
-	<string name="poi_osmand_socket_cee_red_64a_yes">CEE чырвоны 64A</string>
-	<string name="poi_osmand_socket_cee_red_125a_yes">CEE чырвоны 125A</string>
-	<string name="poi_osmand_socket_type1_yes">Type 1</string>
-	<string name="poi_osmand_socket_type1_combo_yes">Type 1 combo</string>
-	<string name="poi_osmand_socket_type2_yes">Type 2</string>
-	<string name="poi_osmand_socket_type2_combo_yes">Type 2 combo</string>
-	<string name="poi_osmand_socket_type3_yes">Type 3</string>
-	<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
-	<string name="poi_osmand_socket_tesla_standard_yes">Tesla standard</string>
-	<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
-	<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
-	<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
-	<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
-	<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
-	<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
-	<string name="poi_osmand_socket_schuko_yes">Schuko</string>
-	<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
-	<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
+<string name="poi_socket_cee_blue_yes">CEE блакітны</string>
+	<string name="poi_socket_cee_red_16a_yes">CEE чырвоны 16A</string>
+	<string name="poi_socket_cee_red_32a_yes">CEE чырвоны 32A</string>
+	<string name="poi_socket_cee_red_64a_yes">CEE чырвоны 64A</string>
+	<string name="poi_socket_cee_red_125a_yes">CEE чырвоны 125A</string>
+	<string name="poi_socket_type1_yes">Type 1</string>
+	<string name="poi_socket_type1_combo_yes">Type 1 combo</string>
+	<string name="poi_socket_type2_yes">Type 2</string>
+	<string name="poi_socket_type2_combo_yes">Type 2 combo</string>
+	<string name="poi_socket_type3_yes">Type 3</string>
+	<string name="poi_socket_chademo_yes">CHAdeMO</string>
+	<string name="poi_socket_tesla_standard_yes">Tesla standard</string>
+	<string name="poi_socket_tesla_supercharger_yes">Tesla Supercharger</string>
+	<string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
+	<string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+	<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+	<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+	<string name="poi_socket_schuko_yes">Schuko</string>
+	<string name="poi_socket_bs1363_yes">BS 1363</string>
+	<string name="poi_socket_as3112_yes">AS/NZS 3112</string>
 
 
 
diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml
index d9611b0100..5b9d2d92b6 100644
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@@ -3734,30 +3734,30 @@
 
 <string name="poi_socket">Ŝtopilo</string>
 
-<string name="poi_osmand_socket_cee_blue_yes">CEE blua</string>
+<string name="poi_socket_cee_blue_yes">CEE blua</string>
 
 
 
-<string name="poi_osmand_socket_cee_red_16a_yes">CEE ruĝa 16A</string>
-	<string name="poi_osmand_socket_cee_red_32a_yes">CEE ruĝa 32A</string>
-	<string name="poi_osmand_socket_cee_red_64a_yes">CEE ruĝa 64A</string>
-	<string name="poi_osmand_socket_cee_red_125a_yes">CEE ruĝa 125A</string>
-	<string name="poi_osmand_socket_type1_yes">tipo 1</string>
-	<string name="poi_osmand_socket_type1_combo_yes">tipo 1 CCS</string>
-	<string name="poi_osmand_socket_type2_yes">tipo 2</string>
-	<string name="poi_osmand_socket_type2_combo_yes">tipo 2 CCS</string>
-	<string name="poi_osmand_socket_type3_yes">tipo 3</string>
-	<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
-	<string name="poi_osmand_socket_tesla_standard_yes">Tesla</string>
-	<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
-	<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
-	<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
-	<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
-	<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
-	<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
-	<string name="poi_osmand_socket_schuko_yes">Schuko</string>
-	<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
-	<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
+<string name="poi_socket_cee_red_16a_yes">CEE ruĝa 16A</string>
+	<string name="poi_socket_cee_red_32a_yes">CEE ruĝa 32A</string>
+	<string name="poi_socket_cee_red_64a_yes">CEE ruĝa 64A</string>
+	<string name="poi_socket_cee_red_125a_yes">CEE ruĝa 125A</string>
+	<string name="poi_socket_type1_yes">tipo 1</string>
+	<string name="poi_socket_type1_combo_yes">tipo 1 CCS</string>
+	<string name="poi_socket_type2_yes">tipo 2</string>
+	<string name="poi_socket_type2_combo_yes">tipo 2 CCS</string>
+	<string name="poi_socket_type3_yes">tipo 3</string>
+	<string name="poi_socket_chademo_yes">CHAdeMO</string>
+	<string name="poi_socket_tesla_standard_yes">Tesla</string>
+	<string name="poi_socket_tesla_supercharger_yes">Tesla Supercharger</string>
+	<string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
+	<string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+	<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+	<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+	<string name="poi_socket_schuko_yes">Schuko</string>
+	<string name="poi_socket_bs1363_yes">BS 1363</string>
+	<string name="poi_socket_as3112_yes">AS/NZS 3112</string>
 
 
 
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index d2bc274913..58c38d840b 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -3780,30 +3780,30 @@
 
 <string name="poi_socket">Enchufe</string>
 
-<string name="poi_osmand_socket_cee_blue_yes">CEE azul</string>
+<string name="poi_socket_cee_blue_yes">CEE azul</string>
 
 
 
-<string name="poi_osmand_socket_cee_red_16a_yes">CEE rojo 16A</string>
-	<string name="poi_osmand_socket_cee_red_32a_yes">CEE rojo 32A</string>
-	<string name="poi_osmand_socket_cee_red_64a_yes">CEE rojo 64A</string>
-	<string name="poi_osmand_socket_cee_red_125a_yes">CEE rojo 125A</string>
-	<string name="poi_osmand_socket_type1_yes">Tipo 1</string>
-	<string name="poi_osmand_socket_type1_combo_yes">Tipo 1 combo</string>
-	<string name="poi_osmand_socket_type2_yes">Tipo 2</string>
-	<string name="poi_osmand_socket_type2_combo_yes">Tipo 2 combo</string>
-	<string name="poi_osmand_socket_type3_yes">Tipo 3</string>
-	<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
-	<string name="poi_osmand_socket_tesla_standard_yes">Tesla estándar</string>
-	<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
-	<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
-	<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
-	<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
-	<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
-	<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
-	<string name="poi_osmand_socket_schuko_yes">Schuko</string>
-	<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
-	<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</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>
+	<string name="poi_socket_cee_red_64a_yes">CEE rojo 64A</string>
+	<string name="poi_socket_cee_red_125a_yes">CEE rojo 125A</string>
+	<string name="poi_socket_type1_yes">Tipo 1</string>
+	<string name="poi_socket_type1_combo_yes">Tipo 1 combo</string>
+	<string name="poi_socket_type2_yes">Tipo 2</string>
+	<string name="poi_socket_type2_combo_yes">Tipo 2 combo</string>
+	<string name="poi_socket_type3_yes">Tipo 3</string>
+	<string name="poi_socket_chademo_yes">CHAdeMO</string>
+	<string name="poi_socket_tesla_standard_yes">Tesla estándar</string>
+	<string name="poi_socket_tesla_supercharger_yes">Tesla Supercharger</string>
+	<string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
+	<string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+	<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+	<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+	<string name="poi_socket_schuko_yes">Schuko</string>
+	<string name="poi_socket_bs1363_yes">BS 1363</string>
+	<string name="poi_socket_as3112_yes">AS/NZS 3112</string>
 
 
 
diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index 424d709445..aecfc1a60f 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -3542,27 +3542,27 @@
 
 <string name="poi_socket">Conector</string>
 
-<string name="poi_osmand_socket_cee_blue_yes">CEE azul</string>
-	<string name="poi_osmand_socket_cee_red_16a_yes">CEE rojo 16A</string>
-	<string name="poi_osmand_socket_cee_red_32a_yes">CEE rojo 32A</string>
-	<string name="poi_osmand_socket_cee_red_64a_yes">CEE rojo 64A</string>
-	<string name="poi_osmand_socket_cee_red_125a_yes">CEE rojo 125A</string>
-	<string name="poi_osmand_socket_type1_yes">Tipo 1</string>
-	<string name="poi_osmand_socket_type1_combo_yes">Tipo 1 combo</string>
-	<string name="poi_osmand_socket_type2_yes">Tipo 2</string>
-	<string name="poi_osmand_socket_type2_combo_yes">Tipo 2 combo</string>
-	<string name="poi_osmand_socket_type3_yes">Tipo 3</string>
-	<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
-	<string name="poi_osmand_socket_tesla_standard_yes">Tesla estándar</string>
-	<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
-	<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
-	<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
-	<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
-	<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
-	<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
-	<string name="poi_osmand_socket_schuko_yes">Schuko</string>
-	<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
-	<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</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>
+	<string name="poi_socket_cee_red_64a_yes">CEE rojo 64A</string>
+	<string name="poi_socket_cee_red_125a_yes">CEE rojo 125A</string>
+	<string name="poi_socket_type1_yes">Tipo 1</string>
+	<string name="poi_socket_type1_combo_yes">Tipo 1 combo</string>
+	<string name="poi_socket_type2_yes">Tipo 2</string>
+	<string name="poi_socket_type2_combo_yes">Tipo 2 combo</string>
+	<string name="poi_socket_type3_yes">Tipo 3</string>
+	<string name="poi_socket_chademo_yes">CHAdeMO</string>
+	<string name="poi_socket_tesla_standard_yes">Tesla estándar</string>
+	<string name="poi_socket_tesla_supercharger_yes">Tesla Supercharger</string>
+	<string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
+	<string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+	<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+	<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+	<string name="poi_socket_schuko_yes">Schuko</string>
+	<string name="poi_socket_bs1363_yes">BS 1363</string>
+	<string name="poi_socket_as3112_yes">AS/NZS 3112</string>
 
 
 
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index d5351c1597..c1d1938c38 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -3738,7 +3738,7 @@
 
 <string name="poi_socket">Konnektor</string>
 
-<string name="poi_osmand_socket_cee_blue_yes">kék CEE</string>
+<string name="poi_socket_cee_blue_yes">kék CEE</string>
 
 
 
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index 98573b9f64..2d51946a17 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -3581,7 +3581,7 @@
 	<string name="poi_historic_era_neolithic">Sögutímabil: nýsteinöld</string>
 	<string name="poi_historic_era_chalcolithic">Sögutímabil: koparöld (4-3 árþúsund f.Kr.)</string>
 
-	<string name="poi_osmand_socket_cee_blue_yes">CEE blátt</string>
+	<string name="poi_socket_cee_blue_yes">CEE blátt</string>
 
 
 
@@ -3597,26 +3597,26 @@
 	<string name="poi_health_specialty_obstetrics_antenatal_no">Heilsutengt sérsvið: fæðingarlækningar (meðganga): nei</string>
 	<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Fæðingarlækningar (keisaraskurður)</string>
 	<string name="poi_health_specialty_obstetrics_caesarean_section_no">Heilsutengt sérsvið: fæðingarlækningar (keisaraskurður): nei</string>
-	<string name="poi_osmand_socket_cee_red_16a_yes">CEE rautt 16A</string>
-	<string name="poi_osmand_socket_cee_red_32a_yes">CEE rautt 32A</string>
-	<string name="poi_osmand_socket_cee_red_64a_yes">CEE rautt 64A</string>
-	<string name="poi_osmand_socket_cee_red_125a_yes">CEE rautt 125A</string>
-	<string name="poi_osmand_socket_type1_yes">Type 1</string>
-	<string name="poi_osmand_socket_type1_combo_yes">Type 1 combo</string>
-	<string name="poi_osmand_socket_type2_yes">Type 2</string>
-	<string name="poi_osmand_socket_type2_combo_yes">Type 2 combo</string>
-	<string name="poi_osmand_socket_type3_yes">Type 3</string>
-	<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
-	<string name="poi_osmand_socket_tesla_standard_yes">Staðlað Tesla</string>
-	<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
-	<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
-	<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
-	<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
-	<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
-	<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
-	<string name="poi_osmand_socket_schuko_yes">Schuko</string>
-	<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
-	<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
+	<string name="poi_socket_cee_red_16a_yes">CEE rautt 16A</string>
+	<string name="poi_socket_cee_red_32a_yes">CEE rautt 32A</string>
+	<string name="poi_socket_cee_red_64a_yes">CEE rautt 64A</string>
+	<string name="poi_socket_cee_red_125a_yes">CEE rautt 125A</string>
+	<string name="poi_socket_type1_yes">Type 1</string>
+	<string name="poi_socket_type1_combo_yes">Type 1 combo</string>
+	<string name="poi_socket_type2_yes">Type 2</string>
+	<string name="poi_socket_type2_combo_yes">Type 2 combo</string>
+	<string name="poi_socket_type3_yes">Type 3</string>
+	<string name="poi_socket_chademo_yes">CHAdeMO</string>
+	<string name="poi_socket_tesla_standard_yes">Staðlað Tesla</string>
+	<string name="poi_socket_tesla_supercharger_yes">Tesla Supercharger</string>
+	<string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
+	<string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+	<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+	<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+	<string name="poi_socket_schuko_yes">Schuko</string>
+	<string name="poi_socket_bs1363_yes">BS 1363</string>
+	<string name="poi_socket_as3112_yes">AS/NZS 3112</string>
 
 
 
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 2c8430bf38..c3521eed8e 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -3736,7 +3736,7 @@
 
 <string name="poi_socket">Gniazdo elektryczne</string>
 
-<string name="poi_osmand_socket_cee_blue_yes">CEE niebieska</string>
+<string name="poi_socket_cee_blue_yes">CEE niebieska</string>
 
 
 
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index f64bba7c07..f1953c055d 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -3719,27 +3719,27 @@
 
 	<string name="poi_cannabis">"Магазин конопель "</string>
 
-	<string name="poi_osmand_socket_cee_blue_yes">CEE блакитний</string>
-	<string name="poi_osmand_socket_cee_red_16a_yes">CEE червоний 16A</string>
-	<string name="poi_osmand_socket_cee_red_32a_yes">CEE червоний 32A</string>
-	<string name="poi_osmand_socket_cee_red_64a_yes">CEE червоний 64A</string>
-	<string name="poi_osmand_socket_cee_red_125a_yes">CEE червоний 125A</string>
-	<string name="poi_osmand_socket_type1_yes">Тип 1</string>
-	<string name="poi_osmand_socket_type1_combo_yes">Тип 1 комбінований</string>
-	<string name="poi_osmand_socket_type2_yes">Тип 2</string>
-	<string name="poi_osmand_socket_type2_combo_yes">Тип 2 комбінований</string>
-	<string name="poi_osmand_socket_type3_yes">Тип 3</string>
-	<string name="poi_osmand_socket_chademo_yes">"CHAdeMO "</string>
-	<string name="poi_osmand_socket_tesla_standard_yes">"Стандарт Тесла "</string>
-	<string name="poi_osmand_socket_tesla_supercharger_yes">Тесла Supercharger</string>
-	<string name="poi_osmand_socket_tesla_roadster_yes">Тесла Родстер</string>
-	<string name="poi_osmand_socket_nema_5_15_yes">"NEMA 5-15R "</string>
-	<string name="poi_osmand_socket_nema_5_20_yes">"NEMA 5-20 "</string>
-	<string name="poi_osmand_socket_nema_14_30_yes">"NEMA 14-30 "</string>
-	<string name="poi_osmand_socket_nema_14_50_yes">"NEMA 14-50 "</string>
-	<string name="poi_osmand_socket_schuko_yes">Щуко</string>
-	<string name="poi_osmand_socket_bs1363_yes">"BS 1363 "</string>
-	<string name="poi_osmand_socket_as3112_yes">"AS/NZS 3112 "</string>
+	<string name="poi_socket_cee_blue_yes">CEE блакитний</string>
+	<string name="poi_socket_cee_red_16a_yes">CEE червоний 16A</string>
+	<string name="poi_socket_cee_red_32a_yes">CEE червоний 32A</string>
+	<string name="poi_socket_cee_red_64a_yes">CEE червоний 64A</string>
+	<string name="poi_socket_cee_red_125a_yes">CEE червоний 125A</string>
+	<string name="poi_socket_type1_yes">Тип 1</string>
+	<string name="poi_socket_type1_combo_yes">Тип 1 комбінований</string>
+	<string name="poi_socket_type2_yes">Тип 2</string>
+	<string name="poi_socket_type2_combo_yes">Тип 2 комбінований</string>
+	<string name="poi_socket_type3_yes">Тип 3</string>
+	<string name="poi_socket_chademo_yes">"CHAdeMO "</string>
+	<string name="poi_socket_tesla_standard_yes">"Стандарт Тесла "</string>
+	<string name="poi_socket_tesla_supercharger_yes">Тесла Supercharger</string>
+	<string name="poi_socket_tesla_roadster_yes">Тесла Родстер</string>
+	<string name="poi_socket_nema_5_15_yes">"NEMA 5-15R "</string>
+	<string name="poi_socket_nema_5_20_yes">"NEMA 5-20 "</string>
+	<string name="poi_socket_nema_14_30_yes">"NEMA 14-30 "</string>
+	<string name="poi_socket_nema_14_50_yes">"NEMA 14-50 "</string>
+	<string name="poi_socket_schuko_yes">Щуко</string>
+	<string name="poi_socket_bs1363_yes">"BS 1363 "</string>
+	<string name="poi_socket_as3112_yes">"AS/NZS 3112 "</string>
 
 
 
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 491b700819..b393d746b4 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -3756,30 +3756,30 @@
 
 	<string name="poi_socket">插座</string>
 
-<string name="poi_osmand_socket_cee_blue_yes">CEE 藍色</string>
+<string name="poi_socket_cee_blue_yes">CEE 藍色</string>
 
 
 
-<string name="poi_osmand_socket_cee_red_16a_yes">CEE 紅色 16A</string>
-	<string name="poi_osmand_socket_cee_red_32a_yes">CEE 紅色 32A</string>
-	<string name="poi_osmand_socket_cee_red_64a_yes">CEE 紅色 64A</string>
-	<string name="poi_osmand_socket_cee_red_125a_yes">CEE 紅色 125A</string>
-	<string name="poi_osmand_socket_type1_yes">種類 1</string>
-	<string name="poi_osmand_socket_type1_combo_yes">種類 1 二合一</string>
-	<string name="poi_osmand_socket_type2_yes">種類 2</string>
-	<string name="poi_osmand_socket_type2_combo_yes">種類 2 二合一</string>
-	<string name="poi_osmand_socket_type3_yes">種類 3</string>
-	<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
-	<string name="poi_osmand_socket_tesla_standard_yes">特斯拉標準</string>
-	<string name="poi_osmand_socket_tesla_supercharger_yes">特斯拉超級充電站</string>
-	<string name="poi_osmand_socket_tesla_roadster_yes">特斯拉 Roadster</string>
-	<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
-	<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
-	<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
-	<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
-	<string name="poi_osmand_socket_schuko_yes">Schuko</string>
-	<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
-	<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
+<string name="poi_socket_cee_red_16a_yes">CEE 紅色 16A</string>
+	<string name="poi_socket_cee_red_32a_yes">CEE 紅色 32A</string>
+	<string name="poi_socket_cee_red_64a_yes">CEE 紅色 64A</string>
+	<string name="poi_socket_cee_red_125a_yes">CEE 紅色 125A</string>
+	<string name="poi_socket_type1_yes">種類 1</string>
+	<string name="poi_socket_type1_combo_yes">種類 1 二合一</string>
+	<string name="poi_socket_type2_yes">種類 2</string>
+	<string name="poi_socket_type2_combo_yes">種類 2 二合一</string>
+	<string name="poi_socket_type3_yes">種類 3</string>
+	<string name="poi_socket_chademo_yes">CHAdeMO</string>
+	<string name="poi_socket_tesla_standard_yes">特斯拉標準</string>
+	<string name="poi_socket_tesla_supercharger_yes">特斯拉超級充電站</string>
+	<string name="poi_socket_tesla_roadster_yes">特斯拉 Roadster</string>
+	<string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+	<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+	<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+	<string name="poi_socket_schuko_yes">Schuko</string>
+	<string name="poi_socket_bs1363_yes">BS 1363</string>
+	<string name="poi_socket_as3112_yes">AS/NZS 3112</string>
 
 
 
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 0d40b96c79..df2d0f3822 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -3709,27 +3709,27 @@
 
 	<string name="poi_cannabis">Cannabis store</string>
 
-	<string name="poi_osmand_socket_cee_blue_yes">CEE blue</string>
-	<string name="poi_osmand_socket_cee_red_16a_yes">CEE red 16A</string>
-	<string name="poi_osmand_socket_cee_red_32a_yes">CEE red 32A</string>
-	<string name="poi_osmand_socket_cee_red_64a_yes">CEE red 64A</string>
-	<string name="poi_osmand_socket_cee_red_125a_yes">CEE red 125A</string>
-	<string name="poi_osmand_socket_type1_yes">Type 1</string>
-	<string name="poi_osmand_socket_type1_combo_yes">Type 1 combo</string>
-	<string name="poi_osmand_socket_type2_yes">Type 2</string>
-	<string name="poi_osmand_socket_type2_combo_yes">Type 2 combo</string>
-	<string name="poi_osmand_socket_type3_yes">Type 3</string>
-	<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
-	<string name="poi_osmand_socket_tesla_standard_yes">Tesla standard</string>
-	<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
-	<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
-	<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
-	<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
-	<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
-	<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
-	<string name="poi_osmand_socket_schuko_yes">Schuko</string>
-	<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
-	<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
+	<string name="poi_socket_cee_blue_yes">CEE blue</string>
+	<string name="poi_socket_cee_red_16a_yes">CEE red 16A</string>
+	<string name="poi_socket_cee_red_32a_yes">CEE red 32A</string>
+	<string name="poi_socket_cee_red_64a_yes">CEE red 64A</string>
+	<string name="poi_socket_cee_red_125a_yes">CEE red 125A</string>
+	<string name="poi_socket_type1_yes">Type 1</string>
+	<string name="poi_socket_type1_combo_yes">Type 1 combo</string>
+	<string name="poi_socket_type2_yes">Type 2</string>
+	<string name="poi_socket_type2_combo_yes">Type 2 combo</string>
+	<string name="poi_socket_type3_yes">Type 3</string>
+	<string name="poi_socket_chademo_yes">CHAdeMO</string>
+	<string name="poi_socket_tesla_standard_yes">Tesla standard</string>
+	<string name="poi_socket_tesla_supercharger_yes">Tesla Supercharger</string>
+	<string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
+	<string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+	<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+	<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+	<string name="poi_socket_schuko_yes">Schuko</string>
+	<string name="poi_socket_bs1363_yes">BS 1363</string>
+	<string name="poi_socket_as3112_yes">AS/NZS 3112</string>