From 98ca9ee1967fe7a14d8048534ae7de4a15d06a87 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Tue, 15 Mar 2016 20:30:48 +0300
Subject: [PATCH] fix

---
 OsmAnd/res/values-ru/strings.xml | 3 +++
 OsmAnd/res/values/strings.xml    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index da93d5c381..4d3ce11610 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1,10 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+<<<<<<< 403d02b34072c0a6c5f78c09aaa457148f878a23
 <<<<<<< dd501239ba9dc90776f69c482aa750ad987cc9f5
     <string name="select_map_markers">Выберите маркеры</string>
 =======
     <string name="select_map_marker">Выберите маркеры</string>
 >>>>>>> Update ru strings
+=======
+>>>>>>> fix
     <string name="shared_string_topbar">Верхняя панель</string>
     <string name="osm_user_stat">Правок: %1$s, ранг: %2$s, всего правок: %3$s</string>
     <string name="osm_editors_ranking">Рейтинг картографов OSM</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index ab2249ce00..c0f3354fc7 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -80,7 +80,7 @@
     <string name="osm_live_header">This subscription enables hourly updates for all maps around the world.
         Major part of the income goes back to OSM community and is paid out per each OSM contribution. 
         In case you love OsmAnd and OSM and want to support it, this is a perfect way to do it.</string>
-    
+
     <string name="select_map_marker">Select map marker</string>
     <string name="map_markers_other">Other markers</string>
     <string name="upload_anonymously">Upload anonymously</string>
@@ -2284,4 +2284,4 @@ If you need help with OsmAnd application, please contact our support team: suppo
     <string name="number_of_edits">Number of edits</string>
     <string name="reports_for">Report for</string>
     <string name="file_name_containes_illegal_char">File name contains illegal character</string>
-</resources>
+</resources>
\ No newline at end of file