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-03-26 22:16:08 +01:00
commit 871f978dac
21 changed files with 523 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/drawable/btn_left_round_transparent.xml
View file

@ -7,8 +7,9 @@
<stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
</shape></item>
<item><shape android:shape="rectangle">
<solid android:color="@color/color_transparent" />
<corners android:topLeftRadius="@dimen/map_button_rect_rad" android:bottomLeftRadius="@dimen/map_button_rect_rad" />
<stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
</shape></item>
</selector>
</selector>

110
OsmAnd/res/layout/dash_first_time.xml Normal file
View file

@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_distance"
android:orientation="vertical"
android:paddingBottom="@dimen/list_content_padding"
android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding"
android:paddingTop="@dimen/list_content_padding">
<TextView
android:id="@+id/velcome_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/list_header_bottom_margin"
android:text="@string/welcome_header"
android:textColor="@color/color_white"
android:textSize="@dimen/welcome_header_text_size"/>
<TextView
android:id="@+id/welcome_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome_text"
android:textColor="@color/color_white"
android:textSize="@dimen/dash_parking_big_text_size"/>
</LinearLayout>
<LinearLayout
android:id="@+id/select_region"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/expandable_list_item_background"
android:minHeight="@dimen/list_item_height"
android:orientation="horizontal"
android:paddingLeft="@dimen/list_content_padding">
<ImageView
android:id="@+id/car_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/list_content_padding"
tools:src="@drawable/ic_action_car_dark"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome_select_region"/>
<TextView
android:id="@+id/region"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="@string/driving_region"/>
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/dashboard_divider"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/list_item_height"
android:orientation="horizontal">
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"/>
<net.osmand.plus.widgets.ButtonEx
android:id="@+id/hide"
style="?attr/dashboardGeneralButtonStyle"
android:text="@string/rendering_category_hide"
osmand:textAllCapsCompat="true"
osmand:typeface="@string/font_roboto_medium"/>
<net.osmand.plus.widgets.ButtonEx
android:id="@+id/download_map"
style="?attr/dashboardGeneralButtonStyle"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/welmode_download_maps"
osmand:textAllCapsCompat="true"
osmand:typeface="@string/font_roboto_medium"/>
</LinearLayout>
</LinearLayout>

17
OsmAnd/res/values-be/phrases.xml
View file

@ -381,7 +381,7 @@
<string name="poi_zoo">Заапарк</string>
<string name="poi_theme_park">Парк забаў</string>
<string name="poi_attraction">Выбітнасьць</string>
<string name="poi_attraction">Турыстычная выбітнасьць</string>
<string name="poi_attraction_big_wheel">Кола агляду</string>
<string name="poi_attraction_carousel">Карусэль</string>
<string name="poi_attraction_maze">Лябірынт</string>
@ -691,4 +691,17 @@
<string name="poi_sightseeing">Славутасьці</string>
<string name="poi_internet_access">Доступ у Інтэрнэт</string>
<string name="poi_cafe_and_restaurant">Кафэ і рэстаран</string>
</resources>
<string name="poi_filling_station">АЗС</string>
<string name="poi_water_transport">Водны транспарт</string>
<string name="poi_bicycle_transport">Роварны транспарт</string>
<string name="poi_water_supply">Водазабесьпячэньне</string>
<string name="poi_trash_disposal">Сьметнік</string>
<string name="poi_shop_food">Прадуктовая крама</string>
<string name="poi_road_obstacle">Дарожная перашкода</string>
<string name="poi_air_transport">Авія транспарт</string>
<string name="poi_aerialway_transport">Лінная дарога</string>
<string name="poi_transport_construction">Транспартнае будаўніцтва</string>
<string name="poi_power">Энэргетыка</string>
<string name="poi_communication">Сувязь</string>
<string name="poi_accomodation">Жыльлё</string>
</resources>

14
OsmAnd/res/values-be/strings.xml
View file

@ -559,7 +559,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="osmand_parking_pm">PM</string>
<string name="osmand_parking_am">AM</string>
<string name="osmand_parking_position_name">Месца стаянкі</string>
<string name="osmand_parking_plugin_description">Гэты модуль дазваляе запомніць месца, дзе прыпаркаваны ваш аўтамабіль.</string>
<string name="osmand_parking_plugin_description">Модуль месца паркоўкі дазваляе запомніць месца, дзе прыпаркаваны ваш аўтамабіль і колькі часу засталося ў выпадку абмежаванай па часе стаянкі. Вы можаце знайсьці вашае месца паркоўкі і час на картцы на панэлі кіраваньня і на віджэце на мапе.\n Ён дадае апавяшчэньне ў календары ў выпадку, калі вы хочаце атрымаць напамін.</string>
<string name="osmand_parking_plugin_name">Месца стаянкі</string>
<string name="context_menu_item_add_parking_point">Пазначыць месца стаянкі</string>
<string name="context_menu_item_delete_parking_point">Выдаліць пазнаку месца стаянкі</string>
@ -632,7 +632,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
\n\t * Графічны інтэрфейс і ўзаемадзеянне * ↵
\n\t → - Палепшана ў многіх напрамках → → ↵
</string>
<string name="osm_editing_plugin_description">Паказвае налады патрэбныя для зваротнай сувязі OSM накшталт збору/зьменаў POI, стварэньня/камэнтаваньня хібаў OSM і дасыланьня запісаных файлаў GPX (патрабуе лагін/пароль OSM).</string>
<string name="osm_editing_plugin_description">З дапамогай гэтага модуля OsmAnd можа быць выкарыстаны для паляпшэньня OSM праз стварэньне або зьмену аб\'ектаў OSM POI, адкрыцьцё або каментуючы OSM памылкі, а таксама адсылаць запісаныя GPX-файлы. OSM разьвіваецца грамадствам, глябальны праект стварэньня мапы агульнай уласнасьці. Для атрыманьня дадатковай інфармацыі, калі ласка, зьвярніцеся на http://openstreetmap.org. Актыўны ўдзел цэніцца, і ўнёскі могуць быць зроблены непасрэдна праз OsmAnd, калі вы ўкажаце свае ўліковыя дадзеныя OSM у наладах.</string>
<string name="vector_maps_may_display_faster_on_some_devices">Вектарныя мапы могуць адлюстроўвацца хутчэй. Падтрымліваецца не ўсімі прыладамі.</string>
<string name="play_commands_of_currently_selected_voice">Прайграць каманды абраным голасам</string>
<string name="debugging_and_development">Для распрацоўшчыкаў OsmAnd</string>
@ -2085,6 +2085,14 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="shared_string_go">Паехалі</string>
<string name="shared_string_not_use">Не выкарыстоўваць</string>
<string name="local_osm_changes_upload_all_confirm">Вы зьбіраецеся адаслаць %1$d зьменаў у OSM. Вы ўпэўненыя?</string>
<string name="plugin_ski_descr">"Модуль для OsmAnd дае вам доступ да дадзеных аб гарналыжных трасах, маршрутах для бегавых лыж, альпійскіх спусках, фунікулёрах і гарналыжных пад\'ёмніках. Маршруты і спускі адзначаны рознымі колерамі ў залежнасці ад іх складанасьці і намаляваныя з выкарыстаньнем адмысловага \"зімовага\" стылю мапы, які заключаецца ў тым, што выкарыстоўваюцца \"сьнежныя\" колеры зімовага пэйзажу.↵\n↵\nСусьветная мапа, на якую нанесеныя ўсе гарналыжныя спускі і лыжныя трасы, даступная для сьцягваньня пад назвай \"World ski map\".↵\n↵\nУ выпадку актывацыі гэтага віду, стыль мапы мяняецца на \"Winter and ski\", паказваючы ўсё дэталі пэйзажу так, як яны выглядаюць зімой. Такі (зімовы) выгляд можа быць адменены альбо шляхам дэактывацыі тут, альбо калі вы памяняеце \"Стыль мапы\" у мэню \"Налада мапы\" на жаданы выгляд. "</string>
<string name="plugin_ski_descr">"Модуль для OsmAnd дае вам доступ да дадзеных аб гарналыжных трасах, маршрутах для бегавых лыж, альпійскіх спусках, фунікулёрах і гарналыжных пад\'ёмніках. Маршруты і спускі адзначаны рознымі колерамі ў залежнасьці ад іх складанасьці і намаляваныя з выкарыстаньнем адмысловага \"зімовага\" стылю мапы, які заключаецца ў тым, што выкарыстоўваюцца \"сьнежныя\" колеры зімовага пэйзажу.↵\n\nУ выпадку актывацыі гэтага віду, стыль мапы мяняецца на \"Winter and ski\", паказваючы ўсё дэталі пэйзажу так, як яны выглядаюць зімой. Такі (зімовы) выгляд можа быць адменены альбо шляхам дэактывацыі тут, альбо калі вы памяняеце \"Стыль мапы\" у мэню \"Налада мапы\" на жаданы выгляд. "</string>
<string name="osmo_grop_name_length_alert">Імя групы павінна быць мінімум 3 сімвала!</string>
<string name="current_route">Бягучы маршрут</string>
<string name="osm_changes_added_to_local_edits">Зьмены OSM дададзеныя да лякальных зьменаў</string>
<string name="mark_to_delete">Пазначыць для выдаленьня</string>
<string name="welmode_download_maps">Сьцягнуць мапы</string>
<string name="welcome_select_region">Абярыце ваш рэгіён</string>
<string name="welcome_text">OsmAnd дазваляе вам карыстацца мапамі і аўтаномнай навігацыяй!</string>
<string name="welcome_header">Вітаем</string>
<string name="plugin_touringview_descr">"Актывацыя гэтага стылю мяняе стыль мапы OsmAnd на \"Турыстычную мапу\", гэта адмысловы высока дэталяваны выгляд для падарожнікаў і прафесійных кіроўцаў. ↵\n↵\nГэты стыль на любым маштабе мапы паказвае максімальную колькасць падрабязнасьцяў для паездкі, наяўных у картаграфічных дадзеных (у прыватнасьці, дарогі, дарожкі, сьцяжынкі, і арыенціры). ↵\n↵\nЁн таксама ясна паказвае ўсе віды дарог праз колеравае кадаваньне, што карысна, для, напрыклад, кіраваньня вялікімі транспартнымі сродкамі. ↵\n↵\nІ ён дадае спецыяльныя турыстычныя налады, такія як веласіпедныя маршруты або альпійскія горныя маршруты. ↵\n↵\nДадатковае сьцягваньне не патрабуецца, выгляд ствараецца з нашых стандартных мапаў. ↵\n↵\nГэты выгляд можа быць дэактываваны тут, або шляхам зьмены \"Стылю мапы\" у разьдзеле \"Налады мапы\" па жаданьні. "</string>
</resources>

7
OsmAnd/res/values-da/strings.xml
View file

@ -297,7 +297,7 @@
<string name="osmand_parking_position_description_add">Afhent bilen:</string>
<string name="osmand_parking_am">AM</string>
<string name="osmand_parking_position_name">Parkeringssted</string>
<string name="osmand_parking_plugin_description">Parkering position plugin kan du nemt huske, når bilen var parkeret, og hvor meget tid tilbage, hvis parkering er tidsbegrænset. Du kan finde din parkering sted og tidspunkt på kortet af kontrolpanelet og på kortet.\n Kan tilføje en meddelelse til kalenderen, hvis man ønsker at få en påmindelse.</string>
<string name="osmand_parking_plugin_description">Parkering udvidelsen gør det nemt huske, hvor bilen er parkeret, og hvor meget tid der er tilbage, hvis parkeringen er tidsbegrænset. Find parkeringsplads og tidspunkt på startsiden og på kortet.\nEn meddelelse kan tilføjes til kalenderen, hvis man ønsker at få en påmindelse.</string>
<string name="osmand_parking_plugin_name">Parkering</string>
<string name="context_menu_item_add_parking_point">Marker som parkeringsplads</string>
<string name="context_menu_item_delete_parking_point">Slet en parkeringsmarkør</string>
@ -1979,4 +1979,9 @@
<string name="osmo_grop_name_length_alert">Gruppenavn skal være på mindst 3 tegn!</string>
<string name="osm_changes_added_to_local_edits">OSM ændringer tilføjet til lokale ændringer</string>
<string name="mark_to_delete">Marker for at slette</string>
<string name="current_route">Aktuel rute</string>
<string name="welmode_download_maps">Hent kort</string>
<string name="welcome_select_region">Vælg region</string>
<string name="welcome_header">Velkommen</string>
<string name="welcome_text">OsmAnd anvender offline kort og navigation!</string>
</resources>

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

@ -912,7 +912,7 @@
<string name="osmand_parking_pm">PM</string>
<string name="osmand_parking_am">AM</string>
<string name="osmand_parking_position_name">Punto de aparcamiento</string>
<string name="osmand_parking_plugin_description">Este extra se desarrolló para usar OsmAnd para memorizar fácilmente la ubicación de tu automóvil aparcado.</string>
<string name="osmand_parking_plugin_description">El extra de Posición de aparcamiento te deja memorizar fácilmente cuándo se aparcó el coche y cuánto tiempo queda si el estacionamiento está limitado por el tiempo. Encontrarás tu lugar de estacionamiento y tiempo en la tarjeta de la consola y en el control del mapa.\n Añade notificación en el calendario en caso de que quieras un recordatorio.</string>
<string name="osmand_parking_plugin_name">Posición de aparcamiento</string>
<string name="context_menu_item_add_parking_point">Marcar como posición de aparcamiento</string>
<string name="context_menu_item_delete_parking_point">Eliminar un marcador de aparcamiento</string>
@ -1991,4 +1991,6 @@
<string name="local_osm_changes_upload_all_confirm">Estás a punto de subir %1$d cambios a OSM. ¿Estás seguro?</string>
<string name="confirmation_to_clear_history">¿Quieres borrar toda la historia?</string>
<string name="osmo_grop_name_length_alert">¡El nombre del grupo debe tener al menos 3 símbolos!</string>
<string name="osm_changes_added_to_local_edits">Cambios OSM añadidos a los cambios locales</string>
<string name="mark_to_delete">Marca para eliminar</string>
</resources>

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

@ -98,7 +98,7 @@
\n\t- Améliorations diverses "</string>
<string name="use_transparent_map_theme">Thème de transparence</string>
<string name="native_library_not_supported">Rendu acceléré non supporté sur cet appareil.</string>
<string name="native_library_not_supported">Rendu natif non supporté sur cet appareil.</string>
<string name="init_native_library">Chargement …</string>
<string name="choose_auto_follow_route">Centrer automatiquement la carte</string>
<string name="choose_auto_follow_route_descr">Temps avant que la carte se recentre sur la position actuelle</string>
@ -106,7 +106,7 @@
<string name="auto_follow_route_navigation">Recentrage automatique navigation</string>
<string name="auto_follow_route_navigation_descr">Recentrage automatique uniquement pendant la navigation.</string>
<string name="auto_follow_location_enabled">Recentrage automatique activé.</string>
<string name="pref_vector_rendering">Options pour le rendu de la carte vectorielle locale</string>
<string name="pref_vector_rendering">Options pour l\'affichage vectoriel</string>
<string name="pref_overlay">Surcouche / sous-couche</string>
<string name="pref_raster_map">Options pour la source des cartes</string>
<string name="pref_vector_map">Options cartographie vectorielle</string>
@ -172,7 +172,7 @@
<string name="local_index_items_uploaded">%1$d sur %2$d élement(s) envoyés avec succès.</string>
<string name="local_index_mi_upload_gpx">Envoyer à OSM</string>
<string name="show_more_map_detail">Afficher plus de détails</string>
<string name="show_more_map_detail_descr">Afficher plus de détails sur les cartes vectorielles (routes etc.) aux niveaux de zooms inférieurs</string>
<string name="show_more_map_detail_descr">Afficher des détails des cartes vectorielles (routes etc.) aux niveaux de zooms inférieurs</string>
<string name="favourites_delete_multiple_succesful">Favori(s) supprimé(s) avec succès.</string>
<string name="favorite_delete_multiple">Vous allez supprimer %1$d favoris et %2$d groupes de favoris. Êtes-vous sûr ?</string>
<string name="favorite_home_category">Domicile</string>
@ -267,7 +267,7 @@
\n\n\'Vert\' - pour les cartes à jour avec le serveur
\n\n\'Bleu\' - pour les cartes qui peuvent être mises à jour depuis le serveur
\n\n\'Italique\' - pour les cartes désactivées sur l\'appareil "</string>
<string name="level_to_switch_vector_raster_descr">Niveau de zoom maximum pour l\'utilisation des cartes vectorielles au lieu des tuiles de carte</string>
<string name="level_to_switch_vector_raster_descr">Niveau de zoom minimum pour l\'utilisation des cartes vectorielles</string>
<string name="level_to_switch_vector_raster">Niveau de zoom vectoriel</string>
<string name="tip_location_sharing">Partager la position</string>
<string name="tip_location_sharing_t">"Durant votre itinéraire, vous notez un point d\'intérêt que vous voulez partager avec des amis ou de la famille ?
@ -402,15 +402,15 @@
<string name="context_menu_item_download_map">Télécharger la carte</string>
<string name="select_max_zoom_preload_area">Sélectionnez le zoom maximum pour précharger la zone visible</string>
<string name="maps_could_not_be_downloaded">Impossible de télécharger cette carte</string>
<string name="continuous_rendering">Rendu continu</string>
<string name="continuous_rendering_descr">Choisir d\'afficher le rendu continu ou une image entière</string>
<string name="continuous_rendering">Affichage continu</string>
<string name="continuous_rendering_descr">Affichage continu plutôt qu\'image par image</string>
<string name="rendering_exception">Erreur lors de l\'affichage de la zone sélectionnée</string>
<string name="rendering_out_of_memory">Pas suffisamment de mémoire pour afficher la zone sélectionnée</string>
<string name="show_point_options">Utiliser ce point</string>
<string name="renderer_load_sucess">Moteur de rendu chargé avec succès</string>
<string name="renderer_load_exception">Erreur: le moteur de rendu n\'est pas chargé</string>
<string name="renderers">Rendu vectoriel</string>
<string name="renderers_descr">Choisir le style de rendu vectoriel</string>
<string name="renderer_load_exception">Erreur : le moteur de rendu n\'est pas chargé</string>
<string name="renderers">Affichage vectoriel</string>
<string name="renderers_descr">Sélectionnez le style d\'affichage</string>
<string name="poi_context_menu_website">Afficher le site web du PI</string>
<string name="poi_context_menu_call">Afficher le numéro téléphone du PI</string>
<string name="website">Site web</string>
@ -451,7 +451,7 @@
<string name="shared_string_import">Importer</string>
<string name="error_occurred_loading_gpx">Erreur lors du chargement du fichier GPX</string>
<string name="send_report">Envoyer rapport</string>
<string name="send_report">Envoyer le rapport</string>
<string name="none_region_found">Aucune région trouvée sur la carte SD. Essayez d\'en télécharger une d\'internet.</string>
<string name="poi_namefinder_query_empty">Paramètres de recherche pour trouver le PI</string>
<string name="any_poi">Tout</string>
@ -543,7 +543,7 @@
<string name="update_poi_error_local">Erreur de mise à jour des index locaux</string>
<string name="update_poi_error_loading">Erreur lors du chargement des données du serveur</string>
<string name="update_poi_no_offline_poi_index">Il n\'y a pas de données hors-ligne pour cette région</string>
<string name="update_poi_is_not_available_for_zoom">Mise à jour de PI n\'est pas disponible pour un petit niveau de zoom</string>
<string name="update_poi_is_not_available_for_zoom">La mise à jour des PI n\'est pas disponible pour un faible niveau de zoom</string>
<string name="context_menu_item_update_poi">Mettre à jour les points d\'intérêt</string>
<string name="context_menu_item_update_map_confirm">Mettre à jour les données locales via Internet ?</string>
<string name="search_history_city">Ville :\n{0}</string>
@ -563,7 +563,7 @@
<string name="search_offline_address">Hors-ligne</string>
<string name="search_online_address">Internet</string>
<string name="max_level_download_tile">Niveau de zoom maximum</string>
<string name="max_level_download_tile_descr">Choisir un niveau de zoom maximum pour le téléchargement</string>
<string name="max_level_download_tile_descr">Sélectionnez un niveau de zoom maximum pour le téléchargement des cartes (tuiles) en ligne</string>
<string name="route_general_information">Distance totale : %1$s, temps de trajet estimé : %2$d h %3$d m.</string>
<string name="router_service_descr">Sélectionner un service de navigation, hors-ligne ou en ligne</string>
<string name="router_service">Service de navigation</string>
@ -613,7 +613,7 @@
<string name="shared_string_close">Fermer</string>
<string name="loading_data">Chargement des données</string>
<string name="reading_indexes">Lecture des index…</string>
<string name="previous_run_crashed">La précédente exécution de l\'application s\'est arrêtée inopinément. Veuillez faire part du problème en incluant le journal {0}.</string>
<string name="previous_run_crashed">OsmAnd s\'est arrêté anormalement. Souhaitez-vous nous envoyer le fichier journal {0} ?</string>
<string name="saving_gpx_tracks">Enregistrement des traces GPX sur la carte SD…</string>
<string name="finished_task">Terminé</string>
@ -858,7 +858,7 @@
<string name="scroll_map_by_gestures_descr">Faire défiler la carte par gestes sur l\'écran</string>
<string name="scroll_map_by_gestures">Défilement naturel de la carte</string>
<string name="i_am_here">Je suis ici</string>
<string name="zoom_by_trackball_descr">Changer le niveau de zoom par mouvements horizontaux du trackball</string>
<string name="zoom_by_trackball_descr">Modifier le niveau de zoom par mouvements horizontaux du trackball</string>
<string name="zoom_by_trackball">Utiliser le trackball pour le contrôle du zoom</string>
<string name="use_short_object_names_descr">Utiliser les noms d\'objets courts</string>
<string name="use_short_object_names">Utiliser les noms d\'objets</string>
@ -884,9 +884,9 @@
<string name="route_kr">Serrez à droite et continuez</string>
<string name="rendering_attr_noPolygons_description">Rendre invisibles les surfaces représentant des éléments de terrain</string>
<string name="rendering_attr_noPolygons_name">Pas de polygones</string>
<string name="rendering_attr_appMode_name">Profil pour le rendu</string>
<string name="rendering_attr_appMode_name">Profil pour l\'affichage</string>
<string name="rendering_attr_appMode_description">Optimisation de la carte selon le profil d\'utilisation</string>
<string name="rendering_attr_contourLines_description">Afficher à partir du niveau de zoom (fichier SRTM nécessaire) :</string>
<string name="rendering_attr_contourLines_description">Afficher à partir du niveau de zoom (données courbes de niveau requises)</string>
<string name="rendering_attr_contourLines_name">Afficher les courbes de niveau</string>
<string name="rendering_attr_hmRendered_description">Augmenter le niveau de détail affiché</string>
<string name="rendering_attr_hmRendered_name">Afficher plus de détail</string>
@ -998,7 +998,7 @@
\nCoucher : %2$s</string>
<string name="day_night_info">Information jour/nuit</string>
<string name="filterpoi_activity">Créer un filtre des PI</string>
<string name="map_widget_renderer">Style de rendu</string>
<string name="map_widget_renderer">Style de carte</string>
<string name="int_continuosly">En continu</string>
<string name="tip_rotation_switching_t_v2">"Vous pouvez modifier l\'orientation de la carte par un appui court sur l\'icône de la boussole
\n\tLes choix sont :
@ -1022,8 +1022,8 @@
\n* Parcours cycliste=affichage de la piste
\n* Amélioration de l\'interface (icônes)
\n* Nombreuses corrections de bugs "</string>
<string name="snap_to_road_descr">Coller à la route pendant la navigation</string>
<string name="snap_to_road">Coller à la route</string>
<string name="snap_to_road_descr">Déplacer la position sur la route pendant la navigation</string>
<string name="snap_to_road">Déplacer sur la route</string>
<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes hors-lignes compactes disponibles pour le monde entier - Téléchargement des cartes pour un pays ou une région directement depuis l\'application - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt (PI), des favoris, des courbes de niveau, les arrêts de transport public, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) Limitations de la version gratuite de OsmAnd : - Nombre de téléchargement de cartes limité - Pas d\'accès aux PI Wikipédia hors-ligne. OsmAnd est activement développé et notre projet et ses progrès futurs dépendent des contributions financières pour financer le développement et le test de nouvelles fonctionnalités. Veuillez considérer l\'achat d\'OsmAnd+, le financement d\'une fonctionnalité spécifique, ou un donation sur osmand.net. "</string>
<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. OsmAnd+ est la version payante de l\'application, en l\'achetant vous supportez le projet, financez le développement de nouvelles fonctionnalités, et recevez les dernières mises à jour. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes es compactes disponibles pour le monde entier - Téléchargement illimité des cartes pour un pays ou une région directement depuis l\'application - Points d\'intérêt (PI) Wikipédia hors-ligne, parfait pour le tourisme - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt, des favoris, des courbes de niveau, les arrêts de transport public, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) - Affichage des limitations de vitesse, voix enregistrées et voix de synthèse "</string>
<string name="tip_map_switch_t_v2">"La source des cartes et des couches affichées est modifiable via \'Menu\' → \'Affichage de la carte\' → \'Source de la carte…\'.
@ -1065,7 +1065,7 @@
<string name="map_widget_show_destination_arrow">Direction de la destination</string>
<string name="enable_plugin_monitoring_services">Activez le greffon de suivi pour utiliser les services d\'enregistrement des traces</string>
<string name="non_optimal_route_calculation">Calcule un itinéraire éventuellement non optimal pour les trajets longues distances</string>
<string name="rendering_attr_roadColors_description">Sélectionner un thème de couleurs pour les routes :</string>
<string name="rendering_attr_roadColors_description">Sélectionnez un thème de couleurs pour les routes :</string>
<string name="rendering_attr_roadColors_name">Thème de couleurs pour les routes</string>
<string name="zxing_barcode_scanner_not_found">L’application ZXing Barcode Scanner n\'est pas installée. Souhaitez-vous l\'installer depuis la boutique ?</string>
<string name="close_changeset">Clôturer les modifications</string>
@ -1075,11 +1075,11 @@
<string name="safe_mode_description">Exécuter l\'application en mode sûr (utiliser le code Android plus lent plutôt que le code natif)</string>
<string name="safe_mode">Mode sûr</string>
<string name="native_library_not_running">L\'application s\'exécute en mode sûr (peut être désactivé dans Paramètres).</string>
<string name="rendering_attr_showRoadMaps_description">Sélectionner à quel moment afficher les cartes uniquement routières :</string>
<string name="rendering_attr_showRoadMaps_name">Cartes uniquement routières</string>
<string name="rendering_attr_showRoadMaps_description">Sélectionnez quand afficher les cartes routières :</string>
<string name="rendering_attr_showRoadMaps_name">Cartes routières uniquement</string>
<string name="download_roads_only_item">Routes uniquement</string>
<string name="download_regular_maps">Cartes standards</string>
<string name="download_roads_only_maps">Cartes uniquement routières</string>
<string name="download_roads_only_maps">Cartes routières uniquement</string>
<string name="incomplete_locale">incomplet</string>
<string name="no_buildings_found">Aucun numéro de bâtiment trouvé.</string>
<string name="search_villages_and_postcodes">Rechercher les villages et les codes postaux</string>
@ -1153,7 +1153,7 @@
\n\t* Correction pour le référentiel EGM96 lors de la lecture de l\'altitude avec le GPS"
</string>
<string name="shared_string_control_start">Démarrer</string>
<string name="srtm_paid_version_msg">Veuillez acheter le greffon \"Courbes de niveau\" sur Market pour soutenir le développement futur.</string>
<string name="srtm_paid_version_msg">Merci d\'acheter le greffon \"Courbes de niveau\" pour soutenir les développements futurs.</string>
<string name="srtm_paid_version_title">Greffon \"Courbes de niveau\"</string>
<string name="intermediate_points_change_order">Modifier l\'ordre</string>
@ -1296,7 +1296,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="cancel_navigation">Arrêter la navigation</string>
<string name="clear_destination">Supprimer la destination</string>
<string name="other_location">Autre</string>
<string name="files_limit">Il reste %1$d fichiers</string>
<string name="files_limit">Encore %1$d téléchargements possibles</string>
<string name="available_downloads_left">Vous pouvez encore télécharger %1$d fichier(s).</string>
<string name="install_paid">Version complète</string>
<string name="use_magnetic_sensor_descr">Utiliser le magnétomètre pour déterminer l\'orientation de la boussole au lieu du capteur d\'orientation</string>
@ -1305,7 +1305,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="use_kalman_filter_compass_descr">Réduit le bruit sur les mesures de la boussole, mais ajoute de l\'inertie</string>
<string name="use_kalman_filter_compass">Utiliser un filtre de Kalman</string>
<string name="access_mark_final_location_first">Mode d\'accessibilité : veuillez d\'abord définir une destination</string>
<string name="distance_measurement_start_editing">Mesurer sur la carte</string>
<string name="distance_measurement_start_editing">Démarrer la mesure sur la carte</string>
<string name="distance_measurement_finish_editing">Terminer la mesure</string>
<string name="distance_measurement_save_gpx">Enregistrer comme GPX...</string>
<string name="distance_measurement_load_gpx">Ouvrir un fichier GPX existant...</string>
@ -1324,7 +1324,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="local_osm_changes_backup">Sauvegarder comme une modification OSM</string>
<string name="delete_point">Supprimer le point de mesure</string>
<string name="plugin_distance_point">Point</string>
<string name="use_distance_measurement_help">* Appui bref pour ajouter un point\n* Appui long sur un point pour afficher sa description puis nouvel appui dans la bulle d\'information pour le supprimer\n* Appui sur le gadget de mesure pour plus d\'actions.</string>
<string name="use_distance_measurement_help">* Ajout d\'un point : appui bref sur la carte\n* Suppression d\'un point : appui long sur le point (affiche une bulle d\'information) puis nouvel appui dans la bulle pour Supprimer le point\n* Pour plus d\'actions : appuyez sur le gadget de mesure.</string>
<string name="distance_measurement_finish_subtrack">Ajouter une nouvelle mesure</string>
<string name="distance_measurement_clear_route">Supprimer la mesure</string>
<string name="shared_string_downloading">Téléchargement en cours</string>
@ -1366,8 +1366,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="speak_cameras">Annoncer les radars</string>
<string name="speak_traffic_warnings">Annoncer les stops et les ralentisseurs</string>
<string name="osb_author_or_password_not_specified">Merci de spécifier votre nom d\'utilisateur et mot de passe OSM dans les paramètres</string>
<string name="clear_intermediate_points">Supprimer les points de passage</string>
<string name="keep_intermediate_points">Conserver les points de passage</string>
<string name="clear_intermediate_points">Supprimer les étapes intermédiaires</string>
<string name="keep_intermediate_points">Conserver les étapes intermédiaires</string>
<string name="local_index_tile_data_name">Données de tuile : %1$s</string>
<string name="edit_tilesource_successfully">Le fournisseur de tuiles %1$s a été enregistré avec succès.</string>
<string name="edit_tilesource_elliptic_tile">Mercator elliptique</string>
@ -1375,7 +1375,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="maps_define_edit">Définir/Éditer…</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 de passage.</string>
<string name="new_directions_point_dialog">Vous avez déjà défini des étapes intermédiaires.</string>
<string name="context_menu_item_directions_to">Aller vers ce point</string>
<string name="context_menu_item_directions_from">Partir de ce point</string>
<string name="route_descr_map_location">Carte : </string>
@ -1451,7 +1451,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="app_mode_aircraft">Avion</string>
<string name="app_modes_choose_descr">Choisir les profils d\'utilisation à afficher dans l\'application</string>
<string name="app_modes_choose">Profils d\'application</string>
<string name="map_widget_map_rendering">Rendu de carte</string>
<string name="map_widget_map_rendering">Affichage de la carte</string>
<string name="amenity_type_seamark">Balise marine</string>
@ -1572,8 +1572,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="osmo_io_error">Problème de connexion OSMo : </string>
<string name="osmo_mode_on">Arrêter session OsMo</string>
<string name="osmo_mode_off">Démarrer session OsMo</string>
<string name="osmo_mode_restart">Redémarrer session OsMo</string>
<string name="osmo_mode_off">Démarrer la session OsMo</string>
<string name="osmo_mode_restart">Redémarrer la session OsMo</string>
<string name="osmo_settings_debug">Informations de débogage</string>
<string name="osmo_tracker_id">Identifiant personnel de suivi</string>
<string name="osmo_tracker_id_descr">Cliquer pour voir ou partager l\'identifiant de suivi.
@ -1763,7 +1763,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="continue_navigation">Reprendre la navigation</string>
<string name="pause_navigation">Interrompre la navigation</string>
<string name="rendering_attr_subwayMode_name">Itinéraires de métropolitain</string>
<string name="rendering_attr_alpineHiking_name">Difficulté des randonnées alpines</string>
<string name="rendering_attr_alpineHiking_name">Difficulté des randonnées en montagne</string>
<string name="rendering_attr_alpineHiking_description">Afficher les chemins selon l\'échelle SAC</string>
<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>
@ -1907,7 +1907,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="settings_privacy">Confidentialité</string>
<string name="rendering_attr_streetLighting_name">Éclairage public</string>
<string name="enable_proxy_title">Activer le mandataire HTTP (Proxy)</string>
<string name="version_settings_descr">Télécharger les versions en cours développement</string>
<string name="version_settings_descr">Télécharger les versions en cours de développement</string>
<string name="version_settings">Versions de développement</string>
<string name="points">Points</string>
@ -1957,7 +1957,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
\n\nCet affichage peut être annulé soit en le désactivant ici soit en modifiant le Style de carte sous \"Configurer la carte\".
</string>
<string name="location_on_map">Position :\n Lat. %1$s\n Lon. %2$s</string>
<string name="days_behind">jours écoulés</string>
<string name="days_behind">jours passés</string>
<string name="rename_failed">Échec du renommage.</string>
<string name="shared_string_currently_recording_track">Enregistrement de l\'itinéraire en cours</string>
<string name="back_to_map">Retour à la carte</string>
@ -1965,7 +1965,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="shared_string_selected">Sélectionné</string>
<string name="track_points">Points de piste</string>
<string name="route_points">Points de passage</string>
<string name="route_points">Itinéraire</string>
<string name="track_segments">Segments de la voie</string>
<string name="simulate_your_location">Simulez votre position</string>
<string name="short_location_on_map">Lat. %1$s\nLon. %2$s</string>
@ -2000,4 +2000,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="osmo_grop_name_length_alert">Le nom d\'un groupe doit être de 3 caractères minimum !</string>
<string name="osm_changes_added_to_local_edits">Modifications OSM ajoutées localement</string>
<string name="mark_to_delete">Marquer pour suppression</string>
</resources>
<string name="current_route">Itinéraire actuel</string>
</resources>

155
OsmAnd/res/values-ja/phrases.xml
View file

@ -1,24 +1,133 @@
<?xml version="1.0" ?>
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="poi_airport">空港</string>
<string name="poi_bank">銀行</string>
<string name="poi_bus_stop">バス停</string>
<string name="poi_car_rental">レンタカー</string>
<string name="poi_car_wash">洗車</string>
<string name="poi_casino">賭場</string>
<string name="poi_city">市</string>
<string name="poi_college">大学</string>
<string name="poi_dentist">歯科医</string>
<string name="poi_embassy">大使館</string>
<string name="poi_hotel">ホテル</string>
<string name="poi_kindergarten">幼稚園</string>
<string name="poi_library">図書館</string>
<string name="poi_pub">パブ（立ち吞み屋）</string>
<string name="poi_sauna">サウナ</string>
<string name="poi_school">学校</string>
<string name="poi_general">店舗</string>
<string name="poi_taxi">タクシー乗り場</string>
<string name="poi_theme_park">テーマパーク</string>
<string name="poi_university">大学</string>
<string name="poi_zoo">動物園</string>
</resources>
<string name="poi_airport">空港(Aireport)</string>
<string name="poi_bank">銀行(Bank)</string>
<string name="poi_bus_stop">バス停(Bus stop)</string>
<string name="poi_car_rental">レンタカー(Car rental)</string>
<string name="poi_car_wash">洗車(Car wash)</string>
<string name="poi_casino">賭場(Casino)</string>
<string name="poi_city">市(City)</string>
<string name="poi_college">大学(College)</string>
<string name="poi_dentist">歯科医(Dentist)</string>
<string name="poi_embassy">大使館(Embassy)</string>
<string name="poi_hotel">ホテル(Hotel)</string>
<string name="poi_kindergarten">幼稚園(Kindergarten)</string>
<string name="poi_library">図書館(Library)</string>
<string name="poi_pub">パブ・立ち呑み屋(Pub)</string>
<string name="poi_sauna">サウナ(Sauna)</string>
<string name="poi_school">学校(School)</string>
<string name="poi_general">雑貨店(General store)</string>
<string name="poi_taxi">タクシー乗り場(Taxi)</string>
<string name="poi_theme_park">テーマパーク(Theme park)</string>
<string name="poi_university">大学(University)</string>
<string name="poi_zoo">動物園(Zoo)</string>
<string name="poi_shop">店(Shop)</string>
<string name="poi_shop_food">食料品店(Food store)</string>
<string name="poi_emergency">救急施設(Emergency)</string>
<string name="poi_transportation">交通機関(Transportation)</string>
<string name="poi_road_obstacle">道路障害物(Road obstacle)</string>
<string name="poi_filling_station">給油所(Filling station)</string>
<string name="poi_personal_transport">私設交通機関(Personal transport)</string>
<string name="poi_public_transport">公共交通機関(Public transport)</string>
<string name="poi_air_transport">航空路(Air transport)</string>
<string name="poi_water_transport">水上交通(Water transport)</string>
<string name="poi_bicycle_transport">自転車交通(Bicycle transport)</string>
<string name="poi_aerialway_transport">索道・ロープウェイ(Aerialway transport)</string>
<string name="poi_man_made">人工物(Man made)</string>
<string name="poi_transport_construction">建設中の交通機関(Transport construction)</string>
<string name="poi_water_supply">井戸・給水所(Water supply)</string>
<string name="poi_power">発電所(Power)</string>
<string name="poi_communication">通信施設(Communication)</string>
<string name="poi_trash_disposal">ゴミ処理施設(Trash disposal)</string>
<string name="poi_education">教育(Education)</string>
<string name="poi_administrative">行政区域(Administrative)</string>
<string name="poi_healthcare">健康(Healthcare)</string>
<string name="poi_office">オフィス(Office)</string>
<string name="poi_sport">スポーツ(Sport)</string>
<string name="poi_tourism">観光(Tourism)</string>
<string name="poi_sightseeing">観光(Sightseeing)</string>
<string name="poi_accomodation">宿泊施設(Accomodation)</string>
<string name="poi_internet_access">インターネット有り(Internet access)</string>
<string name="poi_entertainment">レジャー(Leisure)</string>
<string name="poi_club">クラブ(Club)</string>
<string name="poi_sustenance">食堂(Food)</string>
<string name="poi_cafe_and_restaurant">軽食(Cafe and restaurant)</string>
<string name="poi_service">サービス(Service)</string>
<string name="poi_craft">工芸(Craft)</string>
<string name="poi_finance">金融機関(Finance)</string>
<string name="poi_natural">自然(Natural)</string>
<string name="poi_seamark">船舶(Nautical)</string>
<string name="poi_military">軍事施設(Military)</string>
<string name="poi_osmwiki">ウィキペディア(Wikipedia)</string>
<string name="poi_user_defined_other">ユーザー定義(User defined)</string>
<string name="poi_palaeontological_site">化石出土地(Palaeontological site)</string>
<string name="poi_bakery">パン屋(Bakery)</string>
<string name="poi_alcohol">酒屋(Liquor store)</string>
<string name="poi_convenience">コンビニエンスストア(Convenience store)</string>
<string name="poi_mall">ショッピングセンター(Mall)</string>
<string name="poi_beverages">飲料品店(Beverage store)</string>
<string name="poi_butcher">肉屋(Meat market)</string>
<string name="poi_deli">総菜屋(Deli)</string>
<string name="poi_farm">農作物直売所(Farm shop)</string>
<string name="poi_greengrocer">青果店(Greengrocery)</string>
<string name="poi_seafood">魚屋(Seafood store)</string>
<string name="poi_confectionery">菓子屋(Confectionery)</string>
<string name="poi_ice_cream">アイスクリーム屋(Ice cream parlor)</string>
<string name="poi_supermarket">スーパーマーケット(Supermarket)</string>
<string name="poi_shop_tea">ティーショップ(Tea shop)</string>
<string name="poi_dairy">乳製品店</string>
<string name="poi_vending_machine">自動販売機(Vending machine)</string>
<string name="poi_wine">ワインショップ(Wine shop)</string>
<string name="poi_books">書店(Bookstore)</string>
<string name="poi_bicycle">自転車屋(Bicycle shop)</string>
<string name="poi_anime">アニメショップ(Anime shop)</string>
<string name="poi_antiques">骨董品店(Antiques store)</string>
<string name="poi_art">画材屋(Art shop)</string>
<string name="poi_baby_goods">ベビー用品(Baby goods)</string>
<string name="poi_bag">カバン店(Bag shop)</string>
<string name="poi_bathroom_furnishing">浴室及びトイレ家具</string>
<string name="poi_bed">寝室家具</string>
<string name="poi_boutique">ブティック(Fashion boutique)</string>
<string name="poi_carpet">敷物店(Carpet shop)</string>
<string name="poi_chemist">ドラッグストア・薬局(Drug store)</string>
<string name="poi_clothes">衣料品店(Apparel store)</string>
<string name="poi_child_clothes">子供用衣料品店(Childrens apparel)</string>
<string name="poi_shoes">靴屋(Shoe store)</string>
<string name="poi_computer">パソコンショップ(Computer store)</string>
<string name="poi_copyshop">印刷、現像店(Copy shop)</string>
<string name="poi_curtain">カーテンショップ(Curtain shop)</string>
<string name="poi_fabric">生地・呉服店(Drapery shop)</string>
<string name="poi_bedding">寝具店(Bedding store)</string>
<string name="poi_dive">ダイビング用品(Diving equipment)</string>
<string name="poi_doityourself">DIY・日曜大工用品店(Home improvement store)</string>
<string name="poi_erotic">アダルトショップ(Erotic shop)</string>
<string name="poi_fishing">釣り具(Fishing tackle)</string>
<string name="poi_florist">フラワーショップ(Flower shop)</string>
<string name="poi_frame">額縁屋(Picture frame shop)</string>
<string name="poi_furniture">家具店(Furniture store)</string>
<string name="poi_garden_centre">園芸用品店(Garden center)</string>
<string name="poi_gas">ガス店(Liquid gas store)</string>
<string name="poi_gift">ギフトショップ(Gift shop)</string>
<string name="poi_glaziery">ガラス店(Glaziery)</string>
<string name="poi_hardware">金物屋(Hardware store)</string>
<string name="poi_hearing_aids">補聴器(Hearing aids)</string>
<string name="poi_herbalist">ハーブ店(Herb store)</string>
<string name="poi_hifi">オーディオ店(HiFi store)</string>
<string name="poi_houseware">家庭用品店(Household supply store)</string>
<string name="poi_hunting">狩猟用具(Hunting equipment)</string>
<string name="poi_interior_decoration">室内装飾店(Interior decoration store)</string>
<string name="poi_jewelry">宝石店(Jewelry store)</string>
<string name="poi_kiosk">キオスク(Kiosk)</string>
<string name="poi_kitchen">キッチン家具(Kitchen furnishings)</string>
<string name="poi_mobile_phone">携帯電話ショップ(Cell phone store)</string>
<string name="poi_motorcycle">バイク屋(Motorcycle shop)</string>
<string name="poi_musical_instrument">楽器(Musical instruments)</string>
<string name="poi_newsagent">新聞・週刊誌店(Newsagency)</string>
<string name="poi_optician">検眼医(Optometrist)</string>
<string name="poi_organic">自然食品(Organic food)</string>
<string name="poi_outdoor">アウトドア用品店(Outdoor store)</string>
<string name="poi_paint">ペンキ・塗装屋(Paint shop)</string>
</resources>

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

@ -865,7 +865,7 @@
<string name="zoomOut">Уменьшить</string>
<string name="zoomIn">Увеличить</string>
<string name="zoomIs">Масштаб</string>
<string name="show_details">Подробности</string>
<string name="show_details">Подробности о положении</string>
<string name="back_to_location">Вернуться</string>
<string name="north">север</string>
<string name="north_north_east">северо-северо-восток</string>
@ -1939,4 +1939,9 @@
<string name="confirmation_to_clear_history">Вы хотите очистить всю историю?</string>
<string name="plugin_ski_descr">"Плагин обеспечивает вам доступ к данным о горнолыжных трассах, маршрутах для беговых лыж, альпийских спусках, фуникулерах и горнолыжных подъемниках. Маршруты и спуски отмечены разными цветами в зависимости от их сложности и изображены с использованием специального \"зимнего\" стиля карты, который заключается в том, что используются \"снежные\" цвета зимнего пейзажа.\n\nВ случае активации этого вида, стиль карты меняется на \"Winter and ski\", показывая все детали пейзажа так, как они выглядят зимой. Такой (зимний) вид может быть отменен либо путем деактивации здесь, либо если вы поменяете \"Стиль карты\" в меню \"Настройка карты\" на желаемый вид. "</string>
<string name="osmo_grop_name_length_alert">Имя группы должно быть минимум 3 символа!</string>
<string name="current_route">Текущий маршрут</string>
<string name="welmode_download_maps">Скачать карты</string>
<string name="welcome_select_region">Выберите свой регион</string>
<string name="welcome_header">Добро пожаловать</string>
<string name="mark_to_delete">Отметить для удаления</string>
</resources>

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

@ -790,7 +790,8 @@
<string name="osmand_parking_pm">PM</string>
<string name="osmand_parking_am">AM</string>
<string name="osmand_parking_position_name">Puntu de parchègiu</string>
<string name="osmand_parking_plugin_description">Custu plugin est istadu isvilupadu pro impreare OsmAnd pro ammentare su logu de parchègiu de sa màchina tua.</string>
<string name="osmand_parking_plugin_description">Su plugin positzione parchègiu ti permìtit de ammentare cando sa màchina tua est istada parchegiada, in ue e, si su parchègiu tenet unu tempus limitadu, cantu tempus tenes galu tue. Podes agatare su logu e su tempus de parchègiu in su widget de sa mapa.
\n Si ti diat dèpere servire un\'avisu pro ti l’ammentaret, podet annànghere notìficas in su calendàriu .</string>
<string name="osmand_parking_plugin_name">Plugin positzione parchègiu</string>
<string name="context_menu_item_add_parking_point">Marca comente positzione de parchègiu</string>
<string name="gpxup_public">Pùblicu</string>
@ -1924,4 +1925,10 @@
<string name="local_osm_changes_upload_all_confirm">As a carrigare %1$d modìficas in OSM. Seguru ses?</string>
<string name="osmo_grop_name_length_alert">Sa longària de su nùmene de su grupu depet èssere de a su mancu 3 sìmbulos!</string>
<string name="osm_changes_added_to_local_edits">Mòdificas OSM annantas a sas modìficas locales</string>
</resources>
<string name="welmode_download_maps">Iscàrriga mapas</string>
<string name="welcome_select_region">Ischerta sa regione tua</string>
<string name="welcome_text">OsmAnd ti cunsentit de impreare mapas e nàvigu sena lìnia!</string>
<string name="welcome_header">Benènnidu</string>
<string name="current_route">Àndala atuale</string>
<string name="mark_to_delete">Marca pro burrare</string>
</resources>

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

@ -194,7 +194,7 @@
<string name="osmand_parking_pm">em</string>
<string name="osmand_parking_am">fm</string>
<string name="osmand_parking_position_name">Parkeringspunkt</string>
<string name="osmand_parking_plugin_description">Denna modul gör det möjligt att i OsmAnd spara platsen där du parkerade din bil.</string>
<string name="osmand_parking_plugin_description">Modulen Parkeringsplats hjälper dig att hålla reda på var din bil är parkerad och hur mycket parkeringstid det är kvar. Du hittar din parkeringsplats och -tid på kartwidgeten.\nEn notifierings läggs till i kalendern om du vill få en påminnelse.</string>
<string name="osmand_parking_plugin_name">Parkeringsplats</string>
<string name="context_menu_item_add_parking_point">Markera som parkeringsplats</string>
<string name="context_menu_item_delete_parking_point">Ta bort P-markering</string>
@ -302,14 +302,14 @@
\n\t- Andra ändringar "</string>
<string name="update_poi_does_not_change_indexes">POI-förändringar inom programmet påverkar inte nedladdade kartfiler; förändringar sparas till en lokal fil istället.</string>
<string name="local_openstreetmap_uploading">Laddar upp …</string>
<string name="local_openstreetmap_were_uploaded">{0} POI/buggar laddades upp</string>
<string name="local_openstreetmap_were_uploaded">{0} POI/Anteckningar laddades upp</string>
<string name="local_openstreetmap_uploadall">Ladda upp alla</string>
<string name="local_openstreetmap_upload">Ladda upp ändringar till OSM</string>
<string name="local_openstreetmap_delete">Ta bort ändringen</string>
<string name="local_openstreetmap_descr_title">Asynkron OSM-redigering:</string>
<string name="local_openstreetmap_settings">Lokalt sparade OSM-POIs/-buggar</string>
<string name="local_openstreetmap_settings_descr">Visa och hantera OSM-POIs/-buggar noterade i lokal databas</string>
<string name="local_openstreetmap_settings">Lokalt sparade OSM-POIs/-Anteckningar</string>
<string name="local_openstreetmap_settings_descr">Visa och hantera OSM-POIs/-anteckningar noterade i lokal databas</string>
<string name="live_monitoring_interval_descr">Ange intervall för direktspårning</string>
@ -706,7 +706,7 @@
<string name="thanks_yandex_traffic">Tack till Yandex för trafikinformationen.</string>
<string name="layer_yandex_traffic">Yandex trafik</string>
<string name="layer_route">Rutt</string>
<string name="layer_osm_bugs">OSM-buggar</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_map">Kartkälla …</string>
@ -1840,4 +1840,7 @@
<string name="local_osm_changes_upload_all_confirm">Du håller på att skicka %1$d ändringar till OSM. Är du säker?</string>
<string name="confirmation_to_clear_history">Vill du ta bort hela historiken?</string>
<string name="osmo_grop_name_length_alert">Gruppnamn bör vara minst tre tecken långa!</string>
<string name="current_route">Aktuell rutt</string>
<string name="osm_changes_added_to_local_edits">OSM-ändringar lades till i lokala ändringar</string>
<string name="mark_to_delete">Markera för att ta bort</string>
</resources>

3
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -1951,4 +1951,5 @@
<string name="osmo_grop_name_length_alert">群組名稱至少須要 3 個字符長！</string>
<string name="osm_changes_added_to_local_edits">OSM 變更已加到本機更改</string>
<string name="mark_to_delete">刪除標記</string>
</resources>
<string name="current_route">目前的路線</string>
</resources>

2
OsmAnd/res/values/colors.xml
View file

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="app_mode_icon_color">#33B4E4</color>
<color name="parking_outdated_color">#f41a34</color>
<color name="osmo_header_dark">#2d383d</color>
<color name="osmo_header_light">#b36d12</color>

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

@ -97,4 +97,5 @@
<dimen name="dashParkingTextSize">24sp</dimen>
<dimen name="dash_parking_big_text_size">18sp</dimen>
<dimen name="dash_parking_small_text_size">14sp</dimen>
<dimen name="welcome_header_text_size">22sp</dimen>
</resources>

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

@ -9,6 +9,10 @@
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="welmode_download_maps">Download maps</string>
<string name="welcome_select_region">Select your region</string>
<string name="welcome_text">OsmAnd allows you to use maps and offline navigation!</string>
<string name="welcome_header">Welcome</string>
<string name="current_route">Current route</string>
<string name="osm_changes_added_to_local_edits">OSM changes added to local changes</string>
<string name="mark_to_delete">Mark to delete</string>

43
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -1,14 +1,14 @@
package net.osmand.plus;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Random;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import net.osmand.IProgress;
import net.osmand.IndexConstants;
@ -39,15 +39,16 @@ import net.osmand.util.Algorithms;
import org.xmlpull.v1.XmlPullParserException;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Random;
import btools.routingapp.BRouterServiceConnection;
/**
@ -123,9 +124,9 @@ public class AppInitializer implements IProgress {
initSettings = true;
}
public boolean isFirstTime(Activity a) {
initUiVars(a);
return firstTime;
public boolean isFirstTime(Activity activity) {
SharedPreferences pref = activity.getPreferences(Context.MODE_WORLD_WRITEABLE);
return !pref.contains(FIRST_TIME_APP_RUN);
}
public boolean checkAppVersionChanged(Activity activity) {

14
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -101,6 +101,8 @@ public class MapActivity extends AccessibleActivity {
private OsmandApplication app;
private OsmandSettings settings;
boolean firstTime;
private Dialog progressDlg = null;
private List<DialogProvider> dialogProviders = new ArrayList<DialogProvider>(2);
@ -123,6 +125,16 @@ public class MapActivity extends AccessibleActivity {
return notification;
}
public boolean isFirstTime(){
return firstTime;
}
public void userClosedWelcomeCard(){
firstTime = false;
dashboardOnMap.refreshDashboardFragments();
}
@Override
public void onCreate(Bundle savedInstanceState) {
long tm = System.currentTimeMillis();
@ -141,6 +153,7 @@ public class MapActivity extends AccessibleActivity {
if (mapViewTrackingUtilities == null) {
mapViewTrackingUtilities = new MapViewTrackingUtilities(app);
}
firstTime = app.getAppInitializer().isFirstTime(this);
dashboardOnMap.createDashboardView();
checkAppInitialization();
parseLaunchIntentLocation();
@ -191,6 +204,7 @@ public class MapActivity extends AccessibleActivity {
System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms");
}
mapView.refreshMap(true);
}
private void checkAppInitialization() {

2
OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
View file

@ -253,7 +253,7 @@ public class AppModeDialog {
tb.setTextOn("");
tb.setTextOff("");
tb.setContentDescription(mode.toHumanString(ctx));
tb.setCompoundDrawablesWithIntrinsicBounds(null, ctx.getIconsCache().getIcon(mode.getIconId(), R.color.dashboard_blue), null, null);
tb.setCompoundDrawablesWithIntrinsicBounds(null, ctx.getIconsCache().getIcon(mode.getIconId(), R.color.app_mode_icon_color), null, null);
tb.setPadding(0, padding, 0, 0);
LayoutParams lp = new LinearLayout.LayoutParams(metrics, metrics);
lp.setMargins(left, 0, 0, 0);

3
OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java
View file

@ -22,7 +22,8 @@ import android.widget.Button;
import android.widget.TextView;
/**
* Created by Denis on 02.12.14.
* Created by Denis
* on 02.12.14.
*/
public class DashErrorFragment extends DashBaseFragment {

91
OsmAnd/src/net/osmand/plus/dashboard/DashFirstTimeFragment.java Normal file
View file

@ -0,0 +1,91 @@
package net.osmand.plus.dashboard;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.download.DownloadActivity;
/**
* Created by Denis on
* 26.03.2015.
*/
public class DashFirstTimeFragment extends DashBaseFragment {
public static final String TAG = "DASH_FIRST_TIME_FRAGMENT";
@Override
public void onOpenDash() {
}
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = getActivity().getLayoutInflater().inflate(R.layout.dash_first_time, container, false);
view.findViewById(R.id.select_region).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
final OsmandSettings.DrivingRegion[] drs = OsmandSettings.DrivingRegion.values();
final OsmandSettings.DrivingRegion currentRegion = getMyApplication().getSettings().DRIVING_REGION.get();
String[] entries = new String[drs.length];
int currentIndex = 0;
for (int i = 0; i < entries.length; i++) {
if (currentRegion.equals(drs[i])){
currentIndex = i;
}
entries[i] = getString(drs[i].name); // + " (" + drs[i].defMetrics.toHumanString(this) +")" ;
}
builder.setSingleChoiceItems(entries, currentIndex, null);
builder.setNegativeButton(R.string.shared_string_cancel, null);
builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
int selectedPosition = ((AlertDialog)dialog).getListView().getCheckedItemPosition();
getMyApplication().getSettings().DRIVING_REGION.set(drs[selectedPosition]);
updateCurrentRegion(getView());
}
});
builder.show();
}
});
view.findViewById(R.id.hide).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
((MapActivity)getActivity()).userClosedWelcomeCard();
}
});
view.findViewById(R.id.download_map).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getActivity(), DownloadActivity.class);
intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.DOWNLOAD_TAB);
getActivity().startActivity(intent);
}
});
updateCurrentRegion(view);
((ImageView)view.findViewById(R.id.car_icon)).setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_car_dark));
return view;
}
private void updateCurrentRegion(View view) {
((TextView) view.findViewById(R.id.region)).setText(getMyApplication().getSettings().DRIVING_REGION.get().name);
}
}

80
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -1,36 +1,5 @@
package net.osmand.plus.dashboard;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import net.osmand.data.LatLon;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
import net.osmand.plus.ContextMenuAdapter.OnRowItemClick;
import net.osmand.plus.IconsCache;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.activities.IntermediatePointsDialog;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.audionotes.DashAudioVideoNotesFragment;
import net.osmand.plus.development.DashSimulateFragment;
import net.osmand.plus.development.OsmandDevelopmentPlugin;
import net.osmand.plus.dialogs.ConfigureMapMenu;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.helpers.ScreenOrientationHelper;
import net.osmand.plus.helpers.WaypointDialogHelper;
import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
import net.osmand.plus.monitoring.DashTrackFragment;
import net.osmand.plus.osmedit.DashOsmEditsFragment;
import net.osmand.plus.osmo.DashOsMoFragment;
import net.osmand.plus.parkingpoint.DashParkingFragment;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.DownloadedRegionsLayer;
import net.osmand.plus.views.OsmandMapTileView;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
@ -66,6 +35,38 @@ import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCal
import com.github.ksoichiro.android.observablescrollview.ScrollState;
import com.software.shell.fab.ActionButton;
import net.osmand.data.LatLon;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
import net.osmand.plus.ContextMenuAdapter.OnRowItemClick;
import net.osmand.plus.IconsCache;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.activities.IntermediatePointsDialog;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.audionotes.DashAudioVideoNotesFragment;
import net.osmand.plus.development.DashSimulateFragment;
import net.osmand.plus.development.OsmandDevelopmentPlugin;
import net.osmand.plus.dialogs.ConfigureMapMenu;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.helpers.ScreenOrientationHelper;
import net.osmand.plus.helpers.WaypointDialogHelper;
import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
import net.osmand.plus.monitoring.DashTrackFragment;
import net.osmand.plus.osmedit.DashOsmEditsFragment;
import net.osmand.plus.osmo.DashOsMoFragment;
import net.osmand.plus.parkingpoint.DashParkingFragment;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.DownloadedRegionsLayer;
import net.osmand.plus.views.OsmandMapTileView;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
/**
*/
public class DashboardOnMap implements ObservableScrollViewCallbacks {
@ -374,6 +375,11 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
public void setDashboardVisibility(boolean visible, DashboardType type, boolean animation) {
setDashboardVisibility(visible, type, this.visible ? visibleType : null, animation);
}
public void refreshDashboardFragments(){
addOrUpdateDashboardFragments(mapActivity.isFirstTime());
}
public void setDashboardVisibility(boolean visible, DashboardType type, DashboardType prevItem, boolean animation) {
if(visible == this.visible && type == visibleType) {
return;
@ -398,7 +404,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
View listViewLayout = dashboardView.findViewById(R.id.dash_list_view_layout);
ScrollView scrollView = (ScrollView) dashboardView.findViewById(R.id.main_scroll);
if(visibleType == DashboardType.DASHBOARD) {
addOrUpdateDashboardFragments();
addOrUpdateDashboardFragments(mapActivity.isFirstTime());
scrollView.setVisibility(View.VISIBLE);
listViewLayout.setVisibility(View.GONE);
updateTopButton(scrollView.getScrollY());
@ -435,7 +441,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
}
}
private void updateListAdapter() {
ContextMenuAdapter cm = null;
if (DashboardType.WAYPOINTS == visibleType || DashboardType.WAYPOINTS_FLAT == visibleType) {
@ -618,16 +624,16 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
}
private void addOrUpdateDashboardFragments() {
private void addOrUpdateDashboardFragments(boolean firstTime) {
// boolean showCards = mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get();
boolean showCards = true;
boolean showCards = !firstTime;
FragmentManager manager = mapActivity.getSupportFragmentManager();
FragmentTransaction fragmentTransaction = manager.beginTransaction();
showFragment(manager, fragmentTransaction, DashFirstTimeFragment.TAG, DashFirstTimeFragment.class, firstTime);
showFragment(manager, fragmentTransaction, DashErrorFragment.TAG, DashErrorFragment.class,
mapActivity.getMyApplication().getAppInitializer().checkPreviousRunsForExceptions(mapActivity) && showCards);
showFragment(manager, fragmentTransaction, DashNavigationFragment.TAG, DashNavigationFragment.class, showCards);