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

This commit is contained in:
Victor Shcherb 2014-10-13 00:47:20 +02:00
commit 3dfcf8fecf
41 changed files with 2127 additions and 396 deletions

View file

@ -40,6 +40,7 @@ public class MapTileDownloader {
private ThreadPoolExecutor threadPoolExecutor;
private List<IMapDownloaderCallback> callbacks = new ArrayList<IMapDownloaderCallback>();
private Set<File> pendingToDownload;
private Set<File> currentlyDownloaded;
private int currentErrors = 0;
@ -109,6 +110,7 @@ public class MapTileDownloader {
TimeUnit.SECONDS, new LIFOBlockingDeque<Runnable>());
// 1.6 method but very useful to kill non-running threads
// threadPoolExecutor.allowCoreThreadTimeOut(true);
pendingToDownload = Collections.synchronizedSet(new HashSet<File>());
currentlyDownloaded = Collections.synchronizedSet(new HashSet<File>());
}
@ -125,6 +127,10 @@ public class MapTileDownloader {
return callbacks;
}
public boolean isFilePendingToDownload(File f){
return pendingToDownload.contains(f);
}
public boolean isFileCurrentlyDownloaded(File f){
return currentlyDownloaded.contains(f);
}
@ -157,7 +163,9 @@ public class MapTileDownloader {
return;
}
if (!isFileCurrentlyDownloaded(request.fileToSave)) {
if (!isFileCurrentlyDownloaded(request.fileToSave)
&& !isFilePendingToDownload(request.fileToSave)) {
pendingToDownload.add(request.fileToSave);
threadPoolExecutor.execute(new DownloadMapWorker(request));
}
}
@ -179,6 +187,7 @@ public class MapTileDownloader {
}
currentlyDownloaded.add(request.fileToSave);
pendingToDownload.remove(request.fileToSave);
if(log.isDebugEnabled()){
log.debug("Start downloading tile : " + request.url); //$NON-NLS-1$
}

View file

@ -45,6 +45,7 @@ public class MapRenderingTypes {
private String resourceName = null;
private Map<AmenityType, Map<String, String>> amenityTypeNameToTagVal = null;
private Map<String, AmenityType> amenityNameToType = null;
private Map<String, Map<String, String>> amenityAllTypeNameToTagVal = null;
protected Map<String, MapRulType> types = null;
protected List<MapRulType> typeList = new ArrayList<MapRulType>();
@ -133,7 +134,31 @@ public class MapRenderingTypes {
}
return amenityTypeNameToTagVal;
}
private Map<String, Map<String, String>> getAmenityAllTypeNameToTagVal() {
if (amenityAllTypeNameToTagVal == null) {
Map<String, MapRulType> types = getEncodingRuleTypes();
amenityAllTypeNameToTagVal = new LinkedHashMap<String, Map<String, String>>();
for(MapRulType type : types.values()){
if(type.category != null && type.targetTagValue == null) {
if(!amenityAllTypeNameToTagVal.containsKey(type.category)) {
amenityAllTypeNameToTagVal.put(type.category, new TreeMap<String, String>());
}
String name = type.getValue();
if (name != null) {
if (type.poiPrefix != null) {
name = type.poiPrefix + name;
amenityAllTypeNameToTagVal.get(type.category).put(name, type.getTag() + " " + type.getValue());
} else {
amenityAllTypeNameToTagVal.get(type.category).put(name, type.getTag());
}
}
}
}
}
return amenityAllTypeNameToTagVal;
}
public Collection<Map<String, String>> splitTagsIntoDifferentObjects(final Map<String, String> tags) {
// check open sea maps tags
boolean split = splitIsNeeded(tags);
@ -234,7 +259,15 @@ public class MapRenderingTypes {
}
return amenityTypeNameToTagVal.get(t).keySet();
}
public Collection<String> getAmenityAllSubCategories(AmenityType t){
Map<String, Map<String, String>> amenityAllTypeNameToTagVal = getAmenityAllTypeNameToTagVal();
if(!amenityAllTypeNameToTagVal.containsKey(t.getCategoryName())){
return Collections.emptyList();
}
return amenityAllTypeNameToTagVal.get(t.getCategoryName()).keySet();
}
public MapRulType getTypeByInternalId(int id) {
return typeList.get(id);
}
@ -383,6 +416,7 @@ public class MapRenderingTypes {
XmlPullParser parser = PlatformUtil.newXMLPullParser();
int tok;
parser.setInput(is, "UTF-8");
String parentCategory = null;
String poiParentCategory = null;
String poiParentPrefix = null;
String order = null;
@ -390,12 +424,13 @@ public class MapRenderingTypes {
if (tok == XmlPullParser.START_TAG) {
String name = parser.getName();
if (name.equals("category")) { //$NON-NLS-1$
parentCategory = parser.getAttributeValue("","name");
poiParentCategory = parser.getAttributeValue("","poi_category");
poiParentPrefix = parser.getAttributeValue("","poi_prefix");
order = parser.getAttributeValue("","order");
parseCategoryFromXml(parser, poiParentCategory, poiParentPrefix);
} else if (name.equals("type")) {
parseTypeFromXML(parser, poiParentCategory, poiParentPrefix, order);
parseTypeFromXML(parser, parentCategory, poiParentCategory, poiParentPrefix, order);
} else if (name.equals("routing_type")) {
parseRouteTagFromXML(parser);
}
@ -421,11 +456,11 @@ public class MapRenderingTypes {
protected void parseRouteTagFromXML(XmlPullParser parser) {
}
protected MapRulType parseTypeFromXML(XmlPullParser parser, String poiParentCategory, String poiParentPrefix, String parentOrder) {
return parseBaseRuleType(parser, poiParentCategory, poiParentPrefix, parentOrder, true);
protected MapRulType parseTypeFromXML(XmlPullParser parser, String parentCategory, String poiParentCategory, String poiParentPrefix, String parentOrder) {
return parseBaseRuleType(parser, parentCategory, poiParentCategory, poiParentPrefix, parentOrder, true);
}
protected MapRulType parseBaseRuleType(XmlPullParser parser, String poiParentCategory, String poiParentPrefix, String parentOrder, boolean filterOnlyMap) {
protected MapRulType parseBaseRuleType(XmlPullParser parser, String parentCategory, String poiParentCategory, String poiParentPrefix, String parentOrder, boolean filterOnlyMap) {
String tag = lc(parser.getAttributeValue("", "tag"));
String value = lc(parser.getAttributeValue("", "value"));
String additional = parser.getAttributeValue("", "additional");
@ -473,6 +508,7 @@ public class MapRenderingTypes {
}
rtype.category = parentCategory;
if (poiParentCategory != null && poiParentCategory.length() > 0) {
rtype.poiCategory = AmenityType.getAndRegisterType(poiParentCategory);
rtype.poiSpecified = true;
@ -666,6 +702,7 @@ public class MapRenderingTypes {
protected int order = 50;
protected Set<TagValuePattern> applyToTagValue = null;
protected String category = null;
protected String poiPrefix;
protected AmenityType poiCategory;
// poi_category was specially removed for one tag/value, to skip unnecessary objects

View file

@ -3,6 +3,7 @@
<name>OsmAnd</name>
<comment></comment>
<projects>
<project>SherlockBar</project>
</projects>
<buildSpec>
<buildCommand>

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="auto_zoom_none">Без аўтаматычнага масштабіраваньня</string>
<string name="auto_zoom_close">Зачыніць</string>
<string name="auto_zoom_far">Для сярэдняга масштаба</string>
@ -1964,4 +1964,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="traffic_warning">Абмежаваньне руху</string>
<string name="text_size_descr">Абраць памер тэксту на мапе.</string>
<string name="text_size">Памер тэксту</string>
</resources>
<string name="speed_limit_exceed">Велічыня перавышэньня абмежаваньня хуткасьці.</string>
<string name="speed_limit_exceed_message">Задаць велічыню перавышэньня абмежаваньня хуткасьці, пры якім вы атрымаеце галасавое паведамленьне.</string>
</resources>

View file

@ -1415,8 +1415,8 @@
<string name="routing_attr_avoid_ferries_description">Evita transbordadors</string>
<string name="routing_attr_avoid_motorway_name">Evita autopistes</string>
<string name="routing_attr_avoid_motorway_description">Evita autopistes</string>
<string name="routing_attr_weight_name">Pes màxim</string>
<string name="routing_attr_weight_description">Especifica limitació de pes del vehicle</string>
<string name="routing_attr_weight_name">Límit de pes</string>
<string name="routing_attr_weight_description">Especifiqueu el pes del vehicle que cal permetre a les rutes</string>
<string name="background_service_int_descr">Trieu cada quan voleu que s\'actualitzi la posició en el mode en segon pla</string>
<string name="av_photo_play_sound_descr">Trieu si voleu reproduir un so en fer fotos</string>
<string name="av_camera_focus_continuous">La càmera intenta enfocar de manera contínua</string>
@ -1856,7 +1856,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
<string name="arrival_distance_factor_normally">Normal</string>
<string name="arrival_distance_factor_late">Tard</string>
<string name="arrival_distance_factor_at_last">Als darrers metres</string>
<string name="rendering_attr_coloredBuildings_name">Edificis amb colors</string>
<string name="rendering_attr_coloredBuildings_name">Edificis amb colors codificats per tipus</string>
<string name="av_camera_pic_size">Mida d\'imatge de la càmera</string>
<string name="av_camera_pic_size_descr">Trieu la mida d\'imatge de la càmera interna</string>
<string name="hide_all_waypoints">Esborra-ho tot</string>
@ -1903,6 +1903,8 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
<string name="test_native_render_msg">Inicia l\'activitat amb renderització nativa</string>
<string name="use_native_render">Utilitza la renderització nativa</string>
<string name="use_native_render_descr">Ús de renderització C++ en comptes de Java</string>
<string name="fav_point_emoticons_message">S\'ha canviat el nom del vostre punt preferit a %1$s donat que no es pot desar un text amb emoticons en un arxiu.</string>
<string name="fav_point_emoticons_message">El nom del vostre punt preferit s\'ha canviat a %1$s per facilitar el desar bé la cadena amb emoticones en un fitxer.</string>
<string name="print_route">Imprimeix la ruta</string>
</resources>
<string name="speed_limit_exceed">Tolerància sobre el límit de velocitat</string>
<string name="speed_limit_exceed_message">Trieu el marge de tolerància al límit de velocitat per sobre del que rebreu un avís de veu.</string>
</resources>

View file

@ -1088,7 +1088,7 @@
<string name="rendering_attr_noAdminboundaries_name">Skrýt hranice</string>
<string name="rendering_attr_noAdminboundaries_description">Potlačit zobrazení správních hranic 5-9</string>
<string name="tip_altitude_offset">Korekce nadmořské výšky</string>
<string name="monitoring_control_start">měrit</string>
<string name="monitoring_control_start">GPX</string>
<string name="index_srtm_ele">Vrstevnice</string>
<string name="download_select_map_types">Ostatní mapy</string>
<string name="osmodroid_plugin_old_ver_not_supported">Máte nainstalovanou starou verzi modulu OsMoDroid, která potřebuje být aktualizována.</string>
@ -1478,7 +1478,7 @@ s často kladenými otázkami.</string>
<string name="misc_pref_title">Různé</string>
<string name="voice_pref_title">Hlas</string>
<string name="always_center_position_on_map">Zobrazit pozici vždy uprostřed</string>
<string name="osmo_plugin_name">OsMo</string>
<string name="osmo_plugin_name">OsMo (Pokročilé online monitorování)</string>
<string name="osmo_settings">OpenStreetMap sledování</string>
<string name="osmo_settings_descr">Konfigurovat sledování a nastavit osobní monitorovací kanál</string>
<string name="osmo_settings_debug">Informace ladění</string>
@ -1638,7 +1638,7 @@ s často kladenými otázkami.</string>
<string name="rendering_attr_hideBuildings_name">Skrýt budovy</string>
<string name="rendering_attr_hideText_name">Skrýt text</string>
<string name="rendering_attr_hideWoodScrubs_name">Skrýt lesy a křoviny</string>
<string name="rendering_attr_showSurfaces_name">Ukázat povrch cesty</string>
<string name="rendering_attr_showSurfaces_name">Zobrazit povrch cesty</string>
<string name="osmo_group_information">Prosím čtěte před vytvářením skupiny!</string>
<string name="osmo_group_information_desc">" - Všechny vytvořené skupiny jsou veřejné! Pokud chcete být anonymní, připojte zařízení přímo přes ID.\n - Do skupiny se může registrovat až 16 lidí.
\n - V případě neaktivity nebo aktivity pouze jedné osoby v průběhu dvou týdnů, bude skupina zrušena.\n - Můžete omezit vstup do skupiny pozvánkami, ale pro ovládání skupiny musíte použít administrátorskou konzoli.\n - Pokud potřebujete vytvořit skupinu s jinými podmínkami prosím kontaktujte http://osmo.mobi"</string>
@ -1689,7 +1689,7 @@ s často kladenými otázkami.</string>
<string name="lang_zh_TW">Tradiční čínština</string>
<string name="rendering_attr_alpineHiking_name">Vysokohorská turistika</string>
<string name="rendering_attr_alpineHiking_description">Vykreslovat cesty podle stupnice SAC</string>
<string name="rendering_attr_osmcTraces_name">Zobrazovat turistické značky</string>
<string name="rendering_attr_osmcTraces_name">Turistické trasy a značky</string>
<string name="rendering_attr_osmcTraces_description">Vykreslovat cesty podle OSMC značení</string>
<string name="arrival_distance_factor_early">Brzy</string>
@ -1743,4 +1743,5 @@ s často kladenými otázkami.</string>
<string name="use_native_render">Použít nativní vykreslování</string>
<string name="use_native_render_descr">Použít C++ vykreslování místo Javy</string>
<string name="print_route">Vytisknout trasu</string>
<string name="fav_point_emoticons_message">Změnili jsme jméno vašeho oblíbeného bodu na %1$s, protože není možné ukládat do souboru řetězce s emotikony.</string>
</resources>

File diff suppressed because one or more lines are too long

View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="traffic_warning_speed_limit">Geschwindigkeitsbegrenzung</string>
<string name="traffic_warning_border_control">Grenzkontrolle</string>
@ -56,7 +56,7 @@
<string name="rendering_value_bicycle_name">Fahrrad</string>
<string name="rendering_value_pedestrian_name">Fußgänger</string>
<string name="announce_nearby_favorites">Ansage von Favoriten in den Nähe</string>
<string name="rendering_attr_coloredBuildings_name">Gefärbte Gebäude</string>
<string name="rendering_attr_coloredBuildings_name">Gebäudefärbung nach Typ</string>
<string name="continue_navigation">Navigation fortsetzen</string>
<string name="pause_navigation">Navigation pausieren</string>
<string name="keep_navigation_service">Aktiv erhalten</string>
@ -1533,8 +1533,8 @@
<string name="routing_attr_avoid_ferries_description">Fähren vermeiden</string>
<string name="routing_attr_avoid_motorway_name">Autobahnen vermeiden</string>
<string name="routing_attr_avoid_motorway_description">Autobahnen vermeiden</string>
<string name="routing_attr_weight_name">Maximalgewicht</string>
<string name="routing_attr_weight_description">Angabe einer Massebeschränkung für die Fahrzeugart</string>
<string name="routing_attr_weight_name">Gewichtsbeschränkung</string>
<string name="routing_attr_weight_description">Angabe eines Fahrzeuggewichts für die Zulässigkeit Route</string>
<string name="android_19_location_disabled">"Seit Android 4.4 (KitKat) können neue Karten-Downloads nicht mehr am Speicherort früherer Android-Versionen gespeichert werden (%s). Jetzt einen zulässigen Speicherort wählen und alle notwendigen Dateien dorthin kopieren?
\n Hinweis: Ursprüngliche Dateien bleiben hiervon unberührt.
\n Hinweis: Dateien können dann nicht mehr von OsmAnd und OsmAnd+ gemeinsam genutzt werden. "</string>
@ -1980,4 +1980,8 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="test_native_render_msg">Nutzt den nativen Renderer</string>
<string name="use_native_render">Nativen Renderer benutzen</string>
<string name="use_native_render_descr">C++ Renderer statt Java-Renderer nutzen</string>
</resources>
<string name="fav_point_emoticons_message">Der Name des Favoriten wurde auf %1$s geändert, denn Zeichenketten mit Emoticons können nicht gespeichert werden.</string>
<string name="print_route">Route drucken</string>
<string name="speed_limit_exceed">Schwellenwert für Geschwindigkeitswarnung.</string>
<string name="speed_limit_exceed_message">Schwellenwert für Warnung bei Überschreiten der Höchstgeschwindigkeit.</string>
</resources>

View file

@ -1887,4 +1887,6 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="use_native_render_descr">Usar C++ para la renderización en vez de Java</string>
<string name="print_route">Imprimir ruta</string>
<string name="fav_point_emoticons_message">Hemos cambiado el nombre de tu punto favorito a %1$s porque no es posible guardar nombres con emoticonos al fichero.</string>
</resources>
<string name="speed_limit_exceed">Valor de exceso de velocidad.</string>
<string name="speed_limit_exceed_message">Selecciona el valor de exceso de velocidad sobre el limite de velocidad con el cual recibirás un aviso de voz.</string>
</resources>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="bidforfix_loading">Chargement</string>
<string name="bidforfix_supporters">%1$d mécènes</string>
<string name="bidforfix_funded">financé: %d%%</string>
<string name="bidforfix_funded">financé : %d%%</string>
</resources>

View file

@ -54,9 +54,9 @@
<string name="amenity_type_osmwiki">Wikipédia (hors-ligne)</string>
<string name="amenity_type_user_defined">Défini par l\'utilisateur</string>
<string name="fav_export_confirmation">Un fichier de favoris précédemment exporté existe déjà. Voulez vous le remplacer ?</string>
<string name="profile_settings">Paramètres de profil</string>
<string name="profile_settings">Paramètres pour le profil</string>
<string name="settings_preset">Profil par défaut</string>
<string name="settings_preset_descr">Sélectionner le profil d\'utilisation par défaut. Les paramètres de rendu et de navigation de chaque profil sont mémorisés.</string>
<string name="settings_preset_descr">Sélectionnez le profil d\'utilisation par défaut. Les paramètres de rendu et de navigation de chaque profil sont mémorisés.</string>
<string name="routing_settings">Navigation</string>
@ -236,11 +236,11 @@
<string name="gpx_option_destination_point">Utiliser la destination en cours</string>
<string name="gpx_option_from_start_point">Suivre l\'ensemble de la trace</string>
<string name="switch_to_vector_map_to_see">Cartes vectorielles disponibles pour cette position. \n\t\n\tPour activer: \'Menu\'→\'Couches\'→\'Source de la carte…\'→\'Cartes vectorielles hors ligne\'.</string>
<string name="choose_audio_stream">Canal de sortie</string>
<string name="choose_audio_stream_descr">Sélectionner le canal à utiliser pour le guidage vocal (dépend de la configuration système)</string>
<string name="voice_stream_voice_call">Canal d\'appels vocaux</string>
<string name="voice_stream_notification">Canal de notification</string>
<string name="voice_stream_music">Canal musique</string>
<string name="choose_audio_stream">Sortie audio pour le guidage</string>
<string name="choose_audio_stream_descr">Sélectionnez le canal audio de sortie à utiliser pour le guidage vocal (selon les capacités de votre appareil)</string>
<string name="voice_stream_voice_call">Sortie téléphonie</string>
<string name="voice_stream_notification">Sortie notifications</string>
<string name="voice_stream_music">Sortie musique</string>
<string name="warning_tile_layer_not_downloadable">L\'application ne peut télécharger la couche de carte %1$s, veuillez tenter de la réinstaller.</string>
<string name="overlay_transparency_descr">Modifier la transparence de la sur-couche</string>
<string name="overlay_transparency">Transparence de la sur-couche</string>
@ -257,7 +257,7 @@
<string name="tile_source_already_installed">Carte déjà installée, paramètres seront mis à jour</string>
<string name="select_tile_source_to_install">Sélectioner les cartes à installer ou mettre à jour</string>
<string name="internet_not_available">Connexion Internet nécessaire pour cette opération non disponible</string>
<string name="install_more">Installer plus</string>
<string name="install_more">Installer d\'autres langues </string>
<string name="tip_update_index">Mise à jour des cartes hors-ligne</string>
<string name="tip_update_index_t">"Il est très important d\'avoir des données cartographiques à jour pour la visualisation des cartes hors-ligne, la recherche de points d\'intérêt ou d\'adresses, et la navigation hors-ligne. OsmAnd fournit un gestionnaire de données qui permet de télécharger ces cartes hors-ligne (et d\'autres données), et de vérifier si des mises à jour sont disponibles.
\n\tPour télécharger ou vérifier les mises à jour, allez dans \'Menu Principal\' → \'Paramètres\' → \'Données hors-ligne\' → \'Télécharger des données hors-ligne\'.
@ -284,8 +284,8 @@
<string name="search_offline_geo_error">Ne peut interpréter le geo intent:\'%s\'</string>
<string name="search_osm_offline">Recherche d\'adresses dans les cartes hors-ligne</string>
<string name="system_locale">Système</string>
<string name="preferred_locale_descr">Sélectionner la langue employée à l\'écran</string>
<string name="preferred_locale">Langue de l\'interface</string>
<string name="preferred_locale_descr">Sélectionnez la langue pour l\'affichage</string>
<string name="preferred_locale">Langue de l\'application</string>
<string name="tip_map_switch">Sélectionner une source de carte</string>
<string name="tip_app_mode">Mode de fonctionnement</string>
@ -327,7 +327,7 @@
<string name="send_location">Envoyer le lieu</string>
<string name="context_menu_item_share_location">Partager le lieu</string>
<string name="add_waypoint_dialog_added">Point GPX \'\'{0}\'\' ajouté avec succès</string>
<string name="add_waypoint_dialog_title">Ajouter un point de cheminement à la trace GPX enregistrée</string>
<string name="add_waypoint_dialog_title">Ajouter un point de passage à la trace GPX enregistrée</string>
<string name="context_menu_item_add_waypoint">Ajouter un point GPX</string>
<string name="amenity_type_administrative">Territoire</string>
<string name="amenity_type_barrier">Obstacle</string>
@ -492,7 +492,7 @@
<string name="search_poi_filter">Filtre</string>
<string name="menu_mute_off">Son activé</string>
<string name="menu_mute_on">Son désactivé</string>
<string name="voice_provider_descr">Sélectionner la langue à employer pour le guidage vocal</string>
<string name="voice_provider_descr">Sélectionnez la langue à employer pour le guidage vocal</string>
<string name="voice_provider">Guidage vocal</string>
<string name="voice_data_initializing">Initialisation des données vocales…</string>
<string name="voice_data_not_supported">Les données vocales utilisent une version non supportée</string>
@ -518,7 +518,7 @@
<string name="search_poi_location">Recherche d\'un signal…</string>
<string name="search_near_map">Rechercher près du dernier emplacement</string>
<string name="search_nearby">Rechercher à proximité</string>
<string name="map_orientation_default">Comme l\'appareil</string>
<string name="map_orientation_default">Automatique</string>
<string name="map_orientation_portrait">Portrait</string>
<string name="map_orientation_landscape">Paysage</string>
<string name="map_screen_orientation">Orientation de l\'écran</string>
@ -579,7 +579,7 @@
<string name="downloading">Téléchargement en cours…</string>
<string name="downloading_list_indexes">Téléchargement de la liste des régions disponibles…</string>
<string name="list_index_files_was_not_loaded">Les fichiers d\'index ne sont pas d\'osmand.net.</string>
<string name="select_index_file_to_download">Si vous ne pouvez trouver votre région, vous pouvez la créer vous-même (voir sur osmand.net).</string>
<string name="select_index_file_to_download">Aucun Résultat. Si vous ne trouvez pas votre région, vous pouvez la créer vous-même (voir sur http://osmand.net).</string>
<string name="show_poi_on_map">Voir sur la carte</string>
<string name="fav_points_edited">Le favori a été modifié</string>
<string name="fav_points_not_exist">Il n\'existe aucun favori</string>
@ -635,7 +635,7 @@
<string name="settings">Paramètres</string>
<string name="save_current_track_descr">Enregistrer la trace actuelle sur la carte SD</string>
<string name="save_current_track">Enregistrer la trace GPX</string>
<string name="save_track_interval_descr">Choisir l\'intervalle d\'enregistrement de la trace pendant la navigation</string>
<string name="save_track_interval_descr">Sélectionnez l\'intervalle d\'enregistrement de la trace pendant la navigation</string>
<string name="save_track_interval">Intervalle d\'enregistrement pendant la navigation</string>
<string name="save_track_to_gpx_descrp">Les traces seront enregistrées dans le répertoire des traces pendant la navigation</string>
<string name="save_track_to_gpx">Enregistrer la trace dans un fichier GPX pendant la navigation</string>
@ -842,7 +842,7 @@
<string name="front_right">devant droite</string>
<string name="right">droite</string>
<string name="back_right">arrière droite</string>
<string name="back">arrière</string>
<string name="back">Précédent</string>
<string name="back_left">arrière gauche</string>
<string name="left">gauche</string>
<string name="front_left">devant gauche</string>
@ -1319,7 +1319,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="plugin_distance_point_speed">vitesse</string>
<string name="plugin_distance_point_ele">altitude</string>
<string name="gpx_file_name">nom du fichier GPX</string>
<string name="gpx_saved_sucessfully">Sauvegarde du fichier GPX à {0} réussie</string>
<string name="gpx_saved_sucessfully">La sauvegarde du fichier GPX {0} a réussie.</string>
<string name="osmand_distance_planning_plugin_description">Ce greffon permet de créer un chemin (ou d\'ouvrir et modifier un fichier GPX existant) pour mesurer la distance entre des points, et de le sauvegarder au format GPX. Peut être utilisé pour préparer un itinéraire GPX.</string>
<string name="osmand_distance_planning_plugin_name">Mesure de distance et outil de planification</string>
<string name="default_buttons_do_not_show_again">Ne plus montrer</string>
@ -1377,14 +1377,14 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="edit_tilesource_elliptic_tile">Mercator elliptique</string>
<string name="edit_tilesource_choose_existing">Choisir un fournisseur de tuiles existant…</string>
<string name="maps_define_edit">Définir/Éditer…</string>
<string name="announce_gpx_waypoints">Annoncer les points de cheminement GPX</string>
<string name="announce_gpx_waypoints">Annoncer les points de passage GPX</string>
<string name="speak_descr">Annoncer les noms de rue, les avertissements (stops, ralentisseurs, radars), les limitations de vitesse</string>
<string name="new_directions_point_dialog">Vous avez déjà défini des points intermédiaires.</string>
<string name="context_menu_item_directions_to">Aller vers le point</string>
<string name="context_menu_item_directions_from">Partir depuis le point</string>
<string name="route_descr_map_location">Carte : </string>
<string name="map_widget_fps_info">Informations de débogage du rendu</string>
<string name="route_to">A :</string>
<string name="route_to">À :</string>
<string name="route_via">Via :</string>
<string name="route_from">De :</string>
@ -1489,8 +1489,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="routing_attr_avoid_ferries_description">Éviter les ferries</string>
<string name="routing_attr_avoid_motorway_name">Éviter les autoroutes</string>
<string name="routing_attr_avoid_motorway_description">Éviter les autoroutes</string>
<string name="routing_attr_weight_name">Poids maximum</string>
<string name="routing_attr_weight_description">Spécifier la limite de poids du véhicule</string>
<string name="routing_attr_weight_name">Limite de poids</string>
<string name="routing_attr_weight_description">Spécifier la limite de poids devant être autorisée sur les routes</string>
<string name="select_gpx">Sélectionner GPX…</string>
<string name="route_descr_select_destination">Définir la destination</string>
<string name="route_descr_select_on_map">Définir sur la carte…</string>
@ -1676,13 +1676,13 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="my_favorites">Mes favoris</string>
<string name="my_data_Button">Favoris</string>
<string name="my_data_activity">Favoris</string>
<string name="selected_gpx_info_show">\n\nAppui long pour visualiser sur la carte</string>
<string name="selected_gpx_info_show">\n\nAppui long pour afficher sur la carte</string>
<string name="delay_navigation_start">Démarrer la navigation automatiquement</string>
<string name="selected">sélectionné(s)</string>
<string name="gpx_split_interval">Intervalle de division</string>
<string name="local_index_gpx_info_show">\n\nAppui long pour afficher les options</string>
<string name="gpx_info_subtracks">Sections : %1$s </string>
<string name="gpx_info_waypoints">Points de cheminement : %1$s </string>
<string name="gpx_info_waypoints">"Points de passage : %1$s "</string>
<string name="gpx_info_distance">Distance : %1$s (%2$s points) </string>
<string name="gpx_info_start_time">Heure de départ : %1$tF, %1$tT </string>
<string name="gpx_info_end_time">Heure d\'arrivée : %1$tF, %1$tT </string>
@ -1690,9 +1690,9 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="gpx_info_maximum_speed">Vitesse maximale : %1$s </string>
<string name="gpx_info_avg_altitude">Altitude moyenne : %1$s</string>
<string name="gpx_info_diff_altitude">Amplitude altimétrique : %1$s</string>
<string name="gpx_info_asc_altitude">Dénivelées : %1$s</string>
<string name="gpx_info_asc_altitude">Dénivelés : %1$s</string>
<string name="gpx_timespan">Durée : %1$s</string>
<string name="gpx_timemoving">Temps en déplacement : %1$s</string>
<string name="gpx_timemoving">Durée de mouvement : %1$s</string>
<string name="gpx_selection_segment_title">Segment</string>
<string name="gpx_selection_number_of_points"> %1$s points</string>
<string name="gpx_selection_point">Point %1$s</string>
@ -1701,45 +1701,45 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="gpx_selection_points">%1$s \nPoints</string>
<string name="gpx_selection_track">%1$s \nTrace %2$s</string>
<string name="gpx_available_current_track">Trace en cours d\'enregistrement</string>
<string name="gpx_wpt">Point de cheminement</string>
<string name="map_widget_plain_time">Heure</string>
<string name="gpx_wpt">Point de passage</string>
<string name="map_widget_plain_time">Heure courante</string>
<string name="loading_smth">Chargement de %1$s …</string>
<string name="save_as_favorites_points">Enregistrer comme groupe de favoris</string>
<string name="select_destination_and_intermediate_points">Sélectionner les points de cheminement</string>
<string name="layer_amenity_label">Étiquette des points</string>
<string name="select_destination_and_intermediate_points">Sélectionner les points de passage</string>
<string name="layer_amenity_label">Étiquettes de point</string>
<string name="route_descr_destination">Destination</string>
<string name="show_zoom_buttons_navigation_descr">Afficher les boutons de zoom pendant la navigation</string>
<string name="show_zoom_buttons_navigation">Afficher les boutons de zoom</string>
<string name="visible_element">Voir sur la carte</string>
<string name="visible_element">Afficher sur la carte</string>
<string name="sort_by_distance">Trier par distance</string>
<string name="sort_by_name">Trier par nom</string>
<string name="no_index_file_to_download">Rien à télécharger, veuillez vérifier votre connexion Internet.</string>
<string name="none_selected_gpx">Aucun fichier GPX sélectionné. Pour sélectionner, presser longuement sur la trace disponible.</string>
<string name="none_selected_gpx">Aucun fichier GPX sélectionné. Pour sélectionner, presser longuement sur une trace disponible.</string>
<string name="local_index_unselect_gpx_file">Désélectionner</string>
<string name="local_index_select_gpx_file">Sélectionner pour afficher</string>
<string name="osmo_group_information_desc">" - Tous les groupes créés sont publics! Si vous souhaitez l\'anonymat, connectez votre appareil directement via des identifiants Tracker.\n- Le groupe peut comprendre jusqu\'à 16 personnes.\n- En cas d\'inactivité ou si une seule personne active, le groupe sera supprimé.\n- Vous pouvez restreindre l\'accès au groupe, uniquement sur invitation, mais pour contrôler le groupe, vous devez utiliser la console administrateur.\n- Si vous voulez créer un groupe sous d\'autres conditions, veuillez contacter http://osmo.mobi"</string>
<string name="local_index_select_gpx_file">Sélectionnez pour afficher</string>
<string name="osmo_group_information_desc">" - Tous les groupes créés sont publics ! Si vous souhaitez l\'anonymat, connectez votre appareil directement via des identifiants Tracker.\n- Le groupe peut comprendre jusqu\'à 16 personnes.\n- En cas d\'inactivité ou d\'activité d\'une seule personne sur 2 semaines, le groupe sera supprimé.\n- Vous pouvez restreindre l\'accès au groupe, uniquement sur invitation, mais pour contrôler le groupe, vous devez utiliser la console administrateur.\n- Si vous voulez créer un groupe sous d\'autres conditions, veuillez contacter http://osmo.mobi"</string>
<string name="osmo_group_information">Veuillez lire ceci avant de créer un groupe !</string>
<string name="osmo_not_signed_in">Identification OsMo échouée</string>
<string name="osmo_not_signed_in">L\'authentification OsMo a échoué</string>
<string name="osmo_gpx_points_downloaded">Points OsMo %1$s téléchargés.</string>
<string name="osmo_auto_connect_descr">Connexion automatique au service après démarrage de l\'application</string>
<string name="osmo_auto_connect_descr">Connexion automatique au service lors du démarrage de l\'application</string>
<string name="osmo_auto_connect">Autoconnexion</string>
<string name="osmo_start_service">Service OsMo</string>
<string name="osmo_gpx_track_downloaded">Trace OsMo %1$s téléchargée.</string>
<string name="osmo_group_by_invite">Admission sur invitation</string>
<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">Garder</string>
<string name="keep_navigation_service">Conserver</string>
<string name="stop_navigation_service">Interrompre</string>
<string name="enable_sleep_mode">Activer le mode veille du GPS</string>
<string name="gps_wake_up_timer">Intervalle de réveil du GPS</string>
<string name="sleep_mode_stop_dialog">Interrompre le mode veille du GPS ?</string>
<string name="map_preferred_locale_descr">Langue préférée pour les étiquettes sur la carte (noms anglais ou locaux en cas d\\\'indisponibilité)</string>
<string name="map_preferred_locale_descr">Langue préférée pour les libellés sur la carte (en cas d\'indisponibilité affiche les noms anglais ou locaux)</string>
<string name="map_preferred_locale">Langue préférée pour la carte</string>
<string name="local_map_names">Noms locaux</string>
<string name="lang_sw">swahili</string>
<string name="lang_he">hébreux</string>
<string name="forward">Avancer</string>
<string name="home">Home</string>
<string name="forward">Suivant</string>
<string name="home">Accueil</string>
<string name="live_monitoring_m_descr">Envoyer la position courante à un service Web si l\'enregistrement GPX est activé.</string>
<string name="live_monitoring_m">Suivi en ligne (GPX requis)</string>
<string name="live_monitoring_start">Démarrer le suivi en ligne</string>
@ -1747,18 +1747,18 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="gpx_monitoring_start">Démarrer l\'enregistrement GPX</string>
<string name="gpx_monitoring_stop">Arrêter l\'enregistrement GPX</string>
<string name="gpx_start_new_segment">Débuter un nouveau segment</string>
<string name="rendering_attr_hideBuildings_name">Cacher les bâtiments</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Cacher les voies non adaptées aux véhicules</string>
<string name="rendering_attr_hideText_name">Cacher les textes</string>
<string name="rendering_attr_hideWoodScrubs_name">Cacher la végétation</string>
<string name="rendering_attr_hideBuildings_name">Masquer les bâtiments</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Masquer les voies non adaptées aux véhicules</string>
<string name="rendering_attr_hideText_name">Masquer les textes</string>
<string name="rendering_attr_hideWoodScrubs_name">Masquer la végétation</string>
<string name="rendering_attr_buildings15zoom_name">Bâtiments en zoom 15</string>
<string name="rendering_attr_moreDetailed_name">Plus détaillé</string>
<string name="rendering_attr_lessDetailed_name">Moins détaillé</string>
<string name="rendering_attr_hideAccess_name">Cacher les restrictions d\\\'accès</string>
<string name="rendering_attr_showAccess_name">Montrer les restrictions d\\\'accès</string>
<string name="rendering_attr_showSurfaceGrade_name">Montrer la qualité des routes</string>
<string name="rendering_attr_showSurfaces_name">Montrer la surface des routes</string>
<string name="rendering_attr_showCycleRoutes_name">Montrer les pistes cyclables</string>
<string name="rendering_attr_hideAccess_name">Masquer les restrictions d\'accès</string>
<string name="rendering_attr_showAccess_name">Afficher les restrictions d\'accès</string>
<string name="rendering_attr_showSurfaceGrade_name">Afficher la qualité des routes</string>
<string name="rendering_attr_showSurfaces_name">Afficher la surface des routes</string>
<string name="rendering_attr_showCycleRoutes_name">Afficher les pistes cyclables</string>
<string name="lang_fa">perse</string>
<string name="lang_al">albanais</string>
<string name="lang_ar">arabe</string>
@ -1777,7 +1777,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="rendering_attr_osmcTraces_name">Surcouche de symboles de rando</string>
<string name="rendering_attr_osmcTraces_description">Afficher les chemins selon les traces OSMC</string>
<string name="rendering_attr_coloredBuildings_name">Bâtiments en couleur</string>
<string name="rendering_attr_coloredBuildings_name">Bâtiments colorés par type</string>
<string name="arrival_distance_factor_early">Tôt</string>
<string name="arrival_distance_factor_normally">Normal</string>
<string name="arrival_distance_factor_late">Tard</string>
@ -1794,21 +1794,21 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="more">Plus...</string>
<string name="download_additional_maps">Télécharger les cartes manquantes %1$s (%2$d Mo) ?</string>
<string name="flat_list_waypoitns">Tous</string>
<string name="waypoints">Points de cheminement</string>
<string name="waypoints">Points de passage</string>
<string name="targets">Destinations</string>
<string name="way_alarms">Alertes de circulation</string>
<string name="speak_favorites">Annoncer les favoris proches</string>
<string name="speak_poi">Annoncer les points d\'intérêt proches</string>
<string name="flat_list_waypoints">Tous</string>
<string name="index_tours">Tours</string>
<string name="record_plugin_description">Enregistrer vos traces en touchant le bouton de l\'écran principal. Monter les paramètres pour l\'enregistrement des traces dans des fichiers GPX locaux ou en ligne avec un service Web.</string>
<string name="record_plugin_name">Enregistrer vos itinéraires</string>
<string name="record_plugin_description">Enregistrez vos traces grâce au bouton sur la carte. Affichez les paramètres pour l\'enregistrement des traces dans des fichiers GPX locaux ou en ligne avec un service Web.</string>
<string name="record_plugin_name">Enregistrez vos itinéraires</string>
<string name="int_hour">h</string>
<string name="duration">Durée</string>
<string name="distance">Distance</string>
<string name="rendering_attr_publicTransportMode_name">Mode transports publics</string>
<string name="save_track_to_gpx_globally">Enregistrer les traces dans un fichier GPX</string>
<string name="save_track_to_gpx_globally_descr">L\'enregistrement de la position dans un fichier GPX peut être activer ou désactiver depuis le gadget associé sur la vue carte.</string>
<string name="save_track_to_gpx_globally_descr">L\'enregistrement de la position dans un fichier GPX peut être activé ou désactivé grâce au gadget sur la carte.</string>
<string name="save_track_interval_globally">Intervalle d\'enregistrement</string>
<string name="confirm_every_run">Toujours demander</string>
<string name="save_global_track_interval_descr">Choisir l\'intervalle d\'enregistrement pour l\'enregistrement des traces (activer via le gadget d\'enregistrement GPX sur l\'écran principal)</string>
@ -1822,13 +1822,15 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="traffic_warning">Alerte de circulation</string>
<string name="local_index_description">Cliquez sur n\'importe quel élément pour voir plus de détails, maintenez appuyé pour désactiver ou supprimer. Données actuellement sur l\'appareil (%1$s libre) :</string>
<string name="text_size">Taille du texte</string>
<string name="fav_point_dublicate">Ce nom est déjà utilisé pour un point favori.</string>
<string name="fav_point_dublicate_message">Nous avons changé le nom de votre point favori en %1$s pour éviter les doublons.</string>
<string name="text_size_descr">Sélectionner la taille du texte sur la carte.</string>
<string name="fav_point_dublicate">Ce nom est déjà utilisé pour un favori.</string>
<string name="fav_point_dublicate_message">Nous avons modifié le nom de votre favori en %1$s pour éviter les doublons.</string>
<string name="text_size_descr">Sélectionnez la taille du texte sur la carte.</string>
<string name="test_native_render">Tester le moteur de rendu natif</string>
<string name="test_native_render_msg">Démarrer l\'activité avec le moteur de rendu natif</string>
<string name="use_native_render">Utiliser le moteur de rendu natif</string>
<string name="use_native_render_descr">Utiliser le moteur de rendu C++ au lieu de Java</string>
<string name="print_route">Imprimer la route</string>
<string name="fav_point_emoticons_message">Le nom de votre favoris sera %1$s car il n\'est pas possible d\'utiliser les émoticônes.</string>
</resources>
<string name="speed_limit_exceed">Marge tolérée aux limites de vitesse</string>
<string name="speed_limit_exceed_message">Indiquez la marge à tolérer aux limitations de vitesse avant le déclenchement des annonces vocales.</string>
</resources>

View file

@ -1,3 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="bidforfix_loading">A cargar</string>
</resources>
<string name="bidforfix_supporters">%1$d mecenas</string>
<string name="bidforfix_funded">financiado: %d%%</string>
</resources>

File diff suppressed because one or more lines are too long

View file

@ -284,7 +284,7 @@
<string name="tip_navigation">Navigazione</string>
<string name="tip_navigation_t">"Per ottenere indicazioni, tieni premuto sul luogo di destinazione (poi premi la sua descrizione e seleziona \'Indicazioni verso\'), oppure seleziona \'Indicazioni\' dopo aver premuto sul risultato di una ricerca o un preferito.
\n\nLa destinazione è segnata sulla mappa con una bandiera a scacchi e OsmAnd mostrerà la distanza di arrivo e la direzione per raggiungerla in linea d\'aria (con un triangolo arancione).
\n\nLa destinazione è segnata sulla mappa con una bandiera a scacchi e OsmAnd mostra la distanza di arrivo e la direzione per raggiungerla in linea d\'aria (con un triangolo arancione).
\n\nPuoi selezionare \'Avvia navigazione\', per chiedere a OsmAnd di guidarti fino a destinazione fornendoti avvisi vocali (se abilitati), etc. Oppure seleziona \'Mostra percorso\' per ottenere una guida statica senza aggiornamenti mentre ti muovi.
\n\nPer ricevere indicazioni partendo da un punto diverso alla tua posizione attuale, seleziona il punto voluto sulla mappa e scegli \'Indicazioni da\'.
\n\nSe usi \'Indicazioni da\' insieme ad \'Avvia navigazione\', OsmAnd passerà alla tua posizione attuale on appena essa sarà disponibile (questo modo è stato studiato proprio per permettere di avviare immediatamente la navigazione ancor prima che la posizione sia stata individuata), mentre \'Indicazioni da\' insieme a \'Mostra percorso\' calcola il percorso da un punto arbitrario senza effettuare alcun aggiornamento. "</string>
@ -1900,12 +1900,12 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="rendering_attr_hideNonVehicleHighways_name">Nascondi le strade non carrabili</string>
<string name="rendering_attr_hideText_name">Nascondi il testo</string>
<string name="rendering_attr_hideWoodScrubs_name">Nascondi foreste e boscaglie</string>
<string name="rendering_attr_buildings15zoom_name">Edifici dal zoom 15</string>
<string name="rendering_attr_buildings15zoom_name">Edifici da zoom 15</string>
<string name="rendering_attr_moreDetailed_name">Più dettagli</string>
<string name="rendering_attr_lessDetailed_name">Meno dettagli</string>
<string name="rendering_attr_hideAccess_name">Nascondi le limitazioni di accesso</string>
<string name="rendering_attr_showAccess_name">Mostra le limitazioni di accesso</string>
<string name="rendering_attr_showSurfaceGrade_name">Mostra la qualità delle strade</string>
<string name="rendering_attr_showSurfaceGrade_name">Mostra qualità strade</string>
<string name="rendering_attr_showSurfaces_name">Mostra il tipo di superficie delle strade</string>
<string name="rendering_attr_showCycleRoutes_name">Mostra i percorsi per bicicletta</string>
<string name="osmo_auth_error_short">Autorizzazione fallita</string>
@ -1991,11 +1991,14 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="local_index_description">Clicca su un oggetto per visualizzare maggiori dettagli, tieni premuto per disattivarlo o cancellarlo. Dati attualmente nel dispositivo (%1$s liberi):</string>
<string name="text_size_descr">Imposta la dimensione del testo sulla mappa.</string>
<string name="text_size">Dimensione del testo</string>
<string name="test_native_render">Prova la rappresentazione nativa</string>
<string name="test_native_render_msg">Inizia l\'attività con la rappresentazione nativa</string>
<string name="test_native_render">Prova il rendering nativo</string>
<string name="test_native_render_msg">Inizia l\'attività con il rendering nativo</string>
<string name="fav_point_dublicate">Nome del punto preferito duplicato</string>
<string name="fav_point_dublicate_message">Per evitare duplicati il nome del vostro punto preferito è stato modificato in %1$s.</string>
<string name="use_native_render">Utilizza la rappresentazione nativa</string>
<string name="use_native_render_descr">Usa la rappresentazione C++ anziché Java</string>
<string name="use_native_render">Usa il rendering nativo</string>
<string name="use_native_render_descr">Usa il rendering C++ anziché Java</string>
<string name="print_route">Stampa percorso</string>
</resources>
<string name="fav_point_emoticons_message">Abbiamo cambiato il nome del tuo punto preferito in %1$s perché non è possibile salvare stringhe con emoticon nel file.</string>
<string name="speed_limit_exceed">Valore di superamento del limite di velocità.</string>
<string name="speed_limit_exceed_message">Seleziona il valore di superamento del limite di velocità sal quale si desidera avere l\'avviso vocale.</string>
</resources>

View file

@ -224,7 +224,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
</string>
<string name="file_can_not_be_renamed">파일 이름을 바꿀 수 없습니다.</string>
<string name="file_with_name_already_exists">같은 이름을 가진 파일이 이미 존재합니다.</string>
<string name="gpx_navigation">GPX 경로</string>
<string name="gpx_navigation">GPX 루트</string>
<string name="poi_query_by_name_matches_categories">이름으로 검색한 POI에 해당하는 몇몇 카테고리를 찾았습니다 :</string>
<string name="data_to_search_poi_not_available">검색한 POI에 대한 로컬 데이터가 존재하지 않습니다.</string>
<string name="poi_filter_by_name">이름으로 검색</string>
@ -1119,7 +1119,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="distance_measurement_finish_editing">편집 끝내기</string>
<string name="distance_measurement_finish_subtrack">새로운 subtrack(세그먼트) 시작</string>
<string name="distance_measurement_clear_route">모든 포인트 지우기</string>
<string name="distance_measurement_save_gpx">GPX로 저장</string>
<string name="distance_measurement_save_gpx">GPX파일로 저장</string>
<string name="distance_measurement_load_gpx">기존 GPX파일 불러오기</string>
<string name="wait_current_task_finished">현재 작업이 완료 될 때까지 기다리십시오</string>
<string name="use_kalman_filter_compass_descr">나침반 흔들림을 방지하기 위해 칼만 필터를 사용</string>
@ -1410,7 +1410,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="map_widget_right_stack">오른쪽 패널 :</string>
<string name="map_widget_left_stack">왼쪽 패널 :</string>
<string name="map_widget_parking">주차</string>
<string name="map_widget_monitoring">GPX 기록중</string>
<string name="map_widget_monitoring">GPX 레코딩</string>
<string name="map_widget_speed">속도</string>
<string name="map_widget_distance">목적지</string>
<string name="map_widget_altitude">고도</string>
@ -2012,8 +2012,8 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
<string name="live_monitoring_m">온라인 트래킹 (GPX파일 필요)</string>
<string name="live_monitoring_start">온라인 트래킹 시작</string>
<string name="live_monitoring_stop">온라인 트래킹 중지</string>
<string name="gpx_monitoring_start">GPX 기록 시작</string>
<string name="gpx_monitoring_stop">GPX 기록 중지</string>
<string name="gpx_monitoring_start">GPX 레코딩 시작</string>
<string name="gpx_monitoring_stop">GPX 레코딩 중지</string>
<string name="gpx_start_new_segment">새로운 세그먼트 시작</string>
<string name="lang_fa">페르시아어</string>
<string name="lang_al">알바니아어</string>
@ -2084,4 +2084,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
<string name="use_native_render">기본 렌더링 사용</string>
<string name="use_native_render_descr">Java 대신 C++ 렌더링을 사용합니다</string>
<string name="print_route">경로 인쇄</string>
</resources>
<string name="fav_point_emoticons_message">%1$s 에 즐겨찾기 포인트 이름 변경. 파일에 이모티콘과 함께 문자열을 저장할 수 없습니다.</string>
<string name="speed_limit_exceed">속도 제한 초과 값.</string>
<string name="speed_limit_exceed_message">음성 안내를 받아야 할 속도 제한 초과 값을 선택합니다.</string>
</resources>

View file

@ -1844,9 +1844,11 @@ OsmAnd yra aktyviai tobulinama ir mūsų projektas bei jo tolesnis progresas pri
<string name="fav_point_dublicate_message">Mes pakeitėme įsimintinos vietos pavadinimą į %1$s kad išvengtume pasikartojimų.</string>
<string name="local_index_description">Spustelėkite bet kurį elementą, norėdami gauti daugiau informacijos, paspauskite ir laikykite, norėdami išjungti arba ištrinti. Dabartiniai duomenys įrenginyje (%1$ s laisva):</string>
<string name="print_route">Išspausdinti maršrutą</string>
<string name="fav_point_emoticons_message">Mes pakeitėme jūsų įsimintos vietos pavadinimą į %1$s nes teksto su veidukais išsaugoti faile neįmanoma.</string>
<string name="fav_point_emoticons_message">Mes pakeitėme jūsų įsimintos vietos pavadinimą į %1$s, nes teksto su veidukais išsaugoti faile neįmanoma.</string>
<string name="test_native_render">Testuoti aparatinį atvaizdavimą</string>
<string name="test_native_render_msg">Pradeda veiklą su aparatiniu atvaizdavimu</string>
<string name="use_native_render">Naudoti aparatinį atvaizdavimą</string>
<string name="use_native_render_descr">Naudoti C++ vietoje Java atvaizdavimo</string>
</resources>
<string name="speed_limit_exceed">Greičio ribojimo viršijimo reikšmė.</string>
<string name="speed_limit_exceed_message">Pasirinkite greičio ribojimo viršijimo reikšmę, kurią pasiekus bus pranešta balsu.</string>
</resources>

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
<string name="select_plugin_to_activate">Atzīmējiet spraudni, lai to aktivizētu (varētu būt nepieciešams OsmAnd restarts)</string>
<string name="prefs_plugins_descr">Spraudņi iespējo aplikācijas papildus funkcijas un uzstādījumus kā piemēram sekošana, enerģijas taupīšana, pieejamība un daudzas citas</string>
@ -139,9 +139,9 @@
<string name="amenity_type_osmwiki">Wikipedia (bezsaistes)</string>
<string name="amenity_type_user_defined">Lietotāja definēts</string>
<string name="fav_export_confirmation">Fails ar iepriekš eksportētu izlasi jau pastāv. Vai vēlaties to pārrakstīt?</string>
<string name="profile_settings">Ar profilu saistītie uzstādījumi</string>
<string name="profile_settings">Profila uzstādījumi</string>
<string name="settings_preset">Noklusētais profils</string>
<string name="settings_preset_descr">Izvēlēties lietotāja profilu ar specifiskiem kartes un navigācijas uzstādījumiem.</string>
<string name="settings_preset_descr">Kartes skats un navigācijas uzstādījumi tiek saglabāti lietotāja profilā. Uzstādiet noklusēto profilu šeit.</string>
<string name="routing_settings">Navigācija</string>
@ -297,10 +297,10 @@
<string name="gpx_option_destination_point">Lietot esošo galamērķi</string>
<string name="gpx_option_from_start_point">Sekot pa visu treku</string>
<string name="switch_to_vector_map_to_see">Šai vietai ir pieejama bezsaistes vektoru karte. \n\t\n\tLai to lietotu, aktivizējiet \'Izvēlne\' -&gt; \'Definēt skatu\' -&gt; \'Kartes avots…\' -&gt; \'Bezsaistes vektoru kartes\'.</string>
<string name="choose_audio_stream">Balss vadības izvads</string>
<string name="choose_audio_stream_descr">Izvēlieties kanālu, caur kuru atskaņot balss vadību</string>
<string name="choose_audio_stream">Balss vadības kanāls</string>
<string name="choose_audio_stream_descr">Izvēlieties tālruņa kanālu balss vadībai</string>
<string name="voice_stream_voice_call">Tālruņa skaļrunis</string>
<string name="voice_stream_notification">Ziņojumu sistēma</string>
<string name="voice_stream_notification">Ziņojumu kanāls</string>
<string name="voice_stream_music">Multimēdiju skaļrunis</string>
<string name="warning_tile_layer_not_downloadable">Aplikācija nevar lejupielādēt kartes slāni %1$s, lūdzu mēģiniet to pārinstalēt.</string>
<string name="overlay_transparency_descr">Modificēt pārklāja caurspīdīgumu</string>
@ -367,8 +367,8 @@
</string>
<string name="next_button">Tālāk</string>
<string name="previous_button">Atpakaļ</string>
<string name="unit_of_length_descr">Mainīt ātruma un garuma mērvienības</string>
<string name="unit_of_length">Mērvienība</string>
<string name="unit_of_length_descr">Attāluma un braukšanas ātruma mērvienības</string>
<string name="unit_of_length">Mērvienības</string>
<string name="si_mi_foots">Jūdzes/pēdas</string>
<string name="si_mi_yard">Jūdzes/jardi</string>
<string name="si_km_m">Kilometri/metri</string>
@ -428,7 +428,7 @@
<string name="use_osmand_routing_service_descr">OsmAnd bezsaistes navigācija darbojas tikai &gt; 20 km gariem maršrutiem (eksperimentāli)</string>
<string name="osmand_routing_experimental">OsmAnd bezsaistes navigācija ir eksperimentāla funkcija un tā nestrādā attālumiem, kas ir lielāki par 20 km.\n\nNavigācijas serviss pagaidām ir pārslēgts uz tiešsaistes CloudMade.</string>
<string name="specified_dir_doesnt_exist">Nevar atrast norādīto direktoriju.</string>
<string name="application_dir">Glabātuves direktorija</string>
<string name="application_dir">Glabātuves mape</string>
<string name="osmand_net_previously_installed">Ir atrasta vecāka OsmAnd versija. Bezsaistes dati ir atbalstīti jaunajā versijā, bet izlasi vajadzēs eksportēt no vecās versijas, pēc tam importēt jaunajā versijā.</string>
<string name="build_installed">Versija {0} ir veiksmīgi uzinstalēta ({1}).</string>
@ -631,7 +631,7 @@
<string name="downloading">Lejupielādē…</string>
<string name="downloading_list_indexes">Lejupielādē reģionu sarakstu…</string>
<string name="list_index_files_was_not_loaded">Netika saņemts reģionu saraksts no osmand.net.</string>
<string name="select_index_file_to_download">Nekas netika atrasts. Ja jūs nevariet atrast sava apgabala karti, tad jūs variet to izveidot (skatīt http://osmand.net).</string>
<string name="select_index_file_to_download">Nekas netika atrasts. Ja nevarat atrast sava apgabala karti, tad to var izveidot (skatīt http://osmand.net).</string>
<string name="show_poi_on_map">Rādīt kartē</string>
<string name="fav_points_edited">Izlases punkts tika izlabots</string>
<string name="fav_points_not_exist">Izlases punkti neeksistē</string>
@ -999,7 +999,7 @@
<string name="poi_filter_restaurants">Restorāni</string>
<string name="poi_filter_sightseeing">Apskates vietas</string>
<string name="avoid_motorway">Izvairīties no automaģistrālēm</string>
<string name="snap_to_road_descr">Navigācijas laikā tuvināt pozīciju ceļam</string>
<string name="snap_to_road_descr">Navigācijas laikā tuvināt ceļam</string>
<string name="snap_to_road">Tuvināt ceļam</string>
<string name="osmand_short_description_80_chars">OsmAnd ir atvērtā koda navigācijas aplikācija bezsaistes un tiešsaistes kartēm</string>
<string name="osmand_long_description_1000_chars">
@ -1085,20 +1085,20 @@
<string name="driving_region_descr">Atzīmējiet braukšanas reģionu: ASV, Eiropa, Apvienotā Karaliste, Āzija un citi</string>
<string name="driving_region">Braukšanas reģions</string>
<string name="driving_region_japan">Japāna</string>
<string name="driving_region_us">Amerikas Savienotās Valstis</string>
<string name="driving_region_us">ASV</string>
<string name="driving_region_canada">Kanāda</string>
<string name="driving_region_europe_asia">Eiropa &amp; Āzija</string>
<string name="driving_region_uk">Apvienotā Karaliste, Indija, Austrālija &amp; pārējās valstis</string>
<string name="driving_region_uk">Apvienotā Karaliste, Indija, Austrālija un citas</string>
<string name="osmodroid_mode_on">Apturēt OsMoDroid</string>
<string name="osmodroid_mode_off">Palaist OsMoDroid</string>
<string name="osmodroid_refresh">Atjaunot kanālus</string>
<string name="announce_gpx_waypoints">Izrunāt GPX ceļapunktus</string>
<string name="speak_title">Izrunāt…</string>
<string name="speak_descr">Konfigurēt, lai izrunātu ielu nosaukumus, satiksmes brīdinājumus (apstāšanās, guļošie policisti), brīdinājumus par foto radariem, ātruma ierobežojumus</string>
<string name="speak_street_names">Izrunāt ielu nosaukumus (TTS)</string>
<string name="speak_speed_limit">Ziņot par ātruma ierobežojumiem</string>
<string name="speak_cameras">Ziņot par foto radariem</string>
<string name="speak_traffic_warnings">Ziņot par satiksmes brīdinājumiem</string>
<string name="speak_descr">ielu nosaukumus, satiksmes brīdinājumus (piespiedu apstāšanos, guļošos policistus), fotoradarus, atļauto ātrumu</string>
<string name="speak_street_names">Ielu nosaukumi (TTS)</string>
<string name="speak_speed_limit">Ātruma ierobežojumi</string>
<string name="speak_cameras">Fotoradari</string>
<string name="speak_traffic_warnings">Satiksmes brīdinājumi</string>
<string name="osb_author_or_password_not_specified">Lūdzu norādiet uzstādījumos OSM lietotāja vārdu un paroli</string>
<string name="clear_intermediate_points">Noņemt ceļapunktus</string>
<string name="keep_intermediate_points">Paturēt ceļapunktus</string>
@ -1150,13 +1150,13 @@
<string name="download_using_mobile_internet">Nav savienots ar WIFI. Vai turpināt, izmantojot mobilo internetu?</string>
<string name="street_name">Ielas nosaukums</string>
<string name="hno">Mājas numurs</string>
<string name="monitoring_settings">Ieraksta servisi &amp; miega režīms</string>
<string name="monitoring_settings_descr">Konfigurēt ceļojuma ierakstus un iespējot miega režīmu</string>
<string name="monitoring_settings">Maršruta ieraksts</string>
<string name="monitoring_settings_descr">GPX failā vai sekošanai tīklā</string>
<string name="osmand_monitoring_plugin_description">Iespējot sekošanu un navigāciju strāvas taupīšanas (izslēgts ekrāns) režīmā, periodiski ieslēdzot GPS iekārtu.
………… Rādīt uzstādījumus ceļojuma ierakstīšanai vietējos GPX failos vai interneta vietnē.</string>
<string name="osmand_monitoring_plugin_name">Ieraksta servisi &amp; miega režīms</string>
<string name="choose_osmand_theme_descr">Izvēlēties programmas motīvu</string>
<string name="choose_osmand_theme">Programmas motīvs</string>
<string name="choose_osmand_theme_descr">Krāsu izvēle saskarsmei</string>
<string name="choose_osmand_theme">Aplikācijas motīvs</string>
<string name="accessibility_options">Pieejamības opcijas</string>
<string name="select_address_activity">Atlasīt adresi</string>
<string name="favourites_list_activity">Atlasīt favorītu</string>
@ -1620,13 +1620,13 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
</string>
<string name="interrupt_music">Pārtraukt mūziku</string>
<string name="share_route_subject">Maršruts kopīgots caur OsmAnd</string>
<string name="arrival_distance">Ierašanās paziņojums</string>
<string name="arrival_distance">Paziņojums par ierašanos</string>
<string name="arrival_distance_descr">Kad ziņot par ierašanos galamērķī?</string>
<string name="keep_informing_never">Nekad</string>
<string name="keep_informing_descr">Noteikt intervālu navigācijas norādījumu atkārtošanai</string>
<string name="keep_informing">Atkārtot navigācijas norādījumus</string>
<string name="navigation_intent_invalid">Nepareizs formāts: %s</string>
<string name="interrupt_music_descr">Paziņojumu laikā pārtraukt mūzikas atskaņošanu</string>
<string name="interrupt_music_descr">kad tiek izrunāti paziņojumi</string>
<string name="share_route_as_gpx">Koplietot maršrutu kā GPX failu</string>
<string name="osmo_io_error">"OsMo savienojuma problēma: "</string>
<string name="osmo_mode_on">Apturēt OSMo sesiju</string>
@ -1738,12 +1738,12 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="my_data_activity">Manas vietas</string>
<string name="gpx_file_is_empty">Gpx treks ir tukšs</string>
<string name="loading_smth">Ielādē %1$s…</string>
<string name="map_widget_plain_time">Pašreizējais laiks</string>
<string name="map_widget_plain_time">Tekošais laiks</string>
<string name="gpx_wpt">Ceļapunkts</string>
<string name="selected_gpx_info_show">\n\nTuriet nospiestu, lai rādītu uz kartes</string>
<string name="delay_navigation_start">Sākt navigāciju ar aizturi</string>
<string name="selected">Izvēlēts</string>
<string name="gpx_split_interval">Izvēlēties sadalījuma intervālu</string>
<string name="gpx_split_interval">Sadalījuma intervāls</string>
<string name="gpx_info_subtracks">Apakšposmi: %1$s </string>
<string name="gpx_info_waypoints">Ceļapunkti: %1$s </string>
<string name="gpx_info_distance">Distance: %1$s (%2$s punkti) </string>
@ -1768,18 +1768,79 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="select_destination_and_intermediate_points">Atlasīt ceļapunktus</string>
<string name="layer_amenity_label">Punktu nosaukumi</string>
<string name="arrival_distance_factor_normally">Normāli</string>
<string name="arrival_distance_factor_late">Vēlāk</string>
<string name="arrival_distance_factor_late">Vēlu</string>
<string name="arrival_distance_factor_at_last">Pēdējos metros</string>
<string name="arrival_distance_factor_early">Agrāk</string>
<string name="arrival_distance_factor_early">Agri</string>
<string name="show_zoom_buttons_navigation">Rādīt tālummaiņas pogas</string>
<string name="show_zoom_buttons_navigation_descr">Rādīt navigācijas laikā uz kartes</string>
<string name="show_zoom_buttons_navigation_descr">Navigācijas laikā rādīt tālummaiņas pogas</string>
<string name="confirm_every_run">Vienmēr jautāt</string>
<string name="download_additional_maps">Lejupielādēt trūkstošās kartes %1$s (%2$d MB)?</string>
<string name="more">Vēl...</string>
<string name="lang_he">Ēbreju</string>
<string name="lang_he">Ebreju</string>
<string name="osmo_auth_error_short">Autorizācija neizdevās</string>
<string name="sort_by_distance">Kārtot pēc attāluma</string>
<string name="sort_by_name">Kārtot pēc nosaukuma</string>
<string name="lang_al">Albāņu</string>
<string name="lang_fa">Persiešu</string>
</resources>
<string name="map_preferred_locale_descr">Ieteicamā valoda rakstībai uz kartes (ja netiks atrasta, tiks izmantoti lokālie vai angļu valodas nosaukumi)</string>
<string name="map_preferred_locale">Kartes valoda</string>
<string name="record_plugin_description">Saglabājiet ceļa ierakstus ar pogas piespiedienu uz kartes. Uzstādījumi ceļa ierakstīšanai GPX failā vai tīklā caur internetu.</string>
<string name="record_plugin_name">Ierakstīt ceļojumus</string>
<string name="int_hour">h</string>
<string name="duration">Laiks</string>
<string name="distance">Attālums</string>
<string name="index_tours">Braucieni</string>
<string name="flat_list_waypoints">Visi</string>
<string name="waypoints">Ceļapunkti</string>
<string name="targets">Galamērķi</string>
<string name="rendering_value_browse_map_name">Atvērt karti</string>
<string name="rendering_value_car_name">Auto</string>
<string name="rendering_value_bicycle_name">Velosipēds</string>
<string name="rendering_value_pedestrian_name">Kājāmgājējs</string>
<string name="rendering_attr_coloredBuildings_name">Iekrāsotas celtnes</string>
<string name="osmo_invite">Ielūgt...</string>
<string name="osmo_leave_confirmation_msg">Vai gribat atstāt grupu %1$s?</string>
<string name="osmo_specify_tracker_id">Lūdzu norādiet id</string>
<string name="continue_navigation">Turpināt navigāciju</string>
<string name="pause_navigation">Nopauzēt navigāciju</string>
<string name="rendering_attr_subwayMode_name">Tuneļu režīms</string>
<string name="keep_navigation_service">Paturēt</string>
<string name="gps_wake_up_timer">GPS pamošanās intervāls</string>
<string name="local_map_names">Vietējie nosaukumi</string>
<string name="lang_sw">Svahili</string>
<string name="forward">Uz priekšu</string>
<string name="home">Atgriezties</string>
<string name="live_monitoring_m_descr">Sūtīt sekošanas datus uz doto tīkla servisu, ja ir iespējots GPX ieraksts.</string>
<string name="live_monitoring_m">Sekošana tīklā (no GPX ieraksta)</string>
<string name="live_monitoring_start">Sākt sekošanu tīklā</string>
<string name="live_monitoring_stop">Pārtraukt sekošanu tīklā</string>
<string name="gpx_monitoring_start">Sākt GPX ierakstu</string>
<string name="gpx_monitoring_stop">Pārtraukt GPX ierakstu</string>
<string name="gpx_start_new_segment">Sākt jaunu segmentu</string>
<string name="rendering_attr_hideBuildings_name">Nerādīt ēkas</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Nerādīt ne-auto šosejas</string>
<string name="rendering_attr_hideText_name">Nerādīt tekstu</string>
<string name="rendering_attr_hideWoodScrubs_name">Nerādīt mežus un izcirtumus</string>
<string name="rendering_attr_buildings15zoom_name">Ēkas 15. palielinājumā</string>
<string name="rendering_attr_moreDetailed_name">Vairāk detaļu</string>
<string name="rendering_attr_lessDetailed_name">Mazāk detaļu</string>
<string name="rendering_attr_hideAccess_name">Nerādīt pieejas ierobežojumus</string>
<string name="rendering_attr_showAccess_name">Rādīt pieejas ierobežojumus</string>
<string name="rendering_attr_showSurfaceGrade_name">Rādīt ceļa kvalitāti</string>
<string name="rendering_attr_showSurfaces_name">Rādīt ceļa segumu</string>
<string name="rendering_attr_showCycleRoutes_name">Rādīt velomaršrutus</string>
<string name="osmo_auth_error">OsMo autorizācijas kļūda: %1$s↵\nIespējams īslaicīgs sakaru pārtraukums vai reģistrācijai ir iztecējis termiņš↵\nVai gribat veikt jaunu reģistrāciju?</string>
<string name="osmo_group_by_invite">Ienākt pēc uzaicinājuma</string>
<string name="osmo_group_information">Lūdzu izlasiet sekojošo, pirms veidojiet jaunu grupu!</string>
<string name="osmo_not_signed_in">OsMo pieteikšanās neizdevās</string>
<string name="osmo_gpx_points_downloaded">OsMo punkti %1$s lejupielādēti.</string>
<string name="osmo_auto_connect_descr">Automātiski pievienot tīklam, startējot aplikāciju</string>
<string name="osmo_auto_connect">Pievienot tīklam</string>
<string name="osmo_start_service">OsMo serviss</string>
<string name="osmo_gpx_track_downloaded">OsMo ceļš %1$s lejupielādēts.</string>
<string name="no_index_file_to_download">Lejupielāde neizdevās, pārbaudiet interneta savienojumu.</string>
<string name="none_selected_gpx">Nav atzīmēti GPX faili. Lai atzīmētu, turiet nospiestu izvēlēto ierakstu.</string>
<string name="local_index_unselect_gpx_file">Neatzīmēt</string>
<string name="local_index_select_gpx_file">Atzīmēt rādīšanai</string>
<string name="visible_element">Rādīt uz kartes</string>
</resources>

View file

@ -1634,7 +1634,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="routing_attr_avoid_ferries_description">Vermijd veerboten</string>
<string name="routing_attr_avoid_motorway_name">Geen autowegen</string>
<string name="routing_attr_avoid_motorway_description">Vermijd autowegen</string>
<string name="routing_attr_weight_description">Geef het maximum gewicht van een voertuig</string>
<string name="routing_attr_weight_description">Geef het gewicht van een voertuig voor de routeplanning</string>
<string name="routing_attr_weight_name">Maximum gewicht</string>
<string name="select_gpx">GPX-bestand kiezen …</string>
<string name="route_descr_select_destination">Bestemming kiezen</string>
@ -1923,7 +1923,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="rendering_attr_osmcTraces_name">Wandelsymbolen laag</string>
<string name="rendering_attr_osmcTraces_description">Render paden volgens OSMC sporen</string>
<string name="rendering_attr_coloredBuildings_name">Gekleurde gebouwen</string>
<string name="rendering_attr_coloredBuildings_name">Gebouwen kleuren per soort</string>
<string name="osmo_invite">Uitnodiging voor…</string>
<string name="osmo_leave_confirmation_msg">Wil je de groep %1$s verlaten?</string>
<string name="osmo_specify_tracker_id">Specificeer je tracker-id alsjeblieft</string>
@ -1974,9 +1974,11 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="fav_point_dublicate_message">Favoriet bestaat al: de naam is veranderd in %1$s</string>
<string name="fav_point_dublicate">Favoriet met deze naam bestaat al</string>
<string name="test_native_render">Test \"native rendering\"</string>
<string name="test_native_render_msg">Start activiteit met oorspronkelijke renderer</string>
<string name="use_native_render">Gebruik oorspronkelijke renderer</string>
<string name="test_native_render_msg">Gebruik deze keer de C++ renderer in plaats van Java</string>
<string name="use_native_render">Gebruik \"native renderer\"</string>
<string name="use_native_render_descr">Gebruik C++ renderer in plaats van Java</string>
<string name="fav_point_emoticons_message">Favoriet bewaard als %1s omdat vreemde tekens niet opgeslagen kunnen worden.</string>
<string name="fav_point_emoticons_message">Favoriet bewaard als %1s omdat vreemde tekens niet opgeslagen kunnen worden in een bestand.</string>
<string name="print_route">Route afdrukken</string>
</resources>
<string name="speed_limit_exceed">Te hoge snelheid melden bij...</string>
<string name="speed_limit_exceed_message">Hoeveel de maximumsnelheid mag worden overschreden voordat een melding volgt.</string>
</resources>

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="srtm_plugin_description">Плагин позволяет загружать контурные линии и затемнение высот для использования оффлайн (\"Настройки\" → \"Управление файлами карт\" → \"Загрузить\").</string>
<string name="srtm_paid_version_msg">Рассмотрите, пожалуйста, покупку плагина \"Линии высот\" в Google Play, чтобы поддержать последующую разработку.</string>
<string name="srtm_paid_version_title">Линии высот</string>
@ -1770,4 +1770,7 @@
<string name="traffic_warning_calming">Снизьте скорость</string>
<string name="traffic_warning_speed_camera">Скоростной радар</string>
<string name="traffic_warning">Ограничение скорости</string>
</resources>
<string name="speed_limit_exceed_message">Выберите значение превышения скорости, при котором вы получите голосовое предупреждение.</string>
<string name="speed_limit_exceed">Значение превышения скорости.</string>
<string name="test_native_render">Тест нативной визуализации</string>
</resources>

View file

@ -1716,7 +1716,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="waypoints">Puntos mesanos</string>
<string name="targets">Destinatziones</string>
<string name="way_alarms">Avisos de tràficu</string>
<string name="speak_favorites">Annùntzia Prefèrridos a curtzu</string>
<string name="speak_favorites">Annùntzia sos Prefèrridos a curtzu</string>
<string name="speak_poi">Annùntzia PDI a curtzu</string>
<string name="flat_list_waypoints">Totus</string>
<string name="index_tours">Itineràrios</string>
@ -1734,7 +1734,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="save_global_track_interval_descr">Issèbera s\'intervallu pro sa registratzione generale de sas rastas (abilitadu tramite su widget registratzione GPX in sa mapa)</string>
<string name="traffic_warning_speed_limit">Limite de lestresa</string>
<string name="traffic_warning_payment">Casellu</string>
<string name="traffic_warning_stop">Cartellu Stop</string>
<string name="traffic_warning_stop">Cartellu de Stop</string>
<string name="traffic_warning_border_control">Controllu doganale</string>
<string name="traffic_warning_calming">Moderatzione de su tràficu</string>
<string name="traffic_warning_speed_camera">Autovelox</string>
@ -1744,9 +1744,12 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="text_size">Mannària de su testu</string>
<string name="fav_point_dublicate_message">Amus cambiau su nùmene de su prefèrridu tuo a %1$s pro evitare nùmenes dòpios.</string>
<string name="fav_point_dublicate">Nùmene dòpiu in sos prefèrridos</string>
<string name="test_native_render">Collàuda renderizatzione nativa</string>
<string name="test_native_render_msg">Cumintza atividade cun sa renderizatzione nativa</string>
<string name="test_native_render">Collàuda sa renderizatzione nativa</string>
<string name="test_native_render_msg">Incumentza s\'atividade cun sa renderizatzione nativa</string>
<string name="use_native_render">Imprea sa renderizatzione nativa</string>
<string name="use_native_render_descr">Imprea sa renderizatzione C++ imbetzes de Java</string>
<string name="print_route">Imprenta àndala</string>
</resources>
<string name="fav_point_emoticons_message">Amos cambiadu su nùmene de su prefèrridu tuo, ponende•li %1$s, proite no est possìbile sarbare documentos impreande emòticons in intro de sas istringas.</string>
<string name="speed_limit_exceed_message">Ischerta su balore de barigamentu de su lìmite de lestresa a pustis de su cale as a tènnere un\'avisu vocale.</string>
<string name="speed_limit_exceed">Balore de barigamentu de su lìmite de lestresa.</string>
</resources>

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="recording_context_menu_show">Zobraziť</string>
<string name="recording_photo_description">Fotografia %1$s zachytená dňa %2$s</string>
<string name="av_def_action_picture">Zachytiť fotografiu</string>
@ -1657,8 +1657,8 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="routing_attr_avoid_ferries_description">Vyhnúť sa trajektom</string>
<string name="routing_attr_avoid_motorway_name">Vyhnúť sa diaľniciam</string>
<string name="routing_attr_avoid_motorway_description">Vyhnúť sa diaľniciam</string>
<string name="routing_attr_weight_name">Maximálna hmotnosť</string>
<string name="routing_attr_weight_description">Zadajte obmedzenie hmotnosti vozidla</string>
<string name="routing_attr_weight_name">Hmotnostný limit</string>
<string name="routing_attr_weight_description">Zadajte hmotnosť vozidla, ktorá musí byť povolená na cestách</string>
<string name="select_gpx">Vybrať GPX …</string>
<string name="route_descr_select_destination">Vybrať cieľ</string>
<string name="route_descr_select_on_map">Vybrať na mape …</string>
@ -1946,7 +1946,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="rendering_attr_osmcTraces_name">Zobraziť turistické značky</string>
<string name="rendering_attr_osmcTraces_description">Kresliť chodníky podľa značenia OSMC</string>
<string name="rendering_attr_coloredBuildings_name">Farebné budovy</string>
<string name="rendering_attr_coloredBuildings_name">Vyfarbiť budovy podľa typu</string>
<string name="osmo_invite">Pozvať...</string>
<string name="osmo_leave_confirmation_msg">Chcete opustiť skupinu %1$s?</string>
<string name="osmo_specify_tracker_id">Prosím zadajte ID</string>
@ -2000,4 +2000,8 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="test_native_render_msg">Spustí činnosť s natívnym vykresľovaním</string>
<string name="use_native_render">Použiť natívne vykresľovanie</string>
<string name="use_native_render_descr">Použiť vykresľovanie v C++ namiesto Javy</string>
</resources>
<string name="fav_point_emoticons_message">Názov obľúbeného bodu bol upravený na %1$s, aby bolo možné správne uložiť názov s emotikonom do súboru.</string>
<string name="print_route">Vytlačiť trasu</string>
<string name="speed_limit_exceed">Tolerancia prekročenia povolenej rýchlosti</string>
<string name="speed_limit_exceed_message">Zvoľte toleranciu prekročenia povolenej rýchlosti, po ktorej dostanete hlasové oznámenie.</string>
</resources>

View file

@ -659,7 +659,7 @@
<string name="daynight_descr">Välj regel för byte mellan dag- och nattläge</string>
<string name="daynight">Dag-/nattläge</string>
<string name="download_files_question">Ladda ner {0} fil(er) ({1} MB)?</string>
<string name="items_were_selected">{0} post(er) vald(a)</string>
<string name="items_were_selected">{0} post(er) markerad(e)</string>
<string name="filter_existing_indexes">Visa nerladdat</string>
<string name="deselect_all">Avmarkera alla</string>
<string name="select_all">Markera alla</string>
@ -1363,8 +1363,8 @@
<string name="routing_attr_avoid_ferries_description">Undvik färjor</string>
<string name="routing_attr_avoid_motorway_name">Undvik motorvägar</string>
<string name="routing_attr_avoid_motorway_description">Undvik motorvägar</string>
<string name="routing_attr_weight_name">Maxvikt</string>
<string name="routing_attr_weight_description">Ange viktbegränsning för fordon</string>
<string name="routing_attr_weight_name">Viktgräns</string>
<string name="routing_attr_weight_description">Ange fordonsvikt tillåten på rutter</string>
<string name="routing_attr_short_way_name">Kortast väg</string>
<string name="routing_attr_short_way_description">Använd kortast väg</string>
<string name="select_gpx">Välj GPX …</string>
@ -1653,7 +1653,7 @@
<string name="osmo_invite">Bjud in…</string>
<string name="osmo_leave_confirmation_msg">Vill du lämna gruppen %1$s?</string>
<string name="osmo_specify_tracker_id">Ange id</string>
<string name="rendering_attr_coloredBuildings_name">Färgade byggnader</string>
<string name="rendering_attr_coloredBuildings_name">Färgkodade byggnader efter typ</string>
<string name="arrival_distance_factor_early">Tidigt</string>
<string name="arrival_distance_factor_normally">Normalt</string>
<string name="arrival_distance_factor_late">Sent</string>
@ -1705,4 +1705,7 @@
<string name="use_native_render">Använd inbyggd rendering</string>
<string name="use_native_render_descr">Använd C++rendering i stället för Java</string>
<string name="print_route">Skriv ut rutt</string>
</resources>
<string name="fav_point_emoticons_message">Vi ändrade namnet på din favoritpunkt till %1$s för att underlätta din smiley i filnamnet.</string>
<string name="speed_limit_exceed_message">Välj hur mycket hastighetsgränsen måste överskridas för att du ska få ett röstmeddelande.</string>
<string name="speed_limit_exceed">Tolerans för hastighetsgräns</string>
</resources>

View file

@ -1826,4 +1826,6 @@
<string name="use_native_render_descr">使用 C++ 替代 JAVA 繪製</string>
<string name="print_route">列印路線</string>
<string name="fav_point_emoticons_message">我們把我的最愛標點名稱,改為 %1$s 是因為它不可能把表情字符儲存成檔案。</string>
</resources>
<string name="speed_limit_exceed">超過速限規定。</string>
<string name="speed_limit_exceed_message">選擇超過速限規定時,您將聽到的語音預告。</string>
</resources>

View file

@ -9,7 +9,9 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="fav_point_emoticons_message">We changed your favorite point name to %1$s because it is not possible to save string with emoticons to file.</string>
<string name="speed_limit_exceed">Speed limit tolerance</string>
<string name ="speed_limit_exceed_message">Select speed limit tolerance margin, above which you will receive a voice warning.</string>
<string name="fav_point_emoticons_message">The favorite point name has been modified to %1$s to facilitate properly saving the string with emoticons to a file.</string>
<string name="print_route">Print route</string>
<string name="test_native_render">Test native render</string>
<string name="test_native_render_msg">Starts activity with native render</string>
@ -90,7 +92,7 @@
<string name="rendering_value_car_name">Car</string>
<string name="rendering_value_bicycle_name">Bicycle</string>
<string name="rendering_value_pedestrian_name">Pedestrian</string>
<string name="rendering_attr_coloredBuildings_name">Colored buildings</string>
<string name="rendering_attr_coloredBuildings_name">Color-code buildings by type</string>
<string name="osmo_invite">Invite...</string>
<string name="osmo_leave_confirmation_msg">Do you want to leave group %1$s?</string>
<string name="osmo_specify_tracker_id">Please specify id</string>
@ -366,8 +368,8 @@
<string name="routing_attr_avoid_ferries_description">Avoid ferries</string>
<string name="routing_attr_avoid_motorway_name">Avoid motorways</string>
<string name="routing_attr_avoid_motorway_description">Avoid motorways</string>
<string name="routing_attr_weight_name">Maximum weight</string>
<string name="routing_attr_weight_description">Specify vehicle weight limitation</string>
<string name="routing_attr_weight_name">Weight limit</string>
<string name="routing_attr_weight_description">Specify vehicle weight to be permitted on routes</string>
<string name="android_19_location_disabled">Since KitKat version you can\'t download and update map in previous storage location (%s). Do you want to change to allowed one and copy all files there?
\n Note: old files will stay untouched.
\n Note: it will not be possible to share files between OsmAnd and OsmAnd+. </string>

View file

@ -23,6 +23,10 @@
android:key="arrival_distance_factor"
android:title="@string/arrival_distance"
android:summary="@string/arrival_distance_descr" />
<ListPreference
android:key="speed_limit_exceed"
android:title="@string/speed_limit_exceed"
android:summary="@string/speed_limit_exceed_message"/>
<CheckBoxPreference android:title="@string/show_zoom_buttons_navigation" android:summary="@string/show_zoom_buttons_navigation_descr" android:key="show_zoom_buttons_navigation" />
</PreferenceCategory>
</PreferenceScreen>

View file

@ -675,6 +675,9 @@ public class OsmandSettings {
public final OsmandPreference<Float> ARRIVAL_DISTANCE_FACTOR =
new FloatPreference("arrival_distance_factor", 1f).makeProfile();
public final OsmandPreference<Float> SPEED_LIMIT_EXCEED =
new FloatPreference("speed_limit_exceed", 5f).makeProfile();
// this value string is synchronized with settings_pref.xml preference name
public final OsmandPreference<Boolean> USE_TRACKBALL_FOR_MOVEMENTS =
new BooleanPreference("use_trackball_for_movements", true).makeGlobal();

View file

@ -213,6 +213,8 @@ public class MapActivity extends AccessibleActivity {
((FrameLayout)mapView.getParent()).addView(lockView);
}
gpxImportHelper = new GpxImportHelper(this, getMyApplication(), getMapView());
mapActions.createOptionsMenuAsDrawer(false);
}
public void addLockView(FrameLayout lockView) {
@ -466,7 +468,7 @@ public class MapActivity extends AccessibleActivity {
}
return true;
} else if (keyCode == KeyEvent.KEYCODE_MENU && event.getRepeatCount() == 0) {
mapActions.openOptionsMenuAsList();
mapActions.createOptionsMenuAsDrawer(true);
return true;
} else if (keyCode == KeyEvent.KEYCODE_SEARCH && event.getRepeatCount() == 0) {
Intent newIntent = new Intent(MapActivity.this, getMyApplication().getAppCustomization().getSearchActivity());

View file

@ -723,12 +723,12 @@ public class MapActivityActions implements DialogProvider {
}
}
public void openOptionsMenuAsDrawer(){
public void createOptionsMenuAsDrawer(boolean show){
final ContextMenuAdapter cm = createOptionsMenu();
final DrawerLayout mDrawerLayout = (DrawerLayout) mapActivity.findViewById(R.id.drawer_layout);
final ListView mDrawerList = (ListView) mapActivity.findViewById(R.id.left_drawer);
mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
ListAdapter listAdapter ;
ListAdapter listAdapter;
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB){
listAdapter =
cm.createListAdapter(mapActivity, R.layout.list_menu_item, getMyApplication().getSettings().isLightContentMenu());
@ -755,7 +755,9 @@ public class MapActivityActions implements DialogProvider {
}
});
mDrawerLayout.openDrawer(mDrawerList);
if (show){
mDrawerLayout.openDrawer(mDrawerList);
}
}
public AlertDialog openOptionsMenuAsList() {

View file

@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.AutoZoomMap;
import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.R;
@ -32,6 +33,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
private Preference speakAlarms;
private ListPreference routerServicePreference;
private ListPreference autoZoomMapPreference;
private ListPreference speedLimitExceed;
private List<RoutingParameter> avoidParameters = new ArrayList<RoutingParameter>();
@ -109,7 +111,32 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
getString(R.string.arrival_distance_factor_at_last)
};
registerListPreference(settings.ARRIVAL_DISTANCE_FACTOR, screen, arrivalNames, arrivalValues);
//array size should be equal!
Float[] speedLimitsKm = new Float[]{5f, 7f, 10f, 15f, 20f};
Float[] speedLimitsMiles = new Float[]{3f, 5f, 7f, 10f, 15f};
if (settings.METRIC_SYSTEM.get() == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS) {
String[] speedNames = new String[speedLimitsKm.length];
for (int i =0; i<speedLimitsKm.length;i++){
speedNames[i] = speedLimitsKm[i] + " " + getString(R.string.km_h);
}
registerListPreference(settings.SPEED_LIMIT_EXCEED, screen, speedNames, speedLimitsKm);
} else {
String[] speedNames = new String[speedLimitsKm.length];
for (int i =0; i<speedNames.length;i++){
speedNames[i] = speedLimitsMiles[i] + " " + getString(R.string.mile_per_hour);
}
registerListPreference(settings.SPEED_LIMIT_EXCEED, screen, speedNames, speedLimitsKm);
}
PreferenceCategory category = (PreferenceCategory) screen.findPreference("guidance_preferences");
speedLimitExceed = (ListPreference) category.findPreference("speed_limit_exceed");
ApplicationMode mode = getMyApplication().getSettings().getApplicationMode();
if (!mode.isDerivedRoutingFrom(ApplicationMode.CAR)) {
category.removePreference(speedLimitExceed);
}
profileDialog();
}
@ -175,6 +202,14 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
cat.addPreference(basePref);
}
}
ApplicationMode mode = getMyApplication().getSettings().getApplicationMode();
if (mode.isDerivedRoutingFrom(ApplicationMode.CAR)) {
PreferenceCategory category = (PreferenceCategory) screen.findPreference("guidance_preferences");
category.addPreference(speedLimitExceed);
} else {
PreferenceCategory category = (PreferenceCategory) screen.findPreference("guidance_preferences");
category.removePreference(speedLimitExceed);
}
}
}

View file

@ -217,6 +217,9 @@ public class DownloadFileHelper {
return false;
}
}
if (de.type == DownloadActivityType.VOICE_FILE){
copyVoiceConfig(de);
}
toReIndex.add(de.targetFile);
showWarningCallback.showWarning(ctx.getString(R.string.download_index_success));
return true;
@ -229,6 +232,23 @@ public class DownloadFileHelper {
}
}
private void copyVoiceConfig(DownloadEntry de) {
File f = ctx.getAppPath("/voice/" + de.baseName + "/_config.p");
if (f.exists()) try {
InputStream is = ctx.getAssets().open("voice/" + de.baseName + "/config.p");
int size = is.available();
byte[] buffer = new byte[size];
is.read(buffer);
is.close();
FileOutputStream fos = new FileOutputStream(f);
fos.write(buffer);
fos.close();
} catch (Exception ex){
log.debug(ex.getMessage());
}
}
private void unzipFile(DownloadEntry de, IProgress progress, List<InputStream> is) throws IOException {
CountingMultiInputStream fin = new CountingMultiInputStream(is);
int len = (int) fin.available();

View file

@ -328,8 +328,8 @@ public class DownloadIndexesThread {
boolean res = false;
if (de.isAsset) {
try {
if (uiActivity != null) {
ResourceManager.copyAssets(uiActivity.getAssets(), de.assetName, de.targetFile);
if (ctx != null) {
ResourceManager.copyAssets(ctx.getAssets(), de.assetName, de.targetFile);
boolean changedDate = de.targetFile.setLastModified(de.dateModified);
if(!changedDate) {
log.error("Set last timestamp is not supported");
@ -527,22 +527,24 @@ public class DownloadIndexesThread {
private void prepareFilesToUpdate() {
List<IndexItem> filtered = getCachedIndexFiles();
itemsToUpdate.clear();
for (IndexItem item : filtered) {
String sfName = item.getTargetFileName();
java.text.DateFormat format = uiActivity.getMyApplication().getResourceManager().getDateFormat();
String date = item.getDate(format);
String indexactivateddate = indexActivatedFileNames.get(sfName);
String indexfilesdate = indexFileNames.get(sfName);
if (date != null &&
!date.equals(indexactivateddate) &&
!date.equals(indexfilesdate) &&
indexActivatedFileNames.containsKey(sfName)) {
itemsToUpdate.add(item);
if (filtered != null) {
itemsToUpdate.clear();
for (IndexItem item : filtered) {
String sfName = item.getTargetFileName();
java.text.DateFormat format = uiActivity.getMyApplication().getResourceManager().getDateFormat();
String date = item.getDate(format);
String indexactivateddate = indexActivatedFileNames.get(sfName);
String indexfilesdate = indexFileNames.get(sfName);
if (date != null &&
!date.equals(indexactivateddate) &&
!date.equals(indexfilesdate) &&
indexActivatedFileNames.containsKey(sfName)) {
itemsToUpdate.add(item);
}
}
if (uiActivity != null){
uiActivity.updateDownloadList(itemsToUpdate);
}
}
if (uiActivity != null){
uiActivity.updateDownloadList(itemsToUpdate);
}
}
@ -550,7 +552,7 @@ public class DownloadIndexesThread {
List<IndexItem> stillUpdate = new ArrayList<IndexItem>();
for (IndexItem item : itemsToUpdate) {
String sfName = item.getTargetFileName();
java.text.DateFormat format = uiActivity.getMyApplication().getResourceManager().getDateFormat();
java.text.DateFormat format = app.getResourceManager().getDateFormat();
String date = item.getDate(format);
String indexactivateddate = indexActivatedFileNames.get(sfName);
String indexfilesdate = indexFileNames.get(sfName);

View file

@ -85,19 +85,6 @@ public class DownloadOsmandIndexesHelper {
File destFile = new File(voicePath, voice + File.separatorChar + "_ttsconfig.p");
result.add(new AssetIndexItem(voice +ext, "voice", date, dateModified,
"0.1", 1024*100, key, destFile.getPath(), DownloadActivityType.VOICE_FILE));
} else if (target.endsWith("/_config.p") && target.startsWith("voice/")) {
String voice = target.substring("voice/".length(), target.length() - "/_config.p".length());
IndexItem item = result.getIndexFilesByName(key);
if (item != null) {
File destFile = new File(voicePath, voice + File.separatorChar + "_config.p");
// always use bundled config
// if (item.getTimestamp() > dateModified) {
// continue;
// }
item.timestamp = dateModified;
item.attachedItem = new AssetIndexItem(voice +extvoice, "voice", date, dateModified, "0.1", 1024*100, key, destFile.getPath(),
DownloadActivityType.VOICE_FILE);
}
}
}
result.sort();

View file

@ -27,7 +27,6 @@ public class IndexItem implements Comparable<IndexItem> {
long timestamp;
long contentSize;
long containerSize;
IndexItem attachedItem;
DownloadActivityType type;
@ -99,13 +98,6 @@ public class IndexItem implements Comparable<IndexItem> {
if (backup.exists()) {
entry.existingBackupFile = backup;
}
if (attachedItem != null) {
ArrayList<DownloadEntry> sz = new ArrayList<DownloadEntry>();
attachedItem.createDownloadEntry(ctx, type, sz);
if(sz.size() > 0) {
entry.attachedEntry = sz.get(0);
}
}
downloadEntries.add(entry);
}
return downloadEntries;

View file

@ -157,7 +157,8 @@ public class WaypointHelper {
public AlarmInfo getMostImportantAlarm(MetricsConstants mc, boolean showCameras) {
Location lastProjection = app.getRoutingHelper().getLastProjection();
float mxspeed = route.getCurrentMaxSpeed();
AlarmInfo speedAlarm = createSpeedAlarm(mc, mxspeed, lastProjection);
float delta = app.getSettings().SPEED_LIMIT_EXCEED.get();
AlarmInfo speedAlarm = createSpeedAlarm(mc, mxspeed, lastProjection, delta);
if (speedAlarm != null) {
getVoiceRouter().announceSpeedAlarm();
}
@ -246,7 +247,8 @@ public class WaypointHelper {
public AlarmInfo calculateMostImportantAlarm(RouteDataObject ro, Location loc,
MetricsConstants mc, boolean showCameras) {
float mxspeed = ro.getMaximumSpeed();
AlarmInfo speedAlarm = createSpeedAlarm(mc, mxspeed, loc);
float delta = app.getSettings().SPEED_LIMIT_EXCEED.get();
AlarmInfo speedAlarm = createSpeedAlarm(mc, mxspeed, loc, delta);
if (speedAlarm != null) {
getVoiceRouter().announceSpeedAlarm();
return speedAlarm;
@ -275,10 +277,9 @@ public class WaypointHelper {
}
private static AlarmInfo createSpeedAlarm(MetricsConstants mc, float mxspeed, Location loc) {
private static AlarmInfo createSpeedAlarm(MetricsConstants mc, float mxspeed, Location loc, float delta) {
AlarmInfo speedAlarm = null;
if (mxspeed != 0 && loc != null && loc.hasSpeed() && mxspeed != RouteDataObject.NONE_MAX_SPEED) {
float delta = 5f / 3.6f;
if (loc.getSpeed() > mxspeed + delta) {
int speed;
if (mc == MetricsConstants.KILOMETERS_AND_METERS) {

View file

@ -506,7 +506,7 @@ public class EditingPOIActivity implements DialogProvider {
private void updateSubTypesAdapter(AmenityType t){
Set<String> subCategories = new LinkedHashSet<String>(MapRenderingTypes.getDefault().getAmenitySubCategories(t));
Set<String> subCategories = new LinkedHashSet<String>(MapRenderingTypes.getDefault().getAmenityAllSubCategories(t));
for(String s : MapRenderingTypes.getDefault().getAmenityNameToType().keySet()){
if(!subCategories.contains(s)){
subCategories.add(s);
@ -606,7 +606,7 @@ public class EditingPOIActivity implements DialogProvider {
case DIALOG_SUB_CATEGORIES: {
Builder builder = new AlertDialog.Builder(ctx);
final Amenity a = (Amenity) args.getSerializable(KEY_AMENITY);
final String[] subCats = MapRenderingTypes.getDefault().getAmenitySubCategories(a.getType()).
final String[] subCats = MapRenderingTypes.getDefault().getAmenityAllSubCategories(a.getType()).
toArray(new String[0]);
builder.setItems(subCats, new DialogInterface.OnClickListener() {
@Override

View file

@ -141,6 +141,10 @@ public class AsyncLoadingThread extends Thread {
requests.push(req);
}
public boolean isFilePendingToDownload(File fileToSave) {
return resourceManger.getMapTileDownloader().isFilePendingToDownload(fileToSave);
}
public boolean isFileCurrentlyDownloaded(File fileToSave) {
return resourceManger.getMapTileDownloader().isFileCurrentlyDownloaded(fileToSave);
}

View file

@ -351,7 +351,8 @@ public class ResourceManager {
if (cacheOfImages.size() > maxImgCacheSize) {
clearTiles();
}
if (req.dirWithTiles.canRead() && !asyncLoadingThread.isFileCurrentlyDownloaded(req.fileToSave)) {
if (req.dirWithTiles.canRead() && !asyncLoadingThread.isFileCurrentlyDownloaded(req.fileToSave)
&& !asyncLoadingThread.isFilePendingToDownload(req.fileToSave)) {
long time = System.currentTimeMillis();
if (log.isDebugEnabled()) {
log.debug("Start loaded file : " + req.tileId + " " + Thread.currentThread().getName()); //$NON-NLS-1$ //$NON-NLS-2$

View file

@ -39,7 +39,7 @@ public class MapMenuControls extends MapControls {
// double lat = activity.getMapView().getLatitude();
// double lon = activity.getMapView().getLongitude();
// MainMenuActivity.backToMainMenuDialog(activity, new LatLon(lat, lon));
mapActivity.getMapActions().openOptionsMenuAsDrawer();
mapActivity.getMapActions().createOptionsMenuAsDrawer(true);
notifyClicked();
}
});

View file

@ -27,7 +27,7 @@ public class SmallMapMenuControls extends MapControls {
public void onClick(View v) {
notifyClicked();
//mapActivity.getMapActions().openOptionsMenuAsDrawer();
mapActivity.getMapActions().openOptionsMenuAsDrawer();
mapActivity.getMapActions().createOptionsMenuAsDrawer(true);
}
});
}

View file

@ -105,7 +105,7 @@ public class MapInfoWidgetsFactory {
dlg.setTitle(app.getString(R.string.sleep_mode_stop_dialog));
//Show currently active wake-up interval
int soi = app.getSettings().SERVICE_OFF_INTERVAL.get();
int soi = app.getNavigationService().getServiceOffInterval();
if (soi == 0) {
dlg.setMessage(app.getString(R.string.gps_wake_up_timer) + ": " + app.getString(R.string.int_continuosly));
} else if (soi <= 90000) {

View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="default_buttons_no">Non</string>
<resources><string name="default_buttons_no">No</string>
<string name="default_buttons_yes">Si</string>
<string name="osmand_app_not_found">OsmAnd non está instalado</string>
<string name="app_name">Aparcar co OsmAnd</string>