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

This commit is contained in:
Victor Shcherb 2015-03-19 18:28:54 +01:00
commit 7489f1c3ff
4 changed files with 9 additions and 4 deletions

View file

@ -1967,7 +1967,7 @@
<string name="action_modify">Handling rediger</string>
<string name="action_delete">Handling slet</string>
<string name="osm_edits">OSM redigeringer</string>
<string name="osmand_parking_hour">t</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Tilbage</string> <string name="parking_place_limited">Tidsbegrænset parkering</string>
<string name="osmand_parking_hour">t</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">Tilbage</string> <string name="parking_place_limited">Tidsbegrænset parkering</string>
<string name="your_edits">Dine redigeringer</string>
<string name="osmand_parking_overdue">Udløbet</string>
<string name="delay_to_start_navigation_descr">Start navigation automatisk efter angivne interval</string>
@ -1975,4 +1975,5 @@
<string name="shared_string_go">Udfør</string>
<string name="shared_string_not_use">Ikke brugt</string>
<string name="confirmation_to_clear_history">Skal hele historikken ryddes?</string>
<string name="local_osm_changes_upload_all_confirm">Overfør %1$d ændringer til OSM?</string>
</resources>

View file

@ -2207,4 +2207,6 @@
<string name="delay_to_start_navigation">경로 계획 생략</string>
<string name="shared_string_go">실행</string>
<string name="shared_string_not_use">사용 하지 않음</string>
</resources>
<string name="local_osm_changes_upload_all_confirm">OSM에 %1$d 변경 사항을 업로드 하려고 합니다. 확실합니까?</string>
<string name="confirmation_to_clear_history">모든 기록을 삭제 하시겠습니까?</string>
</resources>

View file

@ -1897,7 +1897,7 @@
<string name="action_modify">Atzione modìfica</string>
<string name="action_delete">Atzione burra</string>
<string name="osm_edits">Modìficas OSM</string>
<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Galu</string> <string name="parking_place_limited">Parchègiu cun tempus limitadu</string>
<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">Galu</string> <string name="parking_place_limited">Parchègiu cun tempus limitadu a</string>
<string name="your_edits">Modìficas tuas</string>
<string name="waypoint_visit_after">Vìsita a pustis</string>
<string name="waypoint_visit_before">Vìsita in antis</string>
@ -1923,4 +1923,5 @@
<string name="shared_string_go">Bae</string>
<string name="delay_to_start_navigation">Brinca sa pianificatzione de s\'àndala</string>
<string name="confirmation_to_clear_history">Boles burrare totu sistòria?</string>
<string name="local_osm_changes_upload_all_confirm">As a carrigare %1$d modìficas in OSM. Seguru ses?</string>
</resources>

View file

@ -1942,7 +1942,7 @@
<string name="shared_string_collapse">崩潰</string>
<string name="drawer">平面清單</string>
<string name="osm_edits">OSM 編輯</string>
<string name="osmand_parking_hour"></string><string name="osmand_parking_minute"></string><string name="osmand_parking_time_left"></string> <string name="parking_place_limited">停車場時限</string>
<string name="osmand_parking_hour"></string><string name="osmand_parking_minute"></string><string name="osmand_parking_time_left"></string> <string name="parking_place_limited">停車場時限</string>
<string name="your_edits">您的編輯</string>
<string name="action_create">行動建立</string>
<string name="action_modify">行動修改</string>
@ -1953,4 +1953,5 @@
<string name="shared_string_go">執行</string>
<string name="shared_string_not_use">不使用</string>
<string name="confirmation_to_clear_history">您想要清除所有過去的記錄嗎?</string>
<string name="local_osm_changes_upload_all_confirm">您要上載 %1$d 更改到 osm。您是否確定</string>
</resources>