Merge branch 'master' of github.com:osmandapp/Osmand

This commit is contained in:
Victor Shcherb 2015-09-24 09:25:44 +02:00
commit acfaa7632c
3 changed files with 11 additions and 10 deletions

View file

@ -1370,17 +1370,17 @@
<string name="poi_pump">Pumpe</string>
<string name="poi_piste_difficulty_easy">Piste sværhedsgrad: let</string>
<string name="poi_piste_difficulty_intermediate">Piste sværhedsgrad: mellemliggende</string>
<string name="poi_piste_difficulty_advanced">Piste sværhedsgrad: avanceret</string>
<string name="poi_piste_difficulty_novice">Piste sværhedsgrad: nybegynder</string>
<string name="poi_piste_difficulty_expert">Piste sværhedsgrad: ekspert</string>
<string name="poi_piste_difficulty_freeride">Piste sværhedsgrad: freeride</string>
<string name="poi_piste_difficulty_easy">Pistesværhedsgrad: let</string>
<string name="poi_piste_difficulty_intermediate">Pistesværhedsgrad: medium</string>
<string name="poi_piste_difficulty_advanced">Pistesværhedsgrad: avanceret</string>
<string name="poi_piste_difficulty_novice">Pistesværhedsgrad: nybegynder</string>
<string name="poi_piste_difficulty_expert">Pistesværhedsgrad: ekspert</string>
<string name="poi_piste_difficulty_freeride">Pistesværhedsgrad: freeride</string>
<string name="poi_piste_grooming_classic">Pistepreparering: klassisk</string>
<string name="poi_piste_grooming_classic_skating">Pistepreparering: klassisk+skating</string>
<string name="poi_piste_grooming_backcountry">Pistepreparering: offpiste</string>
<string name="poi_piste_grooming_scooter">Pistepreparering: scooter</string>
<string name="poi_piste_grooming_skating">Pistepreparering: skøjteløb</string>
<string name="poi_piste_grooming_scooter">Pistepreparering: snescooter</string>
<string name="poi_piste_grooming_skating">Pistepreparering: skating</string>
<string name="poi_piste_grooming_no">Pistepreparering: ingen</string>
<string name="poi_piste_grooming_mogul">Pistepreparering: pukkelpist</string>

View file

@ -2001,4 +2001,5 @@
<string name="unsaved_changes_will_be_lost">Alla osparade ändringar kommer att förloras. Fortsätta ändå?</string>
<string name="simulate_your_location_stop_descr">Sluta simulera din plats</string>
<string name="simulate_your_location_descr">Simulera med inspelad GPX eller beräknad rutt</string>
</resources>
<string name="downloads_left_template">%1$s nedladdningar kvar</string>
</resources>

View file

@ -1361,6 +1361,6 @@
<string name="poi_piste_grooming_scooter">滑雪道修整:滑橇車</string>
<string name="poi_piste_grooming_skating">滑雪道修整:滑冰</string>
<string name="poi_piste_grooming_no">滑雪道修整:無</string>
<string name="poi_piste_grooming_mogul">滑雪道修整:障礙</string>
<string name="poi_piste_grooming_mogul">滑雪道修整:障礙 (mogul)</string>
</resources>