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

This commit is contained in:
Victor Shcherb 2015-04-28 20:03:44 +02:00
commit 9c74ddcab8
5 changed files with 29 additions and 13 deletions

View file

@ -468,7 +468,7 @@
<string name="poi_clinic">Poliklinika</string>
<string name="poi_nursing_home">Ošetřovatelský dům</string>
<string name="poi_baby_hatch">Babybox</string>
<string name="poi_sanatorium">Sanatorium</string>
<string name="poi_sanatorium">Ozdravovna</string>
<string name="poi_healthcare_alternative">Alternativní medicína</string>
<string name="poi_audiologist">Ušní</string>
<string name="poi_healthcare_centre">Zdravotnické centrum</string>
@ -755,4 +755,10 @@
<string name="poi_radio_station">Rádiová stanice, vodní značka</string>
<string name="poi_signal_station_traffic">Signální stanice, doprava</string>
<string name="poi_signal_station_warning">Signální stanice, varování</string>
</resources>
<string name="poi_small_craft_facility">Zařízení pro malé lodě</string>
<string name="poi_topmark">Horní značka, vodní značka</string>
<string name="poi_seamark_rock">Skála, vodní značka</string>
<string name="poi_seamark_wreck">Vrak, vodní značka</string>
<string name="poi_military_nuclear_explosion_site">Místo atomového výbuchu</string>
</resources>

View file

@ -2000,14 +2000,14 @@
<string name="index_name_netherlands">Europa - Holland</string>
<string name="rendering_value__name">Standard</string>
<string name="rendering_value_highContrastRoads_name">Veje med høj kontrast</string>
<string name="specified_directiory_not_writeable">Kort kunne ikke oprettes i angivne bibliotek</string>
<string name="specified_directiory_not_writeable">Kunne ikke oprettes kort i det angivne bibliotek</string>
<string name="copying_osmand_file_failed">Kopiering af filer mislykkedes</string>
<string name="storage_directory_external">Ekstern lager</string>
<string name="storage_directory_multiuser">Flerbruger lager</string>
<string name="storage_directory_internal_app">Intern program hukommelse</string>
<string name="storage_directory_internal_app">Intern programhukommelse</string>
<string name="storage_directory_manual">Manuelt angivet</string>
<string name="storage_directory_default">Intern hukommelse</string>
<string name="storage_directory">Lagring af kort</string>
<string name="shared_string_copy">Kopi</string>
<string name="storage_directory_default">Internhukommelse</string>
<string name="storage_directory">Kortagring</string>
<string name="shared_string_copy">Kopier</string>
<string name="application_dir_change_warning3">Skal OsmAnd også kopiere datafilerne til den nye placering?</string>
</resources>

View file

@ -44,7 +44,7 @@
<string name="poi_bakery">Panadería</string>
<string name="poi_alcohol">Licorería</string>
<string name="poi_convenience">Colmado</string>
<string name="poi_convenience">Tienda de comestibles</string>
<string name="poi_mall">Centro comercial</string>
<string name="poi_beverages">Tienda de bebidas</string>
<string name="poi_butcher">Carnicería</string>
@ -465,7 +465,7 @@
<string name="poi_aerialway_magic_carpet">Cinta transportadora</string>
<string name="poi_standpipe">Boca de incendios</string>
<string name="poi_water_works">Recolector de agua potable</string>
<string name="poi_water_works">Aguador</string>
<string name="poi_boatyard">Astillero</string>
<string name="poi_wastewater_plant">Depuradora</string>
<string name="poi_waterway_turning_point">Punto de giro de embarcaciones</string>

View file

@ -1782,7 +1782,7 @@
<string name="download_tab_local">Локальные</string>
<string name="navigate_point_zone">Зона</string>
<string name="rendering_attr_transportStops_name">Остановки транспорта</string>
<string name="shared_string_dismiss">Не отправлять</string>
<string name="shared_string_dismiss">Отклонить</string>
<string name="dash_download_msg_none">Вы хотите загрузить оффлайн карты?</string>
<string name="dash_download_msg">Загружено карт: %1$s</string>
<string name="dash_download_new_one">Загрузить новую карту</string>
@ -1963,4 +1963,14 @@
<string name="filter_poi_hint">Фильтровать по имени</string>
<string name="rendering_value__name">По умолчанию</string>
<string name="rendering_value_highContrastRoads_name">Высокий контраст</string>
</resources>
<string name="storage_directory_default">Внутренняя память</string>
<string name="specified_directiory_not_writeable">Не возможно создать карты в указанном каталоге</string>
<string name="copying_osmand_file_failed">Не удалось переместить файлы</string>
<string name="storage_directory_external">Внешнее хранилище</string>
<string name="storage_directory_multiuser">Многопользовательское хранилище</string>
<string name="storage_directory_internal_app">Внутренняя память приложения</string>
<string name="storage_directory_manual">Указать вручную</string>
<string name="storage_directory">Хранилище карт</string>
<string name="shared_string_copy">Переместить</string>
<string name="application_dir_change_warning3">Переместить также файлы данных OsmAnd в новое место назначения?</string>
</resources>

View file

@ -578,7 +578,7 @@
<string name="m">m</string>
<string name="old_map_index_is_not_supported">Det föråldrade kartdataformatet \"{0}\" stöds inte</string>
<string name="poi_filter_car_aid">Bilhjälp</string>
<string name="poi_filter_closest_poi">Närmaste intressepunkt</string>
<string name="poi_filter_closest_poi">Närmaste intressepunkter</string>
<string name="poi_filter_custom_filter">Anpassat filter</string>
<string name="poi_filter_food_shop">Mataffär</string>
<string name="poi_filter_for_tourists">För turister</string>
@ -708,7 +708,7 @@
<string name="layer_route">Rutt</string>
<string name="layer_osm_bugs">OSM-anteckningar (online)</string>
<string name="layer_transport">Hållplatser</string>
<string name="layer_poi">Intressepunkt …</string>
<string name="layer_poi">Intressepunkter (POI)</string>
<string name="layer_map">Kartkälla …</string>
<string name="menu_layers">Kartlager</string>
<string name="context_menu_item_search_poi">Sök intressepunkt</string>