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
This commit is contained in:
Victor Shcherb 2015-08-02 21:45:48 +02:00
commit f8f214a7db
15 changed files with 53 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -652,12 +652,14 @@ public class RouteResultPreparation {
// This was just to make sure that there's no bad data.
TurnType.setPrimaryTurnAndReset(lanesArray, ind, TurnType.TL);
TurnType.setSecondaryTurn(lanesArray, ind, tt);
lanesArray[ind] |= 1;
}
} else {
if (!TurnType.isRightTurn(tt)) {
// This was just to make sure that there's no bad data.
TurnType.setPrimaryTurnAndReset(lanesArray, ind, TurnType.TR);
TurnType.setSecondaryTurn(lanesArray, ind, tt);
lanesArray[ind] |= 1;
}
}
setAllowedLanes(tt, lanesArray);

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

@ -2054,4 +2054,6 @@
<string name="successfully_uploaded_pattern">{0}/{1} пасьпяхова адасланыя</string>
<string name="try_again">Паўтарыце спробу</string>
<string name="error_message_pattern">Памылка: {0}</string>
<string name="no_updates_available">Няма даступных абнаўленьняў</string>
<string name="we_really_care_about_your_opinion">Нас вельмі цікавіць ваша меркаваньне і нам важна пачуць вас.</string>
</resources>

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

@ -2085,4 +2085,6 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="successfully_uploaded_pattern">S\'ha pujat amb èxit {0}/{1}</string>
<string name="try_again">Torneu a provar-ho</string>
<string name="error_message_pattern">Error: {0}</string>
<string name="no_updates_available">No hi ha actualitzacions disponibles</string>
<string name="we_really_care_about_your_opinion">"Valorem molt la vostra opinió i és important per nosaltres disposar dels vostres comentaris."</string>
</resources>

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

@ -952,12 +952,12 @@
<string name="poi_node_networks">Vandre-/cykelrutepunkter</string>
<string name="poi_hiking_routes">Vandreruter</string>
<string name="poi_traffic_enforcement">Trafikovervågning</string>
<string name="poi_access_private">Privat adgang</string>
<string name="poi_access_private">Adgang privat</string>
<string name="poi_access_no">Ingen adgang</string>
<string name="poi_access_destination">Destination adgang</string>
<string name="poi_access_permissive">Tolerant adgang</string>
<string name="poi_access_customers">Kunde adgang</string>
<string name="poi_access_delivery">Levering adgang</string>
<string name="poi_access_agricultural">Landbrugs adgang</string>
<string name="poi_access_destination">Adgang destination</string>
<string name="poi_access_permissive">Adgang tolerant</string>
<string name="poi_access_customers">Adgang for kunde</string>
<string name="poi_access_delivery">Adgang for levering</string>
<string name="poi_access_agricultural">Adgang for landbrug</string>
</resources>

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

@ -2099,6 +2099,6 @@
<string name="error_message_pattern">Fejl: {0}</string>
<string name="failed_to_upload">Overførsel mislykkedes</string>
<string name="successfully_uploaded_pattern">Overført {0}/{1}</string>
<string name="no_updates_available">Ingen tilgængelige opdateringer</string>
<string name="we_really_care_about_your_opinion">Vi er meget interesseret din mening, og det er vigtigt for os at høre dig igen.</string>
<string name="no_updates_available">Ingen opdateringer tilgængelige</string>
<string name="we_really_care_about_your_opinion">Vi er meget interesseret i din mening, og det er vigtigt for os at høre fra dig.</string>
</resources>

4
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -643,7 +643,7 @@
<string name="tip_faq_t">Visita https://code.google.com/p/osmand/wiki/FAQ para ver las preguntas más frecuentes.</string>
<string name="tip_faq">Preguntas más frecuentes</string>
<string name="local_osm_changes_delete_all_confirm">Borrará %1$d cambio(s) OSM. ¿Estás seguro?</string>
<string name="animate_routing_route_not_calculated">Calcule la primera ruta</string>
<string name="animate_routing_route_not_calculated">Primero calcule la ruta</string>
<string name="animate_routing_route">"Simular usando la ruta calculada "</string>
<string name="animate_routing_gpx">Simular usando traza GPX</string>
<string name="route_is_too_long">El cálculo de ruta sin conexión de OsmAnd, podría tardar mucho tiempo (o a veces no funcionar) para tramos mayores de 200km. Tal vez quieras añadir puntos de ruta intermedios para un mejor rendimiento.</string>
@ -2014,4 +2014,6 @@
<string name="successfully_uploaded_pattern">Subido correctamente {0}/{1}</string>
<string name="try_again">Pruebe de nuevo</string>
<string name="error_message_pattern">Error: {0}</string>
<string name="no_updates_available">Sin actualizaciones disponibles</string>
<string name="we_really_care_about_your_opinion">Nos interesa mucho y es importante oír su opinión.</string>
</resources>

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

@ -1467,7 +1467,7 @@
<string name="auto_zoom_close">Para primer plano</string>
<string name="auto_zoom_far">Para mediano alcance</string>
<string name="auto_zoom_farthest">Para largo alcance</string>
<string name="animate_routing_route_not_calculated">Calcule la primera ruta</string>
<string name="animate_routing_route_not_calculated">Primero calcule la ruta</string>
<string name="animate_routing_route">"Simular utilizando la ruta calculada "</string>
<string name="animate_routing_gpx">Simula utilizando traza GPX</string>
<string name="app_mode_hiking">Senderismo</string>
@ -2152,4 +2152,6 @@
<string name="successfully_uploaded_pattern">Subido con éxito {0}/{1}</string>
<string name="try_again">Vuelve a intentarlo</string>
<string name="error_message_pattern">Error: {0}</string>
<string name="no_updates_available">Sin actualizaciones disponibles</string>
<string name="we_really_care_about_your_opinion">Nos interesa mucho y es importante para nosotros oír su opinión.</string>
</resources>

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

@ -2118,4 +2118,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="successfully_uploaded_pattern">Envoi avec succès {0}/{1}</string>
<string name="try_again">Merci de re-essayer</string>
<string name="error_message_pattern">Erreur : {0}</string>
<string name="no_updates_available">Aucune mise à jour disponible</string>
<string name="we_really_care_about_your_opinion">Nous prêtons beaucoup d\'attention à vos avis, merci pour vos retours.</string>
</resources>

7
OsmAnd/res/values-hu/strings.xml
View file

@ -2029,4 +2029,11 @@
<string name="user_hates_app_get_feedback_long">Mondja el nekünk, hogy mit változtatna az alkalmazáson.</string>
<string name="rate_this_app_long">Adjon egy pontot az OsmAnd programnak a Google Play áruházban</string>
<string name="download_live_updates">Élő frissítések</string>
<string name="no_updates_available">Nem érhetők el frissítések</string>
<string name="we_really_care_about_your_opinion">Sokat adunk a véleményére és fontos nekünk, hogy visszahalljuk.</string>
<string name="failed_to_upload">Nem sikerült feltölteni</string>
<string name="delete_change">Változtatás törlése</string>
<string name="successfully_uploaded_pattern">Sikeresen feltöltve: {0}/{1}</string>
<string name="try_again">Próbálja újra</string>
<string name="error_message_pattern">Hiba: {0}</string>
</resources>

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

@ -2216,7 +2216,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="archive_wikipedia_data">Er zijn al (verouderde en incompatibele) Wikipedia-gegevens gedownload. Wilt u deze bewaren?</string>
<string name="download_wikipedia_files">Wilt u Wikipedia-artikelen downloaden (%1$s MB) ?</string>
<string name="disable_recording_once_app_killed">Voorkom loggen als app wordt gesloten</string>
<string name="disable_recording_once_app_killed_descrp">Stopt het opnemen van een GPX-spoort als de app wordt gesloten in de applicatielijst. (De OsmAnd achtergrondindicatie verdwijnt dan ook.)</string>
<string name="disable_recording_once_app_killed_descrp">Stopt het opnemen van een GPX-spoor als de app wordt gesloten in de applicatielijst. (De OsmAnd achtergrondindicatie verdwijnt dan ook.)</string>
<string name="shared_string_import2osmand">Importeren in OsmAnd</string>
<string name="download_wikipedia_maps">Wikipedia</string>
<string name="rendering_value_default13_name">Standaard (13)</string>

10
OsmAnd/res/values-sc/strings.xml
View file

@ -117,7 +117,7 @@
<string name="tip_faq">Preguntas fitianas</string>
<string name="local_osm_changes_delete_all_confirm">Istas pro burrare %1$d modìficas OSM. Seguru ses?</string>
<string name="shared_string_delete_all">Burra totu</string>
<string name="animate_routing_route_not_calculated">Pro piaghere, càlcula s’andala in antis</string>
<string name="animate_routing_route_not_calculated">Pro piaghere càlcula s’andala in antis</string>
<string name="animate_routing_route">Dispinta impreande un\'àndala calculada </string>
<string name="animate_routing_gpx">Dispinta impreande una caminera GPX</string>
<string name="shared_string_remember_my_choice">Ammenta s’issèberu meu</string>
@ -2042,4 +2042,12 @@
<string name="rate_this_app_long">Pro piaghere dae unu votu a OsmAnd in Google Play</string>
<string name="user_hates_app_get_feedback">Narade·nos proite.</string>
<string name="user_hates_app_get_feedback_long">Pro piaghere, faghe·nos ischire ite dias bòlere cambiare in custa aplicatzione.</string>
<string name="no_updates_available">Perunu agiornamentu disponìbile</string>
<string name="download_live_updates">Agiornamentos automàticos</string>
<string name="we_really_care_about_your_opinion">Nos importat meda de s\'opinione tua, est importante pro nois a ti intendere.</string>
<string name="failed_to_upload">Carrigamentu faddidu</string>
<string name="delete_change">Burra modìficas</string>
<string name="successfully_uploaded_pattern">Carrigamentu resessidu {0}/{1}</string>
<string name="try_again">Torra a proare</string>
<string name="error_message_pattern">Errore: {0}</string>
</resources>

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

@ -1960,4 +1960,6 @@
<string name="successfully_uploaded_pattern">Laddade upp {0}/{1} utan problem</string>
<string name="try_again">Försök igen</string>
<string name="error_message_pattern">Fel: {0}</string>
<string name="no_updates_available">Inga uppdateringar tillgängliga</string>
<string name="we_really_care_about_your_opinion">Vi bryr oss mycket om vad du tycker och det är viktigt för oss att höra din åsikt.</string>
</resources>

2
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -2071,4 +2071,6 @@
<string name="successfully_uploaded_pattern">已成功上載 {0} / {1}</string>
<string name="try_again">再試一次</string>
<string name="error_message_pattern">錯誤：{0}</string>
<string name="no_updates_available">沒可用的更新</string>
<string name="we_really_care_about_your_opinion">我們很在乎您的意見，並且聽到您的反映對我們來說是很重要的。</string>
</resources>

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

@ -759,7 +759,7 @@
<string name="tip_faq_t">Please visit https://code.google.com/p/osmand/wiki/FAQ to see frequently asked questions.</string>
<string name="tip_faq">Frequently Asked Questions</string>
<string name="local_osm_changes_delete_all_confirm">You are going to delete %1$d OSM changes. Are you sure?</string>
<string name="animate_routing_route_not_calculated">Please, calculate the route first</string>
<string name="animate_routing_route_not_calculated">Please calculate the route first</string>
<string name="animate_routing_route">Simulate using calculated route </string>
<string name="animate_routing_gpx">Simulate using GPX track</string>
<string name="route_is_too_long">OsmAnd offline routing may take very long (or sometimes not work) for points more than 200km apart. You may want to add intermediate waypoints for better performance.</string>

2
OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
View file

@ -584,7 +584,7 @@ public class VoiceRouter {
if(pn != null) {
pn = pn.replace('-', ' ');
pn = pn.replace(':', ' ');
pn = pn.replace(';', ','); //some tts engines actually annoyingly pronounce this as "semicolon"
pn = pn.replace(";", ", "); // Trailing blank prevents punctuation being pronounced. Replace by comma for better intonation.
if ((player != null) && (!"de".equals(player.getLanguage()))) {
pn = pn.replace("\u00df", "ss"); // Helps non-German tts voices to pronounce German Strasse (=street)
}