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

Merge pull request #290 from Zahnstocher/master

Browse source 
add/remove spaces
This commit is contained in:
Pavol Zibrita 2012-08-14 08:27:50 -07:00
commit 8d41f857e4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-nl/strings.xml
View file

@ -17,7 +17,7 @@
<string name="map_widget_transparent">Transparente skin </string> <string name="map_widget_transparent">Transparente skin </string>
<string name="monitoring_mode_off">Stop trackregistratie</string> <string name="monitoring_mode_off">Stop trackregistratie</string>
<string name="monitoring_mode_on">Start trackregistratie</string> <string name="monitoring_mode_on">Start trackregistratie</string>
<string name="gps_wakeup_interval">GPS ontwaak-interval : %s</string> <string name="gps_wakeup_interval">GPS ontwaak-interval: %s</string>
<string name="int_continuosly">Continue</string> <string name="int_continuosly">Continue</string>
<string name="vector_maps_may_display_faster_on_some_devices">Vectorkaarten worden vaak sneller weergegeven. Werkt niet op sommige apparaten.</string> <string name="vector_maps_may_display_faster_on_some_devices">Vectorkaarten worden vaak sneller weergegeven. Werkt niet op sommige apparaten.</string>
<string name="simulate_route_progression_manually">Simuleer routeverloop handmatig</string> <string name="simulate_route_progression_manually">Simuleer routeverloop handmatig</string>

2
OsmAnd/res/values/strings.xml
View file

@ -28,7 +28,7 @@
<string name="monitoring_mode_on">Stop\n GPX rec.</string> <string name="monitoring_mode_on">Stop\n GPX rec.</string>
<string name="bg_service_sleep_mode_off">Enable\n sleep mode</string> <string name="bg_service_sleep_mode_off">Enable\n sleep mode</string>
<string name="bg_service_sleep_mode_on">Stop\n sleep mode</string> <string name="bg_service_sleep_mode_on">Stop\n sleep mode</string>
<string name="gps_wakeup_interval">GPS wake-up interval : %s</string> <string name="gps_wakeup_interval">GPS wake-up interval: %s</string>
<string name="int_continuosly">Continuously</string> <string name="int_continuosly">Continuously</string>
<string name="screen_is_locked">To unlock screen press lock icon</string> <string name="screen_is_locked">To unlock screen press lock icon</string>
<string name="map_widget_top_text">Street name</string> <string name="map_widget_top_text">Street name</string>

4
OsmAnd/src/net/osmand/plus/views/LockInfoControl.java
View file

@ -173,10 +173,10 @@ public class LockInfoControl {
v.value = 0; v.value = 0;
} else { } else {
if(progress < secondsLength) { if(progress < secondsLength) {
s = seconds[progress] + ctx.getString(R.string.int_seconds); s = seconds[progress] + " " + ctx.getString(R.string.int_seconds);
v.value = seconds[progress] * 1000; v.value = seconds[progress] * 1000;
} else { } else {
s = minutes[progress - secondsLength] + ctx.getString(R.string.int_min); s = minutes[progress - secondsLength] + " " + ctx.getString(R.string.int_min);
v.value = minutes[progress - secondsLength] * 60 * 1000; v.value = minutes[progress - secondsLength] * 60 * 1000;
} }
} }