From feb8c50042c4ad9dae735b5e07ba3213aaa9bf55 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Mon, 31 Aug 2015 17:31:25 +0300
Subject: [PATCH] Edit POI UI issues fixed. Except tabs.

---
 OsmAnd/res/layout/editing_poi.xml             |  2 +-
 OsmAnd/res/layout/fragment_edit_poi.xml       | 16 ++++++--------
 .../res/layout/fragment_edit_poi_advanced.xml | 22 +++++++++----------
 .../res/layout/fragment_edit_poi_normal.xml   | 20 +++++++++--------
 OsmAnd/res/layout/open_time_list_item.xml     |  2 +-
 OsmAnd/res/layout/poi_tag_list_item.xml       |  2 +-
 OsmAnd/res/values-af/strings.xml              |  2 +-
 OsmAnd/res/values-ar/strings.xml              |  2 +-
 OsmAnd/res/values-be-rBY/strings.xml          |  2 +-
 OsmAnd/res/values-be/strings.xml              |  6 ++---
 OsmAnd/res/values-bg/strings.xml              |  2 +-
 OsmAnd/res/values-bs/strings.xml              |  2 +-
 OsmAnd/res/values-ca/strings.xml              |  6 ++---
 OsmAnd/res/values-cs/strings.xml              |  2 +-
 OsmAnd/res/values-da/strings.xml              |  6 ++---
 OsmAnd/res/values-de/strings.xml              |  2 +-
 OsmAnd/res/values-el/strings.xml              |  2 +-
 OsmAnd/res/values-es-rAR/strings.xml          |  6 ++---
 OsmAnd/res/values-es/strings.xml              |  6 ++---
 OsmAnd/res/values-eu/strings.xml              |  2 +-
 OsmAnd/res/values-fa/strings.xml              |  2 +-
 OsmAnd/res/values-fi/strings.xml              |  2 +-
 OsmAnd/res/values-fr/strings.xml              |  6 ++---
 OsmAnd/res/values-gl/strings.xml              |  2 +-
 OsmAnd/res/values-he/strings.xml              |  2 +-
 OsmAnd/res/values-hr/strings.xml              |  2 +-
 OsmAnd/res/values-hu/strings.xml              |  2 +-
 OsmAnd/res/values-it/strings.xml              |  6 ++---
 OsmAnd/res/values-ja/strings.xml              |  2 +-
 OsmAnd/res/values-ka/strings.xml              |  2 +-
 OsmAnd/res/values-ko/strings.xml              |  2 +-
 OsmAnd/res/values-lt/strings.xml              |  2 +-
 OsmAnd/res/values-lv/strings.xml              |  2 +-
 OsmAnd/res/values-nb/strings.xml              |  2 +-
 OsmAnd/res/values-nl/strings.xml              |  2 +-
 OsmAnd/res/values-pl/strings.xml              |  2 +-
 OsmAnd/res/values-pt-rBR/strings.xml          |  6 ++---
 OsmAnd/res/values-pt/strings.xml              |  2 +-
 OsmAnd/res/values-ro/strings.xml              |  2 +-
 OsmAnd/res/values-ru/strings.xml              |  2 +-
 OsmAnd/res/values-sc/strings.xml              |  6 ++---
 OsmAnd/res/values-sk/strings.xml              |  2 +-
 OsmAnd/res/values-sl/strings.xml              |  2 +-
 OsmAnd/res/values-sv/strings.xml              |  6 ++---
 OsmAnd/res/values-tr/strings.xml              |  2 +-
 OsmAnd/res/values-uk/strings.xml              |  2 +-
 OsmAnd/res/values-zh-rCN/strings.xml          |  2 +-
 OsmAnd/res/values-zh-rTW/strings.xml          |  6 ++---
 OsmAnd/res/values/colors.xml                  |  2 +-
 OsmAnd/res/values/strings.xml                 | 14 ++++++++----
 OsmAnd/res/values/styles.xml                  |  8 +++----
 .../plus/dashboard/DashSearchFragment.java    |  1 -
 .../osmand/plus/osmedit/EditPoiFragment.java  | 10 ++++++---
 53 files changed, 118 insertions(+), 109 deletions(-)

diff --git a/OsmAnd/res/layout/editing_poi.xml b/OsmAnd/res/layout/editing_poi.xml
index 220fd971ec..8aafcc035e 100644
--- a/OsmAnd/res/layout/editing_poi.xml
+++ b/OsmAnd/res/layout/editing_poi.xml
@@ -217,7 +217,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:minWidth="150dp"
-                android:text="@string/btn_add_tag"
+                android:text="@string/add_tag"
                 android:visibility="gone" />
 
             <Button
diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml
index 07ea401c68..674258f157 100644
--- a/OsmAnd/res/layout/fragment_edit_poi.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi.xml
@@ -44,7 +44,7 @@
                         android:id="@+id/poiNameEditText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="Name"
+                        android:hint="@string/poi_dialog_name"
                         tools:text="@string/lorem_ipsum"/>
 
                 </android.support.design.widget.TextInputLayout>
@@ -76,7 +76,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:drawableRight="@drawable/ic_action_arrow_drop_down"
-                        android:hint="POI Type"
+                        android:hint="@string/poi_dialog_poi_type"
                         android:completionThreshold="1"
                         tools:text="@string/lorem_ipsum"/>
 
@@ -88,7 +88,7 @@
                     android:layout_height="48dp"
                     android:layout_gravity="bottom"
                     android:background="@null"
-                    android:src="@drawable/ic_action_help"/>
+                    tools:src="@drawable/ic_action_help"/>
             </LinearLayout>
 
             <android.support.design.widget.TabLayout
@@ -125,20 +125,18 @@
 
         <net.osmand.plus.widgets.ButtonEx
             android:id="@+id/cancelButton"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/DashboardGeneralButton"
             android:text="@string/shared_string_cancel"
+            android:gravity="center"
             android:textColor="@color/dashboard_general_button_text_light"
             app:textAllCapsCompat="true"/>
 
         <net.osmand.plus.widgets.ButtonEx
             android:id="@+id/saveButton"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/DashboardGeneralButton"
             android:textColor="@color/dashboard_general_button_text_light"
             tools:text="Save"
+            android:gravity="center"
             app:textAllCapsCompat="true"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/OsmAnd/res/layout/fragment_edit_poi_advanced.xml b/OsmAnd/res/layout/fragment_edit_poi_advanced.xml
index c9109e4217..aff4691b92 100644
--- a/OsmAnd/res/layout/fragment_edit_poi_advanced.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi_advanced.xml
@@ -15,9 +15,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginLeft="14dp"
+            android:layout_marginRight="14dp"
+            android:layout_marginTop="14dp"
             android:background="?attr/bg_card"
             android:orientation="vertical">
 
@@ -31,9 +31,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
-                    android:text="name"
+                    android:text="@string/tag_poi_name"
                     android:textColor="@color/dashboard_black"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/default_desc_text_size"
                     osmand:typeface="@string/font_roboto_regular"/>
 
                 <View
@@ -48,7 +48,7 @@
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
                     android:textColor="@color/dashboard_black"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/default_desc_text_size"
                     osmand:typeface="@string/font_roboto_medium"/>
             </LinearLayout>
 
@@ -68,9 +68,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
-                    android:text="amenity"
+                    android:text="@string/tag_poi_amenity"
                     android:textColor="@color/dashboard_black"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/default_desc_text_size"
                     osmand:typeface="@string/font_roboto_regular"/>
 
                 <View
@@ -85,7 +85,7 @@
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
                     android:textColor="@color/dashboard_black"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/default_desc_text_size"
                     osmand:typeface="@string/font_roboto_medium"/>
             </LinearLayout>
         </LinearLayout>
@@ -101,9 +101,9 @@
             android:id="@+id/addTagButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
+            android:layout_marginLeft="12dp"
             android:layout_marginTop="16dp"
-            android:text="Add tag"
+            android:text="@string/add_tag"
             android:textSize="@dimen/default_sub_text_size"
             osmand:typeface="@string/font_roboto_medium"/>
 
diff --git a/OsmAnd/res/layout/fragment_edit_poi_normal.xml b/OsmAnd/res/layout/fragment_edit_poi_normal.xml
index ef38599adb..fba65193b1 100644
--- a/OsmAnd/res/layout/fragment_edit_poi_normal.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi_normal.xml
@@ -17,7 +17,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
             android:layout_marginTop="18dp"
-            android:text="Contact info"
+            android:text="@string/contact_info"
             android:textColor="@color/color_black"
             osmand:typeface="@string/font_roboto_medium"/>
 
@@ -31,8 +31,8 @@
             android:id="@+id/streetEditText"
             style="@style/create_poi_text_field"
             android:layout_below="@id/contactInfoTextView"
-            android:hint="Street"
-            android:inputType="text"/>
+            android:hint="@string/street_name"
+            android:inputType="textMultiLine"/>
 
         <ImageView
             android:id="@+id/houseNumberImageView"
@@ -57,7 +57,7 @@
             android:id="@+id/phoneEditText"
             style="@style/create_poi_text_field"
             android:layout_below="@id/houseNumberEditText"
-            android:hint="Phone"
+            android:hint="@string/phone"
             android:inputType="phone"/>
 
         <ImageView
@@ -70,7 +70,7 @@
             android:id="@+id/webSiteEditText"
             style="@style/create_poi_text_field"
             android:layout_below="@id/phoneEditText"
-            android:hint="Web site"
+            android:hint="@string/website"
             android:inputType="textUri"/>
 
         <ImageView
@@ -84,7 +84,7 @@
             style="@style/create_poi_text_field"
             android:layout_width="match_parent"
             android:layout_below="@id/webSiteEditText"
-            android:hint="Description"
+            android:hint="@string/description"
             android:inputType="textMultiLine"/>
 
         <net.osmand.plus.widgets.TextViewEx
@@ -94,7 +94,8 @@
             android:layout_below="@id/descriptionEditText"
             android:layout_marginLeft="16dp"
             android:layout_marginTop="18dp"
-            android:text="Open hours"
+            android:layout_marginBottom="16dp"
+            android:text="@string/opening_hours"
             android:textColor="@color/color_black"
             osmand:typeface="@string/font_roboto_medium"/>
 
@@ -103,7 +104,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/openHoursTextView"
-            android:orientation="vertical"/>
+            android:orientation="vertical"
+            android:layout_marginBottom="4dp"/>
 
         <ImageView
             android:id="@+id/openingHoursImageView"
@@ -118,7 +120,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/openHoursContainer"
             android:layout_marginLeft="72dp"
-            android:text="Add opening hours"
+            android:text="@string/add_opening_hours"
             android:textSize="@dimen/default_sub_text_size"
             osmand:typeface="@string/font_roboto_medium"/>
 
diff --git a/OsmAnd/res/layout/open_time_list_item.xml b/OsmAnd/res/layout/open_time_list_item.xml
index aa58741f9a..b8f9adc591 100644
--- a/OsmAnd/res/layout/open_time_list_item.xml
+++ b/OsmAnd/res/layout/open_time_list_item.xml
@@ -17,7 +17,7 @@
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="36dp"
+        android:layout_marginLeft="32dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
diff --git a/OsmAnd/res/layout/poi_tag_list_item.xml b/OsmAnd/res/layout/poi_tag_list_item.xml
index 828653f8a7..793ca7af43 100644
--- a/OsmAnd/res/layout/poi_tag_list_item.xml
+++ b/OsmAnd/res/layout/poi_tag_list_item.xml
@@ -10,7 +10,7 @@
     <android.support.design.widget.TextInputLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginLeft="12dp"
         android:layout_marginRight="16dp"
         android:layout_weight="1">
 
diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index 4374311a7f..af60dcbe3e 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -972,7 +972,7 @@
     <string name="context_menu_item_intermediate_point">Voeg by as oorgangspunt</string>
     <string name="map_widget_intermediate_distance">Oorgangspunt</string>
     <string name="ending_point_too_far">Eindpunt te ver van naaste pad.</string>
-    <string name="btn_add_tag">Voeg naamplaatjie by</string>
+    <string name="add_tag">Voeg naamplaatjie by</string>
     <string name="btn_advanced_mode">Gevorderde gebruikswyse…</string>
     <string name="poi_filter_parking">Parkering</string>
     <string name="poi_filter_emergency">Noodgeval</string>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 080c4d1ec5..419f417826 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -405,7 +405,7 @@
     <string name="context_menu_item_intermediate_point">أضف كإحداثية</string>
     <string name="map_widget_intermediate_distance">إحداثية</string>
     <string name="ending_point_too_far">نقطة النهاية بعيدة جدا عن أقرب طريق.</string>
-    <string name="btn_add_tag">أضف وسما</string>
+    <string name="add_tag">أضف وسما</string>
     <string name="show_warnings_descr">ضبط تحذيرات المرور ( حدود السرعة، والتوقف القسري، والمطبات الصناعية ) ، وتحذيرات كاميرا السرعة ، ومعلومات الممرات</string>
 	<string name="tip_recent_changes_1_6_t">التّغيرات في الإصدار 1.6:
     \n\t* دعم أجهزة الدّقة العالية الكاملة
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 93514dd5c6..f12ffd4424 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -776,7 +776,7 @@
     <string name="context_menu_item_intermediate_point">Dadać jak kropku šliachu</string>
     <string name="map_widget_intermediate_distance">Kropka šliachu</string>
     <string name="ending_point_too_far">Kančatkovaja kropka zanadta dalioka ad blіžejšaj darohі.</string>
-    <string name="btn_add_tag">Dadać adznaku</string>
+    <string name="add_tag">Dadać adznaku</string>
     <string name="btn_advanced_mode">Pašyrany režym…</string>
     <string name="poi_filter_parking">Parkoŭka</string>
     <string name="poi_filter_emergency">Avaryjnyja služby</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 1b71b34c02..6f95b502d3 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -289,7 +289,7 @@
     <string name="context_menu_item_intermediate_point">Дадаць як кропку шляху</string>
     <string name="map_widget_intermediate_distance">Кропка шляху</string>
     <string name="ending_point_too_far">Канчатковая кропка занадта далёка ад бліжэйшай дарогі.</string>
-    <string name="btn_add_tag">Дадаць адзнаку</string>
+    <string name="add_tag">Дадаць адзнаку</string>
     <string name="btn_advanced_mode">Пашыраны рэжым…</string>
     <string name="poi_filter_parking">Паркоўка</string>
     <string name="poi_filter_emergency">Аварыйныя службы</string>
@@ -2068,10 +2068,10 @@
 	<string name="commit_poi">Укласьці POI</string>
 <string name="routing_attr_avoid_shuttle_train_name">Пазьбягаць трансфер-цягнікоў</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Пазьбягаць трансфер-цягнікоў</string>
-    <string name="basic_tab_title">Асноўнае</string>
+    <string name="tab_title_basic">Асноўнае</string>
 	<string name="building_number">Нумар будынка</string>
 	<string name="next_proceed">Далей</string>
 	<string name="opening_at">Адчыняецца ў</string>
 	<string name="closing_at">Зачыняецца ў</string>
-<string name="extended_tab_title">Пашыранае</string>
+<string name="tab_title_advanced">Пашыранае</string>
 	</resources>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index e56ce3aeb1..1b655c1fab 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -278,7 +278,7 @@
     <string name="context_menu_item_intermediate_point">Добави  като междинна точка</string>
     <string name="map_widget_intermediate_distance">Междинна точка</string>
     <string name="ending_point_too_far">Крайната цел е твърде далеч от най-близкия път.</string>
-    <string name="btn_add_tag">Добави таг</string>
+    <string name="add_tag">Добави таг</string>
     <string name="btn_advanced_mode">Разширен режим…</string>
     <string name="poi_filter_parking">Паркинг</string>
     <string name="poi_filter_emergency">Спешна помощ</string>
diff --git a/OsmAnd/res/values-bs/strings.xml b/OsmAnd/res/values-bs/strings.xml
index 124ba7c63e..d22b34ed6b 100644
--- a/OsmAnd/res/values-bs/strings.xml
+++ b/OsmAnd/res/values-bs/strings.xml
@@ -106,7 +106,7 @@
     <string name="map_widget_show_destination_arrow">Prikaži smjer odredišta</string>
     <string name="no_route">Nema rute</string>
 	<string name="replace_destination_point">Promjeni odredište</string>
-    <string name="btn_add_tag">Dodaj oznaku</string>
+    <string name="add_tag">Dodaj oznaku</string>
     <string name="poi_filter_public_transport">Javni prijevoz</string>
     <string name="poi_filter_entertainment">Zabava</string>
     <string name="poi_filter_accomodation">Smještaj</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 36539bc226..a134031db0 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -839,7 +839,7 @@
 	\n\t* El mapa no perd la posició després d\'interrupcions
 	\n\t* Permet activar el mode en segon pla durant la navegació
     </string>
-    <string name="btn_add_tag">Afegeix una etiqueta</string>
+    <string name="add_tag">Afegeix una etiqueta</string>
     <string name="poi_filter_entertainment">Entreteniment</string>
     <string name="context_menu_item_first_intermediate_point">Defineix el primer punt objectiu</string>
     <string name="context_menu_item_last_intermediate_point">Defineix el darrer punt objectiu</string>
@@ -2099,8 +2099,8 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
 <string name="routing_attr_avoid_shuttle_train_name">Evita tren llançadora</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Evita tren llançadora</string>
     <string name="plugin_settings">Connectors</string>
-	<string name="basic_tab_title">Bàsic</string>
-	<string name="extended_tab_title">Estès</string>
+	<string name="tab_title_basic">Bàsic</string>
+	<string name="tab_title_advanced">Estès</string>
 	<string name="building_number">Nombre de finca</string>
 	<string name="next_proceed">Següent</string>
 	<string name="opening_at">Obert a les</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index c9e929f3a1..ec430ea62d 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1016,7 +1016,7 @@
 <string name="context_menu_item_intermediate_point">Přidat mezicíl</string>
 <string name="map_widget_intermediate_distance">Mezicíl</string>
 <string name="ending_point_too_far">Cíl je příliš daleko od nejbližší cesty.</string>
-<string name="btn_add_tag">Přidat označení</string>
+<string name="add_tag">Přidat označení</string>
 <string name="btn_advanced_mode">Pokročilý režim…</string>
 <string name="tip_app_mode_t_v2">\tOsmAnd podporuje několik konfigurovatelných profilů pro různé způsoby dopravy.
 \t\nProfil můžete změnit tlačítkem v levém dolním rohu mapové obrazovky (ikona auta, kola nebo chodce) nebo při zadávání navigace.
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 84a962f70b..4b0d0db89c 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -117,7 +117,7 @@
     <string name="arrived_at_intermediate_point">Ankommet til rutepunktet</string>
     <string name="context_menu_item_intermediate_point">Tilføj som rutepunkt</string>
     <string name="ending_point_too_far">Slutpunktet er for langt fra nærmeste vej.</string>
-    <string name="btn_add_tag">Tilføj mærke</string>
+    <string name="add_tag">Tilføj mærke</string>
     <string name="btn_advanced_mode">Avanceret tilstand…</string>
     <string name="poi_filter_parking">Parkering</string>
     <string name="poi_filter_emergency">Nødsituation</string>
@@ -2113,10 +2113,10 @@
 <string name="routing_attr_avoid_shuttle_train_name">Undgå shuttletog</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Undgå shuttletog</string>
     <string name="plugin_settings">Udvidelser</string>
-	<string name="extended_tab_title">Udvidet</string>
+	<string name="tab_title_advanced">Udvidet</string>
 	<string name="building_number">Bygningsnummer</string>
 	<string name="next_proceed">Næste</string>
 	<string name="opening_at">Åbner</string>
 	<string name="closing_at">Lukker</string>
-<string name="basic_tab_title">Basis</string>
+<string name="tab_title_basic">Basis</string>
 	</resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 696937be30..d12ace0ad4 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1276,7 +1276,7 @@
 	<string name="screen_is_locked">Zum Bildschirm Entsperren Schloss antippen</string>
 	<string name="filterpoi_activity">POI-Filter erstellen</string>
 	<string name="email">E-Mail</string>
-	<string name="btn_add_tag">Eintrag hinzufügen</string>
+	<string name="add_tag">Eintrag hinzufügen</string>
 	<string name="btn_advanced_mode">Ergänzende Angaben…</string>
 	<string name="poi_filter_parking">Parkplatz</string>
 	<string name="poi_filter_emergency">Notfall</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 5eaba28ae6..e7a0baee71 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="btn_add_tag">Προσθήκη Ετικέτας</string>
+    <string name="add_tag">Προσθήκη Ετικέτας</string>
     <string name="btn_advanced_mode">Λειτουργία για προχωρημένους…</string>
     <string name="poi_filter_parking">Στάθμευση</string>
     <string name="poi_filter_emergency">Επείγοντα</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 1af344c950..701f751fa5 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -903,7 +903,7 @@
     <string name="context_menu_item_intermediate_point">Añadir como punto de ruta</string>
     <string name="map_widget_intermediate_distance">Punto de ruta</string>
     <string name="ending_point_too_far">Punto final demasiado lejos del camino más cercano.</string>
-    <string name="btn_add_tag">Añadir Etiqueta</string>
+    <string name="add_tag">Añadir Etiqueta</string>
     <string name="btn_advanced_mode">Modo Avanzado…</string>
     <string name="poi_filter_parking">Estacionamiento</string>
     <string name="poi_filter_emergency">Emergencia</string>
@@ -2028,8 +2028,8 @@
 <string name="routing_attr_avoid_shuttle_train_name">Evitar trenes de enlace</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Evite tomar trenes de enlace</string>
     <string name="plugin_settings">Complementos</string>
-	<string name="basic_tab_title">Básico</string>
-	<string name="extended_tab_title">Extendido</string>
+	<string name="tab_title_basic">Básico</string>
+	<string name="tab_title_advanced">Extendido</string>
 	<string name="building_number">Número de edificio</string>
 	<string name="next_proceed">Siguiente</string>
 	<string name="opening_at">Abren a las</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 56d7d34848..bae05dc222 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1057,7 +1057,7 @@
     <string name="context_menu_item_intermediate_point">Añadir como punto de ruta</string>
     <string name="map_widget_intermediate_distance">Punto de ruta</string>
     <string name="ending_point_too_far">Punto final demasiado lejos de la carretera más cercana.</string>
-    <string name="btn_add_tag">Añadir etiqueta</string>
+    <string name="add_tag">Añadir etiqueta</string>
     <string name="btn_advanced_mode">Modo Avanzado…</string>
     <string name="poi_filter_parking">Aparcamiento</string>
     <string name="poi_filter_emergency">Emergencia</string>
@@ -2166,8 +2166,8 @@
 <string name="routing_attr_avoid_shuttle_train_name">Evitar tren de enlace</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Evite tomar trenes de enlace</string>
     <string name="plugin_settings">Complementos</string>
-	<string name="basic_tab_title">Básico</string>
-	<string name="extended_tab_title">Extendido</string>
+	<string name="tab_title_basic">Básico</string>
+	<string name="tab_title_advanced">Extendido</string>
 	<string name="building_number">Número de edificio</string>
 	<string name="next_proceed">Siguiente</string>
 	<string name="opening_at">Abren a las</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 84aa8e31f4..8413821613 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -239,7 +239,7 @@
   <string name="context_menu_item_intermediate_point">Bide puntu bezala gehitu</string>
   <string name="map_widget_intermediate_distance">Bide puntua</string>
   <string name="ending_point_too_far">Bukaera puntua errepide gertuenetik urrutiegi dago.</string>
-  <string name="btn_add_tag">Etiketa gehitu</string>
+  <string name="add_tag">Etiketa gehitu</string>
   <string name="btn_advanced_mode">Modu Aurreratua…</string>
   <string name="poi_filter_parking">Aparkalekua</string>
   <string name="poi_filter_emergency">Larrialdiak</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 318b30c6bf..2d12fb131c 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -192,7 +192,7 @@
     <string name="index_srtm_parts">بخش ها</string>
     <string name="map_widget_show_destination_arrow">نشان دادن جهت مقصد</string>
     <string name="no_route">مسیری وجود ندارد</string>
-	<string name="btn_add_tag">اضافه کردن برچسب</string>
+	<string name="add_tag">اضافه کردن برچسب</string>
     <string name="btn_advanced_mode">حالت پیشرفته…</string>
     <string name="show_warnings_title">مشاهده هشدار…</string>
 	<string name="use_compass_navigation">استفاده از قطب نما</string>
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index c8e92deccb..4d7457dbf0 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -15,7 +15,7 @@
     <string name="context_menu_item_intermediate_point">Lisää välietapiksi</string>
     <string name="map_widget_intermediate_distance">Välietappi</string>
     <string name="ending_point_too_far">Päätepiste on liian kaukana lähimmästä tiestä.</string>
-    <string name="btn_add_tag">Lisää avainsana</string>
+    <string name="add_tag">Lisää avainsana</string>
     <string name="btn_advanced_mode">Edistynyt näkymä…</string>
     <string name="poi_filter_parking">Pysäköinti</string>
     <string name="poi_filter_emergency">Hätätapaus</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 667d36d030..a1f140a31f 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1048,7 +1048,7 @@
     <string name="context_menu_item_intermediate_point">Ajouter comme étape</string>
     <string name="map_widget_intermediate_distance">Étape</string>
     <string name="ending_point_too_far">Point d\'arrivée trop éloigné de la route la plus proche.</string>
-    <string name="btn_add_tag">Ajouter un attribut</string>
+    <string name="add_tag">Ajouter un attribut</string>
     <string name="btn_advanced_mode">Mode avancé…</string>
     <string name="poi_filter_parking">Parking</string>
     <string name="poi_filter_emergency">Urgences</string>
@@ -2128,8 +2128,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="offline_maps_and_navigation">Cartes hors-ligne\n&amp; Navigation</string>
 	<string name="commit_poi">Enregistrer le PI</string>
 <string name="plugin_settings">Greffons</string>
-	<string name="basic_tab_title">Basique</string>
-	<string name="extended_tab_title">Étendue</string>
+	<string name="tab_title_basic">Basique</string>
+	<string name="tab_title_advanced">Étendue</string>
 	<string name="building_number">Numéro de bâtiment</string>
 	<string name="next_proceed">Suivant</string>
 	<string name="opening_at">Ouverture à</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index b79cc0680a..008e37c6fc 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -686,7 +686,7 @@
     <string name="context_menu_item_intermediate_point">Engadir un punto de pasaxe</string>
     <string name="map_widget_intermediate_distance">Punto de pasaxe</string>
     <string name="ending_point_too_far">O punto final está demasiado lonxe da estrada máis próxima.</string>
-    <string name="btn_add_tag">Engadir unha etiqueta</string>
+    <string name="add_tag">Engadir unha etiqueta</string>
     <string name="btn_advanced_mode">Modo avanzado…</string>
     <string name="poi_filter_parking">Aparcamento</string>
     <string name="poi_filter_emergency">Urxencia</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index cf302d6bdc..ad495afff5 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -36,7 +36,7 @@
     <string name="context_menu_item_intermediate_point">הוספה כנקודת ציון</string>
     <string name="map_widget_intermediate_distance">נקודת ציון</string>
     <string name="ending_point_too_far">נקודת הסיום רחוקה מדי מהדרך הקרובה אליה.</string>
-    <string name="btn_add_tag">הוספת תגית</string>
+    <string name="add_tag">הוספת תגית</string>
     <string name="btn_advanced_mode">מצב מתקדם…</string>
     <string name="poi_filter_parking">חנייה</string>
     <string name="poi_filter_emergency">חירום</string>
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index f4d35985b8..f834e739a4 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -90,7 +90,7 @@
 	<string name="map_widget_monitoring_services">Bilježenje položaja</string>
 	<string name="no_route">Nema rute</string>
     <string name="poi_filter_parking">Parkiralište</string>
-    <string name="btn_add_tag">Dodaj oznaku</string>
+    <string name="add_tag">Dodaj oznaku</string>
     <string name="btn_advanced_mode">Napredni način rada…</string>
     <string name="poi_filter_emergency">Prva pomoć</string>
     <string name="poi_filter_public_transport">Javni prijevoz</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index ee6175a6ea..c79c5f74df 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -1026,7 +1026,7 @@
     <string name="context_menu_item_intermediate_point">Beállítás köztes célpontnak</string>
     <string name="map_widget_intermediate_distance">Köztes célpont</string>
     <string name="ending_point_too_far">A célpont közelében nem található út.</string>
-    <string name="btn_add_tag">Címke hozzáadása</string>
+    <string name="add_tag">Címke hozzáadása</string>
     <string name="btn_advanced_mode">Haladó mód…</string>
     <string name="poi_filter_parking">Parkoló</string>
     <string name="poi_filter_emergency">Vészhelyzet</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 52da30e23d..8633b9d85f 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1062,7 +1062,7 @@
 <string name="context_menu_item_intermediate_point">Aggiungi come punto intermedio</string>
 <string name="map_widget_intermediate_distance">Punto intermedio</string>
 <string name="ending_point_too_far">Punto finale troppo distante dalla strada più vicina.</string>
-<string name="btn_add_tag">Aggiungi etichetta</string>
+<string name="add_tag">Aggiungi etichetta</string>
 <string name="btn_advanced_mode">Modalità avanzata…</string>
 <string name="poi_filter_parking">Parcheggio</string>
 <string name="poi_filter_emergency">Emergenza</string>
@@ -2150,8 +2150,8 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="routing_attr_avoid_shuttle_train_name">Evita i treni navetta</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Evita i treni navetta</string>
     <string name="commit_poi">Contribuisci il/i PDI</string>
-<string name="basic_tab_title">Semplice</string>
-	<string name="extended_tab_title">Esteso</string>
+<string name="tab_title_basic">Semplice</string>
+	<string name="tab_title_advanced">Esteso</string>
 	<string name="building_number">Numero civico</string>
 	<string name="next_proceed">Avanti</string>
 	<string name="opening_at">Apre alle</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 7f3b9224ac..d67255e004 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -877,7 +877,7 @@ POIの更新は利用できません</string>
     <string name="new_destination_point_dialog">すでに目的地が設定されています。</string>
     <string name="target_points">経由地点</string>
     <string name="ending_point_too_far">終点が最寄りの道路より遠すぎます。</string>
-    <string name="btn_add_tag">タグの追加</string>
+    <string name="add_tag">タグの追加</string>
     <string name="btn_advanced_mode">拡張モード…</string>
     <string name="poi_filter_parking">駐車場(Parking)</string>
     <string name="poi_filter_emergency">救急施設(Emergency)</string>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index 1373331dfb..0d67a1a554 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -980,7 +980,7 @@
     <string name="arrived_at_intermediate_point">თქვენ მიაღწიეთ თქვენს დანიშნულების წერტილს</string>
     <string name="context_menu_item_intermediate_point">გზის წერტილად დამატება</string>
     <string name="ending_point_too_far">საბოლოო წერტილი მეტისმეტად სორსაა უახლოესი გზიდან.</string>
-    <string name="btn_add_tag">ჭდის დამატება</string>
+    <string name="add_tag">ჭდის დამატება</string>
     <string name="btn_advanced_mode">ზუსტი რეჟიმი…</string>
     <string name="poi_filter_parking">პარკინგი</string>
     <string name="poi_filter_emergency">სასწრაფო</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 42f37384a2..6f6dd8a425 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -1206,7 +1206,7 @@
     <string name="context_menu_item_intermediate_point">경유지로 추가</string>
     <string name="map_widget_intermediate_distance">경유지</string>
     <string name="ending_point_too_far">도로에서 너무 멀리 떨어진 마지막 포인트.</string>
-    <string name="btn_add_tag">태그 추가</string>
+    <string name="add_tag">태그 추가</string>
     <string name="btn_advanced_mode">고급 모드…</string>
     <string name="poi_filter_parking">주차</string>
     <string name="poi_filter_emergency">비상 사태</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index a617c0db2f..a8bde3e8a2 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1085,7 +1085,7 @@
     <string name="context_menu_item_intermediate_point">Pridėti tarpinį tikslą</string>
     <string name="map_widget_intermediate_distance">Tarpinis tikslas</string>
     <string name="ending_point_too_far">Pradžios taškas per toli nuo artimiausio kelio.</string>
-    <string name="btn_add_tag">Pridėti žymą</string>
+    <string name="add_tag">Pridėti žymą</string>
     <string name="btn_advanced_mode">Eksperto režimas…</string>
     <string name="poi_filter_parking">Parkingas</string>
     <string name="poi_filter_emergency">Nelaimės atveju</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index b6c31f59c2..87aba3c364 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -980,7 +980,7 @@
     <string name="context_menu_item_intermediate_point">Pievienot pieturu</string>
     <string name="map_widget_intermediate_distance">Pietura</string>
     <string name="ending_point_too_far">Noslēdzošais punkts ir pārāk tālu no tuvākā ceļa.</string>
-    <string name="btn_add_tag">Pievienot marķējumu</string>
+    <string name="add_tag">Pievienot marķējumu</string>
     <string name="btn_advanced_mode">Paplašinātais režīms…</string>
     <string name="poi_filter_parking">Parkošanās</string>
     <string name="poi_filter_emergency">Ātrā palīdzība</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 19a8c29938..81cd58fee3 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -20,7 +20,7 @@
     <string name="context_menu_item_intermediate_point">Legg til som rutepunkt</string>
     <string name="map_widget_intermediate_distance">Rutepunkt</string>
     <string name="ending_point_too_far">Sluttpunkt for langt fra nærmeste vei.</string>
-    <string name="btn_add_tag">Legg til merke</string>
+    <string name="add_tag">Legg til merke</string>
     <string name="btn_advanced_mode">Avansert modus…</string>
     <string name="poi_filter_parking">Parkering</string>
     <string name="poi_filter_emergency">Nødsituasjon</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index cf38d566ad..a424baa222 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1062,7 +1062,7 @@
 <string name="context_menu_item_intermediate_point">Als routepunt\ntoevoegen</string>
 <string name="map_widget_intermediate_distance">Routepunt</string>
 <string name="ending_point_too_far">Eindpunt te ver van dichtstbijzijnde weg.</string>
-<string name="btn_add_tag">Tag toevoegen</string>
+<string name="add_tag">Tag toevoegen</string>
 <string name="btn_advanced_mode">Geavanceerde modus…</string>
 <string name="poi_filter_parking">Parkeren</string>
 <string name="poi_filter_emergency">Hulpdiensten</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 454d2b314b..038839064c 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1015,7 +1015,7 @@
     <string name="context_menu_item_intermediate_point">Dodaj jako punkt pośredni</string>
     <string name="map_widget_intermediate_distance">Punkt pośredni</string>
     <string name="ending_point_too_far">Punkt końcowy jest zbyt daleko od najbliższej ulicy.</string>
-    <string name="btn_add_tag">Dodaj znacznik</string>
+    <string name="add_tag">Dodaj znacznik</string>
     <string name="btn_advanced_mode">Tryb zaawansowany…</string>
     <string name="poi_filter_parking">Parking</string>
     <string name="poi_filter_emergency">Niebezpieczeństwo</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 5a3918104c..c35b32e19d 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -932,7 +932,7 @@
     <string name="arrived_at_intermediate_point">Você chegou na sua parada</string>
     <string name="context_menu_item_intermediate_point">Adicionar como ponto de parada</string>
     <string name="ending_point_too_far">Destino muito longe da via mais próxima.</string>
-    <string name="btn_add_tag">Adicionar etiqueta</string>
+    <string name="add_tag">Adicionar etiqueta</string>
     <string name="btn_advanced_mode">Modo avançado…</string>
     <string name="poi_filter_parking">Estacionamento</string>
     <string name="poi_filter_emergency">Emergência</string>
@@ -1797,8 +1797,8 @@
 <string name="routing_attr_avoid_shuttle_train_name">Evitar transporte de trem</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Evitar shuttle train</string>
     <string name="plugin_settings">Complementos</string>
-	<string name="basic_tab_title">Básico</string>
-	<string name="extended_tab_title">Estendido</string>
+	<string name="tab_title_basic">Básico</string>
+	<string name="tab_title_advanced">Estendido</string>
 	<string name="building_number">Número de edifício</string>
 	<string name="next_proceed">Próximo</string>
 	<string name="opening_at">Abre às</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 78e58934ce..62d65edce5 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -1036,7 +1036,7 @@ Você pode ativar (on-line ou em cache) fontes azulejo mapa, configurações de
     <string name="arrived_at_intermediate_point">Você chegou ao seu ponto de passagem</string>
     <string name="map_widget_intermediate_distance">Ponto de passagem</string>
     <string name="ending_point_too_far">Destino muito longe da estrada mais próxima.</string>
-    <string name="btn_add_tag">Adicionar tag</string>
+    <string name="add_tag">Adicionar tag</string>
     
 	
 	<string name="rendering_attr_showRoadMaps_description">Selecione quando exibir mapas somente de estradas:</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index e91fae603b..f3a65d132a 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -43,7 +43,7 @@
     <string name="context_menu_item_intermediate_point">Adaugă ca punct intermediar</string>
     <string name="map_widget_intermediate_distance">Punct intermediar</string>
     <string name="ending_point_too_far">Punctul terminus este prea departe de vreun drum.</string>
-    <string name="btn_add_tag">Adaugă etichetă</string>
+    <string name="add_tag">Adaugă etichetă</string>
     <string name="btn_advanced_mode">Mod avansat…</string>
     <string name="poi_filter_parking">Parcare</string>
     <string name="poi_filter_emergency">Servicii de Urgență</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index f40ba26588..d06b589ae4 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1102,7 +1102,7 @@
 <string name="context_menu_item_intermediate_point">Добавить промежуточную точку</string>
 <string name="map_widget_intermediate_distance">Промежуточная точка</string>
 <string name="ending_point_too_far">Начало маршрута слишком далеко от ближайшей дороги.</string>
-<string name="btn_add_tag">Добавить метку</string>
+<string name="add_tag">Добавить метку</string>
 <string name="btn_advanced_mode">Расширенный режим…</string>
 <string name="poi_filter_parking">Парковки</string>
 <string name="poi_filter_emergency">Чрезвычайные обстоятельства</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 66e7b9672a..157b0d7245 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -470,7 +470,7 @@
     <string name="context_menu_item_intermediate_point">Annanghelu comente puntu mesanu</string>
     <string name="map_widget_intermediate_distance">Puntu mesanu</string>
     <string name="ending_point_too_far">Puntu finale tropu indedda dae s’istrada prus a curtzu.</string>
-    <string name="btn_add_tag">Annanghe etichetta</string>
+    <string name="add_tag">Annanghe etichetta</string>
     <string name="btn_advanced_mode">Modalidade avantzada…</string>
     <string name="poi_filter_parking">Parchezu</string>
     <string name="poi_filter_emergency">Apretu/Emergèntzia</string>
@@ -2062,8 +2062,8 @@
 	<string name="plugin_settings">Plugins (estensiones)</string>
 	<string name="routing_attr_avoid_shuttle_train_name">Istransi trenu ispola</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Istransi trenu ispola</string>
-    <string name="basic_tab_title">Bàsicu</string>
-	<string name="extended_tab_title">Estesu</string>
+    <string name="tab_title_basic">Bàsicu</string>
+	<string name="tab_title_advanced">Estesu</string>
 	<string name="building_number">Nùmeru tzìvicu</string>
 	<string name="next_proceed">Imbeniente</string>
 	<string name="opening_at">Aberit a sas</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 3237aa3e8e..17a492496f 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -39,7 +39,7 @@
   <string name="poi_filter_food_shop">Potraviny</string>
   <string name="poi_filter_for_tourists">Pre turistov</string>
   <string name="poi_filter_fuel">Palivo</string>
-  <string name="btn_add_tag">Pridať značku</string>
+  <string name="add_tag">Pridať značku</string>
   <string name="btn_advanced_mode">Pokročilý režim…</string>
   <string name="snap_to_road_descr">Prichytenie pozície k cestám počas navigácie</string>
   <string name="snap_to_road">Prichytiť k ceste</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index c02f5fb245..af0b4e38f0 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -95,7 +95,7 @@
     <string name="intermediate_point_too_far">Vmesna točka %1$s je predaleč od najbližje ceste.</string>
     <string name="map_widget_intermediate_distance">Vmesne točke</string>
     <string name="ending_point_too_far">Končna točka je predaleč od najbližje ceste.</string>
-    <string name="btn_add_tag">Dodaj oznako</string>
+    <string name="add_tag">Dodaj oznako</string>
     <string name="btn_advanced_mode">Napredni način …</string>
     <string name="poi_filter_parking">Parkirišča</string>
     <string name="poi_filter_public_transport">Javni potniški promet</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 89ef9d2bb4..0455b2fcc4 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -607,7 +607,7 @@
     <string name="context_menu_item_intermediate_point">Lägg till som waypoint</string>
     <string name="map_widget_intermediate_distance">Waypoint</string>
     <string name="ending_point_too_far">Slutpunkten för långt från närmaste väg.</string>
-    <string name="btn_add_tag">Lägg till tagg</string>
+    <string name="add_tag">Lägg till tagg</string>
     <string name="btn_advanced_mode">Avancerat läge…</string>
     <string name="poi_filter_parking">Parkering</string>
     <string name="poi_filter_emergency">Olycksfall</string>
@@ -1972,8 +1972,8 @@
 	<string name="routing_attr_avoid_shuttle_train_description">Undvik pendeltåg</string>
     <string name="plugin_settings">Insticksprogram</string>
 	<string name="traffic_warning_hazard">Varning</string>
-    <string name="basic_tab_title">Grundläggande</string>
-	<string name="extended_tab_title">Utökad</string>
+    <string name="tab_title_basic">Grundläggande</string>
+	<string name="tab_title_advanced">Utökad</string>
 	<string name="building_number">Husnummer</string>
 	<string name="next_proceed">Nästa</string>
 	<string name="opening_at">Öppnar</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 67d3243b72..af9b4fb6c5 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -29,7 +29,7 @@
     <string name="context_menu_item_intermediate_point">Ara nokta olarak ekle</string>
     <string name="map_widget_intermediate_distance">Ara nokta</string>
     <string name="ending_point_too_far">Bitiş noktası en yakın yola çok fazla uzaklıkta.</string>
-    <string name="btn_add_tag">Etiket Ekle</string>
+    <string name="add_tag">Etiket Ekle</string>
     <string name="btn_advanced_mode">Gelişmiş Kip…</string>
     <string name="poi_filter_parking">Park Etme</string>
     <string name="poi_filter_emergency">Acil Durum</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index a30bf3ea95..52dac3ae2d 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1108,7 +1108,7 @@
     <string name="arrived_at_intermediate_point">Ви вже досягнули проміжної точки</string>
     <string name="context_menu_item_intermediate_point">Додати проміжну точку</string>
     <string name="ending_point_too_far">Початок маршруту занадто далеко від найближчої дороги.</string>
-    <string name="btn_add_tag">Додати мітку</string>
+    <string name="add_tag">Додати мітку</string>
     <string name="btn_advanced_mode">Розширений режим…</string>
     <string name="poi_filter_parking">Стоянки</string>
     <string name="poi_filter_public_transport">Громадський транспорт</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index dc3c54ebed..07a223d173 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -555,7 +555,7 @@
 	<string name="replace_destination_point">替换终点</string>
     <string name="new_destination_point_dialog">您已经设置了终点。</string>
     <string name="ending_point_too_far">结束点与最近道路太远。</string>
-    <string name="btn_add_tag">添加标记</string>
+    <string name="add_tag">添加标记</string>
     <string name="btn_advanced_mode">高级模式…</string>
     <string name="show_warnings_title">显示警报…</string>
 	<string name="snap_to_road">吸附道路</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 34a8320e5e..0dc917d700 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -28,7 +28,7 @@
     <string name="context_menu_item_intermediate_point">增為航點</string>
     <string name="map_widget_intermediate_distance">航點</string>
     <string name="ending_point_too_far">結束標點離最近的道路太遠。</string>
-    <string name="btn_add_tag">增加旗標</string>
+    <string name="add_tag">增加旗標</string>
     <string name="btn_advanced_mode">進階模式…</string>
     <string name="poi_filter_parking">停車場</string>
     <string name="poi_filter_emergency">緊急救助</string>
@@ -2085,8 +2085,8 @@
 <string name="routing_attr_avoid_shuttle_train_name">往返避開鐵路</string>
 	<string name="routing_attr_avoid_shuttle_train_description">往返避開鐵路</string>
     <string name="plugin_settings">外掛元件</string>
-	<string name="basic_tab_title">基本</string>
-	<string name="extended_tab_title">展開</string>
+	<string name="tab_title_basic">基本</string>
+	<string name="tab_title_advanced">展開</string>
 	<string name="building_number">門牌號碼</string>
 	<string name="opening_at">營業于</string>
 	<string name="closing_at">結束于</string>
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index f7f0600fb8..6a18d33ced 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -152,7 +152,7 @@
 	<color name="spinner_list_background_light">#eeeeee</color>
 	<color name="spinner_list_background_dark">#303030</color>
 
-	<color name="inactive_iteme_orange">#ffc87f</color>
+	<color name="inactive_item_orange">#ffc87f</color>
 	<color name="osmand_orange_dark">#e68200</color>
 	<color name="divider_color">#ccc</color>
 
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 9585521da1..ef336bc4b7 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -899,7 +899,7 @@
     <string name="cancel_navigation">Stop navigation</string>
     <string name="clear_destination">Clear destination</string>
     <string name="download_using_mobile_internet">Wi-Fi is currently not connected. Do you want to use the current Internet connection for downloading?</string>
-    <string name="street_name">Street</string>
+    <string name="street_name">Street name</string>
 	<string name="hno">House number</string>
     <string name="website">Web site</string>
 	<string name="phone">Phone</string>
@@ -1081,7 +1081,7 @@
     <string name="context_menu_item_intermediate_point">Add as waypoint</string>
     <string name="map_widget_intermediate_distance">Waypoint</string>
     <string name="ending_point_too_far">Ending point too far from nearest road.</string>
-    <string name="btn_add_tag">Add Tag</string>
+    <string name="add_tag">Add Tag</string>
     <string name="btn_advanced_mode">Advanced Mode…</string>
     <string name="poi_filter_parking">Parking</string>
     <string name="poi_filter_emergency">Emergency</string>
@@ -2240,10 +2240,16 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="app_name_osmand">OsmAnd</string>
 	<string name="offline_maps_and_navigation"><![CDATA[Offline Maps\n& Navigation]]></string>
 	<string name="commit_poi">Commit POI</string>
-	<string name="basic_tab_title">Basic</string>
-	<string name="extended_tab_title">Extended</string>
+	<string name="tab_title_basic">Basic</string>
+	<string name="tab_title_advanced">Advanced</string>
 	<string name="building_number">Building Number</string>
 	<string name="next_proceed">Next</string>
 	<string name="opening_at">Opening at</string>
 	<string name="closing_at">Closing at</string>
+	<string name="tag_poi_name">name</string>
+	<string name="tag_poi_amenity">amenity</string>
+	<string name="contact_info">Contact info</string>
+	<string name="description">Description</string>
+	<string name="add_opening_hours">Add opening hours</string>
+	<string name="poi_dialog_poi_type">POI Type</string>
 </resources>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index cd3337d35a..af343d5137 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -107,9 +107,9 @@
 
     <style name="OsmandLightTheme.DarkActionbar">
         <item name="android:textColorPrimary">@color/color_white</item>
-        <item name="android:textColorSecondary">@color/inactive_iteme_orange</item>
-        <item name="android:textColorHint">@color/inactive_iteme_orange</item>
-        <item name="colorAccent">@color/accent_material_light</item>
+        <item name="android:textColorSecondary">@color/inactive_item_orange</item>
+        <item name="android:textColorHint">@color/inactive_item_orange</item>
+        <item name="colorAccent">@color/color_white</item>
         <!--<item name="actionMenuTextColor">@color/color_white</item>-->
     </style>
 
@@ -238,7 +238,7 @@
     <style name="create_poi_text_field">
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_marginRight">16dp</item>
-        <item name="android:layout_marginLeft">72dp</item>
+        <item name="android:layout_marginLeft">68dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
index 4162c05f6d..740f88a48d 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
@@ -33,7 +33,6 @@ public class DashSearchFragment extends DashBaseFragment {
 		((TextView) view.findViewById(R.id.search_for)).setTypeface(typeface);
 		((Button) view.findViewById(R.id.recents)).setTypeface(typeface);
 
-
 		return view;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
index eb5acc4f94..04bb78ac7e 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
@@ -83,7 +83,7 @@ public class EditPoiFragment extends Fragment {
 		super.onAttach(activity);
 //		poiTypes = ((OsmandApplication) activity.getApplication()).getPoiTypes();
 //		allTranslatedSubTypes = poiTypes.getAllTranslatedNames();
-		OsmandSettings settings = ((OsmandApplication) activity.getApplication()).getSettings();
+		OsmandSettings settings = ((MapActivity) activity).getMyApplication().getSettings();
 //		editPoiData.isLocalEdit = true;
 		OsmEditingPlugin plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
 		if (settings.OFFLINE_EDITION.get() || !settings.isInternetConnectionAvailable(true)) {
@@ -159,8 +159,8 @@ public class EditPoiFragment extends Fragment {
 		});
 
 		viewPager = (ViewPager) view.findViewById(R.id.viewpager);
-		String basicTitle = getResources().getString(R.string.basic_tab_title);
-		String extendedTitle = getResources().getString(R.string.extended_tab_title);
+		String basicTitle = getResources().getString(R.string.tab_title_basic);
+		String extendedTitle = getResources().getString(R.string.tab_title_advanced);
 		MyAdapter pagerAdapter = new MyAdapter(getChildFragmentManager(), basicTitle, extendedTitle);
 		viewPager.setAdapter(pagerAdapter);
 
@@ -192,6 +192,10 @@ public class EditPoiFragment extends Fragment {
 						Uri.parse("https://wiki.openstreetmap.org/wiki/Map_Features")));
 			}
 		});
+		onlineDocumentationButton.setImageDrawable(
+				((MapActivity) getActivity()).getMyApplication().getIconsCache()
+						.getPaintedContentIcon(R.drawable.ic_action_help,
+								getResources().getColor(R.color.inactive_item_orange)));
 		ImageButton poiTypeButton = (ImageButton) view.findViewById(R.id.poiTypeButton);
 		poiTypeButton.setOnClickListener(new View.OnClickListener() {
 			@Override