From b54b6a0cf2ad9dfdb1a373b2ba7c2cd3c8a0b0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20de=20Metz?= <francois@2metz.fr>
Date: Thu, 22 Nov 2018 19:58:55 +0100
Subject: [PATCH 1/4] Add 360 images mapillary filter.

---
 .../res/layout/fragment_mapillary_filters.xml | 49 ++++++++++++++++++-
 OsmAnd/res/values/strings.xml                 |  3 +-
 .../src/net/osmand/plus/OsmandSettings.java   |  1 +
 .../mapillary/MapillaryFiltersFragment.java   | 46 ++++++++++++-----
 .../plus/mapillary/MapillaryVectorLayer.java  |  7 ++-
 5 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_mapillary_filters.xml b/OsmAnd/res/layout/fragment_mapillary_filters.xml
index a3baf12f4e..3535fec6be 100644
--- a/OsmAnd/res/layout/fragment_mapillary_filters.xml
+++ b/OsmAnd/res/layout/fragment_mapillary_filters.xml
@@ -376,6 +376,53 @@
                 android:background="?attr/dashboard_divider" />
         </LinearLayout>
 
+        <RelativeLayout
+            android:id="@+id/pano_row"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/bg_color"
+            android:minHeight="60dp"
+            tools:layout_height="60dp">
+
+            <android.support.v7.widget.SwitchCompat
+                android:id="@+id/pano_row_toggle"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:focusable="false" />
+
+            <android.support.v7.widget.AppCompatTextView
+                android:id="@+id/pano_row_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                android:text="@string/mapillary_menu_title_pano"
+                android:paddingLeft="52dp" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:animateLayoutChanges="true"
+            android:background="?attr/bg_color"
+            android:orientation="vertical"
+            android:paddingLeft="52dp"
+            android:paddingStart="52dp">
+            <View
+                android:layout_width="wrap_content"
+                android:layout_height="1dp"
+                android:background="?attr/dashboard_divider" />
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -426,4 +473,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index fcd0dae558..fb8b1046cb 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -373,7 +373,8 @@
     <string name="mapillary_menu_edit_text_hint">Type username</string>
     <string name="mapillary_menu_descr_username">View only images added by</string>
     <string name="mapillary_menu_title_username">Username</string>
-    <string name="mapillary_menu_filter_description">Filter images by submitter or by date. Only active in closeup zoom.</string>
+    <string name="mapillary_menu_filter_description">Filter images by submitter, by date or by type. Only active in closeup zoom.</string>
+    <string name="mapillary_menu_title_pano">Display only 360° images</string>
     <string name="map_widget_ruler_control">Radius ruler</string>
     <string name="shared_string_permissions">Permissions</string>
     <string name="import_gpx_failed_descr">OsmAnd cannot import the file. Please check if OsmAnd has permission to read file from its location.</string>
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 4bb77455e1..c63d2ca786 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -823,6 +823,7 @@ public class OsmandSettings {
 	public final CommonPreference<String> MAPILLARY_FILTER_USERNAME = new StringPreference("mapillary_filter_username", "").makeGlobal();
 	public final CommonPreference<Long> MAPILLARY_FILTER_FROM_DATE = new LongPreference("mapillary_filter_from_date", 0).makeGlobal();
 	public final CommonPreference<Long> MAPILLARY_FILTER_TO_DATE = new LongPreference("mapillary_filter_to_date", 0).makeGlobal();
+	public final CommonPreference<Boolean> MAPILLARY_FILTER_PANO = new BooleanPreference("mapillary_filter_pano", false).makeGlobal();
 
 	public final CommonPreference<Boolean> USE_FAST_RECALCULATION = new BooleanPreference("use_fast_recalculation", true).makeGlobal().cache();
 	public final CommonPreference<Boolean> FORCE_PRIVATE_ACCESS_ROUTING_ASKED = new BooleanPreference("force_private_access_routing", false).makeProfile().cache();
diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java
index 2066537a31..c38ee0b279 100644
--- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java
@@ -115,7 +115,6 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
         ((AppCompatImageView) view.findViewById(R.id.mapillary_filters_date_icon)).setImageDrawable(getIcon(R.drawable.ic_action_data, colorRes));
         ((AppCompatImageView) view.findViewById(R.id.mapillary_filters_tile_cache_icon)).setImageDrawable(getIcon(R.drawable.ic_layer_top_dark, colorRes));
 
-
         final DelayAutoCompleteTextView textView = (DelayAutoCompleteTextView) view.findViewById(R.id.auto_complete_text_view);
         textView.setAdapter(new MapillaryAutoCompleteAdapter(getContext(), R.layout.auto_complete_suggestion, getMyApplication()));
         String selectedUsername = settings.MAPILLARY_FILTER_USERNAME.get();
@@ -150,13 +149,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
             @Override
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
                 view.findViewById(R.id.warning_linear_layout).setVisibility(View.GONE);
-                if (!settings.MAPILLARY_FILTER_USERNAME.get().equals("") ||
-                        settings.MAPILLARY_FILTER_TO_DATE.get() != 0 ||
-                        settings.MAPILLARY_FILTER_FROM_DATE.get() != 0) {
-                    changeButtonState((Button) view.findViewById(R.id.button_apply), 1, true);
-                } else {
-                    changeButtonState((Button) view.findViewById(R.id.button_apply), .5f, false);
-                }
+                enableButtonApply(view);
             }
 
             @Override
@@ -179,7 +172,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
                 from.set(Calendar.DAY_OF_MONTH, dayOfMonth);
                 dateFromEt.setText(dateFormat.format(from.getTime()));
                 settings.MAPILLARY_FILTER_FROM_DATE.set(from.getTimeInMillis());
-                changeButtonState((Button) view.findViewById(R.id.button_apply), 1, true);
+                enableButtonApply(view);
                 mapActivity.getDashboard().refreshContent(true);
             }
         };
@@ -206,7 +199,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
                 to.set(Calendar.DAY_OF_MONTH, dayOfMonth);
                 dateToEt.setText(dateFormat.format(to.getTime()));
                 settings.MAPILLARY_FILTER_TO_DATE.set(to.getTimeInMillis());
-                changeButtonState((Button) view.findViewById(R.id.button_apply), 1, true);
+                enableButtonApply(view);
                 mapActivity.getDashboard().refreshContent(true);
             }
         };
@@ -233,9 +226,28 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
             }
         }
 
+        final View rowPano = view.findViewById(R.id.pano_row);
+        final CompoundButton pano = (CompoundButton) rowPano.findViewById(R.id.pano_row_toggle);
+        pano.setOnCheckedChangeListener(null);
+        pano.setChecked(settings.MAPILLARY_FILTER_PANO.get());
+        pano.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                settings.MAPILLARY_FILTER_PANO.set(!settings.MAPILLARY_FILTER_PANO.get());
+                enableButtonApply(view);
+                mapActivity.getDashboard().refreshContent(true);
+            }
+        });
+        rowPano.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                pano.setChecked(!pano.isChecked());
+            }
+        });
+
 
         final Button apply = (Button) view.findViewById(R.id.button_apply);
-        changeButtonState(apply, .5f, false);
+        disableButtonApply(view);
         apply.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -243,7 +255,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
                 String dateFrom = dateFromEt.getText().toString();
                 String dateTo = dateToEt.getText().toString();
 
-                if (!settings.MAPILLARY_FILTER_USERNAME.get().equals("") || !dateFrom.equals("") || !dateTo.equals("")) {
+                if (!settings.MAPILLARY_FILTER_USERNAME.get().equals("") || !dateFrom.equals("") || !dateTo.equals("") || settings.MAPILLARY_FILTER_PANO.get()) {
                     settings.USE_MAPILLARY_FILTER.set(true);
                 }
                 if (dateFrom.equals("")) {
@@ -272,12 +284,14 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
                 textView.setText("");
                 dateFromEt.setText("");
                 dateToEt.setText("");
+                pano.setChecked(false);
 
                 settings.USE_MAPILLARY_FILTER.set(false);
                 settings.MAPILLARY_FILTER_USER_KEY.set("");
                 settings.MAPILLARY_FILTER_USERNAME.set("");
                 settings.MAPILLARY_FILTER_FROM_DATE.set(0L);
                 settings.MAPILLARY_FILTER_TO_DATE.set(0L);
+                settings.MAPILLARY_FILTER_PANO.set(false);
 
                 plugin.updateLayers(mapActivity.getMapView(), mapActivity);
                 hideKeyboard();
@@ -295,6 +309,14 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
         }
     }
 
+    private void enableButtonApply(View view) {
+        changeButtonState((Button) view.findViewById(R.id.button_apply), 1, true);
+    }
+
+    private void disableButtonApply(View view) {
+        changeButtonState((Button) view.findViewById(R.id.button_apply), .5f, false);
+    }
+
     private void changeButtonState(Button button, float alpha, boolean enabled) {
         button.setAlpha(alpha);
         button.setEnabled(enabled);
diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java
index abc928ba8b..5d90bbbf2c 100644
--- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java
+++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java
@@ -202,6 +202,7 @@ class MapillaryVectorLayer extends MapTileLayer implements MapillaryLayer, ICont
 		long capturedAt = ((Number) userData.get("captured_at")).longValue();
 		long from = settings.MAPILLARY_FILTER_FROM_DATE.get();
 		long to = settings.MAPILLARY_FILTER_TO_DATE.get();
+		boolean pano = settings.MAPILLARY_FILTER_PANO.get();
 
 		if (!userKey.equals("")) {
 			String key = (String) userData.get("userkey");
@@ -216,6 +217,10 @@ class MapillaryVectorLayer extends MapTileLayer implements MapillaryLayer, ICont
 		} else if ((from != 0 && capturedAt < from) || (to != 0 && capturedAt > to)) {
 			return true;
 		}
+
+		if (pano) {
+			return (long) userData.get("pano") == 0;
+		}
 		return false;
 	}
 
@@ -386,4 +391,4 @@ class MapillaryVectorLayer extends MapTileLayer implements MapillaryLayer, ICont
 		}
 		return (int) (r * view.getScaleCoefficient());
 	}
-}
\ No newline at end of file
+}

From 68e1d2d460b453f0843de967595054a5805136f6 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Tue, 27 Nov 2018 15:14:18 +0300
Subject: [PATCH 2/4] Fix *_yes phrases within poi_additional_category

---
 OsmAnd/res/values-be/phrases.xml     | 12 ++--
 OsmAnd/res/values-da/phrases.xml     | 10 +--
 OsmAnd/res/values-de/phrases.xml     | 94 ++++++++++++++--------------
 OsmAnd/res/values-el/phrases.xml     |  6 +-
 OsmAnd/res/values-es-rAR/phrases.xml |  4 +-
 OsmAnd/res/values-es-rUS/phrases.xml |  6 +-
 OsmAnd/res/values-es/phrases.xml     |  6 +-
 OsmAnd/res/values-fr/phrases.xml     |  8 +--
 OsmAnd/res/values-hu/phrases.xml     |  6 +-
 OsmAnd/res/values-is/phrases.xml     |  8 +--
 OsmAnd/res/values-it/phrases.xml     |  8 +--
 OsmAnd/res/values-pl/phrases.xml     |  8 +--
 OsmAnd/res/values-ru/phrases.xml     |  4 +-
 OsmAnd/res/values-sc/phrases.xml     | 10 +--
 OsmAnd/res/values-sr/phrases.xml     |  6 +-
 OsmAnd/res/values-uk/phrases.xml     | 12 ++--
 OsmAnd/res/values/phrases.xml        | 10 +--
 17 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index 1c21464057..37af08e64f 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -148,7 +148,7 @@
 	<string name="poi_railway_station">Чыгуначная станцыя</string>
 	<string name="poi_railway_platform">Чыгуначная плятформа</string>
 	<string name="poi_subway_entrance">Уваход у мэтро</string>
-	<string name="poi_subway_station">Станцыя мэтро</string>
+	<string name="poi_subway_station">Так</string>
 	<string name="poi_taxi">Стаянка таксі</string>
 
 	<string name="poi_aerodrome">Аэрапорт</string>
@@ -953,7 +953,7 @@
 	<string name="poi_access_agricultural">Сельгасп. доступ</string>
 
 	<string name="poi_access_destination">Транзіт забаронены</string>
-	<string name="poi_capital">Сталіца</string>
+	<string name="poi_capital">Так</string>
 	<string name="poi_fee_no">Не</string>
 
 	<string name="poi_monitoring_station">Станцыя назіраньня</string>
@@ -1110,7 +1110,7 @@
 	<string name="poi_height">Вышыня</string>
 	<string name="poi_ele">Вышыня над узроўнем мора</string>
 	<string name="poi_start_date">Дата пачатку будаўніцтва</string>
-	<string name="poi_wheelchair_yes">Даступна для інвалідных крэслаў</string>
+	<string name="poi_wheelchair_yes">Так</string>
 	<string name="poi_parking_underground">Падземная</string>
 	<string name="poi_parking_multi_storey">Шматпавярховая</string>
 
@@ -1734,7 +1734,7 @@
 	<string name="poi_drive_through_no">Кліенты, што сядзяць у аўтамабілі, не абслугоўваюцца</string>
 
 	<string name="poi_brewery_additional">Назва бровару</string>
-	<string name="poi_microbrewery_yes">Уласны бровар</string>
+	<string name="poi_microbrewery_yes">Так</string>
 	<string name="poi_microbrewery_no">Няма ўласнага бровара</string>
 
 	<string name="poi_takeaway_yes">На вынас</string>
@@ -2133,7 +2133,7 @@
 	<string name="poi_openfire_no">Развядзеньне адкрытага агню забаронена</string>
 	<string name="poi_backcountry_yes">Так</string>
 	<string name="poi_backcountry_no">Не</string>
-	<string name="poi_scout_yes">так</string>
+	<string name="poi_scout_yes">Так</string>
 	<string name="poi_scout_no">Лягер скаўтаў: не</string>
 	<string name="poi_group_only_yes">Даступна толькі для груп: так</string>
 	<string name="poi_group_only_no">Даступна толькі для груп: не</string>
@@ -3927,7 +3927,7 @@
 <string name="poi_bulk_purchase">Аптовая купля</string>
 	<string name="poi_substation_type">Тып</string>
 
-<string name="poi_bulk_purchase_yes">Аптовая купля: так</string>
+<string name="poi_bulk_purchase_yes">Так</string>
 	<string name="poi_bulk_purchase_only">Аптовая купля: толькі</string>
 
 	<string name="poi_pipeline_substation">Трубаправодная падстанцыя</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index c1e2e8737c..380976ff7b 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -143,7 +143,7 @@
         <string name="poi_railway_station">Banegård</string>
         <string name="poi_railway_platform">Perron</string>
         <string name="poi_subway_entrance">Metroindgang</string>
-        <string name="poi_subway_station">Metrostation</string>
+        <string name="poi_subway_station">Ja</string>
         <string name="poi_taxi">Taxaholdeplads</string>
 
         <string name="poi_aerodrome">Lufthavn</string>
@@ -961,7 +961,7 @@
 	<string name="poi_access_agricultural">Adgang for landbrug</string>
 
 	<string name="poi_monitoring_station">Målestation</string>
-	<string name="poi_capital">Hovedstad</string>
+	<string name="poi_capital">Ja</string>
 	<string name="poi_fee_no">Nej</string>
 
 	<string name="poi_email">E-mail</string>
@@ -1153,7 +1153,7 @@
 	<string name="poi_denomination_scientist">Kristen Videnskab</string>
 	<string name="poi_landfill_waste_nuclear">Atomaffald</string>
 	<string name="poi_start_date">Startdato</string>
-	<string name="poi_wheelchair_yes">Kørestol</string>
+	<string name="poi_wheelchair_yes">Ja</string>
 
 	<string name="poi_content_silage">Indhold: ensilage</string>
 	<string name="poi_content_water">Indhold: vand</string>
@@ -1620,7 +1620,7 @@
 	<string name="poi_drive_through_no">Drive-through: nej</string>
 
 	<string name="poi_brewery_additional">Bryggerinavn</string>
-	<string name="poi_microbrewery_yes">Mikrobryggeri</string>
+	<string name="poi_microbrewery_yes">Ja</string>
 	<string name="poi_microbrewery_no">Ingen mikrobryggeri</string>
 
 	<string name="poi_takeaway_yes">Take Away</string>
@@ -3970,7 +3970,7 @@
 <string name="poi_bulk_purchase">Storkøb</string>
 	<string name="poi_substation_type">Type</string>
 
-<string name="poi_bulk_purchase_yes">Storkøb: ja</string>
+<string name="poi_bulk_purchase_yes">Ja</string>
 	<string name="poi_bulk_purchase_only">Storkøb: kun</string>
 
 	<string name="poi_pipeline_substation">Rørledningsstation</string>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 40042ca313..281c5d40e4 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -509,7 +509,7 @@
 	<string name="poi_studio">Studio</string>
 	<string name="poi_suburb">Stadtteil</string>
 	<string name="poi_subway_entrance">U-Bahnhofeingang</string>
-	<string name="poi_subway_station">U-Bahnhof</string>
+	<string name="poi_subway_station">Ja</string>
 	<string name="poi_craft_sun_protection">Sonnenschutz</string>
 	<string name="poi_supermarket">Supermarkt</string>
 	<string name="poi_surveillance">Überwachung</string>
@@ -746,7 +746,7 @@
 	<string name="poi_internet_access_terminal">Internetzugang: Terminal</string>
 	<string name="poi_internet_access_service">Internetzugang: Dienst</string>
 
-	<string name="poi_fee_yes">ja</string>
+	<string name="poi_fee_yes">Ja</string>
 
 	<string name="poi_brand">Marke</string>
 	<string name="poi_maxweight">Höchstgewicht</string>
@@ -952,15 +952,15 @@
 	<string name="poi_recycling_cars">Autos</string>
 	<string name="poi_recycling_bicycles">Fahrräder</string>
 
-	<string name="poi_capital">Hauptstadt</string>
+	<string name="poi_capital">Ja</string>
 	<string name="poi_shower">Dusche</string>
 	<string name="poi_email">E-Mail</string>
 	<string name="poi_fax">Fax</string>
 	<string name="facebook">"Facebook "</string>
 	<string name="poi_mobile">Handy</string>
-	<string name="poi_fee_no">nein</string>
-	<string name="poi_drinking_water_yes">ja</string>
-	<string name="poi_drinking_water_no">nein</string>
+	<string name="poi_fee_no">Nein</string>
+	<string name="poi_drinking_water_yes">Ja</string>
+	<string name="poi_drinking_water_no">Nein</string>
 	<string name="poi_supervised_yes">Beaufsichtigt</string>
 	<string name="poi_supervised_no">Ohne Aufsicht</string>
 	<string name="poi_crossing_traffic_signals">Mit Ampeln</string>
@@ -987,8 +987,8 @@
 	<string name="poi_recycling_plasterboard">Gipskartonplatte</string>
 	<string name="poi_recycling_animal_waste">Tierischer Abfall</string>
 	<string name="poi_monitoring_station">Überwachungsstation</string>
-	<string name="poi_seasonal_yes">ja</string>
-	<string name="poi_seasonal_no">nein</string>
+	<string name="poi_seasonal_yes">Ja</string>
+	<string name="poi_seasonal_no">Nein</string>
 	<string name="poi_seasonal_dry_season">Trockenzeit</string>
 	<string name="poi_seasonal_wet_season">Regenzeit</string>
 	<string name="poi_recycling_container">Container</string>
@@ -1059,8 +1059,8 @@
 	<string name="poi_height">Höhe</string>
 	<string name="poi_ele">Meereshöhe</string>
 	<string name="poi_start_date">Anfangsdatum</string>
-	<string name="poi_wheelchair_yes">ja</string>
-	<string name="poi_wheelchair_no">nein</string>
+	<string name="poi_wheelchair_yes">Ja</string>
+	<string name="poi_wheelchair_no">Nein</string>
 	<string name="poi_wheelchair_limited">Eingeschränkt</string>
 	<string name="poi_wholesale">Großhandel</string>
 
@@ -1163,7 +1163,7 @@
 	<string name="poi_beach_rocky">Fels</string>
 
 	<string name="poi_cypress">Zypresse</string>
-	<string name="poi_bench_yes">ja</string>
+	<string name="poi_bench_yes">Ja</string>
 	<string name="poi_bench_no">ohne Sitzbank</string>
 	<string name="poi_bin_yes">Mit Abfalleimer</string>
 	<string name="poi_bin_no">Ohne Abfalleimer</string>
@@ -1235,7 +1235,7 @@
 
 	<string name="poi_openfire_yes">Offenes Feuer erlaubt</string>
 	<string name="poi_openfire_no">Offenes Feuer verboten</string>
-	<string name="poi_washing_machine_yes">ja</string>
+	<string name="poi_washing_machine_yes">Ja</string>
 	<string name="poi_washing_machine_no">Waschmaschine: nein</string>
 	<string name="poi_shower_yes">Dusche: ja</string>
 	<string name="poi_shower_no">Dusche: nein</string>
@@ -1243,9 +1243,9 @@
 	<string name="poi_shower_outdoor">Dusche: im Freien</string>
 	<string name="poi_shower_cold">Dusche: kalt</string>
 	<string name="poi_shower_indoor">Dusche: drinnen</string>
-	<string name="poi_caravans_yes">ja</string>
+	<string name="poi_caravans_yes">Ja</string>
 	<string name="poi_caravans_no">Wohnwagen: nein</string>
-	<string name="poi_power_supply_yes">ja</string>
+	<string name="poi_power_supply_yes">Ja</string>
 	<string name="poi_power_supply_no">Stromanschluss: nein</string>
 	<string name="poi_power_supply_cee_17_blue">Sockel: CEE 17 blau</string>
 	<string name="poi_power_supply_cee_7_4">Sockel: CEE 7/4</string>
@@ -1376,7 +1376,7 @@
 
 	<string name="poi_pump_manual">Manuell</string>
 	<string name="poi_pump_no">Keine Pumpe</string>
-	<string name="poi_pump_yes">ja</string>
+	<string name="poi_pump_yes">Ja</string>
 
 	<string name="poi_information_board">Tafel</string>
 	<string name="poi_information_map">Karte</string>
@@ -1396,18 +1396,18 @@
 	<string name="poi_board_type_astronomy">Astronomie</string>
 
 	<string name="poi_commercial">Gewerbegebiet</string>
-	<string name="poi_fireplace_yes">ja</string>
+	<string name="poi_fireplace_yes">Ja</string>
 	<string name="poi_fireplace_no">Keine Feuerstelle</string>
 
-	<string name="poi_covered_yes">ja</string>
+	<string name="poi_covered_yes">Ja</string>
 	<string name="poi_covered_no">nicht überdacht</string>
 
 	<string name="poi_smoking_no">Nicht erlaubt</string>
 	<string name="poi_smoking_outside">nur Außerhalb</string>
 	<string name="poi_smoking_yes">Erlaubt</string>
 	<string name="poi_smoking_separated">In einem separaten Raum</string>
-	<string name="poi_traffic_signals_sound_yes">ja</string>
-	<string name="poi_traffic_signals_sound_no">nein</string>
+	<string name="poi_traffic_signals_sound_yes">Ja</string>
+	<string name="poi_traffic_signals_sound_no">Nein</string>
 	<string name="poi_rescue_station">Rettungsstation</string>
 
 	<string name="poi_mini_roundabout">Mini-Kreisverkehr</string>
@@ -1442,7 +1442,7 @@
 	<string name="poi_garden_style_japanese">Gartenstil: Japanisch</string>
 
 	<string name="poi_capacity">Kapazität</string>
-	<string name="poi_capacity_disabled_yes">ja</string>
+	<string name="poi_capacity_disabled_yes">Ja</string>
 	<string name="poi_capacity_disabled_no">keine Behindertenplätze</string>
 	<string name="poi_capacity_disabled">Behindertenplätze</string>
 	<string name="poi_capacity_women_yes">Frauenplätze</string>
@@ -1459,7 +1459,7 @@
 	<string name="poi_aerialway_duration">durchschnittliche Fahrzeit, Minuten</string>
 	<string name="poi_aerialway_bubble_yes">mit Überdachung</string>
 	<string name="poi_aerialway_bubble_no">Ohne Überdachung</string>
-	<string name="poi_aerialway_heating_yes">ja</string>
+	<string name="poi_aerialway_heating_yes">Ja</string>
 	<string name="poi_aerialway_heating_no">keine Heizung</string>
 	<string name="poi_aerialway_bicycle_yes">Erlaubt</string>
 	<string name="poi_aerialway_bicycle_no">Fahrrad: nicht erlaubt</string>
@@ -1514,13 +1514,13 @@
 	<string name="poi_payment_diners_club_no">Diners Club Karte nicht akzeptiert</string>
 	<string name="poi_payment_dkv_yes">DKV</string>
 	<string name="poi_payment_dkv_no">DKV nicht akzeptiert</string>
-	<string name="poi_drive_in_yes">ja</string>
+	<string name="poi_drive_in_yes">Ja</string>
 	<string name="poi_drive_in_no">Drive-in: nein</string>
-	<string name="poi_drive_through_yes">ja</string>
+	<string name="poi_drive_through_yes">Ja</string>
 	<string name="poi_drive_through_no">Durchfahrt: nein</string>
 
 	<string name="poi_brewery_additional">Brauereiname</string>
-	<string name="poi_microbrewery_yes">Minibrauerei</string>
+	<string name="poi_microbrewery_yes">Ja</string>
 	<string name="poi_microbrewery_no">Keine Minibrauerei</string>
 
 	<string name="poi_takeaway_yes">Zum Mitnehmen</string>
@@ -1531,12 +1531,12 @@
 	<string name="poi_delivery_no">Kein Lieferservice</string>
 	<string name="poi_delivery_only">Nur Lieferung</string>
 
-	<string name="poi_cocktails_yes">ja</string>
+	<string name="poi_cocktails_yes">Ja</string>
 
 	<string name="poi_service_dealer">Händler</string>
 	<string name="poi_service_repair">Reparatur</string>
 	<string name="poi_service_repair_no">Keine Reparatur</string>
-	<string name="poi_automated_yes">ja</string>
+	<string name="poi_automated_yes">Ja</string>
 	<string name="poi_automated_no">Nicht automatisiert</string>
 	<string name="poi_brushless_no">Bürstenlos: nein</string>
 	<string name="poi_car_wash_no">Autowäsche: nein</string>
@@ -1545,7 +1545,7 @@
 	<string name="poi_male_no">Für Männer verboten</string>
 	<string name="poi_female_yes">Weiblich</string>
 	<string name="poi_female_no">Für Frauen verboten</string>
-	<string name="poi_toilets_yes">ja</string>
+	<string name="poi_toilets_yes">Ja</string>
 	<string name="poi_toilets_no">Keine Toiletten</string>
 	<string name="poi_religion_bahai">Bahaitum</string>
 	<string name="poi_religion_pagan">Heidentum</string>
@@ -1733,7 +1733,7 @@
 	<string name="poi_toll_yes">Maut</string>
 	<string name="poi_toll_no">keine Maut</string>
 	<string name="poi_toll_hgv_yes">LKW Maut</string>
-	<string name="poi_tactile_paving_yes">ja</string>
+	<string name="poi_tactile_paving_yes">Ja</string>
 	<string name="poi_tactile_paving_no">Ohne Blindenleitsystem</string>
 	<string name="poi_traffic_signals_sound_walk">Nur wenn Gehen erlaubt ist</string>
 
@@ -1751,7 +1751,7 @@
 	<string name="poi_piste_grooming_backcountry">Tourenski</string>
 	<string name="poi_piste_grooming_scooter">Schneemobil</string>
 	<string name="poi_piste_grooming_skating">Skaten</string>
-	<string name="poi_piste_grooming_no">nein</string>
+	<string name="poi_piste_grooming_no">Nein</string>
 	<string name="poi_piste_grooming_mogul">Buckel</string>
 
 	<string name="poi_garden_type_residential">Gartentyp: Hausgarten</string>
@@ -1773,7 +1773,7 @@
 	<string name="poi_payment_girocard_no">Girokarte nicht akzeptiert</string>
 	<string name="poi_payment_discover_card_yes">Discover-Karte</string>
 	<string name="poi_payment_discover_card_no">Discover Karte nicht akzeptiert</string>
-	<string name="poi_brushless_yes">ja</string>
+	<string name="poi_brushless_yes">Ja</string>
 	<string name="poi_parish">Gemeindebüro</string>
 	<string name="poi_payment_cheque_yes">Schecks</string>
 	<string name="poi_payment_cheque_no">Schecks nicht akzeptiert</string>
@@ -1919,7 +1919,7 @@
 	<string name="poi_service_parts">Teile</string>
 	<string name="poi_service_electrical">Reparatur von elektrischen Fahrzeugen</string>
 	<string name="poi_motorcycle_repair">Motorradreparatur</string>
-	<string name="poi_self_service_yes">ja</string>
+	<string name="poi_self_service_yes">Ja</string>
 	<string name="poi_self_service_no">keine Selbstbedienung</string>
 	<string name="poi_full_service_yes">Rundumservice</string>
 	<string name="poi_aeroway_fuel">Flugzeugtankstelle</string>
@@ -2271,9 +2271,9 @@
 
 	<string name="poi_tents_yes">Erlaubt</string>
 	<string name="poi_tents_no">Zelten nicht gestattet</string>
-	<string name="poi_backcountry_yes">ja</string>
-	<string name="poi_backcountry_no">nein</string>
-	<string name="poi_scout_yes">ja</string>
+	<string name="poi_backcountry_yes">Ja</string>
+	<string name="poi_backcountry_no">Nein</string>
+	<string name="poi_scout_yes">Ja</string>
 	<string name="poi_scout_no">Pfadfinderlager: nein</string>
 	<string name="poi_group_only_yes">Nur Gruppen: ja</string>
 	<string name="poi_group_only_no">Nur Gruppen: nein</string>
@@ -2630,12 +2630,12 @@
 
 	<string name="poi_plant_nursery">Baumschule</string>
 
-	<string name="poi_compressed_air_yes">ja</string>
+	<string name="poi_compressed_air_yes">Ja</string>
 	<string name="poi_compressed_air_no">Druckluft: nein</string>
 
-	<string name="poi_car_wash_yes">ja</string>
+	<string name="poi_car_wash_yes">Ja</string>
 
-	<string name="poi_vacuum_cleaner_yes">ja</string>
+	<string name="poi_vacuum_cleaner_yes">Ja</string>
 	<string name="poi_vacuum_cleaner_no">Staubsauger: nein</string>
 	<string name="poi_amenity_vacuum_cleaner">Staubsauger</string>
 
@@ -2813,7 +2813,7 @@
 	<string name="poi_counselling_no">Beratung: nein</string>
 	<string name="poi_emergency_yes">Notaufnahme: ja</string>
 	<string name="poi_emergency_no">Notaufnahme: nein</string>
-	<string name="poi_home_visit_yes">ja</string>
+	<string name="poi_home_visit_yes">Ja</string>
 	<string name="poi_home_visit_no">Hausbesuch: nein</string>
 
 	<string name="poi_disease_ebola_no">Ebola: nein</string>
@@ -2979,8 +2979,8 @@
 	<string name="poi_aquaculture_mussels">Aquakultur: Muscheln</string>
 
 	<string name="poi_mdf">Hauptverteiler</string>
-	<string name="poi_organic_yes">ja</string>
-	<string name="poi_organic_no">nein</string>
+	<string name="poi_organic_yes">Ja</string>
+	<string name="poi_organic_no">Nein</string>
 	<string name="poi_organic_only">Ausschließlich</string>
 
 	<string name="poi_diplomatic_consulate">Konsulat</string>
@@ -3274,16 +3274,16 @@
 
 	<string name="poi_payment_transport_type">Zahlungsart (Transport)</string>
 
-<string name="poi_outdoor_seating_filter_yes">ja</string>
-	<string name="poi_delivery_filter_yes">ja</string>
+<string name="poi_outdoor_seating_filter_yes">Ja</string>
+	<string name="poi_delivery_filter_yes">Ja</string>
 	<string name="poi_diet_vegetarian_filter_yes">Vegetarisch</string>
 	<string name="poi_diet_vegan_filter_yes">Vegan</string>
 	<string name="poi_diet_gluten_free_filter_yes">Glutenfrei</string>
 	<string name="poi_diet_kosher_filter_yes">Koscher</string>
 	<string name="poi_diet_halal_filter_yes">Halal</string>
 	<string name="poi_diet_lactose_free_filter_yes">Laktosefrei</string>
-	<string name="poi_takeaway_filter_yes">ja</string>
-	<string name="poi_shower_filter_yes">ja</string>
+	<string name="poi_takeaway_filter_yes">Ja</string>
+	<string name="poi_shower_filter_yes">Ja</string>
 
 <string name="poi_social_facility_for">Zielgruppe</string>
 	<string name="poi_compressed_air_filter">Druckluft</string>
@@ -3349,7 +3349,7 @@
 
 <string name="poi_cafeteria">Cafeteria</string>
 
-<string name="poi_fast_food_cafeteria">ja</string>
+<string name="poi_fast_food_cafeteria">Ja</string>
 
 	<string name="poi_drink_wine_yes">Wein: ja</string>
 	<string name="poi_drink_wine_retail">Wein: Einzelhandel</string>
@@ -3888,8 +3888,8 @@
 <string name="poi_bulk_purchase">Großeinkauf</string>
 	<string name="poi_substation_type">Typ</string>
 
-<string name="poi_bulk_purchase_yes">Großeinkauf: ja</string>
-	<string name="poi_bulk_purchase_only">Großeinkauf: nur</string>
+<string name="poi_bulk_purchase_yes">Ja</string>
+	<string name="poi_bulk_purchase_only">Nur</string>
 
 	<string name="poi_substation_transmission">Umspannwerk</string>
 	<string name="poi_substation_distribution">Verteiler</string>
diff --git a/OsmAnd/res/values-el/phrases.xml b/OsmAnd/res/values-el/phrases.xml
index 6ebecbfb5a..c397fbd797 100644
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@@ -348,7 +348,7 @@
 	<string name="poi_railway_platform">Αποβάθρα σιδηροδρόμου</string>
 	<string name="poi_halt">Στάση σιδηροδρόμου</string>
 	<string name="poi_subway_entrance">Είσοδος μετρό</string>
-	<string name="poi_subway_station">Σταθμός μετρό</string>
+	<string name="poi_subway_station">Ναι</string>
 	<string name="poi_traffic_calming_cushion">Σαμαράκι (Μαξιλαράκι)</string>
 	<string name="poi_traffic_calming_chicane">Επιβραδυντής (απότομη στροφή)</string>
 	<string name="poi_traffic_calming_rumble_strip">Λωρίδα τραχειάς επιφάνειας</string>
@@ -577,7 +577,7 @@
 	<string name="poi_customs">Τελωνεία</string>
 	<string name="poi_country">Ύπαιθρος</string>
 	<string name="poi_city">Πόλη</string>
-	<string name="poi_capital">Πρωτεύουσα</string>
+	<string name="poi_capital">Ναι</string>
 	<string name="poi_town">Κωμόπολη</string>
 	<string name="poi_village">Χωριό</string>
 	<string name="poi_hamlet">Μικρό χωριό</string>
@@ -1774,7 +1774,7 @@
 	<string name="poi_drive_through_no">Στο όχημα σε στάση: όχι</string>
 
 	<string name="poi_brewery_additional">Όνομα ζυθοποιίας</string>
-	<string name="poi_microbrewery_yes">Μικροζυθοποιία</string>
+	<string name="poi_microbrewery_yes">Ναι</string>
 	<string name="poi_microbrewery_no">Χωρίς μικροζυθοποιία</string>
 
 	<string name="poi_takeaway_filter_yes">Ναι</string>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index f003fbf7b1..d6cd265980 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -944,7 +944,7 @@
 
 	<string name="poi_access_delivery">Acceso para entregas</string>
 	<string name="poi_monitoring_station">Estación de monitoreo</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Sí</string>
 	<string name="poi_fee_no">No</string>
 
 	<string name="poi_email">Correo electrónico;Email</string>
@@ -3941,7 +3941,7 @@
 <string name="poi_bulk_purchase">Compra al por mayor</string>
 	<string name="poi_substation_type">Tipo de subestación</string>
 
-<string name="poi_bulk_purchase_yes">Compra al por mayor: sí</string>
+<string name="poi_bulk_purchase_yes">Sí</string>
 	<string name="poi_bulk_purchase_only">Compra al por mayor: solamente</string>
 
 	<string name="poi_pipeline_substation">Subestación de tuberías</string>
diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index 230addfa76..f7b0d90744 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -208,7 +208,7 @@
 	<string name="poi_railway_platform">Andén de tren</string>
 	<string name="poi_halt">Parada de tren</string>
 	<string name="poi_subway_entrance">Entrada de metro;Entrada de subte</string>
-	<string name="poi_subway_station">Estación de metro;Estación de subte</string>
+	<string name="poi_subway_station">Sí</string>
 	<string name="poi_railway_buffer_stop">Fin de vía</string>
 	<string name="poi_taxi">Parada de taxi;Remis</string>
 	<string name="poi_aerodrome">Aeropuerto;Aeródromo</string>
@@ -890,7 +890,7 @@
 	<string name="poi_access_agricultural">Acceso agrícola</string>
 	<string name="poi_access_delivery">Acceso para entregas</string>
 	<string name="poi_monitoring_station">Estación de monitoreo</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Sí</string>
 	<string name="poi_fee_no">No</string>
 	<string name="poi_email">Correo electrónico;Email</string>
 	<string name="poi_fax">Fax</string>
@@ -3700,7 +3700,7 @@
 <string name="poi_bulk_purchase">Compra al por mayor</string>
 	<string name="poi_substation_type">Tipo de subestación</string>
 
-<string name="poi_bulk_purchase_yes">Compra al por mayor: sí</string>
+<string name="poi_bulk_purchase_yes">Sí</string>
 	<string name="poi_bulk_purchase_only">Compra al por mayor: solamente</string>
 
 	<string name="poi_pipeline_substation">Subestación de tuberías</string>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 229c5d55be..eb5da5a416 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -144,7 +144,7 @@
 	<string name="poi_railway_station">Estación de tren</string>
 	<string name="poi_halt">Parada de tren</string>
 	<string name="poi_subway_entrance">Entrada de metro</string>
-	<string name="poi_subway_station">Estación de metro</string>
+	<string name="poi_subway_station">Sí</string>
 	<string name="poi_aerodrome">Aeropuerto</string>
 	<string name="poi_helipad">Helipuerto</string>
 	<string name="poi_taxi">Parada de taxi</string>
@@ -947,7 +947,7 @@
 
 	<string name="poi_access_delivery">Acceso para entregas</string>
 	<string name="poi_monitoring_station">Estación de monitoreo</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Sí</string>
 	<string name="poi_fee_no">No</string>
 
 	<string name="poi_email">Email</string>
@@ -3923,7 +3923,7 @@
 <string name="poi_bulk_purchase">Compra al por mayor;Compra a granel</string>
 	<string name="poi_substation_type">Tipo de subestación</string>
 
-<string name="poi_bulk_purchase_yes">Compra al por mayor: sí</string>
+<string name="poi_bulk_purchase_yes">Sí</string>
 	<string name="poi_bulk_purchase_only">Compra al por mayor: solamente</string>
 
 	<string name="poi_pipeline_substation">Subestación de tuberías</string>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 3f1e036274..a39e6ae90c 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -391,7 +391,7 @@
 
 	<string name="poi_service_tyres">Pneus</string>
 	<string name="poi_public_transport_platform_bus">Arrêt de bus</string>
-	<string name="poi_subway_station">Station de métro</string>
+	<string name="poi_subway_station">Oui</string>
 	<string name="poi_tunnel">Tunnel</string>
 	<string name="poi_register_office">Bureau d\'état civil</string>
 	<string name="poi_customs">Douanes</string>
@@ -1036,7 +1036,7 @@
 	<string name="poi_notary">Office de notaire</string>
 	<string name="poi_doors">Magasin de portes</string>
 	<string name="poi_landfill_waste_nuclear">Déchet nucléaire</string>
-	<string name="poi_capital">Capitale</string>
+	<string name="poi_capital">Oui</string>
 	<string name="poi_office_religion">Lieu de culte</string>
 	<string name="poi_association">Siège d\'association</string>
 	<string name="poi_financial">Société financière</string>
@@ -1565,7 +1565,7 @@
 
 	<string name="poi_payment_cheque_yes">Chèques</string>
 	<string name="poi_payment_cheque_no">Chèques non acceptés</string>
-	<string name="poi_microbrewery_yes">Microbrasserie</string>
+	<string name="poi_microbrewery_yes">Oui</string>
 	<string name="poi_microbrewery_no">Pas de microbrasserie</string>
 
 	<string name="poi_takeaway_no">Pas de vente à emporter</string>
@@ -3505,7 +3505,7 @@
 	<string name="poi_appliance">Magasin d\'électroménager</string>
 
 	<string name="poi_bulk_purchase">Vente en vrac</string>
-	<string name="poi_bulk_purchase_yes">Vente en vrac : oui</string>
+	<string name="poi_bulk_purchase_yes">Oui</string>
 	<string name="poi_bulk_purchase_only">Vente en vrac : uniquement</string>
 
 	<string name="poi_atm">Distributeur de billets</string>
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index 696209c338..644d3c55a0 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -68,7 +68,7 @@
 	<string name="poi_public_transport_platform_trolleybus">Trolibuszmegálló</string>
 	<string name="poi_public_transport_platform_tram">Villamosmegálló</string>
 	<string name="poi_subway_entrance">Metrólejárat</string>
-	<string name="poi_subway_station">Metróállomás</string>
+	<string name="poi_subway_station">Igen</string>
 	<string name="poi_taxi">Taxiállomás</string>
 
 	<string name="poi_aerodrome">Repülőtér</string>
@@ -772,7 +772,7 @@
 	<string name="poi_migration">Bevándorlás</string>
 	<string name="poi_tax_inspection">Adóellenőrzés</string>
 	<string name="poi_country">Ország</string>
-	<string name="poi_capital">Főváros</string>
+	<string name="poi_capital">Igen</string>
 	<string name="poi_healthcare_alternative">Alternatív gyógyászat</string>
 	<string name="poi_audiologist">Hallásspecialista</string>
 	<string name="poi_optometrist">Optometrikus</string>
@@ -1259,7 +1259,7 @@
 	<string name="poi_diet_pescetarian_yes">Peszketáriánus</string>
 
 	<string name="poi_brewery_additional">Sörfőzde neve</string>
-	<string name="poi_microbrewery_yes">Házi sörfőzés</string>
+	<string name="poi_microbrewery_yes">Igen</string>
 	<string name="poi_microbrewery_no">Házi sörfőzés nincs</string>
 
 	<string name="poi_takeaway_yes">Elvitelre</string>
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index 6c199f624a..fe910ccbf3 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -43,7 +43,7 @@
 	<string name="poi_customs">Tollafgreiðsla</string>
 	<string name="poi_country">Land</string>
 	<string name="poi_city">Borg</string>
-	<string name="poi_capital">Höfuðborg</string>
+	<string name="poi_capital">Já</string>
 	<string name="poi_town">Bær</string>
 	<string name="poi_village">Þorp</string>
 	<string name="poi_hamlet">Byggðakjarni</string>
@@ -1836,7 +1836,7 @@
 	<string name="poi_railway_station">Járnbrautarstöð</string>
 	<string name="poi_halt">Járnbrautarpallur</string>
 	<string name="poi_subway_entrance">Inngangur í neðanjarðarlest</string>
-	<string name="poi_subway_station">Neðanjarðarlestarstöð</string>
+	<string name="poi_subway_station">Já</string>
 	<string name="poi_taxi">Leigubílastaur</string>
 
 	<string name="poi_bicycle_rental">Reiðhjólaleiga</string>
@@ -2430,7 +2430,7 @@
 	<string name="poi_drive_through_no">Bílaafgreiðsla: nei</string>
 
 	<string name="poi_brewery_additional">Nafn á brugghúsi</string>
-	<string name="poi_microbrewery_yes">Bruggað á staðnum</string>
+	<string name="poi_microbrewery_yes">Já</string>
 	<string name="poi_microbrewery_no">Ekki bruggað á staðnum</string>
 
 	<string name="poi_service_electrical">Viðgerðir rafknúinna ökutækja</string>
@@ -3871,7 +3871,7 @@
 <string name="poi_bulk_purchase">Magnkaup</string>
 	<string name="poi_substation_type">Tegund</string>
 
-<string name="poi_bulk_purchase_yes">Magnkaup: já</string>
+<string name="poi_bulk_purchase_yes">Já</string>
 	<string name="poi_bulk_purchase_only">Magnkaup: einungis</string>
 
 	</resources>
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index 67ae8a74bb..913f0c9753 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -72,7 +72,7 @@
 	<string name="poi_public_transport_station">Stazione trasporto pubblico</string>
 	<string name="poi_bus_station">Stazione autobus</string>
 	<string name="poi_subway_entrance">Entrata metropolitana</string>
-	<string name="poi_subway_station">Stazione metropolitana</string>
+	<string name="poi_subway_station">Sì</string>
 	<string name="poi_aerodrome">Aeroporto</string>
 	<string name="poi_helipad">Eliporto</string>
 	<string name="poi_bicycle_rental">Noleggio bici</string>
@@ -1450,7 +1450,7 @@
 	<string name="poi_drive_in_yes">Sì</string>
 	<string name="poi_drive_in_no">"Drive-in: no "</string>
 	<string name="poi_drive_through_yes">Sì</string>
-	<string name="poi_microbrewery_yes">Microbirrificio</string>
+	<string name="poi_microbrewery_yes">Sì</string>
 	<string name="poi_takeaway_filter_yes">Sì</string>
 	<string name="poi_takeaway_yes">A portar via</string>
 	<string name="poi_takeaway_no">No a portar via</string>
@@ -2329,7 +2329,7 @@
 	<string name="poi_allotments">Orti urbani</string>
 	<string name="poi_basin">Bacino</string>
 
-	<string name="poi_capital">Capitale</string>
+	<string name="poi_capital">Sì</string>
 	<string name="poi_place_allotments">Orti di città</string>
 	<string name="poi_ice_hockey">Hockey su ghiaccio</string>
 	<string name="poi_denomination_lutheran">Luterana</string>
@@ -2509,7 +2509,7 @@
 	<string name="poi_fire_hydrant_style_water_source_stream">Ruscello</string>
 	<string name="poi_valley_balka">"Balka "</string>
 
-	<string name="poi_display_yes">Display: Sì</string>
+	<string name="poi_display_yes">Display: sì</string>
 	<string name="poi_display_no">"Display: no "</string>
 	<string name="poi_display_analog_yes">Display analogico</string>
 	<string name="poi_display_digital_yes">Display digitale</string>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index cf4d6c56ca..ba3ddc3df2 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -143,7 +143,7 @@
 	<string name="poi_railway_station">Stacja kolejowa</string>
 	<string name="poi_railway_platform">Peron kolejowy</string>
 	<string name="poi_subway_entrance">Wejście do metra</string>
-	<string name="poi_subway_station">Stacja metra</string>
+	<string name="poi_subway_station">Tak</string>
 	<string name="poi_taxi">Postój taksówek</string>
 
 	<string name="poi_aerodrome">Lotnisko</string>
@@ -1185,7 +1185,7 @@
 
 	<string name="poi_lighting_tower">Maszt oświetleniowy</string>
 	<string name="poi_greenfield">Teren niezagospodarowany</string>
-	<string name="poi_capital">Stolica</string>
+	<string name="poi_capital">Tak</string>
 	<string name="poi_religion_multifaith">Wielowyznaniowość</string>
 	<string name="poi_denomination_shia">Szyityzm</string>
 	<string name="poi_denomination_united">Zjednoczony Kościół Kanady</string>
@@ -1274,7 +1274,7 @@
 	<string name="poi_delivery_no">Brak dostawy</string>
 	<string name="poi_delivery_only">Wyłącznie dostawa</string>
 
-	<string name="poi_microbrewery_yes">Browar rzemieślniczy</string>
+	<string name="poi_microbrewery_yes">Tak</string>
 	<string name="poi_microbrewery_no">Brak browaru rzemieślniczego</string>
 
 	<string name="poi_takeaway_yes">Na wynos</string>
@@ -3911,7 +3911,7 @@
 <string name="poi_bulk_purchase">Zakup hurtowy</string>
 	<string name="poi_substation_type">Typ</string>
 
-<string name="poi_bulk_purchase_yes">Zakup zbiorczy: tak</string>
+<string name="poi_bulk_purchase_yes">Tak</string>
 	<string name="poi_bulk_purchase_only">Zakup zbiorczy: tylko</string>
 
 	<string name="poi_pipeline_substation">Podstacja rurociągów</string>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 3e5f7e58ef..4d2faa84e1 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -3834,8 +3834,8 @@
 	<string name="poi_shoe_repair">Ремонт обуви</string>
 
 	<string name="poi_bulk_purchase">Массовая закупка</string>
-	<string name="poi_bulk_purchase_yes">Массовая закупка: есть</string>
-	<string name="poi_bulk_purchase_only">Только массовая закупка</string>
+	<string name="poi_bulk_purchase_yes">Есть</string>
+	<string name="poi_bulk_purchase_only">Исключительно</string>
 
 	<string name="poi_pipeline_substation">Трубопроводная подстанция</string>
 	<string name="poi_substation_type">Тип</string>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index 371636d64b..be664eec2c 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -121,7 +121,7 @@
 	<string name="poi_railway_station">Istatzione de sos trenos</string>
 	<string name="poi_railway_platform">Piattaredda ferroviària</string>
 	<string name="poi_subway_entrance">Intrada de sa metropolitana</string>
-	<string name="poi_subway_station">Istatzione de sa metropolitana</string>
+	<string name="poi_subway_station">Eja</string>
 	<string name="poi_taxi">Postèggiu de sos taxi</string>
 
 	<string name="poi_aerodrome">Aeroportu</string>
@@ -926,7 +926,7 @@
 	<string name="poi_brownfield">Terrinu abbandonadu</string>
 	<string name="poi_greenfield">Terrinu egadu</string>
 	<string name="poi_bunker_silo">Lòssia \"bunker\"</string>
-	<string name="poi_capital">Capitale</string>
+	<string name="poi_capital">Eja</string>
 	<string name="poi_office_religion">Ufìtziu religiosu</string>
 	<string name="poi_association">Ufìtziu de un’assòtziu</string>
 	<string name="poi_financial">Ufìtziu finantziàriu</string>
@@ -1122,7 +1122,7 @@
 	<string name="poi_crossing_uncontrolled">Non controlladu</string>
 	<string name="poi_crossing_unmarked">Non sinnaladu</string>
 	<string name="poi_start_date">Data de cumintzu</string>
-	<string name="poi_wheelchair_yes">Cadira a rodas</string>
+	<string name="poi_wheelchair_yes">Eja</string>
 	<string name="poi_wheelchair_no">Nono</string>
 	<string name="poi_wheelchair_limited">Limitada</string>
 	<string name="poi_access_private">Atzessu privadu</string>
@@ -2107,7 +2107,7 @@
 	<string name="poi_drive_through_no">Servìtziu pro automobilistas (drive-through): nono</string>
 
 	<string name="poi_brewery_additional">Nùmene birrifìtziu</string>
-	<string name="poi_microbrewery_yes">Micro-birrifìtziu</string>
+	<string name="poi_microbrewery_yes">Eja</string>
 	<string name="poi_microbrewery_no">Chene micro-birrifìtziu</string>
 
 	<string name="poi_takeaway_filter_yes">Eja</string>
@@ -3904,7 +3904,7 @@
 <string name="poi_bulk_purchase">Còmpora a s\'ingrossu</string>
 	<string name="poi_substation_type">Casta</string>
 
-<string name="poi_bulk_purchase_yes">Còmpora a s\'ingrossu: eja</string>
+<string name="poi_bulk_purchase_yes">Eja</string>
 	<string name="poi_bulk_purchase_only">Compora a s\'ingrossu: petzi</string>
 
 	<string name="poi_pipeline_substation">Sutaistatzione de sas condutas</string>
diff --git a/OsmAnd/res/values-sr/phrases.xml b/OsmAnd/res/values-sr/phrases.xml
index 1edef1fa23..898d898ef7 100644
--- a/OsmAnd/res/values-sr/phrases.xml
+++ b/OsmAnd/res/values-sr/phrases.xml
@@ -269,7 +269,7 @@
 	<string name="poi_bus_station">Аутобуска станица</string>
 	<string name="poi_railway_station">Железничка станица</string>
 	<string name="poi_subway_entrance">Улаз у подземну</string>
-	<string name="poi_subway_station">Подземна станица</string>
+	<string name="poi_subway_station">Да</string>
 	<string name="poi_taxi">Такси станица</string>
 
 	<string name="poi_aerodrome">Аеродром</string>
@@ -462,7 +462,7 @@
 	<string name="poi_customs">Царина</string>
 	<string name="poi_country">Држава</string>
 	<string name="poi_city">Град</string>
-	<string name="poi_capital">Престоница</string>
+	<string name="poi_capital">Да</string>
 	<string name="poi_town">Варошица</string>
 	<string name="poi_village">Село</string>
 	<string name="poi_hamlet">Засеок</string>
@@ -1921,7 +1921,7 @@
 	<string name="poi_drive_through_no">Пролазак кроз: не</string>
 
 	<string name="poi_brewery_additional">Име пиваре</string>
-	<string name="poi_microbrewery_yes">Микропивара</string>
+	<string name="poi_microbrewery_yes">Да</string>
 	<string name="poi_microbrewery_no">Не микропивара</string>
 
 	<string name="poi_takeaway_filter_yes">Да</string>
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index 91faccb81f..4c673e3451 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -239,7 +239,7 @@
 	<string name="poi_fuel_biogas">Біогаз</string>
 	<string name="poi_halt">Залізнична зупинка</string>
 	<string name="poi_subway_entrance">Вхід в метро</string>
-	<string name="poi_subway_station">Станція метро</string>
+	<string name="poi_subway_station">Так</string>
 	<string name="poi_taxi">Стоянка таксі</string>
 
 	<string name="poi_aerodrome">Аеропорт</string>
@@ -445,7 +445,7 @@
 	<string name="poi_prosecutor">Прокуратура</string>
 	<string name="poi_migration">Міграційна служба</string>
 	<string name="poi_tax_inspection">Налоговая інспекція</string>
-	<string name="poi_capital">Столиця</string>
+	<string name="poi_capital">Так</string>
 	<string name="poi_hamlet">Хутір</string>
 	<string name="poi_suburb">Район</string>
 	<string name="poi_neighbourhood">Мікрорайон</string>
@@ -2669,7 +2669,7 @@
 	<string name="poi_diet_vegetarian_only">Лише вегетаріанське харчування</string>
 	<string name="poi_memorial_column">Колона</string>
 	<string name="poi_service_bicycle_diy_yes">Інструменти для самостійного ремонту</string>
-	<string name="poi_scout_yes">так</string>
+	<string name="poi_scout_yes">Так</string>
 	<string name="poi_water_tap">Водопровідний кран</string>
 	<string name="poi_diplomatic_delegation">Делегація</string>
 	<string name="poi_cuisine_bavarian">Баварська</string>
@@ -2897,7 +2897,7 @@
 	<string name="poi_telescope_type_gamma">Гамма</string>
 	<string name="poi_cuisine_diner">Дайнер (американська дешева закусочна)</string>
 	<string name="poi_cuisine_cuban">Кубинська</string>
-	<string name="poi_microbrewery_yes">Власна пивоварня</string>
+	<string name="poi_microbrewery_yes">Так</string>
 	<string name="poi_vending_tickets">Квитки</string>
 	<string name="poi_bridge_movable_retractable">Тип розвідного моста: висувається</string>
 
@@ -3874,8 +3874,8 @@
 <string name="poi_bulk_purchase">Масове придбання</string>
 	<string name="poi_substation_type">Тип</string>
 
-<string name="poi_bulk_purchase_yes">Масове придбання: так</string>
-	<string name="poi_bulk_purchase_only">Масове придбання: виключно</string>
+<string name="poi_bulk_purchase_yes">Так</string>
+	<string name="poi_bulk_purchase_only">Виключно</string>
 
 	<string name="poi_pipeline_substation">Трубопровідна підстанція</string>
 	<string name="poi_substation_transmission">Передавальна</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 2339d8e8a0..140c2c69a2 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -365,7 +365,7 @@
 	<string name="poi_railway_platform">Railroad platform</string>
 	<string name="poi_halt">Railroad stop</string>
 	<string name="poi_subway_entrance">Subway entrance</string>
-	<string name="poi_subway_station">Subway station</string>
+	<string name="poi_subway_station">Yes</string>
 	<string name="poi_railway_buffer_stop">Railroad buffer stop</string>
 	<string name="poi_taxi">Taxi stand</string>
 
@@ -576,7 +576,7 @@
 	<string name="poi_customs">Customs</string>
 	<string name="poi_country">Country</string>
 	<string name="poi_city">City</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Yes</string>
 	<string name="poi_town">Town</string>
 	<string name="poi_village">Village</string>
 	<string name="poi_hamlet">Hamlet</string>
@@ -1777,7 +1777,7 @@
 	<string name="poi_drive_through_no">Drive-through: no</string>
 
 	<string name="poi_brewery_additional">Brewery name</string>
-	<string name="poi_microbrewery_yes">Microbrewery</string>
+	<string name="poi_microbrewery_yes">Yes</string>
 	<string name="poi_microbrewery_no">No microbrewery</string>
 
 	<string name="poi_takeaway_filter_yes">Yes</string>
@@ -3859,8 +3859,8 @@
 
 	<string name="poi_shoe_repair">Shoe repair</string>
 
-	<string name="poi_bulk_purchase_yes">Bulk purchase: yes</string>
-	<string name="poi_bulk_purchase_only">Bulk purchase: only</string>
+	<string name="poi_bulk_purchase_yes">Yes</string>
+	<string name="poi_bulk_purchase_only">Only</string>
 
 	<string name="poi_pipeline_substation">Pipeline substation</string>
 	<string name="poi_substation_transmission">Transmission</string>

From 8f08fac24247d6f2ebd3458a7c279cf59175ba87 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Tue, 27 Nov 2018 15:56:34 +0300
Subject: [PATCH 3/4] Add ru synonyms to phrases

---
 OsmAnd/res/values-ru/phrases.xml | 86 ++++++++++++++++----------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 4d2faa84e1..87121a232d 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources> 
 	<string name="poi_bakery">Булочная</string>
-	<string name="poi_alcohol">Винно-водочный магазин</string>
+	<string name="poi_alcohol">Винно-водочный магазин;Алкоголь</string>
 	<string name="poi_convenience">Продукты</string>
 	<string name="poi_mall">Торговый центр</string>
 	<string name="poi_beverages">Напитки</string>
-	<string name="poi_butcher">Мясная лавка</string>
+	<string name="poi_butcher">Мясная лавка;Мясо</string>
 	<string name="poi_deli">Деликатесы</string>
 	<string name="poi_greengrocer">Овощи и фрукты</string>
 	<string name="poi_seafood">Морепродукты</string>
 	<string name="poi_confectionery">Кондитерская</string>
 	<string name="poi_ice_cream">Мороженое</string>
-	<string name="poi_supermarket">Супермаркет</string>
+	<string name="poi_supermarket">Супермаркет;Универсам</string>
 	<string name="poi_tea">Чайный магазин</string>
-	<string name="poi_dairy">Молочный магазин</string>
+	<string name="poi_dairy">Молочный магазин;Молоко</string>
 	<string name="poi_vending_machine">Торговый автомат</string>
 	<string name="poi_cheese">Сыр</string>
 	<string name="poi_chocolate">Шоколад</string>
@@ -21,25 +21,25 @@
 	<string name="poi_pasta">Макаронные изделия</string>
 	<string name="poi_pastry">Хлебобулочные и кондитерские изделия</string>
 
-	<string name="poi_camera">Фотокамеры и объективы</string>
+	<string name="poi_camera">Фотокамеры и объективы;Фототехника</string>
 	<string name="poi_candles">Свечи и подсвечники</string>
 
-	<string name="poi_books">Книжный магазин</string>
-	<string name="poi_bicycle">Магазин велосипедов</string>
+	<string name="poi_books">Книжный магазин;Книги</string>
+	<string name="poi_bicycle">Магазин велосипедов;Веломагазин</string>
 	<string name="poi_anime">Магазин аниме</string>
 	<string name="poi_antiques">Антиквариат</string>
 	<string name="poi_art">Предметы искусства</string>
-	<string name="poi_baby_goods">Товары для детей</string>
+	<string name="poi_baby_goods">Товары для детей;Детские товары</string>
 	<string name="poi_bag">Сумки, чемоданы</string>
 	<string name="poi_bathroom_furnishing">Сантехника, ванные</string>
 	<string name="poi_bed">Магазин постельного белья</string>
 	<string name="poi_boutique">Бутик</string>
-	<string name="poi_carpet">Магазин ковров</string>
+	<string name="poi_carpet">Магазин ковров;Ковры</string>
 	<string name="poi_charity">Благотворительный магазин</string>
 	<string name="poi_chemist">Бытовая химия, косметика</string>
 	<string name="poi_clothes">Одежда</string>
 	<string name="poi_clothes_children">Детская одежда</string>
-	<string name="poi_shoes">Обувь</string>
+	<string name="poi_shoes">Обувь;Ботинки</string>
 	<string name="poi_computer">Компьютеры</string>
 	<string name="poi_copyshop">Ксерокопия, полиграфия</string>
 	<string name="poi_curtain">Шторы, портьеры</string>
@@ -48,9 +48,9 @@
 	<string name="poi_dive">Снаряжение для дайвинга</string>
 	<string name="poi_doityourself">Инструменты и стройматериалы</string>
 	<string name="poi_doors">Двери</string>
-	<string name="poi_erotic">Секс-шоп</string>
+	<string name="poi_erotic">Секс-шоп;Интим-салон;Магазин для взрослых</string>
 	<string name="poi_fishing">Рыболовный магазин</string>
-	<string name="poi_florist">Цветочный магазин</string>
+	<string name="poi_florist">Цветочный магазин;Цветы</string>
 	<string name="poi_frame">Рамки, багет</string>
 	<string name="poi_furniture">Мебель</string>
 	<string name="poi_garden_centre">Садово-огородный магазин</string>
@@ -62,63 +62,63 @@
 	<string name="poi_hearing_aids">Слуховые аппараты</string>
 	<string name="poi_herbalist">Травы (народная медицина)</string>
 	<string name="poi_hifi">Hi-Fi аппаратура</string>
-	<string name="poi_houseware">Хозяйственные товары</string>
+	<string name="poi_houseware">Хозяйственные товары;Хозтовары</string>
 	<string name="poi_hunting">Охотничий магазин</string>
 	<string name="poi_interior_decoration">Декор и оформление</string>
-	<string name="poi_jewelry">Ювелирный магазин</string>
+	<string name="poi_jewelry">Ювелирный магазин;Ювелирный салон</string>
 	<string name="poi_kiosk">Киоск, ларёк</string>
 	<string name="poi_kitchen">Кухни</string>
 	<string name="poi_mobile_phone">Салон связи</string>
 	<string name="poi_motorcycle">Мотоциклы</string>
 	<string name="poi_musical_instrument">Музыкальные инструменты</string>
-	<string name="poi_music">Аудиозаписи</string>
-	<string name="poi_newsagent">Журнальный киоск</string>
+	<string name="poi_music">Аудиозаписи;Музыкальный магазин</string>
+	<string name="poi_newsagent">Журнальный киоск;Журналы</string>
 	<string name="poi_optician">Оптика</string>
-	<string name="poi_organic">Биопродукты</string>
+	<string name="poi_organic">Биопродукты;Экологически чистые продукты;Органическая пища</string>
 	<string name="poi_outdoor">Товары для активного отдыха</string>
 	<string name="poi_paint">Краски</string>
-	<string name="poi_pet">Зоомагазин</string>
+	<string name="poi_pet">Зоомагазин;Товары для животных</string>
 	<string name="poi_radiotechnics">Радиодетали</string>
 	<string name="poi_second_hand">Секонд-хенд</string>
 	<string name="poi_ship_chandler">Яхты, запчасти, оснастка</string>
-	<string name="poi_sports">Спорттовары</string>
-	<string name="poi_stationery">Канцелярские товары</string>
+	<string name="poi_sports">Спорттовары;Товары для спорта;Спортивные товары</string>
+	<string name="poi_stationery">Канцелярские товары;Канцтовары</string>
 	<string name="poi_tableware">Кухонные принадлежности</string>
-	<string name="poi_ticket">Продажа, бронирование билетов</string>
-	<string name="poi_tobacco">Табак</string>
-	<string name="poi_toys">Игрушки</string>
+	<string name="poi_ticket">Продажа, бронирование билетов;Билеты</string>
+	<string name="poi_tobacco">Табак;Сигареты</string>
+	<string name="poi_toys">Игрушки;Детские игрушки</string>
 	<string name="poi_trade">Оптовый склад</string>
 	<string name="poi_vacuum_cleaner">Пылесосы и аксессуары</string>
 	<string name="poi_variety_store">Всё по одной цене</string>
-	<string name="poi_video">Продажа, прокат DVD</string>
+	<string name="poi_video">Видеосалон;Продажа, прокат DVD</string>
 	<string name="poi_window_blind">Жалюзи, ставни, маркизы</string>
 	<string name="poi_department_store">Универмаг</string>
 	<string name="poi_electronics">Электроника</string>
 	<string name="poi_car">Автосалон</string>
-	<string name="poi_car_parts">Автозапчасти</string>
+	<string name="poi_car_parts">Автозапчасти;Запчасти для автомобилей</string>
 	<string name="poi_atv">Квадроциклы</string>
 	<string name="poi_cosmetics">Косметика, парфюмерия</string>
 	<string name="poi_marketplace">Рынок</string>
 	<string name="poi_sewing">Шитьё и рукоделие</string>
 	<string name="poi_perfumery">Парфюмерия</string>
-	<string name="poi_energy">Элементы питания</string>
+	<string name="poi_energy">Элементы питания;Батарейки</string>
 	<string name="poi_fashion">Модная одежда</string>
 	<string name="poi_free_flying">Товары для свободного полёта</string>
-	<string name="poi_games">Магазин игр</string>
+	<string name="poi_games">Магазин игр;Игры</string>
 	<string name="poi_garden_furniture">Садовая мебель, аксессуары</string>
 	<string name="poi_furnace">Системы отопления</string>
-	<string name="poi_leather">Изделия из кожи</string>
-	<string name="poi_pyrotechnics">Пиротехника</string>
+	<string name="poi_leather">Изделия из кожи;Кожаные изделия</string>
+	<string name="poi_pyrotechnics">Пиротехника;Фейерверки</string>
 	<string name="poi_weapons">Оружие</string>
 	<string name="poi_model">Масштабные модели</string>
 	<string name="poi_trophy">Трофеи, награды</string>
 	<string name="poi_scuba_diving_shop">Товары для аквалангистов</string>
 	<string name="poi_swimming_pool_shop">Оборудование и аксессуары для плавательных бассейнов</string>
 	<string name="poi_tyres">Шины</string>
-	<string name="poi_video_games">Магазин видеоигр</string>
-	<string name="poi_watches">Магазин часов</string>
+	<string name="poi_video_games">Магазин видеоигр;Видеоигры</string>
+	<string name="poi_watches">Магазин часов;Часы</string>
 
-	<string name="poi_police">Отделение полиции</string>
+	<string name="poi_police">Отделение полиции;Полиция</string>
 	<string name="poi_fire_station">Пожарная часть</string>
 	<string name="poi_emergency_phone">Экстренный телефон</string>
 	<string name="poi_fire_hydrant">Пожарный гидрант</string>
@@ -127,7 +127,7 @@
 	<string name="poi_fire_hose">Пожарный шланг</string>
 	<string name="poi_fire_water_pond">Пожарный водоём</string>
 	<string name="poi_grit_bin">Ящик с песком</string>
-	<string name="poi_ambulance_station">Станция скорой помощи</string>
+	<string name="poi_ambulance_station">Станция скорой помощи;Скорая помощь</string>
 	<string name="poi_ses_station">Станция SES</string>
 	<string name="poi_emergency_access_point">Табличка с кодом для службы спасения</string>
 
@@ -152,7 +152,7 @@
 
 	<string name="poi_service_general">Услуги</string>
 	<string name="poi_service_tyres">Шиномонтаж</string>
-	<string name="poi_vehicle_inspection">Пункт техосмотра</string>
+	<string name="poi_vehicle_inspection">Пункт техосмотра;Техосмотр</string>
 	<string name="poi_car_wash">Автомойка</string>
 	<string name="poi_fuel">Автомобильная заправка;Автозаправка;Бензоколонка;АЗС;Бензозаправка</string>
 	<string name="poi_electricity_combined_charging">Зарядная станция</string>
@@ -177,7 +177,7 @@
 
 	<string name="poi_subway_station_filter">Станция метро</string>
 	<string name="poi_subway_station">Да</string>
-	<string name="poi_taxi">Стоянка такси</string>
+	<string name="poi_taxi">Стоянка такси;Такси</string>
 
 	<string name="poi_aerodrome">Аэропорт</string>
 	<string name="poi_helipad">Вертолётная площадка</string>
@@ -189,8 +189,8 @@
 	<string name="poi_ferry_terminal">Причал парома</string>
 	<string name="poi_lighthouse">Маяк</string>
 
-	<string name="poi_bicycle_rental">Прокат велосипедов</string>
-	<string name="poi_bicycle_parking">Велопарковка</string>
+	<string name="poi_bicycle_rental">Прокат велосипедов;Велопрокат</string>
+	<string name="poi_bicycle_parking">Велопарковка;Велосипедная парковка;Парковка для велосипедов</string>
 
 	<string name="poi_aerialway_station">Станция канатной дороги</string>
 	<string name="poi_aerialway_cable_car">Канатная дорога с кабинами</string>
@@ -231,7 +231,7 @@
 	<string name="poi_power_tower">Опора линии электропередач</string>
 	<string name="poi_power_pole">Столб линии электропередач</string>
 
-	<string name="poi_post_office">Почта</string>
+	<string name="poi_post_office">Почта;Почтовое отделение</string>
 	<string name="poi_post_box">Почтовый ящик</string>
 	<string name="poi_telephone">Телефон</string>
 	<string name="poi_communication_tower">Вышка связи</string>
@@ -349,13 +349,13 @@
 
 	<string name="poi_pharmacy">Аптека</string>
 	<string name="poi_hospital">Больница</string>
-	<string name="poi_doctors">Врач</string>
+	<string name="poi_doctors">Врач;Доктор</string>
 	<string name="poi_clinic">Поликлиника, клиника</string>
 	<string name="poi_first_aid">Первая помощь</string>
-	<string name="poi_dentist">Стоматология</string>
+	<string name="poi_dentist">Стоматология;Лечение зубов;Зубной врач</string>
 	<string name="poi_nursing_home">Дом престарелых</string>
 	<string name="poi_baby_hatch">Бэби-бокс</string>
-	<string name="poi_veterinary">Ветеринарная лечебница</string>
+	<string name="poi_veterinary">Ветеринарная лечебница;Ветеринария</string>
 
 	<string name="poi_resort_type">Тип</string>
 	<string name="poi_sanatorium">Санаторий</string>
@@ -377,14 +377,14 @@
 	<string name="poi_company">Фирма</string>
 	<string name="poi_insurance">Страховая компания</string>
 	<string name="poi_estate_agent">Агентство недвижимости</string>
-	<string name="poi_lawyer">Юридические услуги</string>
+	<string name="poi_lawyer">Юридические услуги;Юрист</string>
 	<string name="poi_office_telecommunication">Телекоммуникационная компания</string>
 	<string name="poi_ngo">Общественная организация</string>
 	<string name="poi_townhall">Администрация населенного пункта</string>
 	<string name="poi_employment_agency">Биржа труда</string>
 	<string name="poi_research">Исследовательский центр</string>
 	<string name="poi_it">Информационные технологии</string>
-	<string name="poi_newspaper">Печатное издание</string>
+	<string name="poi_newspaper">Печатное издание;Офис газеты</string>
 	<string name="poi_architect">Архитектура, офис</string>
 	<string name="poi_advertising_agency">Рекламное агентство</string>
 	<string name="poi_educational_institution">Образовательное учреждение (администрация)</string>

From 90f006ee088a1e279b5b9cb4eac94cb9f18fe077 Mon Sep 17 00:00:00 2001
From: Chumva <faiver.unknown@gmail.com>
Date: Tue, 27 Nov 2018 18:38:45 +0200
Subject: [PATCH 4/4] Fix scroll height

---
 OsmAnd/res/layout/fragment_mapillary_filters.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/layout/fragment_mapillary_filters.xml b/OsmAnd/res/layout/fragment_mapillary_filters.xml
index 3535fec6be..718f60c55c 100644
--- a/OsmAnd/res/layout/fragment_mapillary_filters.xml
+++ b/OsmAnd/res/layout/fragment_mapillary_filters.xml
@@ -468,7 +468,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="18dp" />
+                android:layout_height="26dp" />
         </LinearLayout>
 
     </LinearLayout>