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

Merge branch 'master' of https://github.com/osmandapp/OsmAnd

Browse source
This commit is contained in:
Dmitry 2021-02-15 17:32:43 +02:00
commit 65db4e43b5
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/values/phrases.xml
View file

@ -4332,7 +4332,6 @@
<string name="poi_wildlife_crossing_bat_bridge">Bat bridge</string>
<string name="poi_wildlife_crossing_bat_tunnel">Bat tunnel</string>
<<<<<<< HEAD
<string name="poi_piste_ski_jump">Ski jump</string>
<string name="poi_piste_name">Piste name</string>
<string name="poi_gladed_yes">Gladed: yes</string>
@ -4340,17 +4339,10 @@
<string name="poi_patrolled_no">Patrolled: no</string>
<string name="poi_piste_status_open">Piste status: open</string>
<string name="poi_piste_status_closed">Piste status: closed</string>
<string name="poi_summit_register_yes">Summit register: yes</string>
<string name="poi_summit_register_no">Summit register: no</string>
<string name="poi_mobile_library">Mobile library stop position</string>
=======
<string name="poi_conference_centre">Conference centre</string>
<string name="poi_geodesist">Geodesist</string>
>>>>>>> Add phrases
</resources>