Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix

Browse source
This commit is contained in:
xmd5a 2016-03-15 20:30:48 +03:00 committed by GaidamakUA
parent 403d02b340
commit 98ca9ee196
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/values-ru/strings.xml
View file

@ -1,10 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<resources> <resources>
<<<<<<< 403d02b34072c0a6c5f78c09aaa457148f878a23
<<<<<<< dd501239ba9dc90776f69c482aa750ad987cc9f5 <<<<<<< dd501239ba9dc90776f69c482aa750ad987cc9f5
<string name="select_map_markers">Выберите маркеры</string> <string name="select_map_markers">Выберите маркеры</string>
======= =======
<string name="select_map_marker">Выберите маркеры</string> <string name="select_map_marker">Выберите маркеры</string>
>>>>>>> Update ru strings >>>>>>> Update ru strings
=======
>>>>>>> fix
<string name="shared_string_topbar">Верхняя панель</string> <string name="shared_string_topbar">Верхняя панель</string>
<string name="osm_user_stat">Правок: %1$s, ранг: %2$s, всего правок: %3$s</string> <string name="osm_user_stat">Правок: %1$s, ранг: %2$s, всего правок: %3$s</string>
<string name="osm_editors_ranking">Рейтинг картографов OSM</string> <string name="osm_editors_ranking">Рейтинг картографов OSM</string>