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

Fix exceptions

Browse source 
Conflicts:
	OsmAnd/res/values-da/strings.xml
This commit is contained in:
Victor Shcherb 2013-04-27 19:27:09 +02:00
parent 5ff4c9d121
commit 793a641dc3
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values-da/strings.xml
View file

@ -192,7 +192,7 @@
<string name="monitoring_mode_on">Stop\n GPX-opt.</string> <string name="monitoring_mode_on">Stop\n GPX-opt.</string>
<string name="bg_service_sleep_mode_off">Aktiver\n dvaletilstand</string> <string name="bg_service_sleep_mode_off">Aktiver\n dvaletilstand</string>
<string name="bg_service_sleep_mode_on">Stop\n dvaletilstand</string> <string name="bg_service_sleep_mode_on">Stop\n dvaletilstand</string>
<string name="gps_wakeup_interval">GPS-opvågningsinterval: %s</string> <string name="gps_wakeup_interval">GPS vågn-op interval:%1$s</string>
<string name="int_continuosly">Vedvarende</string> <string name="int_continuosly">Vedvarende</string>
<string name="screen_is_locked">Tryk låseikon for at låse skærmen op</string> <string name="screen_is_locked">Tryk låseikon for at låse skærmen op</string>
<string name="map_widget_top_text">Gadenavn</string> <string name="map_widget_top_text">Gadenavn</string>
@ -232,7 +232,7 @@
<string name="show_cameras">Vis fartkameraer</string> <string name="show_cameras">Vis fartkameraer</string>
<string name="show_speed_limits">Vis trafik advarsler</string> <string name="show_speed_limits">Vis trafik advarsler</string>
<string name="avoid_toll_roads">Undgå betalingsveje</string> <string name="avoid_toll_roads">Undgå betalingsveje</string>
<string name="continue_follow_previous_route_auto">Forrige navigation var ikke færdig. Fortsæt med at følge den? (% 1 $ s sekunder)</string> <string name="continue_follow_previous_route_auto">Forrige navigation var ufærdig. Fortsæt den? (%1$s sekunder)</string>
<string name="route_updated_loc_found">Rute beregnes, når position er fundet</string> <string name="route_updated_loc_found">Rute beregnes, når position er fundet</string>
<string name="osmand_parking_hours">Timer</string> <string name="osmand_parking_hours">Timer</string>
<string name="osmand_parking_minutes">Minutter</string> <string name="osmand_parking_minutes">Minutter</string>

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

@ -500,7 +500,7 @@
<string name="asap">ACİL</string> <string name="asap">ACİL</string>
<string name="recording_context_menu_play">Oynat</string> <string name="recording_context_menu_play">Oynat</string>
<string name="bg_service_interval">Uyandırma aralığı ayarlayın:</string> <string name="bg_service_interval">Uyandırma aralığı ayarlayın:</string>
<string name="continue_follow_previous_route_auto">Önceki navigasyon bitmemiş. Onu izlemeye devam et? (%1$ s saniye)</string> <string name="continue_follow_previous_route_auto">Önceki navigasyon bitmemiş. Onu izlemeye devam et? (%1$s saniye)</string>
<string name="route_updated_loc_found">Pozisyon bulundu sonra rota hesaplanacak</string> <string name="route_updated_loc_found">Pozisyon bulundu sonra rota hesaplanacak</string>
<string name="tip_recent_changes_0_8_1_t">"0.8.1 deki Değişiklikler: <string name="tip_recent_changes_0_8_1_t">"0.8.1 deki Değişiklikler:
\n\t* Daha kesin rotalar (biraz yavaş) şeritleriyle \n\t* Daha kesin rotalar (biraz yavaş) şeritleriyle

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

@ -11,7 +11,11 @@
--> -->
<string name="save_current_track_widget">Save <string name="save_current_track_widget">Save
\n current GPX track</string> \n current GPX track</string>
<string name="tip_recent_changes_1_2_t">Changes in 1.2: <string name="tip_recent_changes_1_2_t">Fixes in 1.2.1:
\n\t*Fix Geo Intent (Foursquare, c:geo)
\n\t*Fix screen tremble during navigation
\n\t*Other small fixes
\nChanges in 1.2:
\n\t* Bug fixes (tuned routing, search, AV recording, voice prompts, some display improvements) \n\t* Bug fixes (tuned routing, search, AV recording, voice prompts, some display improvements)
\n\t* Easier hillshade overlay configuration (requires Contour Lines plugin) \n\t* Easier hillshade overlay configuration (requires Contour Lines plugin)
\n\t* Now accepts maps.google.com location links \n\t* Now accepts maps.google.com location links

10
OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
View file

@ -129,11 +129,13 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
} }
public void updateSettings(){ public void updateSettings(){
if(settings.ROTATE_MAP.get() != OsmandSettings.ROTATE_MAP_COMPASS){ if (mapView != null) {
mapView.setRotate(0); if (settings.ROTATE_MAP.get() != OsmandSettings.ROTATE_MAP_COMPASS) {
mapView.setRotate(0);
}
mapView.setMapPosition(settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING ? OsmandSettings.BOTTOM_CONSTANT
: OsmandSettings.CENTER_CONSTANT);
} }
mapView.setMapPosition(settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING
? OsmandSettings.BOTTOM_CONSTANT : OsmandSettings.CENTER_CONSTANT);
registerUnregisterSensor(app.getLocationProvider().getLastKnownLocation(), false); registerUnregisterSensor(app.getLocationProvider().getLastKnownLocation(), false);
} }