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

2018-11-22 13:36:09 +02:00 · 2018-11-22 13:36:09 +02:00 · edb3cabd8c
commit edb3cabd8c
parent c2fcbcb038 68a13a3f4a
13 changed files with 1 additions and 0 deletions
--- a/OsmAnd/assets/bundled_assets.xml
+++ b/OsmAnd/assets/bundled_assets.xml
@ -22,6 +22,7 @@
 	<asset source="voice/fi/fi_tts.js" destination="voice/fi-tts/fi_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/fr/fr_tts.js" destination="voice/fr-tts/fr_tts.js" mode="alwaysOverwriteOrCopy" />
 	<!--<asset source="voice/he/he_tts.js" destination="voice/he-tts/he_tts.js" mode="overwriteOnlyIfExists" />-->
+	<asset source="voice/nb/nb_tts.js" destination="voice/nb-tts/nb_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/hi/hi_tts.js" destination="voice/hi-tts/hi_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/hr/hr_tts.js" destination="voice/hr-tts/hr_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/hu/hu_tts.js" destination="voice/hu-tts/hu_tts.js" mode="overwriteOnlyIfExists" />
--- a/OsmAnd/res/drawable-hdpi/ic_action_start_navigation.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_start_navigation.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_volume_mute.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_volume_mute.png
--- a/OsmAnd/res/drawable-hdpi/map_start_navigation.png
+++ b/OsmAnd/res/drawable-hdpi/map_start_navigation.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_start_navigation.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_start_navigation.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_volume_mute.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_volume_mute.png
--- a/OsmAnd/res/drawable-mdpi/map_start_navigation.png
+++ b/OsmAnd/res/drawable-mdpi/map_start_navigation.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_start_navigation.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_start_navigation.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_volume_mute.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_volume_mute.png
--- a/OsmAnd/res/drawable-xhdpi/map_start_navigation.png
+++ b/OsmAnd/res/drawable-xhdpi/map_start_navigation.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_start_navigation.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_start_navigation.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_volume_mute.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_volume_mute.png
--- a/OsmAnd/res/drawable-xxhdpi/map_start_navigation.png
+++ b/OsmAnd/res/drawable-xxhdpi/map_start_navigation.png