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

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

Browse source 
Conflicts:
	OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
This commit is contained in:
Victor Shcherb 2014-11-23 19:51:47 +01:00
commit 1fd9841ea6
8 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
View file

@ -642,7 +642,7 @@ public class RouteResultPreparation {
if(lns == 0) {
String tls = getTurnLanesString(attached);
if(tls != null) {
lns = countOccurrences(tls, '|');
return Math.max(1, countOccurrences(tls, '|'));
}
}
if (oneway) {
@ -654,7 +654,7 @@ public class RouteResultPreparation {
} else if (!attached.isForwardDirection() && attached.getObject().getValue("lanes:backward") != null) {
return Integer.parseInt(attached.getObject().getValue("lanes:backward"));
}
} catch (NumberFormatException e) {
} catch(NumberFormatException e) {
e.printStackTrace();
}
return Math.max(1, (lns + 1) / 2);

2
OsmAnd/res/values-be/strings.xml
View file

@ -1999,4 +1999,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="wake_on_voice_never">Ніколі</string>
<string name="lock_screen_request_explanation">%1$s патрабуе дазвол на выключэньне экрану для энергазберажэньня.</string>
<string name="advanced_settings">Дадатковыя</string>
<string name="osmo_use_https_descr">Выкарыстоўваць бясьпечнае злучэньне з серверам</string>
<string name="osmo_use_https">Выкарыстоўваць HTTPS</string>
</resources>

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

@ -346,7 +346,7 @@
<string name="poi_attraction">Turistattraktion</string>
<string name="poi_memorial">Mindesmærke</string>
<string name="poi_artwork">Kunstværk</string>
<string name="poi_archaeological_site">Arkæologiske område</string>
<string name="poi_archaeological_site">Arkæologisk område</string>
<string name="poi_battlefield">Slagmark</string>
<string name="poi_boundary_stone">Grænsesten</string>
<string name="poi_castle">Slot</string>
@ -387,7 +387,7 @@
<string name="poi_travel_agent">Rejsebureau</string>
<string name="poi_viewpoint">Udsigtspunkt</string>
<string name="poi_camp_site">Campingplads</string>
<string name="poi_caravan_site">campingvognsplads</string>
<string name="poi_caravan_site">Campingvognsplads</string>
<string name="poi_picnic_site">Skovtur/rasteplads</string>
<string name="poi_spring">Kilde</string>
<string name="poi_cemetery">Kirkegård</string>
@ -408,7 +408,7 @@
<string name="poi_club_cinema">Filmklub</string>
<string name="poi_club_fan">Fanklub</string>
<string name="poi_club_fishing">Lystfiskerklub</string>
<string name="poi_club_veterans">Veteranklub</string>
<string name="poi_club_veterans">Veteranforening</string>
<string name="poi_club_linux">Linux klub</string>
<string name="poi_club_theatre">Teaterklub</string>
<string name="poi_club_history">Historieklub</string>
@ -417,7 +417,7 @@
<string name="poi_club_nature">Naturklub</string>
<string name="poi_club_photography">Fotoklub</string>
<string name="poi_club_hunting">Jagtklub</string>
<string name="poi_club_shooting">Skytteforeningen</string>
<string name="poi_club_shooting">Skytteforening</string>
<string name="poi_club_tourism">Turistklub</string>
<string name="poi_club_charity">Velgørenhedsklub</string>
@ -598,7 +598,7 @@
<string name="poi_military_range">Militærsøvelsesområde</string>
<string name="poi_military_naval_base">Militærflådebase</string>
<string name="poi_military_nuclear_explosion_site">Nuklear eksplosion område</string>
<string name="poi_city">Stor by</string>
<string name="poi_city">Storby</string>
<string name="poi_town">By</string>
<string name="poi_village">Landsby</string>
<string name="poi_hamlet">Lille landsby</string>
@ -610,7 +610,7 @@
<string name="poi_healthcare_alternative">Alternativ medicin</string>
<string name="poi_audiologist">Audiolog</string>
<string name="poi_blood_bank">Blodbank</string>
<string name="poi_healthcare_centre">Medicinsk center</string>
<string name="poi_healthcare_centre">Medicinskcenter</string>
<string name="poi_midwife">Jordemoder</string>
<string name="poi_occupational_therapist">Ergoterapeut</string>
<string name="poi_optometrist">Optiker</string>

2
OsmAnd/res/values-da/strings.xml
View file

@ -1860,4 +1860,6 @@ Nogle af de centrale funktioner:
<string name="lock_screen_request_explanation">%1$s behøver denne tilladelse til at slukke for skærmen for strømbesparende funktion.</string>
<string name="wake_on_voice_never">Aldrig</string>
<string name="advanced_settings">Avanceret</string>
<string name="osmo_use_https_descr">Brug sikker forbindelse med server</string>
<string name="osmo_use_https">Brug https</string>
</resources>

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

@ -2013,4 +2013,5 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="rendering_attr_busRoutes_name">Buslinien</string>
<string name="rendering_category_hide">Ausblenden</string>
<string name="lock_screen_request_explanation">%1$s benötigt diese Berechtigung, um den Bildschirm auszuschalten (Energiesparfunktion).</string>
<string name="advanced_settings">Erweitert</string>
</resources>

2
OsmAnd/res/values-es/strings.xml
View file

@ -1919,4 +1919,6 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="lock_screen_request_explanation">%1$s necesita este permiso para apagar la pantalla para la característica de ahorro energético.</string>
<string name="wake_on_voice_never">Nunca</string>
<string name="advanced_settings">Avanzado</string>
<string name="osmo_use_https_descr">Usar conexión segura con el servidor</string>
<string name="osmo_use_https">Usar https</string>
</resources>

2
OsmAnd/res/values-fr/strings.xml
View file

@ -1861,4 +1861,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="lock_screen_request_explanation">%1$s a besoin de cette permission pour éteindre l\'écran en mode économie d\'énergie.</string>
<string name="wake_on_voice_never">Jamais</string>
<string name="advanced_settings">Avancé</string>
<string name="osmo_use_https_descr">Utiliser une connexion sécurisée avec le serveur</string>
<string name="osmo_use_https">Utiliser https</string>
</resources>

5
OsmAnd/res/values-lt/strings.xml
View file

@ -1878,4 +1878,7 @@ OsmAnd yra aktyviai tobulinama ir mūsų projektas bei jo tolesnis progresas pri
<string name="wake_on_voice_descr">Įjungti ekraną artėjant prie posūkio</string>
<string name="lock_screen_request_explanation">%1$s prašo leidimo išjungti ekraną tausojant energiją.</string>
<string name="wake_on_voice_never">Niekada</string>
</resources>
<string name="osmo_use_https">Naudoti https</string>
<string name="osmo_use_https_descr">Prie serverio jungtis saugiu ryšiu</string>
<string name="advanced_settings">Plačiau</string>
</resources>