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

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

Browse source
This commit is contained in:
Victor Shcherb 2015-06-09 00:33:47 +02:00
commit 172db34b80
9 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="shared_string_import2osmand">Zu OsmAnd importieren</string>
<string name="tips_and_tricks_descr">Häufig gestellte Fragen, neueste Änderungen und anderes</string>
<string name="delay_to_start_navigation">Routenführung beginnen nach…</string>
<string name="delay_to_start_navigation_descr">Wartezeit festlegen, um mit der Routenführung zu beginnen</string>

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

@ -2047,4 +2047,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="download_wikipedia_item">Wikipédia</string>
<string name="local_indexes_cat_wiki">Wikipédia</string>
<string name="download_wikipedia_maps">Wikipedia</string>
</resources>
<string name="shared_string_import2osmand">Importer dans OsmAnd</string>
<string name="local_recordings_delete_all_confirm">Vous allez supprimer %1$d notes. Etes-vous sûrs ?</string>
</resources>

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

@ -1602,7 +1602,7 @@
</string>
<string name="use_points_as_intermediates">Útvonal tervezése pontok között</string>
<string name="import_file_favourites">Mentés GPX fájlként, vagy importálás a kedvencekbe?</string>
<string name="import_file_favourites">Pontok mentése GPX fájlként, vagy importálja a kedvencekbe?</string>
<string name="shared_string_share">Megosztás</string>
<string name="share_fav_subject">OsmAndból megosztott kedvencek</string>
@ -1963,4 +1963,6 @@
<string name="download_wikipedia_item">Wikipédia</string>
<string name="local_indexes_cat_wiki">Wikipédia</string>
<string name="download_wikipedia_maps">Wikipédia</string>
</resources>
<string name="shared_string_import2osmand">Importálás az OsmAnd programba</string>
<string name="local_recordings_delete_all_confirm">%1$d jegyzetet fog törölni. Biztos benne?</string>
</resources>

6
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -1454,7 +1454,7 @@
<string name="rotate_map_to_bearing">Orientação do mapa</string>
<string name="show_route">Detalhes da rota</string>
<string name="fav_imported_sucessfully">Favoritos importados</string>
<string name="import_file_favourites">Salvar como arquivo GPX ou importar nos favoritos ?</string>
<string name="import_file_favourites">Salvar pontos como arquivo GPX ou importar para os favoritos ?</string>
<string name="fav_file_to_load_not_found">O arquivo GPX contendo os favoritos não foi encontrado em {0}</string>
<string name="share_fav_subject">Favoritos compartilhados através do OsmAnd</string>
<string name="error_occurred_loading_gpx">Erro ao carregar o arquivo GPX</string>
@ -1712,4 +1712,6 @@
<string name="download_wikipedia_item">Wikipédia</string>
<string name="local_indexes_cat_wiki">Wikipédia</string>
<string name="download_wikipedia_maps">Wikipédia</string>
</resources>
<string name="shared_string_import2osmand">Importar para OsmAnd</string>
<string name="local_recordings_delete_all_confirm">Você vai apagar %1$d notas. Tem certeza?</string>
</resources>

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

@ -1553,7 +1553,7 @@
<string name="osmo_connect_menu">Соединение</string>
<string name="osmo_connect">Подключиться к</string>
<string name="osmo_server_operation_failed">OsMo: не удалось правильно обработать команду</string>
<string name="import_file_favourites">Сохранить как файл GPX или импортировать в избранное?</string>
<string name="import_file_favourites">Сохранить точки как файл GPX или импортировать их в избранное?</string>
<string name="color_red">красный</string>
<string name="color_pink">розовый</string>
@ -1987,4 +1987,10 @@
<string name="rendering_value_walkingRoutesOSMC_name">Раскраска в соответствии с OSMC</string>
<string name="osmo_share_my_location">Поделиться моим местоположением</string>
<string name="shared_string_logoff">Выход</string>
<string name="index_name_netherlands">Европа - Нидерланды</string>
<string name="download_wikipedia_item">Википедия</string>
<string name="local_indexes_cat_wiki">Википедия</string>
<string name="shared_string_show_details">Показать детали</string>
<string name="download_wikipedia_maps">Википедия</string>
<string name="read_full_article">Читать полный текст статьи</string>
</resources>

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

@ -1343,7 +1343,7 @@
<string name="rotate_map_to_bearing_descr">Isseberare s’alliniamentu de sa mapa a s’ischermu</string>
<string name="rotate_map_to_bearing">Orientamentu de sa mapa</string>
<string name="fav_imported_sucessfully">Importatzione de sos prefèrridos cumprida</string>
<string name="import_file_favourites">Sarbare comente documentu GPX o importare in sos prefèrridos?</string>
<string name="import_file_favourites">Sarbare sos puntos comente documentu GPX o importare in sos prefèrridos?</string>
<string name="fav_file_to_load_not_found">Su documentu GPX chi càbit sos prefèrridos no est istadu agatadu in {0}</string>
<string name="fav_saved_sucessfully">Prefèrridos sarbados in {0}</string>
@ -1739,7 +1739,7 @@
<string name="local_index_description">Ischerta unu elementu esistente pro bìere prus minujas, carca e mantène carcau pro lu disativare o burrare. Datos como in su dispositivu (%1$s lìberos):</string>
<string name="text_size_descr">Issèbera sa mannària de su testu in sa mapa.</string>
<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_message">Nùmene prefèrridu giai impreadu, cambiadu in %1$s pro non tènnere duplicados.</string>
<string name="fav_point_dublicate">Nùmene dòpiu in sos prefèrridos</string>
@ -1972,4 +1972,11 @@
<string name="rendering_value_walkingRoutesScopeOSMC_name">Coloratzione a segunda de sa casta de àndala</string>
<string name="rendering_value_walkingRoutesOSMC_name">Coloratzione a segunda de OSMC</string>
<string name="osm_edit_context_menu_delete">Burra modìfica OSM</string>
<string name="shared_string_import2osmand">Importa in OsmAnd</string>
<string name="read_full_article">Leghe s\'artìculu intreu</string>
<string name="download_wikipedia_item">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Ammustra minujas</string>
<string name="local_recordings_delete_all_confirm">Istas pro burrare %1$d notas. Seguru ses?</string>
<string name="download_wikipedia_maps">Wikipedia</string>
</resources>

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

@ -1507,7 +1507,7 @@
<string name="arrival_distance_descr">Hur tidigt vill du höra ankomstmeddelandet?</string>
<string name="create_poi_link_to_osm_doc"><u>Online OSM</u>-kartklassificering med bilder</string>
<string name="import_file_favourites">Spara som GPX-fil eller importera till favoriter?</string>
<string name="import_file_favourites">Spara punkter som GPX-fil eller importera dem till favoriter?</string>
<string name="share_fav_subject">Favoriter utdelade via OsmAnd</string>
<string name="commiting_node">Skickar nod…</string>
<string name="none_selected_gpx">Inga GPX-filer markerade. För att markera tryck och håll ned på tillgängligt spår.</string>
@ -1621,7 +1621,7 @@
<string name="text_size_descr">Ange textstorlek på kartan.</string>
<string name="text_size">Textstorlek</string>
<string name="fav_point_dublicate">Duplicerat namn på favoritpunkt</string>
<string name="fav_point_dublicate_message">Namnet på din favoritpunkt %1$s ändrades för att undvika duplicerade namn.</string>
<string name="fav_point_dublicate_message">Det angivna favoritnamnet finns redan så det ändrades till %1$s för att undvika dubbletter.</string>
<string name="print_route">Skriv ut rutt</string>
@ -1889,4 +1889,6 @@
<string name="download_wikipedia_item">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Visa detaljer</string>
<string name="local_recordings_delete_all_confirm">Du håller på att ta bort %1$d anteckningar. Är du säker?</string>
<string name="download_wikipedia_maps">Wikipedia</string>
</resources>

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

@ -9,6 +9,7 @@
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="shared_string_import2osmand">Import to OsmAnd</string>
<string name="read_full_article">Read full article</string>
<string name="download_wikipedia_item">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string>

1
OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
View file

@ -339,6 +339,7 @@ public class GpxImportHelper {
};
new AlertDialog.Builder(mapActivity)
.setTitle(R.string.shared_string_import2osmand)
.setMessage(R.string.import_file_favourites)
.setPositiveButton(R.string.shared_string_import, importFavouritesListener)
.setNegativeButton(R.string.shared_string_save, importFavouritesListener)