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

OsmAnd/build.gradle

@@ -38,7 +38,7 @@ android {
 	}
 
 	defaultConfig {
-		minSdkVersion 14
+		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14
 		targetSdkVersion 21
 
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode

OsmAnd/res/values-da/phrases.xml

@@ -1071,4 +1071,12 @@
 	<string name="poi_building">Bygning</string>
 
 <string name="poi_military_office">Militærkontor</string>
+	<string name="poi_notary">Notar</string>
+	<string name="poi_political_party">Partikontor</string>
+	<string name="poi_tax_advisor">Skatterådgiverkontor</string>
+
+	<string name="poi_office_religion">Religiøs kontor</string>
+	<string name="poi_association">Foreningskontor</string>
+	<string name="poi_financial">Finansiel kontor</string>
+	<string name="poi_foundation">Fondskontor</string>
 	</resources>

OsmAnd/res/values-de/phrases.xml

@@ -147,7 +147,7 @@
 	<string name="poi_club_tourism">Tourismusverein</string>
 	<string name="poi_club_veterans">Veteranenklub</string>
 	<string name="poi_college">Hochschule</string>
-	<string name="poi_communication_tower">Kommunikationstumr</string>
+	<string name="poi_communication_tower">Kommunikationsturm</string>
 	<string name="poi_community_centre">Gemeindezentrum</string>
 	<string name="poi_company">Firma</string>
 	<string name="poi_compressed_air">Druckluft</string>
@@ -699,7 +699,7 @@
 	<string name="poi_sailing">Segeln</string>
 	<string name="poi_apartment">Apartment</string>
 	<string name="poi_internet_access_wlan">Internetzugang: WLAN</string>
-	<string name="poi_internet_access_wired">Internetzugang: Kabel</string>
+	<string name="poi_internet_access_wired">Internetzugang: Kabelgebunden</string>
 	<string name="poi_internet_access_public">Internetzugang: öffentlich</string>
 	<string name="poi_picnic_table">Picknicktisch</string>
 	<string name="poi_wine_cellar">Weinkeller</string>
@@ -1014,4 +1014,17 @@
 	<string name="poi_instagram">Instagram</string>
 	<string name="poi_vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
+	<string name="poi_perfumery">Parfümerie</string>
+
+	<string name="poi_association">Geschäftsstelle</string>
+	<string name="poi_political_party">Parteibüro</string>
+	<string name="poi_notary">Notar</string>
+	<string name="poi_foundation">Stiftungsbüro</string>
+	<string name="poi_tax_advisor">Steuerberatung</string>
+
+	<string name="poi_military_office">Militärverwaltung</string>
+	<string name="poi_building">Gebäude</string>
+
+<string name="poi_office_religion">Büro einer Glaubensgemeinschaft</string>
+	<string name="poi_financial">Finanzverwaltung</string>
 	</resources>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -1052,4 +1052,13 @@
 
 	<string name="poi_building">Edificio</string>
 
+<string name="poi_office_religion">Oficina religiosa</string>
+	<string name="poi_association">Asociación</string>
+	<string name="poi_financial">Oficina financiera</string>
+	<string name="poi_political_party">Partido político</string>
+	<string name="poi_notary">Escribano</string>
+	<string name="poi_foundation">Fundación</string>
+	<string name="poi_tax_advisor">Asesor fiscal</string>
+
+	<string name="poi_military_office">Oficina militar</string>
 	</resources>

OsmAnd/res/values-es/phrases.xml

@@ -1055,4 +1055,13 @@
 
 	<string name="poi_building">Edificio</string>
 
+<string name="poi_office_religion">Oficina religiosa</string>
+	<string name="poi_association">Asociación</string>
+	<string name="poi_financial">Oficina financiera</string>
+	<string name="poi_political_party">Partido político</string>
+	<string name="poi_notary">Escribano / notario</string>
+	<string name="poi_foundation">Fundación</string>
+	<string name="poi_tax_advisor">Asesor fiscal</string>
+
+	<string name="poi_military_office">Oficina militar</string>
 	</resources>

OsmAnd/res/values-pt-rBR/phrases.xml

@@ -1054,4 +1054,12 @@
 	<string name="poi_building">Número</string>
 
 <string name="poi_military_office">Área militar</string>
+	<string name="poi_office_religion">Área religiosa</string>
+	<string name="poi_association">Escritório de Associação</string>
+	<string name="poi_financial">Escritório financeiro</string>
+	<string name="poi_political_party">Escritório de partido político</string>
+	<string name="poi_notary">Tabelião</string>
+	<string name="poi_foundation">Escritório de fundação</string>
+	<string name="poi_tax_advisor">Escritório de conselheiro fiscal</string>
+
 	</resources>

OsmAnd/res/values-zh-rTW/phrases.xml

@@ -1052,4 +1052,12 @@
 	<string name="poi_building">建築物</string>
 
 <string name="poi_military_office">軍事辦公室</string>
+	<string name="poi_office_religion">宗教辦公室</string>
+	<string name="poi_association">社團辦公室</string>
+	<string name="poi_financial">金融辦公室</string>
+	<string name="poi_political_party">政黨辦公室</string>
+	<string name="poi_notary">公證人</string>
+	<string name="poi_foundation">基金會辦公室</string>
+	<string name="poi_tax_advisor">稅務顧問辦公室</string>
+
 	</resources>