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 2016-02-08 01:37:07 +01:00
commit 95445ab363
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,7 @@
<string name="shared_string_help">Ayuda</string>
<string name="shared_string_settings">Ajustes</string>
<string name="shared_string_history">Historial</string>
<string name="shared_string_select_on_map">Seleccione en el mapa</string>
<string name="shared_string_select_on_map">Eligir en el mapa</string>
<string name="shared_string_select_all">Seleccionar todo</string>
<string name="shared_string_deselect">Deseleccionar</string>
<string name="shared_string_deselect_all">Deseleccionar todo</string>
@ -602,7 +602,7 @@
<string name="animate_routing_route">"Simular, usando la ruta calculada "</string>
<string name="animate_routing_gpx">Simular, usando la 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 destinos intermedios para un mejor rendimiento.</string>
<string name="auto_zoom_none">Sin ampliación automático</string>
<string name="auto_zoom_none">Sin ampliación automática</string>
<string name="auto_zoom_close">Para corto alcance</string>
<string name="auto_zoom_far">Para mediano alcance</string>
<string name="auto_zoom_farthest">Para largo alcance</string>

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

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="offline_edition">Modifications hors-ligne</string>
<string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
@ -672,7 +672,7 @@
<string name="left_side_navigation_descr">Activer dans les pays où l\'on conduit à gauche</string>
<string name="unknown_from_location">Point de départ inconnu</string>
<string name="confirm_interrupt_download">Voulez-vous interrompre le téléchargement ?</string>
<string name="confirm_interrupt_download">Souhaitez-vous annuler le téléchargement ?</string>
<string name="basemap_was_selected_to_download">Carte mondiale de base requise pour le bon fonctionnement, sélectionnée pour téléchargement.</string>
<string name="map_online_plugin_is_not_installed">Activez le greffon \"Cartes en ligne\" pour sélectionner différentes sources de cartes</string>
@ -1467,7 +1467,7 @@
<string name="osmo_auth_error_short">Échec de l\'autorisation</string>
<string name="osmo_auth_error">Erreur d\\\'autorisation OsMo : %1$s.\n Le service est momentanément inutilisable ou votre inscription a expiré.\n Voulez-vous procéder à une nouvelle inscription ?</string>
<string name="keep_navigation_service">Conserver</string>
<string name="stop_navigation_service">Interrompre</string>
<string name="stop_navigation_service">Arrêter</string>
<string name="enable_sleep_mode">Démarrer l’exécution de la tâche de fond GPS ?</string>
<string name="gps_wake_up_timer">Intervalle de réveil du GPS</string>
<string name="sleep_mode_stop_dialog">Arrêter l’exécution de la tâche de fond GPS ?</string>
@ -2115,7 +2115,7 @@
<string name="rendering_attr_hideIcons_name">Masquer les icônes des PI</string>
<string name="number_of_contributors">Nombre de contributeurs</string>
<string name="number_of_edits">Nombre de modifications</string>
<string name="reports_for">Signaler pour :</string>
<string name="reports_for">Signaler pour</string>
<string name="shared_string_select">Sélectionner</string>
<string name="shared_string_remove">Supprimer</string>
<string name="clear_updates_proposition_message">Vous pouvez supprimer les mises à jour et retrouver la carte précédente</string>

12
OsmAnd/res/values-it/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
<string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
@ -634,7 +634,7 @@
<string name="left_side_navigation_descr">Abilita nei paesi in cui si guida tenendo la sinistra</string>
<string name="unknown_from_location">La posizione di partenza non è ancora stata determinata</string>
<string name="confirm_interrupt_download">Vuoi interrompere il download dei file?</string>
<string name="confirm_interrupt_download">Vuoi eliminare i file in download?</string>
<string name="basemap_was_selected_to_download">La mappa di base è richiesta per il funzionamento corretto dell\'applicazione ed è stata selezionata per il download.</string>
<string name="map_online_plugin_is_not_installed">Abilita il plugin Mappe Online per scegliere altre sorgenti di mappe</string>
@ -943,7 +943,7 @@
<string name="safe_mode_description">Avvia l\'applicazione in modalità sicura (usando il più lento Android invece del codice nativo).</string>
<string name="safe_mode">Modalità sicura</string>
<string name="native_library_not_running">L\'applicazione è in esecuzione in modalità sicura (disabilitala nelle Impostazioni).</string>
<string name="background_service_is_enabled_question">Il servizio OsmAnd è ancora in esecuzione in background. Si desidera arrestarlo?</string>
<string name="background_service_is_enabled_question">Il servizio OsmAnd è ancora in esecuzione in background. Si desidera arrestare anche questo?</string>
<string name="route_descr_lat_lon">Lat %1$.3f lon %2$.3f</string>
@ -1472,10 +1472,10 @@
<string name="lang_fa">Persiano</string>
<string name="lang_he">Ebraico</string>
<string name="keep_navigation_service">Mantieni</string>
<string name="stop_navigation_service">Interrompi</string>
<string name="stop_navigation_service">Ferma</string>
<string name="enable_sleep_mode">Abilita la modalità GPS in background</string>
<string name="gps_wake_up_timer">Intervallo di risveglio del GPS</string>
<string name="sleep_mode_stop_dialog">Interrompere la modalità GPS in background?</string>
<string name="sleep_mode_stop_dialog">Fermare la modalità GPS in background?</string>
<string name="lang_al">Albanese</string>
<string name="lang_ar">Arabo</string>
<string name="lang_sc">Sardo</string>
@ -2154,4 +2154,6 @@
<string name="shared_string_email_address">Indirizzo email</string>
<string name="shared_string_status">Stato</string>
<string name="shared_string_save_changes">Salva le modifiche</string>
<string name="show_polygons">Mostra i poligoni</string>
<string name="find_parking">Cerca un parcheggio</string>
</resources>

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

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
<string name="ChooseCountry">Välj land</string>
@ -794,7 +794,7 @@
<string name="safe_mode_description">Kör program i felsäkert läge (för långsammare Android istället för inbyggd kod).</string>
<string name="safe_mode">Felsäkert läge</string>
<string name="native_library_not_running">Programmet körs i felsäkert läge (inaktivera det i Inställningar).</string>
<string name="background_service_is_enabled_question">Bakgrundstjänsten körs fortfarande. Vill du avbryta den också?</string>
<string name="background_service_is_enabled_question">Bakgrundstjänsten körs fortfarande. Vill du stoppa den också?</string>
<string name="edit_filter_create_message">Filter {0} har skapats</string>
<string name="poi_error_info_not_loaded">Info om noden laddades inte</string>
@ -1396,10 +1396,10 @@
<string name="osmo_group_information_desc">" - Alla skapade grupper är offentliga! Om du vill vara anonym, anslut enheter direkt via Tracker-id-\n- Privata grupper är begränsade till åtta personer.\n- Grupper tas bort i fall av inaktivitet eller aktivitet av endast en (1) person under två veckor.\n- Du kan begränsa inträde i grupp (som t.ex. endast via inbjudan) men för att kontrollera gruppen måste du gå till adminkonsollen.\n- Om du behöver skapa en grupp med andra villkor kontakta http://osmo.mobi"</string>
<string name="osmo_group_information">Läs detta innan du skapar en grupp!</string>
<string name="keep_navigation_service">Behåll</string>
<string name="stop_navigation_service">Avbryt</string>
<string name="stop_navigation_service">Stoppa</string>
<string name="enable_sleep_mode">Aktivera GPS-bakgrundsläge</string>
<string name="gps_wake_up_timer">Väckningsintervall för GPS</string>
<string name="sleep_mode_stop_dialog">Avbryta GPS-bakgrundsläget?</string>
<string name="sleep_mode_stop_dialog">Stoppa GPS-bakgrundsläget?</string>
<string name="map_preferred_locale_descr">Föredraget språk för etiketter på kartan (växlar till engelska eller lokala namn om ej tillgängligt)</string>
<string name="map_preferred_locale">Föredraget språk på kartan</string>
<string name="local_map_names">Lokala namn</string>

1
OsmAnd/src/net/osmand/plus/inapp/util/IabHelper.java
View file

@ -270,6 +270,7 @@ public class IabHelper {
}
else {
// no service available to handle that Intent
mServiceConn = null;
if (listener != null) {
listener.onIabSetupFinished(
new IabResult(BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE,