Fixed merge artifacts

This commit is contained in:
Weblate 2013-06-21 14:51:27 +02:00
parent 4f2290baee
commit 008bd3d304

View file

@ -892,10 +892,6 @@
<string name="choose_city">選擇縣市</string>
<string name="ChooseCountry">選擇國家</string>
<string name="show_view_angle">顯示目視方向</string>
<<<<<<< HEAD
=======
<string name="navigate_to_point">設為目的地。</string>
>>>>>>> Translated using Weblate.
<string name="map_view_3d_descr">啟用3D地圖</string>
<string name="map_view_3d">3D地圖</string>
<string name="show_poi_over_map_description">顯示景點在地圖上 (依最近一次的篩選條件)</string>