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

update master and resolve strings conflict

Browse source
This commit is contained in:
madwasp79 2019-05-28 13:31:18 +03:00
parent 2a832dd99a
commit 0975f81d0f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values/strings.xml
View file

@ -11,6 +11,8 @@
Thx - Hardy Thx - Hardy
--> -->
<string name="app_mode_skiing">Skiing</string>
<string name="base_profile_descr_ski">Skiing</string> <string name="base_profile_descr_ski">Skiing</string>
<string name="show_compass_ruler">Show compass ruler</string> <string name="show_compass_ruler">Show compass ruler</string>
<string name="hide_compass_ruler">Hide compass ruler</string> <string name="hide_compass_ruler">Hide compass ruler</string>
@ -3157,7 +3159,7 @@
<string name="run_full_osmand_header">Launch OsmAnd?</string> <string name="run_full_osmand_header">Launch OsmAnd?</string>
<string name="routing_attr_avoid_sett_name">Avoid cobblestone and sett</string> <string name="routing_attr_avoid_sett_name">Avoid cobblestone and sett</string>
<string name="routing_attr_avoid_sett_description">Avoid cobblestone and sett</string> <string name="routing_attr_avoid_sett_description">Avoid cobblestone and sett</string>
<string name="app_mode_skiing">Skiing</string>
</resources> </resources>