Merge remote-tracking branch 'origin/master'

Conflicts: OsmAnd/res/values-de/strings.xml
2014-12-12 17:47:06 +01:00 · 2014-12-12 17:47:06 +01:00 · 9396f08319
commit 9396f08319
parent c22f4ea33e 9b9c6609b7
89 changed files with 2 additions and 0 deletions
--- a/OsmAnd/res/drawable-hdpi/ic_action_bug_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_bug_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_bug_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_bug_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_fav_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_fav_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_fav_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_fav_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_micro_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_micro_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_micro_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_micro_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_photo_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_photo_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_photo_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_photo_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_play_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_play_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_play_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_play_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_remove_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_remove_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_remove_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_remove_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_video_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_video_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_video_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_video_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_dashboard_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_dashboard_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_dashboard_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_dashboard_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_layer_bottom_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_layer_bottom_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_layer_bottom_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_layer_bottom_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_layer_top_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_layer_top_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_layer_top_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_layer_top_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_bug_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_bug_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_bug_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_bug_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_fav_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_fav_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_fav_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_fav_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_micro_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_micro_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_micro_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_micro_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_photo_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_photo_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_photo_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_photo_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_play_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_play_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_play_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_play_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_remove_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_remove_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_remove_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_remove_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_road_works_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_road_works_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_video_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_video_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_video_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_video_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_dashboard_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_dashboard_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_dashboard_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_dashboard_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_layer_bottom_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_layer_bottom_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_layer_bottom_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_layer_bottom_light.png
--- a/OsmAnd/res/drawable-mdpi/ic_layer_top_dark.png
+++ b/OsmAnd/res/drawable-mdpi/ic_layer_top_dark.png
--- a/OsmAnd/res/drawable-mdpi/ic_layer_top_light.png
+++ b/OsmAnd/res/drawable-mdpi/ic_layer_top_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_bug_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_bug_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_bug_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_bug_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_fav_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_fav_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_fav_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_fav_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_micro_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_micro_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_micro_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_micro_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_photo_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_photo_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_photo_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_photo_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_play_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_play_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_play_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_play_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_remove_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_remove_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_remove_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_remove_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_video_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_video_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_video_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_video_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_dashboard_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_dashboard_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_dashboard_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_dashboard_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_layer_bottom_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_layer_bottom_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_layer_bottom_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_layer_bottom_light.png
--- a/OsmAnd/res/drawable-xhdpi/ic_layer_top_dark.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_layer_top_dark.png
--- a/OsmAnd/res/drawable-xhdpi/ic_layer_top_light.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_layer_top_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_bug_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_bug_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_bug_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_bug_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_fav_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_fav_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_fav_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_fav_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_micro_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_micro_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_micro_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_micro_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_photo_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_photo_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_photo_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_photo_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_play_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_play_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_play_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_play_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_remove_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_remove_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_remove_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_remove_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_video_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_video_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_video_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_video_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_dashboard_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_dashboard_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_dashboard_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_dashboard_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_layer_bottom_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_layer_bottom_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_layer_bottom_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_layer_bottom_light.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_layer_top_dark.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_layer_top_dark.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_layer_top_light.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_layer_top_light.png
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -2048,4 +2048,6 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 	<string name="show_railway_warnings">Zeige Eisenbahn-Warnungen</string>
 	<string name="show_pedestrian_warnings">Zeige Warnungen für Fußgänger</string>
    <string name="rendering_value_americanRoadAtlas_name">Amerikanischer Straßenaltlas</string>
+    <string name="routing_attr_no_new_routing_name">Routing v1.9 nicht verwenden</string>
+    <string name="routing_attr_no_new_routing_description">Neue Routenberechnung nicht verwenden</string>
    </resources>