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

This commit is contained in:
Victor Shcherb 2015-06-10 16:16:52 +02:00
commit efa8b203e3
3 changed files with 5 additions and 2 deletions

View file

@ -2030,4 +2030,6 @@
<string name="download_wikipedia_maps">Wikipedia</string>
<string name="shared_string_import2osmand">Importer til OsmAnd</string>
<string name="local_recordings_delete_all_confirm">Slet %1$d noter. Bekræft?</string>
<string name="disable_recording_once_app_killed">Kør i baggrunden</string>
<string name="disable_recording_once_app_killed_descrp">Stopper optagelsen, hvis programmet afsluttes (via seneste programmer). Når programmer startes, vil optagelsen starte igen (meddelese i notifikationslinien om baggrundsproces).</string>
</resources>

View file

@ -1965,4 +1965,5 @@
<string name="download_wikipedia_maps">Wikipédia</string>
<string name="shared_string_import2osmand">Importálás az OsmAnd programba</string>
<string name="local_recordings_delete_all_confirm">%1$d jegyzetet fog törölni. Biztos benne?</string>
<string name="disable_recording_once_app_killed">Futtatás a háttérben</string>
</resources>

View file

@ -10,7 +10,7 @@
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="disable_recording_once_app_killed">Run in background</string>
<string name="disable_recording_once_app_killed_descrp">Stops recording if the app is killed (via recent apps). When the app is started, the recording will start over (notification on the top about background process).</string>
<string name="disable_recording_once_app_killed_descrp">Unless checked, GPX recording will stop when the app is killed (via recent apps). Upon app restart, the recording will resume (see notification in the top bar about the OsmAnd Sleep mode process).</string>
<string name="shared_string_import2osmand">Import to OsmAnd</string>
<string name="read_full_article">Read full article</string>
<string name="download_wikipedia_item">Wikipedia</string>