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

Fix issue #5193

Browse source
This commit is contained in:
Victor Shcherb 2018-05-09 15:59:31 +02:00
parent 36c0df00e7
commit 27342c8b2f
37 changed files with 43 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2870,7 +2870,6 @@
<string name="parked_at">تم الرّكنُ على</string>
<string name="add_favourites_group_to_markers_descr">إختر الفئة التي تود إضافة العلامات إليها.</string>
<string name="favourites_group">الفئات المفضلة</string>
<string name="empty_state_markers_history"/>
<string name="shared_string_two">الثاني</string>
<string name="shared_string_one">واحد</string>
<string name="coordinate_input_accuracy">%1$d أرقام</string>

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

@ -1760,7 +1760,6 @@
<string name="favourites_group">Favoritlər kateqoriyası</string>
<string name="empty_state_markers_active">Xəritə işarələri yarat!</string>
<string name="empty_state_markers_active_desc">“Yerlər”ə uzun və ya qısa basın, sonra bayraq düyməsinə toxunun.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="digits_quantity">Onluq rəqəmlərin sayı</string>
<string name="show_number_pad">Rəqəm panelini göstər</string>
<string name="shared_string_paste">Əlavə et</string>

1
OsmAnd/res/values-b+ast/strings.xml
View file

@ -1081,7 +1081,6 @@ Puntos</string>
<string name="empty_state_markers_active_desc">Da un toque llargu o curtiu en «Llugares», llueu toca nel botón de bandera de marcador.</string>
<string name="empty_state_markers_groups">Importar grupos</string>
<string name="empty_state_markers_groups_desc">Puedes importar grupos de favoritos o puntos de ruta d\\\'una traza como marcadores.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="shared_string_two">Dos</string>
<string name="shared_string_one">Un</string>
<string name="show_guide_line_descr">Amosar llinies de direición dende la to posición a les de marcadores activos.</string>

1
OsmAnd/res/values-be-rBY/strings.xml
View file

@ -2900,7 +2900,6 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
<string name="rename_marker">Pierajmienavać markier</string>
<string name="appearance_on_the_map">Źniešni vyhlad na mapie</string>
<string name="add_track_to_markers_descr">Abiarycie trek, kab dadać šlachavyja kropki da markieraŭ. (Pieraličanyja tolki treki z šlachavymi kropkami.)</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="shared_string_right">Naprava</string>
<string name="shared_string_left">Nalieva</string>
<string name="shared_string_more_without_dots">Bolš</string>

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

@ -2986,7 +2986,6 @@
<string name="active_markers_descr">Абярыце колькасць індыкатараў накірунку, што будзе адлюстравана.</string>
<string name="appearance_on_the_map">Зьнешні выгляд на мапе</string>
<string name="add_track_to_markers_descr">Шляхавые кропкі могуць быць даданыя ў маркеры выбарам аднаго з гэтых слядоў.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="shared_string_right">Направа</string>
<string name="shared_string_left">Налева</string>
<string name="shared_string_more_without_dots">Больш</string>

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

@ -2698,7 +2698,6 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="empty_state_markers_active_desc">Premeu molt o poc temps a \'Llocs\' i després el botó seleccionador.</string>
<string name="empty_state_markers_groups">Importa grups</string>
<string name="empty_state_markers_groups_desc">Podeu importar com marcadors a grups de preferits o a fites de la traça.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Els marcadors marcats com a aprovats apareixeran en aquesta pantalla.</string>
<string name="shared_string_two">Dos</string>
<string name="shared_string_one">Un</string>

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

@ -3045,7 +3045,6 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="empty_state_markers_active_desc">Tryk langt eller kort på \'Steder\', og tryk derefter på markørflagsknappen.</string>
<string name="empty_state_markers_groups">Importer grupper</string>
<string name="empty_state_markers_groups_desc">Importer favoritgrupper eller et spor af rutepunkter som markører.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Markører, der er markeret som passeret, vil blive vist på denne skærm.</string>
<string name="appearance_on_the_map">Udseende på kortet</string>
<string name="looking_for_tracks_with_waypoints">Søger efter spor med rutepunkter</string>

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

@ -2949,7 +2949,6 @@ Abgedeckte Fläche: %1$s x %2$s</string>
<string name="add_group">Gruppe hinzufügen</string>
<string name="empty_state_markers_active">Kartenmarkierungen erstellen!</string>
<string name="empty_state_markers_groups">Gruppen importieren</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Markierungen, die als passiert gekennzeichnet sind, werden auf diesem Bildschirm angezeigt.</string>
<string name="digits_quantity">Anzahl der Dezimalstellen</string>
<string name="show_number_pad">Nummernblock anzeigen</string>

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

@ -1899,7 +1899,6 @@
<string name="empty_state_markers_active_desc">Πατήστε παρατεταμένα ή σύντομα \'Μέρη\', έπειτα πατήστε το πλήκτρο σημαίας δείκτη.</string>
<string name="empty_state_markers_groups">Εισαγωγή ομάδων</string>
<string name="empty_state_markers_groups_desc">Μπορείτε να εισάγετε ομάδες αγαπημένων ή σημεία διαδρομής ίχνους ως δείκτες.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Οι δείκτες που σημειώθηκαν ως περασμένοι, θα εμφανιστούν στην οθόνη.</string>
<string name="shared_string_two">Δύο</string>
<string name="shared_string_one">Ένα</string>

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

@ -2834,7 +2834,6 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="what_is_here">Tie ĉi:</string>
<string name="parked_at">parkumita je</string>
<string name="pick_up_till">Reprenu ĝis</string>

1
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -2855,7 +2855,6 @@ Lon %2$s</string>
<string name="distance_indication_descr">Elige cómo mostrar la distancia a los marcadores activos.</string>
<string name="active_markers_descr">Elige el número de marcadores activos a mostrar.</string>
<string name="appearance_on_the_map">Aspecto en el mapa</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="looking_for_tracks_with_waypoints">Búsqueda de trazas con puntos de referencia</string>
<string name="shared_string_more_without_dots">Más</string>
<string name="empty_state_osm_edits">Crear o modificar objetos OSM</string>

1
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -2857,7 +2857,6 @@ Lon %2$s</string>
<string name="appearance_on_the_map">Aspecto en el mapa</string>
<string name="looking_for_tracks_with_waypoints">Búsqueda de trazas con puntos de referencia</string>
<string name="shared_string_more_without_dots">Más</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_osm_edits">Crear o modificar objetos OSM</string>
<string name="empty_state_osm_edits_descr">Crea o modifica puntos de interés, abre o comenta notas de OSM y contribuye con grabaciones GPX.</string>
<string name="shared_string_deleted">Borrado</string>

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

@ -2858,7 +2858,6 @@
<string name="distance_indication_descr">Elige cómo mostrar la distancia a los marcadores activos.</string>
<string name="active_markers_descr">Elige el número de marcadores activos a mostrar.</string>
<string name="shared_string_more_without_dots">Más</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="looking_for_tracks_with_waypoints">Búsqueda de trazas con puntos de ruta</string>
<string name="release_3_0">•
\n</string>

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

@ -2838,7 +2838,6 @@ Area honi dagokio: %1$s x %2$s</string>
<string name="empty_state_markers_active_desc">Sakatu labur edo luze \'Tokiak\', gero sakatu markatzaile-bandera botoian.</string>
<string name="empty_state_markers_groups">Inportatu taldeak</string>
<string name="empty_state_markers_groups_desc">Inportatu gogokoen taldeak edo lorratzen bide-puntuak markatzaile gisa.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Pasatutako gisa markatutako markatzaileak pantaila honetan agertzen dira.</string>
<string name="shared_string_two">Bi</string>
<string name="shared_string_one">Bat</string>

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

@ -3049,7 +3049,6 @@
<string name="notes_by_date">یادداشت‌ها بر اساس تاریخ</string>
<string name="by_date">بر اساس تاریخ</string>
<string name="by_type">بر اساس نوع</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="modify_the_search_query">عبارت جست‌وجوشده را اصلاح کنید.</string>
<string name="release_3_0">\\022
\n

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

@ -3014,7 +3014,6 @@ représentant la zone : %1$s x %2$s</string>
<string name="empty_state_markers_active_desc">Sélectionnez des emplacements sur la carte puis appuyez sur le drapeau de marque.</string>
<string name="empty_state_markers_groups">Importer des groupes</string>
<string name="empty_state_markers_groups_desc">Importez des groupes de favoris ou des points de passage comme marques.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Les marques visitées s\'afficheront sur cet écran.</string>
<string name="shared_string_two">Deux</string>
<string name="shared_string_one">Une</string>

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

@ -3119,5 +3119,4 @@
<string name="map_widget_bearing">תכווין יחסי</string>
<string name="rendering_value_walkingRoutesOSMC_name">צבע לפי סימול הליכת שטח של OSMC</string>
<string name="osmand_team">צוות OsmAnd</string>
<string name="empty_state_markers_history">היסטוריה</string>
</resources>

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

@ -2848,7 +2848,6 @@ Kérlek adj meg egy teljes kódot</string>
<string name="empty_state_markers_active_desc">Koppints hosszan vagy röviden a helyekre, majd koppints a jelölőzászló gombjára.</string>
<string name="empty_state_markers_groups">Csoportok importálása</string>
<string name="empty_state_markers_groups_desc">Importálhatsz jelölőket kedvencek csoportokból, vagy nyomvonal útpontokból.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="shared_string_two">Kettő</string>
<string name="shared_string_one">Egy</string>
<string name="show_guide_line_descr">Segédvonalat jelenít meg az aktuális pozíciódtól az aktív térképjelölőkig.</string>

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

@ -2651,7 +2651,6 @@
<string name="by_date">Ըստ ամսաթվի</string>
<string name="by_type">Ըստ տեսակի</string>
<string name="looking_for_tracks_with_waypoints">Տրեկների որոնում ճանապարհային կետեր հետ</string>
<string name="empty_state_markers_history">\@string/shared_string_history (պատմությունը)</string>
<string name="show_guide_line_descr">Ցուցադրել ուղեցույցները ձեր գտնվելու վայրից մինչև ակտիվ մարկերներ:</string>
<string name="show_arrows_descr">Ցուցադրել մեկ կամ երկու նետ, նշելով ակտիվ մարկերների ուղղությունը:</string>
<string name="distance_indication_descr">Ընտրեք, թե ինչպես ցուցադրեք հեռավորությունը մինչև ակտիվ մարկերներին:</string>

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

@ -107,7 +107,6 @@
<string name="empty_state_markers_active_desc">Tekan lama atau sebentar pada tempat, lalu ketuk tombol tanda petik.</string>
<string name="empty_state_markers_groups">Impor beberap grup</string>
<string name="empty_state_markers_groups_desc">Kamu bisa impor grup favorit atau trek titik arah sebagai penanda.</string>
<string name="empty_state_markers_history">\@string/bagikan_string_riwayat</string>
<string name="empty_state_markers_history_desc">Penanda yang ditandai sebagai yang telah dilewati akan muncul di layar ini.</string>
<string name="shared_string_two">Dua</string>
<string name="shared_string_one">Satu</string>

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

@ -2429,7 +2429,6 @@ Stendur fyrir svæði: %1$s x %2$s</string>
<string name="empty_state_favourites_desc">Flytja inn eða merkja eftirlæti á korti.</string>
<string name="import_track_desc">Skráin %1$s inniheldur enga ferilpunkta, á að flytja hana inn sem leið?</string>
<string name="move_point">Færa punkt</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="add_points_to_map_markers_q">Viltu bæta öllum punktum í kortamerki?</string>
<string name="complex_route_calculation_failed">Hraður leiðarútreikningur mistókst (%s), nota til vara hægari útreikning.</string>
<string name="quick_action_fav_name_descr">Skildu þetta eftir autt til að nota heimilisfangið eða staðarheiti.</string>

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

@ -2948,7 +2948,6 @@ Rappresenta l\'area: %1$s x %2$s</string>
<string name="empty_state_markers_active_desc">Tap lungo o breve su \'Luoghi\', poi tappa il pulsante bandiera del marcatore.</string>
<string name="empty_state_markers_groups">Importa gruppi</string>
<string name="empty_state_markers_groups_desc">Puoi importare, come marcatori, gruppi di luoghi preferiti o punti intermedi di tracce.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Marcatori indicati come passati appariranno su questa schermata.</string>
<string name="shared_string_two">Due</string>
<string name="shared_string_one">Uno</string>

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

@ -2759,7 +2759,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
<string name="add_group">Pridėti grupę</string>
<string name="empty_state_markers_active">Sukurk žemėlapio žymeklius!</string>
<string name="empty_state_markers_groups">Importuoti grupes</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="shared_string_two">Du</string>
<string name="shared_string_one">Vienas</string>
<string name="distance_indication_descr">Pasirinkti, kaip rodyti atstumą iki aktyvių žymeklių.</string>

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

@ -2651,7 +2651,6 @@
<string name="quick_action_empty_param_error">Parameterne kan ikke være tomme</string>
<string name="quick_action_btn_tutorial_descr">Lang-trykking og dragning av knappen endrer dens posisjon på skjermen.</string>
<string name="add_track_to_markers_descr">Rutepunkter kan legges til i markører ved å velge et av disse sporene (som har rutepunkter).</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="depth_contour_descr">Kart for havdybdekoter og sjømerker.</string>
<string name="do_not_send_anonymous_app_usage_desc">OsmAnd samler inn info om hvilke deler av programmet du åpner. Plasseringen din blir aldri sendt, ei heller noe du måtte skrive inn i programmet eller detaljer om områder som vises, søkes etter, eller lastes ned.</string>
<string name="do_not_show_startup_messages_desc">Ikke vis programrabatter og spesielle lokale hendelsesmeldinger.</string>

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

@ -2693,7 +2693,6 @@ Pôr do Sol: %2$s</string>
<string name="osm_recipients_label">Destinatários OSM</string>
<string name="osmand_plus_extended_description_part6">Recursos de ciclismo e pedestre • Visualização de caminhos a pé, pistas de caminhadas e ciclovias, ideal para atividades ao ar livre • Roteamento e modos de exibição especiais para bicicleta e pedestres • Paradas de transporte público opcionais (ônibus, troleibus, trem) incluindo nomes de linhas • Gravação opcional de viagem para arquivo GPX local ou serviço on-line • Exibição opcional de velocidade e altitudes • Exibição de curvas de nível e sombreamento de relevo (via plugin adicional)</string>
<string name="shared_string_without_name">Sem nome</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="release_2_6">\\022 Novo recurso: Botão de ação rápida
\n
\n • Resposta a gesto de toque de tela melhorada (por exemplo, deslocamento de tela e zoom simultâneos)

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

@ -1942,7 +1942,6 @@
<string name="empty_state_markers_active_desc">Atinge lung sau scurt pe locații, apoi atinge butonul pentru steagul marcajului.</string>
<string name="empty_state_markers_groups">Importă grupuri</string>
<string name="empty_state_markers_groups_desc">Puteți importa grupuri favorite sau puncte intermediare de trackuri ca marcaje.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Marcajele marcate ca trecute vor apărea pe această fereastră.</string>
<string name="shared_string_two">Două</string>
<string name="shared_string_one">Una</string>

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

@ -2712,7 +2712,6 @@
<string name="import_track_desc">Файл %1$s не содержит путевых точек, импортировать его как трек?</string>
<string name="add_track_to_markers_descr">Путевые точки можно добавить к маркерам выбрав один из этих треков, содержащих их.</string>
<string name="track_waypoints">Трек путевых точек</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="shared_string_right">Направо</string>
<string name="shared_string_left">Налево</string>
<string name="show_number_pad">Показать цифровую панель</string>

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

@ -2993,7 +2993,6 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="empty_state_markers_active_desc">Marca logos in sa mapa cun un\'incarcu curtzu o longu in \"Logos\" e, a pustis, incarchende su butone cun sa bandera de sos marcadores.</string>
<string name="empty_state_markers_groups">Importa grupos</string>
<string name="empty_state_markers_groups_desc">Importa grupos de preferidos o puntos de coladòrgiu de una rasta comente marcadores.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Sos marcadores sinnados comente colados ant a aparire in custu ischermu.</string>
<string name="shared_string_two">Duos</string>
<string name="shared_string_one">Unu</string>

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

@ -2866,7 +2866,6 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="empty_state_markers_active">Ustvarjanje označb zemljevida</string>
<string name="empty_state_markers_active_desc">Ob dolgem pritisku na zemljevid se izriše označba, s ponovnim pa se doda še zastavica.</string>
<string name="empty_state_markers_groups_desc">Uvoziti je mogoče skupine priljubljenih in vmesnih točk kot označbe na zemljevidu.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Označbe, označene kot dosežene, bodo prikazane na tem zaslonu.</string>
<string name="shared_string_two">Dve</string>
<string name="shared_string_one">Ena</string>

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

@ -1756,7 +1756,6 @@
<string name="osc_file_desc">ОСЦ - погодно за извоз у OpenStreetMap.</string>
<string name="osc_file">ОСЦ датотека</string>
<string name="osm_edits_export_desc">Одаберити тип извоза: ОСМ белешке, тачке од интереса или оба.</string>
<string name="empty_state_markers_history"/>
<string name="lang_ml">Малајалам</string>
<string name="lang_lo">Лаоски</string>
<string name="lang_vo">Волапук</string>

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

@ -2747,7 +2747,6 @@ Vänligen tillhandahåll fullständig kod</string>
<string name="empty_state_markers_active_desc">Tryck långt eller kort på platser, tryck sedan på flaggknappen.</string>
<string name="empty_state_markers_groups">Importera grupper</string>
<string name="empty_state_markers_groups_desc">Du kan importera Favoritgrupper eller spåra waypoints som markörer.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Markörer markerade som godkända visas på denna skärm.</string>
<string name="shared_string_two">Två</string>
<string name="shared_string_one">En</string>

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

@ -2320,7 +2320,6 @@
<string name="empty_state_markers_active">Harita işaretleyicileri oluştur!</string>
<string name="empty_state_markers_active_desc">Yerler üzerinde uzun veya kısa basıp, sonra bayrak butonuna bas.</string>
<string name="empty_state_markers_groups">Grupları al</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="shared_string_two">İki</string>
<string name="shared_string_one">Bir</string>
<string name="active_markers_descr">Kaç tane yön göstergesi görüntüleneceğini seçin.</string>

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

@ -3069,7 +3069,6 @@
<string name="empty_state_markers_active_desc">Натисніть на потрібне місце, а потім на прапорець маркера.</string>
<string name="empty_state_markers_groups">Імпортувати групи</string>
<string name="empty_state_markers_groups_desc">Ви можете імпортувати групи закладок або шляхові точки треку як маркери.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Маркери, позначені як пройдені, з\'являться на цьому екрані.</string>
<string name="shared_string_two">Два</string>
<string name="shared_string_one">Один</string>

1
OsmAnd/res/values-zh-rCN/strings.xml
View file

@ -2699,7 +2699,6 @@
<string name="empty_state_markers_active_desc">长按或短按位置, 然后点击标记标志按钮。</string>
<string name="empty_state_markers_groups">导入组群</string>
<string name="empty_state_markers_groups_desc">你可以导入收藏组或轨迹航点作为标记。</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">标记为已通过的标记将显示在此屏幕上。</string>
<string name="shared_string_two">二</string>
<string name="shared_string_one">一</string>

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

@ -2994,7 +2994,6 @@
<string name="empty_state_markers_active_desc">長按或點一下「地點」，然後點擊標記標誌按鈕。</string>
<string name="empty_state_markers_groups">匯入群組</string>
<string name="empty_state_markers_groups_desc">您可以匯入我的收藏群組或軌跡航點作為標記。</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="shared_string_two">二</string>
<string name="shared_string_one">一</string>
<string name="distance_indication_descr">選擇如何顯示活動標記的距離。</string>

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

@ -161,7 +161,6 @@
<string name="empty_state_markers_active_desc">Long or short tap \'Places\', then tap the marker flag button.</string>
<string name="empty_state_markers_groups">Import groups</string>
<string name="empty_state_markers_groups_desc">Import favorite groups or track waypoints as markers.</string>
<string name="empty_state_markers_history">@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Markers marked as passed will appear on this screen.</string>
<string name="shared_string_two">Two</string>
<string name="shared_string_one">One</string>

175
OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
View file

@ -11,8 +11,8 @@ import android.os.Build;
import android.os.ParcelFileDescriptor;
import android.support.v7.app.AlertDialog;
import android.view.View;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.aidl.favorite.AFavorite;
import net.osmand.aidl.favorite.group.AFavoriteGroup;
import net.osmand.aidl.gpx.ASelectedGpxFile;
@ -62,10 +62,15 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
public class OsmandAidlApi {
import org.apache.commons.logging.Log;
import scala.collection.immutable.HashMap;
public class OsmandAidlApi {
private static final Log LOG = PlatformUtil.getLog(OsmandAidlApi.class);
private static final String AIDL_REFRESH_MAP = "aidl_refresh_map";
private static final String AIDL_SET_MAP_LOCATION = "aidl_set_map_location";
private static final String AIDL_LATITUDE = "aidl_latitude";
@ -113,19 +118,8 @@ public class OsmandAidlApi {
private Map<String, TextInfoWidget> widgetControls = new ConcurrentHashMap<>();
private Map<String, AMapLayer> layers = new ConcurrentHashMap<>();
private Map<String, OsmandMapLayer> mapLayers = new ConcurrentHashMap<>();
private Map<String, BroadcastReceiver> receivers = new TreeMap<String, BroadcastReceiver>();
private BroadcastReceiver refreshMapReceiver;
private BroadcastReceiver setMapLocationReceiver;
private BroadcastReceiver addMapWidgetReceiver;
private BroadcastReceiver removeMapWidgetReceiver;
private BroadcastReceiver addMapLayerReceiver;
private BroadcastReceiver removeMapLayerReceiver;
private BroadcastReceiver takePhotoNoteReceiver;
private BroadcastReceiver startVideoRecordingReceiver;
private BroadcastReceiver startAudioRecordingReceiver;
private BroadcastReceiver stopRecordingReceiver;
private BroadcastReceiver navigateReceiver;
private BroadcastReceiver navigateGpxReceiver;
public OsmandAidlApi(OsmandApplication app) {
this.app = app;
@ -147,119 +141,31 @@ public class OsmandAidlApi {
}
public void onDestroyMapActivity(final MapActivity mapActivity) {
if (refreshMapReceiver != null) {
try {
mapActivity.unregisterReceiver(refreshMapReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
for (BroadcastReceiver b : receivers.values()) {
if(b == null) {
continue;
}
refreshMapReceiver = null;
}
if (setMapLocationReceiver != null) {
try {
mapActivity.unregisterReceiver(setMapLocationReceiver);
mapActivity.unregisterReceiver(b);
} catch (IllegalArgumentException e) {
e.printStackTrace();
LOG.error(e.getMessage(), e);
}
setMapLocationReceiver = null;
}
if (addMapWidgetReceiver != null) {
try {
mapActivity.unregisterReceiver(addMapWidgetReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
addMapWidgetReceiver = null;
}
if (removeMapWidgetReceiver != null) {
try {
mapActivity.unregisterReceiver(removeMapWidgetReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
removeMapWidgetReceiver = null;
}
widgetControls.clear();
if (addMapLayerReceiver != null) {
try {
mapActivity.unregisterReceiver(addMapLayerReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
addMapLayerReceiver = null;
}
if (removeMapLayerReceiver != null) {
try {
mapActivity.unregisterReceiver(removeMapLayerReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
removeMapLayerReceiver = null;
}
if (takePhotoNoteReceiver != null) {
try {
mapActivity.unregisterReceiver(takePhotoNoteReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
takePhotoNoteReceiver = null;
}
if (startVideoRecordingReceiver != null) {
try {
mapActivity.unregisterReceiver(startVideoRecordingReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
startVideoRecordingReceiver = null;
}
if (startAudioRecordingReceiver != null) {
try {
mapActivity.unregisterReceiver(startAudioRecordingReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
startAudioRecordingReceiver = null;
}
if (stopRecordingReceiver != null) {
try {
mapActivity.unregisterReceiver(stopRecordingReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
stopRecordingReceiver = null;
}
if (navigateReceiver != null) {
try {
mapActivity.unregisterReceiver(navigateReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
navigateReceiver = null;
}
if (navigateGpxReceiver != null) {
try {
mapActivity.unregisterReceiver(navigateGpxReceiver);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
navigateGpxReceiver = null;
}
receivers = new TreeMap<String, BroadcastReceiver>();
}
private void registerRefreshMapReceiver(final MapActivity mapActivity) {
refreshMapReceiver = new BroadcastReceiver() {
BroadcastReceiver refreshMapReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
mapActivity.refreshMap();
}
};
mapActivity.registerReceiver(refreshMapReceiver, new IntentFilter(AIDL_REFRESH_MAP));
registerReceiver(refreshMapReceiver, mapActivity, AIDL_REFRESH_MAP);
}
private void registerSetMapLocationReceiver(final MapActivity mapActivity) {
setMapLocationReceiver = new BroadcastReceiver() {
BroadcastReceiver setMapLocationReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
double lat = intent.getDoubleExtra(AIDL_LATITUDE, Double.NaN);
@ -284,7 +190,7 @@ public class OsmandAidlApi {
mapActivity.refreshMap();
}
};
mapActivity.registerReceiver(setMapLocationReceiver, new IntentFilter(AIDL_SET_MAP_LOCATION));
registerReceiver(setMapLocationReceiver, mapActivity, AIDL_SET_MAP_LOCATION);
}
private int getDrawableId(String id) {
@ -296,7 +202,7 @@ public class OsmandAidlApi {
}
private void registerAddMapWidgetReceiver(final MapActivity mapActivity) {
addMapWidgetReceiver = new BroadcastReceiver() {
BroadcastReceiver addMapWidgetReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String widgetId = intent.getStringExtra(AIDL_OBJECT_ID);
@ -320,11 +226,16 @@ public class OsmandAidlApi {
}
}
};
mapActivity.registerReceiver(addMapWidgetReceiver, new IntentFilter(AIDL_ADD_MAP_WIDGET));
registerReceiver(addMapWidgetReceiver, mapActivity, AIDL_ADD_MAP_WIDGET);
}
private void registerReceiver(BroadcastReceiver rec, MapActivity ma,
String filter) {
ma.registerReceiver(rec, new IntentFilter(filter));
}
private void registerRemoveMapWidgetReceiver(final MapActivity mapActivity) {
removeMapWidgetReceiver = new BroadcastReceiver() {
BroadcastReceiver removeMapWidgetReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String widgetId = intent.getStringExtra(AIDL_OBJECT_ID);
@ -339,7 +250,7 @@ public class OsmandAidlApi {
}
}
};
mapActivity.registerReceiver(removeMapWidgetReceiver, new IntentFilter(AIDL_REMOVE_MAP_WIDGET));
registerReceiver(removeMapWidgetReceiver, mapActivity, AIDL_REMOVE_MAP_WIDGET);
}
public void registerWidgetControls(MapActivity mapActivity) {
@ -360,7 +271,7 @@ public class OsmandAidlApi {
}
private void registerAddMapLayerReceiver(final MapActivity mapActivity) {
addMapLayerReceiver = new BroadcastReceiver() {
BroadcastReceiver addMapLayerReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String layerId = intent.getStringExtra(AIDL_OBJECT_ID);
@ -378,11 +289,11 @@ public class OsmandAidlApi {
}
}
};
mapActivity.registerReceiver(addMapLayerReceiver, new IntentFilter(AIDL_ADD_MAP_LAYER));
registerReceiver(addMapLayerReceiver, mapActivity, AIDL_ADD_MAP_LAYER);
}
private void registerRemoveMapLayerReceiver(final MapActivity mapActivity) {
removeMapLayerReceiver = new BroadcastReceiver() {
BroadcastReceiver removeMapLayerReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String layerId = intent.getStringExtra(AIDL_OBJECT_ID);
@ -395,11 +306,11 @@ public class OsmandAidlApi {
}
}
};
mapActivity.registerReceiver(removeMapLayerReceiver, new IntentFilter(AIDL_REMOVE_MAP_LAYER));
registerReceiver(removeMapLayerReceiver, mapActivity, AIDL_REMOVE_MAP_LAYER);
}
private void registerTakePhotoNoteReceiver(final MapActivity mapActivity) {
takePhotoNoteReceiver = new BroadcastReceiver() {
BroadcastReceiver takePhotoNoteReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
final AudioVideoNotesPlugin plugin = OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class);
@ -410,11 +321,11 @@ public class OsmandAidlApi {
}
}
};
mapActivity.registerReceiver(takePhotoNoteReceiver, new IntentFilter(AIDL_TAKE_PHOTO_NOTE));
registerReceiver(takePhotoNoteReceiver, mapActivity, AIDL_TAKE_PHOTO_NOTE);
}
private void registerStartVideoRecordingReceiver(final MapActivity mapActivity) {
startVideoRecordingReceiver = new BroadcastReceiver() {
BroadcastReceiver startVideoRecordingReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
final AudioVideoNotesPlugin plugin = OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class);
@ -425,11 +336,11 @@ public class OsmandAidlApi {
}
}
};
mapActivity.registerReceiver(startVideoRecordingReceiver, new IntentFilter(AIDL_START_VIDEO_RECORDING));
registerReceiver(startVideoRecordingReceiver, mapActivity, AIDL_START_VIDEO_RECORDING);
}
private void registerStartAudioRecordingReceiver(final MapActivity mapActivity) {
startVideoRecordingReceiver = new BroadcastReceiver() {
BroadcastReceiver startAudioRecordingReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
final AudioVideoNotesPlugin plugin = OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class);
@ -440,11 +351,11 @@ public class OsmandAidlApi {
}
}
};
mapActivity.registerReceiver(startVideoRecordingReceiver, new IntentFilter(AIDL_START_AUDIO_RECORDING));
registerReceiver(startAudioRecordingReceiver, mapActivity, AIDL_START_AUDIO_RECORDING);
}
private void registerStopRecordingReceiver(final MapActivity mapActivity) {
stopRecordingReceiver = new BroadcastReceiver() {
BroadcastReceiver stopRecordingReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
final AudioVideoNotesPlugin plugin = OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class);
@ -453,11 +364,11 @@ public class OsmandAidlApi {
}
}
};
mapActivity.registerReceiver(stopRecordingReceiver, new IntentFilter(AIDL_STOP_RECORDING));
registerReceiver(stopRecordingReceiver, mapActivity, AIDL_STOP_RECORDING);
}
private void registerNavigateReceiver(final MapActivity mapActivity) {
navigateReceiver = new BroadcastReceiver() {
BroadcastReceiver navigateReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String profileStr = intent.getStringExtra(AIDL_PROFILE);
@ -515,11 +426,11 @@ public class OsmandAidlApi {
}
}
};
mapActivity.registerReceiver(navigateReceiver, new IntentFilter(AIDL_NAVIGATE));
registerReceiver(navigateReceiver, mapActivity, AIDL_NAVIGATE);
}
private void registerNavigateGpxReceiver(final MapActivity mapActivity) {
navigateGpxReceiver = new BroadcastReceiver() {
BroadcastReceiver navigateGpxReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
boolean force = intent.getBooleanExtra(AIDL_FORCE, false);
@ -567,7 +478,7 @@ public class OsmandAidlApi {
}
}
};
mapActivity.registerReceiver(navigateGpxReceiver, new IntentFilter(AIDL_NAVIGATE_GPX));
registerReceiver(navigateGpxReceiver, mapActivity, AIDL_NAVIGATE_GPX);
}
private void startNavigation(MapActivity mapActivity,