Update help
This commit is contained in:
Victor Shcherb
parent
74009778c3
commit
bc6773c5d0
30 changed files with 535 additions and 162 deletions
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
|
||||
<string name="auto_zoom_close">Буйней</string>
|
||||
<string name="auto_zoom_far">Для сярэдняга маштаба</string>
|
||||
<string name="auto_zoom_farthest">Драбней</string>
|
||||
|
|
@ -1971,13 +1970,13 @@
|
|||
<string name="shared_string_qr_code">QR-код</string>
|
||||
<string name="map_downloaded">Мапа сьцягнутая</string>
|
||||
<string name="feedback">галасаваньне</string>
|
||||
<string name="rec_photo_description">Фота %1$s</string>
|
||||
|
||||
<string name="shared_string_upload">Адаслаць</string>
|
||||
<string name="osm_edit_created_poi">Створана OSM POI</string>
|
||||
<string name="osm_edit_created_bug">Створана OSM памылка</string>
|
||||
<string name="go_to_map">Перайсьці да мапы</string>
|
||||
<string name="rec_audio_description">Аўдыё %1$s</string>
|
||||
<string name="rec_video_description">Відэа %1$s</string>
|
||||
|
||||
|
||||
<string name="new_version">Новая вэрсія</string>
|
||||
<string name="features_menu_group">Адметнасьці</string>
|
||||
<string name="other_menu_group">Іншае</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="show_warnings_title">Mostra els missatges d\'avís…</string>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="show_warnings_title">Mostra els missatges d\'avís…</string>
|
||||
<string name="map_widget_fluorescent">Rutes amb fluorescència</string>
|
||||
<string name="map_widget_show_ruler">Mostra el regle</string>
|
||||
<string name="map_widget_transparent">Aparença amb transparència</string>
|
||||
|
|
@ -1988,9 +1987,9 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
|
|||
<string name="world_map_download_descr">El mapa base mundial (que abasta el món sencer però amb poca ampliació) no es troba o està malmès. Considereu baixar-lo per una operació completa.</string>
|
||||
<string name="show_on_start_description">Si es desactiva s\'engega amb la pantalla del mapa</string>
|
||||
<string name="enter_country_name">Indiqueu el nom del país</string>
|
||||
<string name="rec_photo_description">Fotografia %1$s</string>
|
||||
<string name="rec_audio_description">Àudio %1$s</string>
|
||||
<string name="rec_video_description">Vídeo %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_upload">Pujada</string>
|
||||
<string name="osm_edit_created_poi">S\'ha creat un PDI a OSM</string>
|
||||
<string name="osm_edit_created_bug">S\'ha obert un nou error a OSM</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy.</string>
|
||||
|
||||
<string name="send_files_to_osm">Nahrát GPX soubory do OSM?</string>
|
||||
|
|
@ -1974,7 +1973,7 @@
|
|||
<string name="search_on_the_map_item">Hledání na mapě</string>
|
||||
<string name="planning_trip_item">Plánování cesty</string>
|
||||
|
||||
<string name="osmand_ski_maps_item">OsmAnd lyžařské mapy</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">Instalace a řešení problémů</string>
|
||||
<string name="techical_articles_item">Technické články</string>
|
||||
|
|
@ -1985,8 +1984,8 @@
|
|||
<string name="osm_edit_created_bug">Vytvořena OSM chyba</string>
|
||||
<string name="map_legend">Legenda mapy</string>
|
||||
<string name="shared_string_update">Aktualizovat</string>
|
||||
<string name="rec_photo_description">Foto %1$s</string>
|
||||
<string name="rec_audio_description">Zvuk %1$s</string>
|
||||
<string name="rec_video_description">Video %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_upload">Odeslat</string>
|
||||
</resources>
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
|
||||
<string name="av_def_action_video">Optag video</string>
|
||||
<string name="av_def_action_audio">Optag audio</string>
|
||||
|
|
@ -1891,7 +1890,7 @@
|
|||
<string name="av_locations">Placeringer</string>
|
||||
<string name="tab_title_basic">Grundlæggende</string>
|
||||
|
||||
<string name="tag_poi_amenity">facilitet</string>
|
||||
|
||||
<string name="contact_info">Kontaktoplysninger</string>
|
||||
<string name="description">Beskrivelse</string>
|
||||
<string name="add_opening_hours">Tilføj åbningstider</string>
|
||||
|
|
@ -1993,7 +1992,7 @@
|
|||
<string name="search_on_the_map_item">Søgning på kortet</string>
|
||||
<string name="planning_trip_item">Turplanlægning</string>
|
||||
|
||||
<string name="osmand_ski_maps_item">Skikort</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">Installation og fejlfinding</string>
|
||||
<string name="techical_articles_item">Tekniske artikler</string>
|
||||
|
|
@ -2004,9 +2003,9 @@
|
|||
<string name="osm_edit_created_bug">Oprettede OSM fejlregistrering</string>
|
||||
<string name="map_legend">Signaturforklaring</string>
|
||||
<string name="shared_string_upload">Overfør</string>
|
||||
<string name="rec_photo_description">Foto %1$s</string>
|
||||
<string name="rec_audio_description">Audio %1$s</string>
|
||||
<string name="rec_video_description">Video %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_update">Opdatering</string>
|
||||
<string name="rendering_attr_hideProposed_name">Skjul foreslåede objekter</string>
|
||||
</resources>
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
|
||||
<string name="copying_osmand_file_failed">Falló al copiar archivos</string>
|
||||
<string name="storage_directory_external">Almacenamiento externo</string>
|
||||
<string name="storage_directory_multiuser">Almacenamiento multiusuario</string>
|
||||
|
|
@ -1907,7 +1906,7 @@
|
|||
<string name="av_locations_descr">Archivo GPX con notas de ubicaciones</string>
|
||||
<string name="av_locations">Ubicaciones</string>
|
||||
|
||||
<string name="tag_poi_amenity">servicio</string>
|
||||
|
||||
<string name="contact_info">Información de contacto</string>
|
||||
<string name="description">Descripción</string>
|
||||
<string name="add_opening_hours">Añadir horario de atención</string>
|
||||
|
|
@ -2007,7 +2006,7 @@
|
|||
<string name="search_on_the_map_item">Busqueda en el mapa</string>
|
||||
<string name="planning_trip_item">Planificación de viaje</string>
|
||||
|
||||
<string name="osmand_ski_maps_item">Mapas de esquí de OsmAnd</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">Instalación y solución de problemas</string>
|
||||
<string name="techical_articles_item">Artículos técnicos</string>
|
||||
|
|
@ -2018,8 +2017,8 @@
|
|||
<string name="osm_edit_created_bug">Nota OSM creada</string>
|
||||
<string name="map_legend">Leyenda del mapa</string>
|
||||
<string name="shared_string_update">Actualizar</string>
|
||||
<string name="rec_photo_description">Foto %1$s</string>
|
||||
<string name="rec_audio_description">Audio %1$s</string>
|
||||
<string name="rec_video_description">Video %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_upload">Subir</string>
|
||||
</resources>
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="layer_map_appearance">Configurar pantalla</string>
|
||||
<string name="show_lanes">Mostrar carriles</string>
|
||||
<string name="avoid_unpaved">Evitar carreteras no pavimentadas</string>
|
||||
|
|
@ -2026,7 +2025,7 @@
|
|||
<string name="av_locations_descr">Archivo GPX con ubicaciones de nota</string>
|
||||
<string name="av_locations">Ubicaciones</string>
|
||||
|
||||
<string name="tag_poi_amenity">servicio</string>
|
||||
|
||||
<string name="contact_info">Información de contacto</string>
|
||||
<string name="description">Descripción</string>
|
||||
<string name="add_opening_hours">Añadir horario de atención</string>
|
||||
|
|
@ -2125,7 +2124,7 @@
|
|||
<string name="search_on_the_map_item">Búsqueda en el mapa</string>
|
||||
<string name="planning_trip_item">Planeando un viaje</string>
|
||||
|
||||
<string name="osmand_ski_maps_item">Mapas de esquí de OsmAnd</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">Instalación y solución de problemas</string>
|
||||
<string name="techical_articles_item">Artículos técnicos</string>
|
||||
|
|
@ -2136,8 +2135,8 @@
|
|||
<string name="osm_edit_created_bug">Nota OSM creada</string>
|
||||
<string name="map_legend">Leyenda del mapa</string>
|
||||
<string name="shared_string_update">Actualizar</string>
|
||||
<string name="rec_photo_description">Foto %1$s</string>
|
||||
<string name="rec_audio_description">Audio %1$s</string>
|
||||
<string name="rec_video_description">Video %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_upload">Subir</string>
|
||||
</resources>
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="offline_edition">Modifications hors-ligne</string>
|
||||
<string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
|
||||
|
||||
|
|
@ -2066,7 +2065,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
|
|||
<string name="search_on_the_map_item">Rechercher de carte</string>
|
||||
<string name="planning_trip_item">Préparer un trajet</string>
|
||||
|
||||
<string name="osmand_ski_maps_item">Cartes de ski OsmAnd</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">Installation et débogage</string>
|
||||
<string name="techical_articles_item">Articles techniques</string>
|
||||
|
|
@ -2078,8 +2077,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
|
|||
<string name="osm_edit_created_bug">Bugs déclarés sur OSM</string>
|
||||
<string name="map_legend">Légende</string>
|
||||
<string name="shared_string_upload">Téléchargement</string>
|
||||
<string name="rec_photo_description">Photo %1$s</string>
|
||||
<string name="rec_audio_description">Audio %1$s</string>
|
||||
<string name="rec_video_description">Vidéo %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_update">Mise à jour</string>
|
||||
</resources>
|
||||
|
|
@ -1876,7 +1876,7 @@
|
|||
<string name="opening_at">Nyitás</string>
|
||||
<string name="closing_at">Zárás</string>
|
||||
|
||||
<string name="tag_poi_amenity">szolgáltatás</string>
|
||||
|
||||
<string name="contact_info">Elérhetőségek</string>
|
||||
<string name="description">Leírás</string>
|
||||
<string name="add_opening_hours">Nyitva tartás hozzáadása</string>
|
||||
|
|
@ -1976,7 +1976,7 @@
|
|||
<string name="search_on_the_map_item">Keresés a térképen</string>
|
||||
<string name="planning_trip_item">Utazás tervezése</string>
|
||||
|
||||
<string name="osmand_ski_maps_item">OsmAnd sítérkép</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">Telepítés és hibaelhárítás</string>
|
||||
<string name="techical_articles_item">Technikai cikkek</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
|
||||
<string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
|
||||
<string name="offline_edition">Modifiche offline</string>
|
||||
|
|
@ -1923,7 +1922,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="av_locations_descr">File GPX con note locali</string>
|
||||
<string name="av_locations">Località</string>
|
||||
|
||||
<string name="tag_poi_amenity">amenità</string>
|
||||
|
||||
<string name="contact_info">Informazioni di contatto</string>
|
||||
<string name="description">Descrizione</string>
|
||||
<string name="add_opening_hours">Aggiungi orari di apertura</string>
|
||||
|
|
@ -2024,7 +2023,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="search_on_the_map_item">Ricerca sulla mappa</string>
|
||||
<string name="planning_trip_item">Pianifica un viaggio</string>
|
||||
|
||||
<string name="osmand_ski_maps_item">Mappe sci OsmAnd</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">Installazione e soluzione dei problemi</string>
|
||||
<string name="techical_articles_item">Articoli tecnici</string>
|
||||
|
|
@ -2036,7 +2035,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="shared_string_upload">Carica</string>
|
||||
<string name="feedback">Feedback</string>
|
||||
<string name="shared_string_update">Aggiorna</string>
|
||||
<string name="rec_photo_description">Foto %1$s</string>
|
||||
<string name="rec_audio_description">Audio %1$s</string>
|
||||
<string name="rec_video_description">Video %1$s</string>
|
||||
|
||||
|
||||
|
||||
</resources>
|
||||
|
|
@ -1963,7 +1963,7 @@ POIの更新は利用できません</string>
|
|||
<string name="opening_at">～で開く</string>
|
||||
<string name="closing_at">～で閉じる</string>
|
||||
|
||||
<string name="tag_poi_amenity">施設</string>
|
||||
|
||||
<string name="contact_info">連絡先</string>
|
||||
<string name="description">説明</string>
|
||||
<string name="add_opening_hours">開店時間を追記</string>
|
||||
|
|
|
|||
|
|
@ -2150,7 +2150,7 @@
|
|||
<string name="opening_at">~ 열기</string>
|
||||
<string name="closing_at">에 닫기</string>
|
||||
|
||||
<string name="tag_poi_amenity">시설</string>
|
||||
|
||||
<string name="contact_info">연락처 정보</string>
|
||||
<string name="description">설명</string>
|
||||
<string name="add_opening_hours">오프닝 시간 추가</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
|
||||
<string name="shared_location">Bendrinta vieta</string>
|
||||
<string name="osmand_parking_warning">Dėmesio</string>
|
||||
|
|
@ -1958,7 +1957,7 @@
|
|||
<string name="search_on_the_map_item">Paieška žemėlapyje</string>
|
||||
<string name="planning_trip_item">Kelionės planavimas</string>
|
||||
|
||||
<string name="osm_editing_item">OSM redagavimas</string>
|
||||
|
||||
<string name="instalation_troubleshooting_item">Diegimas ir problemų sprendimas</string>
|
||||
<string name="versions_item">Versijos</string>
|
||||
<string name="contact_us">Susisiekti</string>
|
||||
|
|
@ -1979,9 +1978,9 @@
|
|||
|
||||
<string name="osm_edit_created_poi">Sukurta OSM LV</string>
|
||||
<string name="osm_edit_created_bug">Sukurtas OSM riktas</string>
|
||||
<string name="rec_photo_description">Fotografijos %1$s</string>
|
||||
<string name="rec_audio_description">Garsas %1$s</string>
|
||||
<string name="rec_video_description">Vaizdas %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_upload">Išsiųsti</string>
|
||||
<string name="shared_string_update">Atnaujinti</string>
|
||||
<string name="simulate_initial_startup_descr">Nustato kad programa pasileistų kaip pirmą kartą, visi kiti nustatymai nepakitę</string>
|
||||
|
|
|
|||
|
|
@ -1430,7 +1430,7 @@
|
|||
<string name="map_viewing_item">Kartvisning</string>
|
||||
<string name="search_on_the_map_item">Kartsøking</string>
|
||||
|
||||
<string name="audio_video_note_item">Audio/video-notater</string>
|
||||
|
||||
<string name="versions_item">Versjoner</string>
|
||||
<string name="contact_us">Kontakt oss</string>
|
||||
<string name="planning_trip_item">Planlegge en tur</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
|
||||
<string name="layer_map_appearance">Configureer scherm</string>
|
||||
<string name="show_lanes">Toon rijstroken</string>
|
||||
|
|
@ -2113,9 +2112,9 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
|
|||
<string name="go_to_map">Ga naar de kaart</string>
|
||||
<string name="world_map_download_descr">De basis-wereldkaart ontbreekt of is verouderd. Download deze om OsmAnd goed te laten functioneren.</string>
|
||||
<string name="shared_string_update">Updaten</string>
|
||||
<string name="rec_photo_description">Foto %1$s</string>
|
||||
<string name="rec_audio_description">Audio %1$s</string>
|
||||
<string name="rec_video_description">Video %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_upload">Upload</string>
|
||||
<string name="osm_edit_created_poi">POI in OSM gemaakt</string>
|
||||
<string name="osm_edit_created_bug">Bug in OSM gemaakt</string>
|
||||
|
|
|
|||
|
|
@ -2057,7 +2057,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="opening_at">Otwarte od</string>
|
||||
<string name="closing_at">Zamknięte od</string>
|
||||
|
||||
<string name="tag_poi_amenity">Udogodnienia</string>
|
||||
|
||||
<string name="contact_info">Informacje kontaktowe</string>
|
||||
<string name="add_opening_hours">Dodaj godziny otwarcia</string>
|
||||
<string name="working_days">Dni robocze</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="shared_string_my_places">Meus locais</string>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="shared_string_my_places">Meus locais</string>
|
||||
<string name="days_behind">dias atrás</string>
|
||||
<string name="watch">Ver</string>
|
||||
<string name="rendering_attr_pisteGrooming_name">Pista de preparação</string>
|
||||
|
|
@ -1802,9 +1801,9 @@
|
|||
<string name="are_you_sure">Tem certeza?</string>
|
||||
<string name="unsaved_changes_will_be_lost">Quaisquer alterações não salvas serão perdidas. Continuar?</string>
|
||||
<string name="shared_string_update">Atualizar</string>
|
||||
<string name="rec_photo_description">Foto %1$s</string>
|
||||
<string name="rec_audio_description">Áudio %1$s</string>
|
||||
<string name="rec_video_description">Vídeo %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_upload">Enviar</string>
|
||||
<string name="osm_edit_created_poi">POI OSM criado</string>
|
||||
<string name="osm_edit_created_bug">Erro no OSM criado</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="rendering_attr_hideProposed_name">Скрыть планируемые объекты</string>
|
||||
<string name="osmo_use_https_descr">Использовать безопасное подключение к серверу</string>
|
||||
<string name="osmo_use_https">Использовать HTTPS</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
|
||||
<string name="voice_pref_title">Boghe</string>
|
||||
<string name="misc_pref_title">Mistura</string>
|
||||
|
|
@ -1966,7 +1965,7 @@
|
|||
<string name="search_on_the_map_item">Chircare in sa mapa</string>
|
||||
<string name="planning_trip_item">Pranificare unu biàgiu</string>
|
||||
|
||||
<string name="osmand_ski_maps_item">Mapas pro iscì OsmAnd</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">Installatzione e solutziones a sos problemas</string>
|
||||
<string name="techical_articles_item">Artìculos tècnicos</string>
|
||||
|
|
@ -1977,8 +1976,8 @@
|
|||
<string name="osm_edit_created_bug">Nota de errore de OSM creada</string>
|
||||
<string name="map_legend">Legenda de sa mapa</string>
|
||||
<string name="shared_string_upload">Càrriga</string>
|
||||
<string name="rec_photo_description">Foto %1$s</string>
|
||||
<string name="rec_audio_description">Àudio %1$s</string>
|
||||
<string name="rec_video_description">Vìdeu %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_update">Agiorna</string>
|
||||
</resources>
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="recording_context_menu_show">Zobraziť</string>
|
||||
<string name="recording_photo_description">Fotografia %1$s %2$s</string>
|
||||
<string name="av_def_action_picture">Zachytiť fotografiu</string>
|
||||
|
|
@ -2032,7 +2031,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
|
|||
<string name="opening_at">Otvára o</string>
|
||||
<string name="closing_at">Zatvára o</string>
|
||||
|
||||
<string name="tag_poi_amenity">občianska vybavenosť</string>
|
||||
|
||||
<string name="contact_info">Kontaktné údaje</string>
|
||||
<string name="description">Popis</string>
|
||||
<string name="add_opening_hours">Pridať otváracie hodiny</string>
|
||||
|
|
@ -2134,7 +2133,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
|
|||
<string name="search_on_the_map_item">Hľadanie na mape</string>
|
||||
<string name="planning_trip_item">Plánovanie výletu</string>
|
||||
|
||||
<string name="osmand_ski_maps_item">Lyžiarske mapy</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">Inštalácia a riešenie problémov</string>
|
||||
<string name="techical_articles_item">Technické články</string>
|
||||
|
|
@ -2142,9 +2141,9 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
|
|||
<string name="feedback">Anketa</string>
|
||||
<string name="contact_us">Kontaktujte nás</string>
|
||||
<string name="map_legend">Vysvetlivky k mape</string>
|
||||
<string name="rec_photo_description">Foto %1$s</string>
|
||||
<string name="rec_audio_description">Zvuk %1$s</string>
|
||||
<string name="rec_video_description">Video %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_upload">Odoslať</string>
|
||||
<string name="shared_string_update">Aktualizovať</string>
|
||||
</resources>
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="search_button">Poišči</string>
|
||||
<string name="search_activity">Iskanje podatkov</string>
|
||||
|
||||
|
|
@ -1872,7 +1871,7 @@
|
|||
<string name="tab_title_basic">Osnovno</string>
|
||||
<string name="tab_title_advanced">Napredno</string>
|
||||
|
||||
<string name="tag_poi_amenity">prednost</string>
|
||||
|
||||
<string name="contact_info">Podatki stika</string>
|
||||
<string name="description">Opis</string>
|
||||
<string name="add_opening_hours">Dodaj odpiralni čas</string>
|
||||
|
|
@ -1966,7 +1965,7 @@
|
|||
<string name="search_on_the_map_item">Iskanje po zemljevidu</string>
|
||||
<string name="planning_trip_item">Planiranje potovanja</string>
|
||||
|
||||
<string name="audio_video_note_item">Zvočni in video zaznamki</string>
|
||||
|
||||
<string name="instalation_troubleshooting_item">Namestitev in odpravljanje napak</string>
|
||||
<string name="techical_articles_item">Tehnični članki</string>
|
||||
<string name="versions_item">Različice</string>
|
||||
|
|
@ -1980,8 +1979,8 @@
|
|||
|
||||
<string name="map_legend">Legenda zemljevida</string>
|
||||
<string name="shared_string_update">Posodobitev</string>
|
||||
<string name="rec_photo_description">Fotografija %1$s</string>
|
||||
<string name="rec_audio_description">Zvočni posnetek %1$s</string>
|
||||
<string name="rec_video_description">Video posnetek %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_upload">Pošlji</string>
|
||||
</resources>
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
|
||||
<string name="ChooseCountry">Välj land</string>
|
||||
<string name="choose_city">Välj stad</string>
|
||||
|
|
@ -1861,7 +1860,7 @@
|
|||
<string name="dahboard_options_dialog_title">Konfigurera panelen</string>
|
||||
<string name="commit_poi">Skicka in POI</string>
|
||||
|
||||
<string name="tag_poi_amenity">service</string>
|
||||
|
||||
<string name="number_of_rows_in_dash">Antal rader i panelen: %1$s</string>
|
||||
<string name="please_specify_poi_type">Ange typ av POI.</string>
|
||||
<string name="favourites">Favoriter</string>
|
||||
|
|
@ -1953,7 +1952,7 @@
|
|||
<string name="search_on_the_map_item">Söka på kartan</string>
|
||||
<string name="planning_trip_item">Att planera en resa</string>
|
||||
|
||||
<string name="nautical_charts_item">Sjökort</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">Installation och problemlösning</string>
|
||||
<string name="techical_articles_item">Tekniska artiklar</string>
|
||||
|
|
@ -1965,8 +1964,8 @@
|
|||
<string name="shared_string_upload">Skicka</string>
|
||||
<string name="map_legend">Teckenförklaring</string>
|
||||
<string name="shared_string_update">Uppdatera</string>
|
||||
<string name="rec_photo_description">Foto %1$s</string>
|
||||
<string name="rec_audio_description">Ljud %1$s</string>
|
||||
<string name="rec_video_description">Video %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="feedback">Återkoppling</string>
|
||||
</resources>
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
|
||||
<string name="rendering_attr_roadColors_name">道路的色彩調配</string>
|
||||
<string name="map_widget_show_destination_arrow">顯示目的地方向</string>
|
||||
|
|
@ -1851,7 +1850,7 @@
|
|||
<string name="av_locations_descr">GPX 檔案加上地點注解</string>
|
||||
<string name="av_locations">地點</string>
|
||||
|
||||
<string name="tag_poi_amenity">便利設施</string>
|
||||
|
||||
<string name="contact_info">連絡資訊</string>
|
||||
<string name="description">記述</string>
|
||||
<string name="add_opening_hours">增加營業時間</string>
|
||||
|
|
@ -1951,7 +1950,7 @@
|
|||
<string name="search_on_the_map_item">地圖查詢中</string>
|
||||
<string name="planning_trip_item">規劃一次旅程</string>
|
||||
|
||||
<string name="osmand_ski_maps_item">OsmAnd 滑雪地圖</string>
|
||||
|
||||
|
||||
<string name="instalation_troubleshooting_item">安裝和疑難排除</string>
|
||||
<string name="techical_articles_item">技術文章</string>
|
||||
|
|
@ -1962,8 +1961,8 @@
|
|||
<string name="osm_edit_created_bug">建立 OSM 的錯誤</string>
|
||||
<string name="map_legend">地圖圖例</string>
|
||||
<string name="shared_string_upload">上傳</string>
|
||||
<string name="rec_photo_description">照片 %1$s</string>
|
||||
<string name="rec_audio_description">音訊 %1$s</string>
|
||||
<string name="rec_video_description">視訊 %1$s</string>
|
||||
|
||||
|
||||
|
||||
<string name="shared_string_update">更新</string>
|
||||
</resources>
|
||||
|
|
@ -9,11 +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="read_more">Read more</string>
|
||||
<string name="whats_new">What's new in</string>
|
||||
<string name="rendering_attr_hideProposed_name">Hide proposed objects</string>
|
||||
<string name="shared_string_update">Update</string>
|
||||
<string name="rec_photo_description">Photo %1$s</string>
|
||||
<string name="rec_audio_description">Audio %1$s</string>
|
||||
<string name="rec_video_description">Video %1$s</string>
|
||||
<string name="shared_string_upload">Upload</string>
|
||||
<string name="osm_edit_created_poi">Created OSM POI</string>
|
||||
<string name="osm_edit_created_bug">Created OSM bug</string>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,8 @@ public class AppInitializer implements IProgress {
|
|||
private static final String VERSION_INSTALLED = "VERSION_INSTALLED"; //$NON-NLS-1$
|
||||
private static final String EXCEPTION_FILE_SIZE = "EXCEPTION_FS"; //$NON-NLS-1$
|
||||
|
||||
public static final String LATEST_CHANGES_URL = "http://osmand.net/help/changes-2.1.html";
|
||||
// public static final String LATEST_CHANGES_URL = "http://osmand.net/help/changes-2.2.html";
|
||||
public static final String LATEST_CHANGES_URL = null; // not enough to read
|
||||
public static final int APP_EXIT_CODE = 4;
|
||||
public static final String APP_EXIT_KEY = "APP_EXIT_KEY";
|
||||
private OsmandApplication app;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,44 @@
|
|||
package net.osmand.plus.activities;
|
||||
|
||||
import android.os.Bundle;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.osmand.plus.dialogs.helpscreen.HelpScreenDialogFragment;
|
||||
import net.osmand.PlatformUtil;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.Version;
|
||||
import net.osmand.plus.dialogs.helpscreen.HelpArticleDialogFragment;
|
||||
import net.osmand.plus.dialogs.helpscreen.HelpMenuItem;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.StringRes;
|
||||
import android.support.v4.app.DialogFragment;
|
||||
import android.support.v4.app.FragmentActivity;
|
||||
import android.support.v7.widget.Toolbar;
|
||||
import android.util.TypedValue;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ExpandableListView;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
|
||||
public class HelpActivity extends OsmandActionBarActivity {
|
||||
|
||||
public static final String DIALOG = "dialog";
|
||||
final static HelpMenuCategory[] categories = HelpMenuCategory.values();
|
||||
public static final String OSMAND_POLL_HTML = "http://osmand.net/android-poll.html";
|
||||
public static final String OSMAND_MAP_LEGEND = "http://osmand.net/help/map-legend_default.png";
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
|
@ -16,4 +47,373 @@ public class HelpActivity extends OsmandActionBarActivity {
|
|||
new HelpScreenDialogFragment().show(getSupportFragmentManager(), DIALOG);
|
||||
}
|
||||
}
|
||||
|
||||
public static class HelpScreenDialogFragment extends DialogFragment implements ExpandableListView.OnChildClickListener {
|
||||
private static final Log LOG = PlatformUtil.getLog(HelpScreenDialogFragment.class);
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
boolean isLightTheme = (getOsmandApplication())
|
||||
.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
|
||||
int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme;
|
||||
setStyle(STYLE_NO_FRAME, themeId);
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
final View view = inflater.inflate(R.layout.fragment_help_screen, container, false);
|
||||
|
||||
Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
|
||||
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
HelpMenuCategory.BEGIN_WITH_OSMAND.initItems(createBeginWithOsmandItems());
|
||||
HelpMenuCategory.FEATURES.initItems(createFeaturesItems());
|
||||
HelpMenuCategory.PLUGINS.initItems(createPluginsItems());
|
||||
HelpMenuCategory.OTHER.initItems(createOtherItems());
|
||||
|
||||
ExpandableListView listView = (ExpandableListView) view.findViewById(android.R.id.list);
|
||||
final HelpAdapter listAdapter = new HelpAdapter(getActivity());
|
||||
listView.setAdapter(listAdapter);
|
||||
for (int i = 0; i < listAdapter.getGroupCount(); i++) {
|
||||
listView.expandGroup(i);
|
||||
}
|
||||
listView.setOnChildClickListener(this);
|
||||
return view;
|
||||
}
|
||||
|
||||
private OsmandApplication getOsmandApplication() {
|
||||
return (OsmandApplication) getActivity().getApplication();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
|
||||
int childPosition, long id) {
|
||||
if (categories[groupPosition] != HelpMenuCategory.HELP_US_TO_IMPROVE &&
|
||||
categories[groupPosition].getItem(childPosition).getOnClickListener() != null) {
|
||||
LOG.debug("nice");
|
||||
categories[groupPosition].getItem(childPosition).getOnClickListener().onClick(v);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
private List<HelpMenuItem> createBeginWithOsmandItems() {
|
||||
ArrayList<HelpMenuItem> arrayList = new ArrayList<>();
|
||||
ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener(
|
||||
"feature_articles/start.html", getActivity());
|
||||
HelpMenuItem.Builder builder = new HelpMenuItem.Builder()
|
||||
.setTitle(R.string.first_usage_item, getActivity())
|
||||
.setDescription(R.string.first_usage_item_description, getActivity())
|
||||
.setListener(listener);
|
||||
arrayList.add(builder.create());
|
||||
listener = new ShowArticleOnTouchListener(
|
||||
"feature_articles/navigation.html", getActivity());
|
||||
builder = new HelpMenuItem.Builder()
|
||||
.setTitle(R.string.shared_string_navigation, getActivity())
|
||||
.setDescription(R.string.navigation_item_description, getActivity())
|
||||
.setListener(listener);
|
||||
arrayList.add(builder.create());
|
||||
listener = new ShowArticleOnTouchListener("feature_articles/faq.html", getActivity());
|
||||
builder = new HelpMenuItem.Builder()
|
||||
.setTitle(R.string.faq_item, getActivity())
|
||||
.setDescription(R.string.faq_item_description, getActivity())
|
||||
.setListener(listener);
|
||||
arrayList.add(builder.create());
|
||||
return arrayList;
|
||||
}
|
||||
|
||||
private List<HelpMenuItem> createFeaturesItems() {
|
||||
ArrayList<HelpMenuItem> arrayList = new ArrayList<>();
|
||||
String name = getActivity().getString(R.string.map_viewing_item);
|
||||
ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener(
|
||||
"feature_articles/map-viewing.html", getActivity());
|
||||
arrayList.add(new HelpMenuItem(name, listener));
|
||||
name = getActivity().getString(R.string.search_on_the_map_item);
|
||||
listener = new ShowArticleOnTouchListener(
|
||||
"feature_articles/find-something-on-map.html", getActivity());
|
||||
arrayList.add(new HelpMenuItem(name, listener));
|
||||
name = getActivity().getString(R.string.planning_trip_item);
|
||||
listener = new ShowArticleOnTouchListener(
|
||||
"feature_articles/trip-planning.html", getActivity());
|
||||
arrayList.add(new HelpMenuItem(name, listener));
|
||||
name = getActivity().getString(R.string.map_legend);
|
||||
View.OnClickListener onClickListener = new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
HelpArticleDialogFragment.instantiateWithUrl(OSMAND_MAP_LEGEND)
|
||||
.show(getFragmentManager(), null);
|
||||
}
|
||||
};
|
||||
arrayList.add(new HelpMenuItem(name, onClickListener));
|
||||
return arrayList;
|
||||
}
|
||||
|
||||
private List<HelpMenuItem> createPluginsItems() {
|
||||
ArrayList<HelpMenuItem> arrayList = new ArrayList<>();
|
||||
HelpMenuItem.Builder builder = new HelpMenuItem.Builder();
|
||||
for (final OsmandPlugin osmandPlugin : OsmandPlugin.getAvailablePlugins()) {
|
||||
builder.reset();
|
||||
builder.setTitle(osmandPlugin.getName())
|
||||
.setIcon(osmandPlugin.getLogoResourceId());
|
||||
final String helpFileName = osmandPlugin.getHelpFileName();
|
||||
if (helpFileName != null) {
|
||||
builder.setListener(new ShowArticleOnTouchListener(helpFileName, getActivity()));
|
||||
}
|
||||
arrayList.add(builder.create());
|
||||
}
|
||||
return arrayList;
|
||||
}
|
||||
|
||||
private List<HelpMenuItem> createOtherItems() {
|
||||
ArrayList<HelpMenuItem> arrayList = new ArrayList<>();
|
||||
String name = getActivity().getString(R.string.instalation_troubleshooting_item);
|
||||
ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener(
|
||||
"feature_articles/installation-and-troubleshooting.html", getActivity());
|
||||
arrayList.add(new HelpMenuItem(name, listener));
|
||||
|
||||
name = getActivity().getString(R.string.techical_articles_item);
|
||||
listener = new ShowArticleOnTouchListener(
|
||||
"feature_articles/TechnicalArticles.html", getActivity());
|
||||
arrayList.add(new HelpMenuItem(name, listener));
|
||||
name = getActivity().getString(R.string.versions_item);
|
||||
listener = new ShowArticleOnTouchListener(
|
||||
"feature_articles/changes.html", getActivity());
|
||||
arrayList.add(new HelpMenuItem(name, listener));
|
||||
|
||||
String releasedate = "";
|
||||
if (!this.getString(R.string.app_edition).equals("")) {
|
||||
releasedate = this.getString(R.string.shared_string_release) + ": \t" + this.getString(R.string.app_edition);
|
||||
}
|
||||
String version = Version.getFullVersion(getOsmandApplication()) + " " + releasedate;
|
||||
listener = new ShowArticleOnTouchListener(
|
||||
"feature_articles/about.html", getActivity());
|
||||
HelpMenuItem.Builder builder = new HelpMenuItem.Builder()
|
||||
.setTitle(R.string.shared_string_about, getActivity())
|
||||
.setDescription(version)
|
||||
.setListener(listener);
|
||||
|
||||
arrayList.add(builder.create());
|
||||
return arrayList;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
public static class HelpAdapter extends OsmandBaseExpandableListAdapter {
|
||||
private final OsmandApplication ctx;
|
||||
private final FragmentActivity activity;
|
||||
|
||||
public HelpAdapter(FragmentActivity activity) {
|
||||
this.ctx = (OsmandApplication) activity.getApplication();
|
||||
this.activity = activity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HelpMenuItem getChild(int groupPosition, int childPosition) {
|
||||
if (categories[groupPosition] != HelpMenuCategory.HELP_US_TO_IMPROVE) {
|
||||
return categories[groupPosition].getItem(childPosition);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getChildId(int groupPosition, int childPosition) {
|
||||
return groupPosition * 10000 + childPosition;
|
||||
}
|
||||
|
||||
@Override
|
||||
public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
|
||||
View convertView, ViewGroup parent) {
|
||||
if (categories[groupPosition] == HelpMenuCategory.HELP_US_TO_IMPROVE) {
|
||||
convertView = LayoutInflater.from(parent.getContext()).inflate(
|
||||
R.layout.help_to_improve_item, parent, false);
|
||||
TextView feedbackButton = (TextView) convertView.findViewById(R.id.feedbackButton);
|
||||
Drawable pollIcon = ctx.getIconsCache().getContentIcon(R.drawable.ic_action_message);
|
||||
feedbackButton.setCompoundDrawablesWithIntrinsicBounds(null, pollIcon, null, null);
|
||||
feedbackButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
HelpArticleDialogFragment.instantiateWithUrl(OSMAND_POLL_HTML)
|
||||
.show(activity.getSupportFragmentManager(), null);
|
||||
}
|
||||
});
|
||||
TextView contactUsButton = (TextView) convertView.findViewById(R.id.contactUsButton);
|
||||
Drawable contactUsIcon =
|
||||
ctx.getIconsCache().getContentIcon(R.drawable.ic_action_message);
|
||||
contactUsButton.setCompoundDrawablesWithIntrinsicBounds(null, contactUsIcon, null,
|
||||
null);
|
||||
final String email = ctx.getString(R.string.support_email);
|
||||
contactUsButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
Intent intent = new Intent(Intent.ACTION_SENDTO);
|
||||
intent.setData(Uri.parse("mailto:")); // only email apps should handle this
|
||||
intent.putExtra(Intent.EXTRA_EMAIL, new String[]{email});
|
||||
if (intent.resolveActivity(ctx.getPackageManager()) != null) {
|
||||
activity.startActivity(intent);
|
||||
}
|
||||
}
|
||||
});
|
||||
return convertView;
|
||||
} else {
|
||||
final HelpMenuItem child = getChild(groupPosition, childPosition);
|
||||
MenuItemViewHolder viewHolder;
|
||||
if (convertView == null || convertView.getTag() == null) {
|
||||
convertView = LayoutInflater.from(parent.getContext()).inflate(
|
||||
R.layout.two_line_with_images_list_item, parent, false);
|
||||
viewHolder = new MenuItemViewHolder(convertView, ctx);
|
||||
convertView.setTag(viewHolder);
|
||||
} else {
|
||||
viewHolder = (MenuItemViewHolder) convertView.getTag();
|
||||
}
|
||||
viewHolder.bindMenuItem(child);
|
||||
|
||||
return convertView;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public View getGroupView(int groupPosition, boolean isExpanded, final View convertView, final ViewGroup parent) {
|
||||
View v = convertView;
|
||||
int titleId = getGroup(groupPosition);
|
||||
if (v == null) {
|
||||
LayoutInflater inflater = LayoutInflater.from(ctx);
|
||||
v = inflater.inflate(R.layout.download_item_list_section, parent, false);
|
||||
}
|
||||
TextView nameView = ((TextView) v.findViewById(R.id.section_name));
|
||||
nameView.setText(titleId);
|
||||
v.setOnClickListener(null);
|
||||
TypedValue typedValue = new TypedValue();
|
||||
Resources.Theme theme = ctx.getTheme();
|
||||
theme.resolveAttribute(R.attr.ctx_menu_info_view_bg, typedValue, true);
|
||||
v.setBackgroundColor(typedValue.data);
|
||||
|
||||
return v;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getChildrenCount(int groupPosition) {
|
||||
if (categories[groupPosition] != HelpMenuCategory.HELP_US_TO_IMPROVE) {
|
||||
return categories[groupPosition].getChildrenCount();
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getGroup(int groupPosition) {
|
||||
return categories[groupPosition].getTitle();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getGroupCount() {
|
||||
return HelpMenuCategory.values().length;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getGroupId(int groupPosition) {
|
||||
return groupPosition;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasStableIds() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isChildSelectable(int groupPosition, int childPosition) {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static class ShowArticleOnTouchListener implements View.OnClickListener {
|
||||
private final String filename;
|
||||
private final FragmentActivity ctx;
|
||||
|
||||
private ShowArticleOnTouchListener(String filename, FragmentActivity ctx) {
|
||||
this.filename = filename;
|
||||
this.ctx = ctx;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
HelpArticleDialogFragment.instantiateWithAsset(filename)
|
||||
.show(ctx.getSupportFragmentManager(), null);
|
||||
}
|
||||
}
|
||||
|
||||
private enum HelpMenuCategory {
|
||||
BEGIN_WITH_OSMAND(R.string.begin_with_osmand_menu_group),
|
||||
FEATURES(R.string.features_menu_group),
|
||||
PLUGINS(R.string.plugins_menu_group),
|
||||
HELP_US_TO_IMPROVE(R.string.help_us_to_improve_menu_group),
|
||||
OTHER(R.string.other_menu_group);
|
||||
|
||||
private List<HelpMenuItem> items;
|
||||
@StringRes
|
||||
private final int title;
|
||||
|
||||
HelpMenuCategory(int title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public int getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public int getChildrenCount() {
|
||||
return items.size();
|
||||
}
|
||||
|
||||
public HelpMenuItem getItem(int position) {
|
||||
return items.get(position);
|
||||
}
|
||||
|
||||
public void initItems(List<HelpMenuItem> items) {
|
||||
this.items = items;
|
||||
}
|
||||
}
|
||||
|
||||
private static class MenuItemViewHolder {
|
||||
private final TextView nameTextView;
|
||||
private final TextView descrTextView;
|
||||
private final ImageView leftImageView;
|
||||
private final OsmandApplication context;
|
||||
|
||||
public MenuItemViewHolder(View view, OsmandApplication context) {
|
||||
this.context = context;
|
||||
leftImageView = (ImageView) view.findViewById(R.id.leftImageView);
|
||||
descrTextView = (TextView) view.findViewById(R.id.description);
|
||||
nameTextView = (TextView) view.findViewById(R.id.name);
|
||||
}
|
||||
|
||||
public void bindMenuItem(HelpMenuItem menuItem) {
|
||||
nameTextView.setText(menuItem.getTitle());
|
||||
if (menuItem.getDesription() != null) {
|
||||
descrTextView.setVisibility(View.VISIBLE);
|
||||
descrTextView.setText(menuItem.getDesription());
|
||||
} else {
|
||||
descrTextView.setVisibility(View.GONE);
|
||||
}
|
||||
if (menuItem.getIcon() != -1) {
|
||||
leftImageView.setVisibility(View.VISIBLE);
|
||||
leftImageView.setImageDrawable(context.getIconsCache()
|
||||
.getContentIcon(menuItem.getIcon()));
|
||||
} else {
|
||||
leftImageView.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -746,17 +746,6 @@ public class MapActivityActions implements DialogProvider {
|
|||
@Override
|
||||
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
|
||||
mapActivity.startActivity(new Intent(mapActivity, HelpActivity.class));
|
||||
// FIXME show ABOUT!
|
||||
// showAboutDialog(getMyApplication());
|
||||
// String version = Version.getFullVersion(app);
|
||||
// String vt = this.getString(R.string.about_version) + "\t";
|
||||
// String edition = "";
|
||||
// if (!this.getString(R.string.app_edition).equals("")) {
|
||||
// edition = this.getString(R.string.shared_string_release) + " : \t" + this.getString(R.string.app_edition);
|
||||
// }
|
||||
// tv.setText(vt + version + "\n" +
|
||||
// edition + "\n\n" +
|
||||
// this.getString(R.string.about_content));
|
||||
return true;
|
||||
}
|
||||
}).reg();
|
||||
|
|
|
|||
|
|
@ -233,11 +233,11 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
|
|||
if (desc != null) {
|
||||
return desc;
|
||||
} else if (this.isAudio()) {
|
||||
return ctx.getString(R.string.rec_audio_description, formatDateTime(ctx, file.lastModified()));
|
||||
return ctx.getString(R.string.shared_string_audio) + " " + formatDateTime(ctx, file.lastModified());
|
||||
} else if (this.isVideo()) {
|
||||
return ctx.getString(R.string.rec_video_description, formatDateTime(ctx, file.lastModified()));
|
||||
return ctx.getString(R.string.shared_string_video) + " " + formatDateTime(ctx, file.lastModified());
|
||||
} else if (this.isPhoto()) {
|
||||
return ctx.getString(R.string.rec_photo_description, formatDateTime(ctx, file.lastModified()));
|
||||
return ctx.getString(R.string.shared_string_photo) + " " + formatDateTime(ctx, file.lastModified());
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ public class WhatsNewDialogFragment extends DialogFragment {
|
|||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
||||
final OsmandApplication osmandApplication = (OsmandApplication) getActivity().getApplication();
|
||||
final String appVersion = Version.getAppVersion(osmandApplication);
|
||||
builder.setTitle("What's new in " + appVersion)
|
||||
.setMessage(getString(R.string.last_release))
|
||||
builder.setTitle(getString(R.string.whats_new) + " " + appVersion)
|
||||
.setMessage(getString(R.string.release_2_2))
|
||||
.setNegativeButton(R.string.shared_string_close, null);
|
||||
// TODO: 10/28/15 Implement
|
||||
builder.setPositiveButton("Read more", new DialogInterface.OnClickListener() {
|
||||
if (AppInitializer.LATEST_CHANGES_URL != null) {
|
||||
builder.setPositiveButton(R.string.read_more, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
Intent i = new Intent(Intent.ACTION_VIEW);
|
||||
|
|
@ -39,6 +39,7 @@ public class WhatsNewDialogFragment extends DialogFragment {
|
|||
dismiss();
|
||||
}
|
||||
});
|
||||
}
|
||||
return builder.create();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package net.osmand.plus.dialogs.helpscreen;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
|
|
@ -10,14 +11,11 @@ import android.view.View;
|
|||
import android.view.ViewGroup;
|
||||
import android.webkit.WebView;
|
||||
import android.webkit.WebViewClient;
|
||||
|
||||
import net.osmand.PlatformUtil;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.R;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
|
@ -46,6 +44,7 @@ public class HelpArticleDialogFragment extends DialogFragment {
|
|||
setStyle(STYLE_NO_FRAME, themeId);
|
||||
}
|
||||
|
||||
@SuppressLint("SetJavaScriptEnabled")
|
||||
@NonNull
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
|
|
@ -63,6 +62,7 @@ public class HelpArticleDialogFragment extends DialogFragment {
|
|||
String assetName = getArguments().getString(ASSET_NAME);
|
||||
String url = getArguments().getString(URL);
|
||||
webView = (WebView) view.findViewById(R.id.webView);
|
||||
webView.getSettings().setJavaScriptEnabled(true);
|
||||
if (assetName != null) {
|
||||
if (savedInstanceState != null) {
|
||||
webView.restoreState(savedInstanceState);
|
||||
|
|
@ -77,6 +77,7 @@ public class HelpArticleDialogFragment extends DialogFragment {
|
|||
webView.loadDataWithBaseURL("http://osmand.net", sb.toString(), null, "utf-8", null);
|
||||
}
|
||||
} else if (url != null) {
|
||||
|
||||
webView.getSettings().setLoadWithOverviewMode(true);
|
||||
webView.getSettings().setUseWideViewPort(true);
|
||||
if (savedInstanceState != null) {
|
||||
|
|
|
|||
|
|
@ -176,7 +176,6 @@ public class HelpScreenDialogFragment extends DialogFragment implements Expandab
|
|||
nameView.setText(titleId);
|
||||
v.setOnClickListener(null);
|
||||
TypedValue typedValue = new TypedValue();
|
||||
// TODO optimize
|
||||
Resources.Theme theme = ctx.getTheme();
|
||||
theme.resolveAttribute(R.attr.ctx_menu_info_view_bg, typedValue, true);
|
||||
v.setBackgroundColor(typedValue.data);
|
||||
|
|
|
|||
Loading…
Reference in a new issue