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

This commit is contained in:
Victor Shcherb 2015-11-15 22:27:41 +01:00
commit 9368391c65
4 changed files with 29 additions and 8 deletions

View file

@ -2039,4 +2039,6 @@
<string name="poi_dialog_reopen">Genåbn</string> <string name="poi_dialog_reopen">Genåbn</string>
<string name="osn_close_dialog_success">Fejl lukket</string> <string name="osn_close_dialog_success">Fejl lukket</string>
</resources> <string name="osm_edit_modified_poi">Redigeret OSM IP</string>
<string name="osm_edit_deleted_poi">Slettet OSM IP</string>
</resources>

View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources> <?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="offline_edition">Modifications hors-ligne</string> <string name="offline_edition">Modifications hors-ligne</string>
<string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string> <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
@ -2093,4 +2094,21 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="shared_string_location">Localisation</string> <string name="shared_string_location">Localisation</string>
<string name="context_menu_item_delete_waypoint">Supprimer le point de passage GPX ?</string> <string name="context_menu_item_delete_waypoint">Supprimer le point de passage GPX ?</string>
<string name="context_menu_item_edit_waypoint">Modifier le point de passage GPX</string> <string name="context_menu_item_edit_waypoint">Modifier le point de passage GPX</string>
</resources> <string name="context_menu_item_open_note">Ouvrir la note OSM</string>
<string name="osm_edit_reopened_note">Ré-ouvrir la note OSM</string>
<string name="osm_edit_removed_note">Note OSM supprimée</string>
<string name="osm_edit_created_note">Note OSM créée</string>
<string name="osn_bug_name">Note OSM</string>
<string name="osn_add_dialog_title">Créer une note</string>
<string name="osn_comment_dialog_title">Ajouter un commentaire</string>
<string name="osn_reopen_dialog_title">Ré-ouvrir la note</string>
<string name="osn_close_dialog_title">Fermer la note</string>
<string name="osn_add_dialog_success">Note créée avec succès</string>
<string name="osn_add_dialog_error">Une erreur s\'est produite : la note n\'a pas pu être créée</string>
<string name="osn_close_dialog_success">Le bug a été soumis avec succès</string>
<string name="osn_close_dialog_error">Une erreur s\'est produite : la note ne peut pas être fermée</string>
<string name="shared_string_commit">Soumettre</string>
<string name="poi_dialog_reopen">Ré-ouvrir</string>
<string name="osm_edit_commented_note">Note OSM commentée</string>
</resources>

View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources> <?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string> <string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
<string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string> <string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
<string name="offline_edition">Modifiche offline</string> <string name="offline_edition">Modifiche offline</string>
@ -210,7 +211,7 @@
<string name="yard">iarda</string> <string name="yard">iarda</string>
<string name="foot">piedi</string> <string name="foot">piedi</string>
<string name="mile_per_hour">mph</string> <string name="mile_per_hour">mph</string>
<string name="mile">miglio</string> <string name="mile">miglia</string>
<string name="send_location_way_choose_title">Condividi la posizione usando</string> <string name="send_location_way_choose_title">Condividi la posizione usando</string>
<string name="send_location_sms_pattern">Posizione: %1$s\n%2$s</string> <string name="send_location_sms_pattern">Posizione: %1$s\n%2$s</string>
<string name="send_location_email_pattern">Per vedere la posizione segui il collegamento web %1$s o il collegamento %2$s</string> <string name="send_location_email_pattern">Per vedere la posizione segui il collegamento web %1$s o il collegamento %2$s</string>
@ -2049,4 +2050,4 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="context_menu_item_edit_waypoint">Modifica i waypoint del GPX</string> <string name="context_menu_item_edit_waypoint">Modifica i waypoint del GPX</string>
<string name="shared_string_location">Localizzazione</string> <string name="shared_string_location">Localizzazione</string>
<string name="poi_context_menu_modify_osm_change">Modifica gli edit OSM</string> <string name="poi_context_menu_modify_osm_change">Modifica gli edit OSM</string>
</resources> </resources>

View file

@ -1334,7 +1334,7 @@
<string name="opening_hours">Oràrios pro abèrrere</string> <string name="opening_hours">Oràrios pro abèrrere</string>
<string name="opening_changeset">Abertura modìficas…</string> <string name="opening_changeset">Abertura modìficas…</string>
<string name="closing_changeset">Serradura modìficas…</string> <string name="closing_changeset">Serradura modìficas…</string>
<string name="commiting_node">Sutaponende su nodu…</string> <string name="commiting_node">Imbiande su nodu…</string>
<string name="converting_names">Cunversione nùmenes locales/nùmenes inglesos…</string> <string name="converting_names">Cunversione nùmenes locales/nùmenes inglesos…</string>
<string name="loading_streets_buildings">Carrigamentu istradas/edifìtzios…</string> <string name="loading_streets_buildings">Carrigamentu istradas/edifìtzios…</string>
<string name="loading_postcodes">Carrigamentu CAP…</string> <string name="loading_postcodes">Carrigamentu CAP…</string>
@ -1470,7 +1470,7 @@
<string name="shared_string_delete">Burra</string> <string name="shared_string_delete">Burra</string>
<string name="poi_remove_success">PDI burradu curretamente</string> <string name="poi_remove_success">PDI burradu curretamente</string>
<string name="poi_error_unexpected_template">Errore ispessadu durante sesecutzione de satzione {0}.</string> <string name="poi_error_unexpected_template">Errore ispessadu durante sesecutzione de satzione {0}.</string>
<string name="default_buttons_commit">Esegui</string> <string name="default_buttons_commit">Imbia</string>
<string name="shared_string_clear">Burra</string> <string name="shared_string_clear">Burra</string>
<string name="edit_filter_delete_dialog_title">Burrare su filtru ischertadu?</string> <string name="edit_filter_delete_dialog_title">Burrare su filtru ischertadu?</string>
<string name="edit_filter_delete_message">Su filtru {0} est istadu burradu</string> <string name="edit_filter_delete_message">Su filtru {0} est istadu burradu</string>