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

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

Browse source 
Conflicts:
	OsmAnd/res/drawable-hdpi/map_intermediate_point.png
	OsmAnd/res/drawable-hdpi/map_target_point.png
	OsmAnd/res/drawable-mdpi/map_intermediate_point.png
	OsmAnd/res/drawable-mdpi/map_target_point.png
	OsmAnd/res/drawable-xhdpi/map_intermediate_point.png
	OsmAnd/res/drawable-xhdpi/map_target_point.png
	OsmAnd/res/drawable-xxhdpi/map_intermediate_point.png
	OsmAnd/res/drawable-xxhdpi/map_target_point.png
This commit is contained in:
Victor Shcherb 2015-04-24 23:21:24 +02:00
commit 416af8ae11
8 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/build.gradle
View file

@ -186,12 +186,6 @@ task collectVoiceAssets(type: Sync) {
include "**/*.p"
}
task collectSpecialPhrasesAssets(type: Sync) {
from "../../resources/specialphrases"
into "assets/specialphrases"
include "*.txt"
}
task collectHelpContentsAssets(type: Sync) {
from "../../help"
into "assets/help"
@ -239,7 +233,6 @@ task copyStyleIcons(type: Copy) {
task collectExternalResources << {}
collectExternalResources.dependsOn collectVoiceAssets,
collectSpecialPhrasesAssets,
collectHelpContentsAssets,
collectRoutingResources,
collectRenderingStylesResources,

1
OsmAnd/build.xml
View file

@ -78,7 +78,6 @@
<target name="copy_resources">
<copy todir="assets">
<fileset dir="../../resources/">
<include name="specialphrases/**" />
<include name="voice/**/*.p" />
</fileset>
</copy>

10
OsmAnd/res/values-ca/phrases.xml
View file

@ -360,4 +360,12 @@
<string name="poi_historic_ship">Vaixell històric</string>
<string name="poi_dyke">Dic</string>
<string name="poi_floating_dock">Moll flotant</string>
</resources>
<string name="poi_shop">Botiga</string>
<string name="poi_shop_food">Queviures</string>
<string name="poi_public_transport">Transport públic</string>
<string name="poi_air_transport">Transport aéri</string>
<string name="poi_personal_transport">Transport privat</string>
<string name="poi_transportation">Transport</string>
<string name="poi_emergency">Emergències</string>
<string name="poi_filling_station">Punt de proveïment</string>
</resources>

3
OsmAnd/res/values-ca/strings.xml
View file

@ -1984,4 +1984,5 @@ Activant aquests canvis de visualització l\'estil del mapa canvia a "Hibern i e
<string name="shared_string_search">Cerca</string>
<string name="filter_poi_hint">Filtre per nom</string>
<string name="search_poi_category_hint">Escriviu per cercar-ho tot</string>
</resources>
<string name="index_name_netherlands">Europa - Països Baixos</string>
</resources>

14
OsmAnd/res/values-da/phrases.xml
View file

@ -4,7 +4,7 @@
<string name="poi_alcohol">Spiritus</string>
<string name="poi_convenience">Nærbutik</string>
<string name="poi_mall">Butikscenter</string>
<string name="poi_beverages">Drikkevarebutik</string>
<string name="poi_beverages">Drikkevarer</string>
<string name="poi_butcher">Kødmarked</string>
<string name="poi_deli">Delikatesse</string>
<string name="poi_farm">Gårdbutik</string>
@ -23,17 +23,17 @@
<string name="poi_antiques">Antikviteter</string>
<string name="poi_art">Kunsthandler</string>
<string name="poi_baby_goods">Babyudstryr</string>
<string name="poi_bag">Taskebutik</string>
<string name="poi_bag">Tasker</string>
<string name="poi_bathroom_furnishing">Badeværelsesinventar</string>
<string name="poi_bed">Soveværelsesmøbler</string>
<string name="poi_boutique">Modebutik</string>
<string name="poi_carpet">Tæppeforretning</string>
<string name="poi_carpet">Tæpper</string>
<string name="poi_chemist">Materialist</string>
<string name="poi_clothes">Tøjbutik</string>
<string name="poi_shoes">Skobutik</string>
<string name="poi_computer">Computerbutik</string>
<string name="poi_copyshop">Kopicenter</string>
<string name="poi_curtain">Gardinforretning</string>
<string name="poi_curtain">Gardiner</string>
<string name="poi_fabric">Stofbutik</string>
<string name="poi_bedding">Sengetøj</string>
<string name="poi_dive">Dykkerudstyr</string>
@ -42,7 +42,7 @@
<string name="poi_fishing">Fiskegrej</string>
<string name="poi_florist">Blomsterhandler</string>
<string name="poi_frame">Rammer</string>
<string name="poi_furniture">Møbelforretning</string>
<string name="poi_furniture">Møbeler</string>
<string name="poi_garden_centre">Havecenter</string>
<string name="poi_gas">Flaskegas</string>
<string name="poi_general">Landhandel</string>
@ -55,7 +55,7 @@
<string name="poi_houseware">Husholdningsartikler</string>
<string name="poi_hunting">Jagtudstyr</string>
<string name="poi_interior_decoration">Boligindretning</string>
<string name="poi_jewelry">Smykkeforretning</string>
<string name="poi_jewelry">Smykker</string>
<string name="poi_kiosk">Kiosk</string>
<string name="poi_kitchen">Køkkenudstyr</string>
<string name="poi_mobile_phone">Mobiltelefoner</string>
@ -685,7 +685,7 @@
<string name="poi_railway_buffer_stop">Jernbane sporstopper</string>
<string name="poi_wine">Vinhandel</string>
<string name="poi_shop_food">Fødevarebutik</string>
<string name="poi_shop_food">Fødevarer</string>
<string name="poi_road_obstacle">Vejhindring</string>
<string name="poi_filling_station">Tankstation</string>
<string name="poi_personal_transport">Personlig transport</string>

8
OsmAnd/res/values-de/phrases.xml
View file

@ -188,8 +188,8 @@
<string name="poi_craft_electrician">Elektriker</string>
<string name="poi_electronics">Elektronik-Geschäft</string>
<string name="poi_embassy">Botschaft</string>
<string name="poi_emergency_access_point">Nofall-Zugangspunkt</string>
<string name="poi_emergency_phone">Nofall-Telefon</string>
<string name="poi_emergency_access_point">Rettungspunkt</string>
<string name="poi_emergency_phone">Notfall-Telefon</string>
<string name="poi_employment_agency">Arbeitsamt</string>
<string name="poi_equestrian">Reiter</string>
<string name="poi_erotic">Sex-Shop</string>
@ -271,7 +271,7 @@
<string name="poi_internet_cafe">Internet Cafe</string>
<string name="poi_island">Insel</string>
<string name="poi_islet">Inselchen</string>
<string name="poi_isolated_dwelling">Freistehendes Haus</string>
<string name="poi_isolated_dwelling">Einzelsiedlung</string>
<string name="poi_it">IT-Dienst</string>
<string name="poi_craft_jeweller">Juwelier</string>
<string name="poi_jewelry">Juwelier</string>
@ -507,7 +507,7 @@
<string name="poi_stream">Fluss</string>
<string name="poi_stripclub">Stripclub</string>
<string name="poi_studio">Studio</string>
<string name="poi_suburb">Vorstadt</string>
<string name="poi_suburb">Stadtteil</string>
<string name="poi_railway_subway_entrance">U-Bahnhofeingang</string>
<string name="poi_subway_station">U-Bahnhof</string>
<string name="poi_craft_sun_protection">Lichtschutz</string>

14
OsmAnd/res/values-de/strings.xml
View file

@ -1,5 +1,9 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="tips_and_tricks_descr">Häufig gestellte Fragen, neueste Änderungen und anderes</string>
<string name="delay_to_start_navigation">Routenführung beginnen nach…</string>
<string name="simulate_your_location">Simulieren der Position</string>
<string name="rendering_attr_OSMMapperAssistant_name">OSM-Mapper-Assistent</string>
<string name="traffic_warning_speed_limit">Geschwindigkeitsbegrenzung</string>
<string name="traffic_warning_border_control">Grenzkontrolle</string>
<string name="traffic_warning_payment">Mautstelle</string>
@ -64,7 +68,7 @@
<string name="stop_navigation_service">Unterbrechen</string>
<string name="rendering_attr_alpineHiking_name">Alpine Tourenskala (SAC)</string>
<string name="rendering_attr_alpineHiking_description">Wege entsprechend der SAC-Wanderskala darstellen</string>
<string name="rendering_attr_osmcTraces_name">Wandersymbole anzeigen</string>
<string name="rendering_attr_osmcTraces_name">Wanderwege anzeigen</string>
<string name="rendering_attr_osmcTraces_description">Wandersymbole anzeigen (OSMC)</string>
<string name="arrival_distance_factor_early">Früh</string>
<string name="arrival_distance_factor_normally">Normal</string>
@ -325,11 +329,13 @@
<string name="settings_preset_descr">Karten- und Navigations-Einstellungen werden je Profil gespeichert. Hier Standardprofil vorauswählen.</string>
<string name="routing_settings">Navigation</string>
<string name="routing_settings_2">Navigationseinstellungen</string>
<string name="routing_settings_descr">Nutzerprofilspezifische Einstellungen (Autofahrer, Radfahrer, Fußgänger)</string>
<string name="global_settings">Globale Einstellungen</string>
<string name="index_settings">Karten-Management</string>
<string name="index_settings_descr">Laden und Verwalten von Landkarten</string>
<string name="general_settings">Allgemein</string>
<string name="general_settings_2">Allgemeine Einstellungen</string>
<string name="general_settings_descr">Konfiguration der Anzeige und anderer allgemeiner Einstellungen</string>
<string name="global_app_settings">Globale Einstellungen</string>
<string name="user_name">OSM-Benutzername</string>
@ -378,9 +384,9 @@
<string name="pref_raster_map">Einstellungen Kartenquelle</string>
<string name="pref_vector_map">Einstellungen Vektorkarten</string>
<string name="delete_confirmation_msg">%1$s löschen?</string>
<string name="city_type_suburb">Vorstadt</string>
<string name="city_type_hamlet">Dorf</string>
<string name="city_type_village">Gemeinde</string>
<string name="city_type_suburb">Stadtteil</string>
<string name="city_type_hamlet">Weiler</string>
<string name="city_type_village">Dorf</string>
<string name="city_type_town">Stadt</string>
<string name="city_type_city">Großstadt</string>

2
OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
View file

@ -109,7 +109,7 @@ public class AvoidSpecificRoads {
bld.setAdapter(listAdapter, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
RouteDataObject obj = getMissingRoads().get(which - 1);
RouteDataObject obj = getMissingRoads().get(which);
double lat = MapUtils.get31LatitudeY(obj.getPoint31YTile(0));
double lon = MapUtils.get31LongitudeX(obj.getPoint31XTile(0));
showOnMap(app, mapActivity, lat, lon, getText(obj), dialog);