From 7db5462e9fad568c84cc29b9a6ba39a26855c69d Mon Sep 17 00:00:00 2001
From: PavelRatushnyi <pavelratushniy@gmail.com>
Date: Wed, 22 Nov 2017 23:53:09 +0200
Subject: [PATCH] Revert: Fix #4734

---
 OsmAnd/res/layout-land/empty_state_markers_history.xml | 2 +-
 OsmAnd/res/layout/empty_state_markers_history.xml      | 2 +-
 OsmAnd/res/values-be-rBY/strings.xml                   | 1 +
 OsmAnd/res/values-be/strings.xml                       | 1 +
 OsmAnd/res/values-ca/strings.xml                       | 1 +
 OsmAnd/res/values-da/strings.xml                       | 1 +
 OsmAnd/res/values-de/strings.xml                       | 1 +
 OsmAnd/res/values-es-rAR/strings.xml                   | 1 +
 OsmAnd/res/values-es-rUS/strings.xml                   | 1 +
 OsmAnd/res/values-es/strings.xml                       | 1 +
 OsmAnd/res/values-fr/strings.xml                       | 1 +
 OsmAnd/res/values-it/strings.xml                       | 1 +
 OsmAnd/res/values-ru/strings.xml                       | 1 +
 OsmAnd/res/values-sc/strings.xml                       | 1 +
 OsmAnd/res/values-uk/strings.xml                       | 1 +
 OsmAnd/res/values-zh-rTW/strings.xml                   | 1 +
 OsmAnd/res/values/strings.xml                          | 1 +
 17 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout-land/empty_state_markers_history.xml b/OsmAnd/res/layout-land/empty_state_markers_history.xml
index 2c45d0d8a8..c423a8ee80 100644
--- a/OsmAnd/res/layout-land/empty_state_markers_history.xml
+++ b/OsmAnd/res/layout-land/empty_state_markers_history.xml
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/empty_state_text_interval"
             android:background="@null"
-            android:text="@string/shared_string_history"
+            android:text="@string/empty_state_markers_history"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="@dimen/empty_state_text_size"
             osmand:typeface="@string/font_roboto_medium"/>
diff --git a/OsmAnd/res/layout/empty_state_markers_history.xml b/OsmAnd/res/layout/empty_state_markers_history.xml
index 7af867b962..94ab69e18b 100644
--- a/OsmAnd/res/layout/empty_state_markers_history.xml
+++ b/OsmAnd/res/layout/empty_state_markers_history.xml
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/empty_state_text_interval"
         android:background="@null"
-        android:text="@string/shared_string_history"
+        android:text="@string/empty_state_markers_history"
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="@dimen/empty_state_text_size"/>
 
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index ae5d5e25d4..d84486e645 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -2917,6 +2917,7 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="rename_marker">Pierajmienavać markier</string>
     <string name="appearance_on_the_map">Źniešni vyhlad na mapie</string>
     <string name="add_track_to_markers_descr">Abiarycie trek, kab dadać šlachavyja kropki da markieraŭ. (Pieraličanyja tolki treki z šlachavymi kropkami.)</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="shared_string_right">Naprava</string>
     <string name="shared_string_left">Nalieva</string>
     <string name="shared_string_more_without_dots">Bolš</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 72cffaf28f..e494fcb9e5 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2966,6 +2966,7 @@
     <string name="active_markers_descr">Выберыце, колькі індыкатараў накірунку будзе адлюстравана.</string>
     <string name="appearance_on_the_map">Зьнешні выгляд на мапе</string>
     <string name="add_track_to_markers_descr">Абярыце трэк, каб дадаць шляхавые кропкі да маркераў. (Пералічаныя толькі трэкі з шляхавымі кропкамі.)</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="shared_string_right">Направа</string>
     <string name="shared_string_left">Налева</string>
     <string name="shared_string_more_without_dots">Больш</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index e28e68330e..3ff78b63da 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -2714,6 +2714,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="empty_state_markers_active_desc">Premeu més o menys temps sobre els llocs i després el botó tipus bandera del marcador.</string>
     <string name="empty_state_markers_groups">Importa grups</string>
     <string name="empty_state_markers_groups_desc">Podeu importar com marcadors a grups de preferits o a fites de la traça.</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="empty_state_markers_history_desc">Els marcadors marcats com a aprovats apareixeran en aquesta pantalla.</string>
     <string name="shared_string_two">Dos</string>
     <string name="shared_string_one">Un</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 32472df2a9..35fba6ccfb 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2966,6 +2966,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="empty_state_markers_active_desc">Langt eller kort tryk på steder, og tryk derefter på markørflag knappen.</string>
     <string name="empty_state_markers_groups">Importer grupper</string>
     <string name="empty_state_markers_groups_desc">Importer favoritgrupper eller et spor af rutepunkter som markører.</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="empty_state_markers_history_desc">Markører, der er markeret som passeret vises på denne skærm.</string>
     <string name="appearance_on_the_map">Udseende på kortet</string>
     <string name="looking_for_tracks_with_waypoints">Find spor med rutepunkter</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 74f7366d03..799b215fc1 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2900,6 +2900,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="add_group">Gruppe hinzufügen</string>
     <string name="empty_state_markers_active">Kartenmarkierungen erstellen!</string>
     <string name="empty_state_markers_groups">Gruppen importieren</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="empty_state_markers_history_desc">Markierungen, die als passiert gekennzeichnet sind, werden auf diesem Bildschirm angezeigt.</string>
     <string name="digits_quantity">Anzahl der Dezimalstellen</string>
     <string name="show_number_pad">Nummernblock anzeigen</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 135344611d..463ab8a8df 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2846,6 +2846,7 @@ Proporciona un código completo</string>
     <string name="distance_indication_descr">Elige cómo mostrar la distancia a los marcadores activos.</string>
     <string name="active_markers_descr">Elige cuántos indicadores de dirección mostrar.</string>
     <string name="appearance_on_the_map">Aspecto en el mapa</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="looking_for_tracks_with_waypoints">Búsqueda de trazas con puntos de referencia</string>
     <string name="shared_string_more_without_dots">Más</string>
     <string name="empty_state_osm_edits">Crear o modificar objetos OSM</string>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 041830b4b8..9124fd3adc 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -2849,6 +2849,7 @@ Proporciona un código completo</string>
     <string name="appearance_on_the_map">Aspecto en el mapa</string>
     <string name="looking_for_tracks_with_waypoints">Búsqueda de trazas con puntos de referencia</string>
     <string name="shared_string_more_without_dots">Más</string>
+    <string name="empty_state_markers_history"></string>
     <string name="empty_state_osm_edits">Crear o modificar objetos OSM</string>
     <string name="empty_state_osm_edits_descr">Crea o modifica puntos de interés (OSM), abre o comenta problemas del mapa (OSM), y contribuye con archivos de grabaciones GPX.</string>
     <string name="shared_string_deleted">Borrado</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index e338ce98ae..8ce58a9c42 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2782,5 +2782,6 @@ Por favor proporciona un código completo</string>
     <string name="distance_indication_descr">Elige cómo mostrar la distancia hasta los marcadores activos.</string>
     <string name="active_markers_descr">Elige cuántos indicadores de dirección se muestran.</string>
     <string name="shared_string_more_without_dots">Más</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="looking_for_tracks_with_waypoints">Buscando trazas con puntos de referencia</string>
     </resources>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 16d1173e9a..1a5e9d5a25 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -3012,6 +3012,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="empty_state_markers_active_desc">Sélectionnez des emplacements sur la carte puis appuyez sur le drapeau de marque.</string>
     <string name="empty_state_markers_groups">Importer des groupes</string>
     <string name="empty_state_markers_groups_desc">Vous pouvez importer des groupes de favoris ou des points de passage comme marques.</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="empty_state_markers_history_desc">Les marques visitées s\'afficheront sur cet écran.</string>
     <string name="shared_string_two">Deux</string>
     <string name="shared_string_one">Une</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index e87a92b031..6d10aff29d 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2970,6 +2970,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="empty_state_markers_active_desc">Tap lungo o breve nel luogo, poi tappa il pulsante bandiera del marcatore.</string>
     <string name="empty_state_markers_groups">Importa gruppi</string>
     <string name="empty_state_markers_groups_desc">Puoi importare, come marcatori, gruppi di luoghi preferiti o punti intermedi di tracce.</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="empty_state_markers_history_desc">Marcatori indicati come passati appariranno su questa schermata.</string>
     <string name="shared_string_two">Due</string>
     <string name="shared_string_one">Uno</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 2a4cc4dfc5..61d4383a8a 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -2634,6 +2634,7 @@
     <string name="import_track_desc">Файл %1$s не содержит путевых точек, импортировать его как трек?</string>
     <string name="add_track_to_markers_descr">Выберите трек для добавления путевых точек. (Показаны только треки с путевыми точками.)</string>
     <string name="track_waypoints">Трек путевых точек</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="shared_string_right">Направо</string>
     <string name="shared_string_left">Налево</string>
     <string name="show_number_pad">Показать цифровую панель</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 9d4492965c..b57e318c70 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2861,6 +2861,7 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="empty_state_markers_active_desc">Marca logos in sa mapa cun un\'incarcu curtzu o longu e, a pustis, incarchende su butone cun sa bandera de sos marcadores.</string>
     <string name="empty_state_markers_groups">Importa grupos</string>
     <string name="empty_state_markers_groups_desc">Podes importare grupos de preferidos o puntos de coladòrgiu de una rasta comente marcadores.</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="empty_state_markers_history_desc">Sos marcadores sinnados comente colados ant a aparire in custu ischermu.</string>
     <string name="shared_string_two">Duos</string>
     <string name="shared_string_one">Unu</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index b28a8a6d77..b5832b33f2 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -3089,6 +3089,7 @@
     <string name="empty_state_markers_active_desc">Відзначити місце на мапі дотиком.</string>
     <string name="empty_state_markers_groups">Імпортувати групи</string>
     <string name="empty_state_markers_groups_desc">Ви можете імпортувати групи закладок або шляхові точки треку як маркери.</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="empty_state_markers_history_desc">Маркери, позначені як пройдені, з\'являться на цьому екрані.</string>
     <string name="shared_string_two">Два</string>
     <string name="shared_string_one">Один</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index e9d6a5e352..89cd87db88 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2945,6 +2945,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="empty_state_markers_active_desc">長按或點一下地點，然後點擊標記標誌按鈕。</string>
     <string name="empty_state_markers_groups">匯入群組</string>
     <string name="empty_state_markers_groups_desc">您可以匯入我的收藏群組或軌跡航點作為標記。</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="shared_string_two">二</string>
     <string name="shared_string_one">一</string>
     <string name="distance_indication_descr">選擇如何顯示現行標記的距離。</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 22e52f9f59..74bd2dc17a 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -35,6 +35,7 @@
     <string name="empty_state_markers_active_desc">Long or short tap places, then tap the marker flag button.</string>
     <string name="empty_state_markers_groups">Import groups</string>
     <string name="empty_state_markers_groups_desc">You can import favorite groups or track waypoints as markers.</string>
+    <string name="empty_state_markers_history">@string/shared_string_history</string>
     <string name="empty_state_markers_history_desc">Markers marked as passed will appear on this screen.</string>
     <string name="shared_string_two">Two</string>
     <string name="shared_string_one">One</string>