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

OsmAnd/build.gradle

@@ -48,7 +48,7 @@ android {
         targetSdkVersion 21
 
         versionCode System.getenv("APK_NUMBER_VERSION")? System.getenv("APK_NUMBER_VERSION").toInteger(): versionCode
-        versionName System.getenv("APK_VERSION") ?: versionName
+        versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
     }
 
     lintOptions {
@@ -167,16 +167,17 @@ android {
 
 def replaceNoTranslate(line) {
     if(line.contains("\"app_name\"") && System.getenv("APP_NAME")) {
-        return line.replaceAll(">[^<]*<", " >"+System.getenv("APP_NAME")+"<")
+        return line.replaceAll(">[^<]*<", ">"+System.getenv("APP_NAME")+"<")
     }
     if(line.contains("\"app_edition\"") && System.getenv("APP_EDITION")) {
-        return line.replaceAll(">[^<]*<", " >"+System.getenv("APP_EDITION")+"<")
+        return line.replaceAll(">[^<]*<", ">"+System.getenv("APP_EDITION")+"<")
     }
     if(line.contains("\"app_version\"") && System.getenv("APK_VERSION")) {
-        return line.replaceAll(">[^<]*<", " >\1"+System.getenv("APK_VERSION")+"<")
+	// appends build number to version number for dev builds
+        return line.replaceAll("</", System.getenv("APK_VERSION")+"</")
     }
     if(line.contains("\"versionFeatures\"") && System.getenv("APP_FEATURES")) {
-        return line.replaceAll(">[^<]*<", " >"+System.getenv("APP_FEATURES")+"<")
+        return line.replaceAll(">[^<]*<", ">"+System.getenv("APP_FEATURES")+"<")
     }
     return line;
 }

OsmAnd/res/values-ca/phrases.xml

@@ -63,7 +63,7 @@
 	<string name="poi_fire_extinguisher">Extintor</string>
 	<string name="poi_fire_hose">Mànega d\'incendis</string>
 	<string name="poi_ambulance_station">Parc d\'ambulàncies</string>
-	<string name="poi_mountain_pass">Port de muntanya</string>
+	<string name="poi_mountain_pass">Coll</string>
 	<string name="poi_city_wall">Muralla</string>
 	<string name="poi_vehicle_inspection">Inspecció de vehicles</string>
 	<string name="poi_military_nuclear_explosion_site">Lloc d\'explosió nuclear</string>
@@ -154,21 +154,21 @@
 	<string name="poi_bridge">Pont</string>
 
 	<string name="poi_vacuum_cleaner_shop">Aspiradores i aparells de neteja</string>
-	<string name="poi_motorway_junction">Sortida d\'autopista</string>
+	<string name="poi_motorway_junction">Creuament d\'autopistes</string>
 
 	<string name="poi_water_well">Pou d\'aigua</string>
 	<string name="poi_boatyard">Drassana</string>
 	<string name="poi_wastewater_plant">Planta de tractament d\'aigües residuals</string>
 	<string name="poi_water_tower">Torre d\'aigua</string>
 	<string name="poi_lock_gate">Resclosa</string>
-	<string name="poi_weir">Abocador d\'aigua</string>
+	<string name="poi_weir">Sobreeixidor</string>
 	<string name="poi_dam">Presa d\'aigua</string>
 	<string name="poi_water_mill">Molí hidràulic</string>
 
 	<string name="poi_power_substation">Subestació elèctrica</string>
 	<string name="poi_power_transformer">Transformador elèctric</string>
 	<string name="poi_power_plant">Central energètica</string>
-	<string name="poi_power_generator">Generador d\'energia</string>
+	<string name="poi_power_generator">Generador elèctric</string>
 
 	<string name="poi_post_office">Oficina de correus</string>
 	<string name="poi_post_box">Bústia de correus</string>
@@ -182,7 +182,7 @@
 	<string name="poi_waste_basket">Paperera</string>
 
 	<string name="poi_pier">Moll</string>
-	<string name="poi_surveillance">Equip de vigilància</string>
+	<string name="poi_surveillance">Vigilància</string>
 	<string name="poi_observatory">Observatori</string>
 	<string name="poi_astronomical_observatory">Observatori astronòmic</string>
 	<string name="poi_tower">Torre</string>

OsmAnd/res/values-ca/strings.xml

@@ -1862,7 +1862,7 @@
     <string name="speak_pedestrian">Anuncia els passos de zebra</string>
     <string name="rendering_value__name">Renderització per defecte</string>
 	<string name="navigation_over_track">Voleu iniciar la navegació sobre la traça?</string>
-	<string name="avoid_roads_msg">Podeu condicionar la ruta amb la selecció de les vies a evitar</string>
+	<string name="avoid_roads_msg">Podeu generar una ruta alternativa amb la selecció de les vies a evitar</string>
     <string name="save_track_to_gpx_globally_headline">Registre de traces a petició</string>
 	<string name="recents">RECENTS</string>
 	<string name="proxy_pref_title">Servidor intermediari</string>
@@ -1874,4 +1874,11 @@
 	<string name="proxy_host_descr">Configureu el nom de l\'amfitrió del vostre servidor intermediari (p.ex. 127.0.0.1)</string>
 	<string name="proxy_port_title">Port del servidor intermediari</string>
 	<string name="proxy_port_descr">Configureu el número de port del vostre servidor intermediari (p.ex. 8118)</string>
-	</resources>
+	<string name="points">Punts</string>
+    <string name="tracks">Traces</string>
+    <string name="my_location">La vostra posició</string>
+    <string name="osm_editing_manage">Gestió</string>
+    <string name="version_settings_descr">Baixada de les darreres actualitzacions</string>
+    <string name="version_settings">Versions</string>
+    <string name="rendering_attr_streetLighting_name">Enllumenat dels carrers</string>
+    </resources>

OsmAnd/res/values-da/strings.xml

@@ -726,7 +726,7 @@
 	<string name="gpx_option_from_start_point">Passere langs hele sporet</string>
 	<string name="switch_to_vector_map_to_see">Offline vektor-kort er tilgængelig for denne placering.
 \n\nFor at anvende aktiver \'Menu\' → \'Konfigurer kort\' → \'Vælg kortkilde…\' → \'Offline vektor-kort\'.</string>
-	<string name="choose_audio_stream">Stemmeindstillinger</string>
+	<string name="choose_audio_stream">Stemmevejledning udgang</string>
 	<string name="choose_audio_stream_descr">Vælg audiokanal til at afspille stemmevejledning (system afhængig)</string>
 	<string name="voice_stream_voice_call">Stemmeopkald lyd</string>
 	<string name="voice_stream_notification">Meddelelselyd</string>
@@ -1019,7 +1019,7 @@
 	<string name="transport_finish_search">Afslut søgning</string>
 	<string name="transport_to_go_after">tidligere afstand</string>
 	<string name="transport_to_go_before">efterfølgende afstand</string>
-	<string name="transport_route_distance">Ruteplan længde</string>
+	<string name="transport_route_distance">Rutelængde</string>
 	<string name="transport">Transport</string>
 	<string name="default_buttons_no">Nej</string>
 	<string name="default_buttons_yes">Ja</string>
@@ -1864,7 +1864,7 @@
     <string name="dash_download_new_one">Hent nye kort</string>
     <string name="dash_download_manage">Administrer</string>
     <string name="voices">Stemmevejledning</string>
-	<string name="rendering_attr_roadStyle_name">Vejstil</string>
+	<string name="rendering_attr_roadStyle_name">Vejrepræsentation</string>
     <string name="rendering_value_default_name">Standard</string>
     <string name="rendering_value_orange_name">Orange</string>
     <string name="rendering_value_germanRoadAtlas_name">Tysk vejkort</string>
@@ -1878,11 +1878,11 @@
     <string name="speak_pedestrian">Fodgængerovergange</string>
     <string name="rendering_value__name">Standard</string>
 	<string name="save_track_to_gpx_globally_headline">On demand sporingslogning</string>
-	<string name="navigation_over_track">Start navigation over spor?</string>
-	<string name="avoid_roads_msg">Du kan ændre ruten ved at vælge veje der skal undgås</string>
+	<string name="navigation_over_track">Start navigation langs spor?</string>
+	<string name="avoid_roads_msg">Du kan generere en alternativ rute ved at vælge veje der skal undgås</string>
     <string name="recents">SENESTE</string>
 	<string name="proxy_pref_title">Proxy</string>
-    <string name="proxy_pref_descr">Opsæt en proxy internetkommunikation</string>
+    <string name="proxy_pref_descr">Opsæt en proxy til internetkommunikation</string>
     <string name="settings_privacy">Privatliv</string>
     <string name="enable_proxy_title">Aktiver HTTP proxy</string>
 	<string name="enable_proxy_descr">Konfigurer HTTP-proxy for alle netværksanmodninger</string>
@@ -1894,7 +1894,7 @@
     <string name="tracks">Spor</string>
     <string name="my_location">Min placering</string>
     <string name="osm_editing_manage">Administrer</string>
-    <string name="version_settings_descr">Hent natlige versioner</string>
+    <string name="version_settings_descr">"Hent aktuelle  udviklingsversioner"</string>
     <string name="version_settings">Versioner</string>
     <string name="points">Punkter</string>
     </resources>

OsmAnd/res/values-es/strings.xml

@@ -1899,4 +1899,6 @@
 	<string name="proxy_port_title">Puerto del proxy</string>
 	<string name="proxy_port_descr">Configurar el número de puerto de tu proxy (p.e. 8118)</string>
 	<string name="proxy_host_descr">Configura el hostname de tu proxy (p.e. 127.0.0.1)</string>
-	</resources>
+	<string name="version_settings_descr">Descargar versiones de desarrollo (nightly builds)</string>
+    <string name="version_settings">Compilaciones</string>
+    </resources>

OsmAnd/res/values-it/strings.xml

@@ -2058,4 +2058,10 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="settings_privacy">Privacy</string>
     <string name="rendering_attr_streetLighting_name">Illuminazione stradale</string>
     <string name="proxy_pref_title">Proxy</string>
+    <string name="version_settings_descr">Download versioni di sviluppo</string>
+    <string name="version_settings">Versioni</string>
+    <string name="points">Punti</string>
+    <string name="tracks">Tracce</string>
+    <string name="my_location">La mia posizione</string>
+    <string name="osm_editing_manage">Gestisci</string>
     </resources>

OsmAnd/res/values-ko/strings.xml

@@ -2108,7 +2108,7 @@
     <string name="speak_pedestrian">보행자 횡단보도 알리기</string>
     <string name="rendering_value__name">기본값</string>
 	<string name="navigation_over_track">경로를 따라 운행을 시작할까요?</string>
-	<string name="avoid_roads_msg">원하는 도로를 선택하여 경로를 변경할 수 있습니다</string>
+	<string name="avoid_roads_msg">원하는 도로를 선택하여 대체 경로를 실행할 수 있습니다</string>
     <string name="save_track_to_gpx_globally_headline">트랙 로깅 요구</string>
 	<string name="recents">최근</string>
 	<string name="rendering_attr_streetLighting_name">거리 조명</string>
@@ -2121,4 +2121,10 @@
 	<string name="proxy_host_descr">프록시 호스트 이름 구성 (예: 127.0.0.1)</string>
 	<string name="proxy_port_title">프록시 포트</string>
 	<string name="proxy_port_descr">당신의 프록시 포트 번호 구성 (예: 8118)</string>
-	</resources>
+	<string name="version_settings_descr">야간 빌드를 다운로드</string>
+    <string name="version_settings">빌드</string>
+    <string name="points">장소</string>
+    <string name="tracks">경로</string>
+    <string name="my_location">내 위치</string>
+    <string name="osm_editing_manage">관리</string>
+    </resources>

OsmAnd/res/values-ru/strings.xml

@@ -1851,7 +1851,7 @@
 	<string name="speak_pedestrian">Сообщать о пешеходных переходах</string>
     <string name="rendering_value__name">По умолчанию</string>
 	<string name="navigation_over_track">Начать навигацию по треку?</string>
-	<string name="avoid_roads_msg">Вы можете изменить маршрут, выбрав дороги, которые стоит избегать</string>
+	<string name="avoid_roads_msg">Вы можете выбрать альтернативный маршрут, выбрав дороги, которые стоит избегать</string>
     <string name="save_track_to_gpx_globally_headline">Запись трека по требованию</string>
 	<string name="proxy_pref_title">Прокси-сервер</string>
     <string name="proxy_pref_descr">Настройка интернет соединения через прокси-сервер</string>
@@ -1864,4 +1864,8 @@
 	<string name="proxy_port_descr">Настройте номер порта вашего прокси-сервера (например, 8118)</string>
 	<string name="recents">НЕДАВНИЕ</string>
 	<string name="rendering_attr_streetLighting_name">Уличное освещение</string>
+    <string name="version_settings_descr">Скачать ночные сборки</string>
+    <string name="version_settings">Сборки</string>
+    <string name="tracks">Треки</string>
+    <string name="my_location">Мое местоположение</string>
     </resources>

OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java

@@ -10,6 +10,8 @@ import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.SettingsBaseActivity;
 import net.osmand.plus.activities.actions.AppModeDialog;
+import net.osmand.plus.Version;
+//import net.osmand.plus.development.OsmandDevelopmentPlugin;
 import net.osmand.util.SunriseSunset;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -65,10 +67,27 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 			}
 		});
 		cat.addPreference(pref);
-		
+
+		if ((Version.getBuildAppEdition(getMyApplication()).length() > 0
+				|| Version.isDeveloperVersion(getMyApplication()))) {
+				//&& OsmandPlugin.getEnabledPlugin(OsmandDevelopmentPlugin.class) != null){
+			pref = new Preference(this);
+			pref.setTitle(R.string.version_settings);
+			pref.setSummary(R.string.version_settings_descr);
+			pref.setKey("version");
+//TODO			pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+//				@Override
+//				public boolean onPreferenceClick(Preference preference) {
+//					startActivityForResult(new Intent(SettingsDevelopmentActivity.this, ContributionVersionActivity.class));
+//					return false;
+//				}
+//			});
+			cat.addPreference(pref);
+		}
+
 		pref = new Preference(this);
 		pref.setTitle(R.string.global_app_allocated_memory);
-		
+
 		long javaAvailMem = (Runtime.getRuntime().totalMemory() -  Runtime.getRuntime().freeMemory())/ (1024*1024l);
 		long javaTotal = Runtime.getRuntime().totalMemory() / (1024*1024l);
 		long dalvikSize = android.os.Debug.getNativeHeapAllocatedSize() / (1024*1024l);