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

Fix #7244 Configure Map: add sunset / sunrise time to Map Mode

Browse source
This commit is contained in:
Dima-1 2020-01-28 18:29:53 +02:00
parent ad8b7e369e
commit 78edec2259
39 changed files with 63 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3308,7 +3308,7 @@
<string name="routing_attr_width_description">حدد الحد المسموح به لعرض السيارة على الطرق.</string>
<string name="simulate_your_location_gpx_descr">محاكاة موقعك باستخدام مسار GPX مسجل.</string>
<string name="quick_action_directions_from_desc">زر لجعل الشاشة مركز نقطة الانطلاق وحساب الطريق إلى الوجهة أو فتح مربع حوار لتحديد الوجهة إذا لم تكن علامة الوجهة علي الخريطة.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">شخصي</string>
<string name="shared_string_downloading_formatted">تنزيل %s</string>

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

@ -3360,7 +3360,7 @@
<string name="add_new_profile_q">Дадаць новы профіль \"%1$s\"\?</string>
<string name="save_heading">Захоўваць кірунак</string>
<string name="save_heading_descr">Падчас запісу захоўваць кірунак для кожнага пункта маршруту.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Асабісты</string>
<string name="shared_string_downloading_formatted">Спампоўванне %s</string>

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

@ -3394,7 +3394,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="dialogs_and_notifications_descr">Emergents de control, diàlegs i notificacions que surten a OsmAnd mentre s\'utilitza.</string>
<string name="join_segments">Uneix segments</string>
<string name="add_new_profile_q">Voleu afegir el perfil nou \'%1$s\'\?</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personal</string>
<string name="shared_string_downloading_formatted">S\'està baixant %s</string>

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

@ -3406,7 +3406,7 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="add_new_profile_q">Tilføj ny profil \'%1$s\'\?</string>
<string name="save_heading">Medtag overskrift</string>
<string name="save_heading_descr">Gem overskrift til hvert TrackPoint under optagelsen.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personlig</string>
<string name="shared_string_downloading_formatted">Henter %s</string>

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

@ -3403,7 +3403,7 @@ Lon %2$s</string>
<string name="add_new_profile_q">Neues Profil \'%1$s\' hinzufügen\?</string>
<string name="save_heading">Richtung einbeziehen</string>
<string name="save_heading_descr">Richtung zu jedem Trackpunkt während der Aufnahme speichern.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Persönlich</string>
<string name="shared_string_downloading_formatted">%s herunterladen</string>

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

@ -3399,7 +3399,7 @@
<string name="add_new_profile_q">Προσθήκη νέας κατατομής (προφίλ) \'%1$s\';</string>
<string name="save_heading">Συμπερίληψη κατεύθυνσης</string>
<string name="save_heading_descr">Αποθήκευση κατεύθυνσης για κάθε σημείο ίχνους κατά την εγγραφή.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Προσωπικό</string>
<string name="shared_string_downloading_formatted">Λήψη %s</string>

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

@ -3378,7 +3378,7 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="add_new_profile_q">Ĉu aldoni novan profilon “%1$s”\?</string>
<string name="save_heading">Inkluzivi direkton</string>
<string name="save_heading_descr">Konservi direkton al ĉiu punkto de kurso dum registri.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personaj</string>
<string name="shared_string_downloading_formatted">Elŝutado de %s</string>

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

@ -3415,7 +3415,7 @@ Lon %2$s</string>
<string name="add_new_profile_q">¿Añadir el nuevo perfil «%1$s»\?</string>
<string name="save_heading">Incluir rumbo</string>
<string name="save_heading_descr">Guarda el rumbo para cada punto de la traza durante el seguimiento.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personal</string>
<string name="shared_string_downloading_formatted">Descargando %s</string>

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

@ -3403,7 +3403,7 @@ Lon %2$s</string>
<string name="add_new_profile_q">¿Añadir el nuevo perfil «%1$s»\?</string>
<string name="save_heading">Incluir rumbo</string>
<string name="save_heading_descr">Guarda el rumbo para cada punto de la traza durante la grabación.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personal</string>
<string name="shared_string_downloading_formatted">Descargando %s</string>

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

@ -3394,7 +3394,7 @@
<string name="add_new_profile_q">¿Añadir el nuevo perfil «%1$s»\?</string>
<string name="save_heading">Incluir rumbo</string>
<string name="save_heading_descr">Guarda el rumbo para cada punto de la traza durante la grabación.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personal</string>
<string name="shared_string_downloading_formatted">Descargando %s</string>

2
OsmAnd/res/values-et/strings.xml
View file

@ -1032,7 +1032,7 @@
<string name="add_new_profile_q">Lisada uus profiil \'%1$s\'\?</string>
<string name="save_heading">Kaasa pealkiri</string>
<string name="save_heading_descr">Salvestamise ajal salvesta kurss igasse teekonnapunkti.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Isiklik</string>
<string name="shared_string_downloading_formatted">Allalaadimine %s</string>

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

@ -3400,7 +3400,7 @@ Area honi dagokio: %1$s x %2$s</string>
<string name="add_new_profile_q">Gehitu \'%1$s\' profil berria\?</string>
<string name="save_heading">Sartu norabidea</string>
<string name="save_heading_descr">Gorde lorratzeko puntu bakoitzerako norabidea grabatzean.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Pertsonala</string>
<string name="shared_string_downloading_formatted">%s deskargatzen</string>

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

@ -3431,7 +3431,7 @@
<string name="join_segments">پیوند پاره‌ها</string>
<string name="save_heading">ثبت جهت</string>
<string name="save_heading_descr">هنگام ضبط، جهت را برای هر یک از نقطه‌های رد ثبت کن.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s،‏ %2$s</string>
<string name="personal_category_name">شخصی</string>
<string name="shared_string_downloading_formatted">در حال بارگیری %s</string>

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

@ -3376,7 +3376,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="rendering_attr_showCycleNodeNetworkRoutes_name">Afficher les pistes cyclables</string>
<string name="rendering_value_walkingRoutesOSMCNodes_name">Réseaux</string>
<string name="personal_category_name">Personnel</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="shared_string_downloading_formatted">Téléchargement %s</string>
<string name="rendering_value_thick_name">Épais</string>

2
OsmAnd/res/values-gl/strings.xml
View file

@ -3430,7 +3430,7 @@ Lon %2$s</string>
<string name="add_new_profile_q">Engadir novo perfil \'%1$s\'\?</string>
<string name="save_heading">Incluír encabezamento</string>
<string name="save_heading_descr">Gardar encabezamento en cada punto da pista (trackpoint) mentres se grava.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Persoal</string>
<string name="shared_string_downloading_formatted">Baixando %s</string>

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

@ -3386,7 +3386,7 @@
<string name="add_new_profile_q">להוסיף פרופיל חדש ‚%1&amp;s’\?</string>
<string name="save_heading">כולל הכותרת</string>
<string name="save_heading_descr">לשמור את הכותרת של כל נקודת דרך בזמן ההקלטה.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">אישי</string>
<string name="shared_string_downloading_formatted">%s בהורדה</string>

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

@ -3232,7 +3232,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
<string name="dialogs_and_notifications_descr">Felugró üzenetek, párbeszédablakok és értesítések beállításai.</string>
<string name="suggested_maps">Javasolt térképek</string>
<string name="add_new_profile_q">Hozzáadja az új „%1$s” profilt\?</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Személyes</string>
<string name="shared_string_downloading_formatted">%s letöltése</string>

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

@ -3407,7 +3407,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
<string name="add_new_profile_q">Bæta við nýja sniðinu \'%1$s\'\?</string>
<string name="save_heading">Hafa með stefnu</string>
<string name="save_heading_descr">Vista stefnu í hvern ferilpunkt á meðan upptöku stendur.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Persónulegt</string>
<string name="shared_string_downloading_formatted">Sæki %s</string>

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

@ -3394,7 +3394,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
<string name="add_new_profile_q">Aggiungere il nuovo profilo \'%1$s\'\?</string>
<string name="save_heading">Salva orientamento</string>
<string name="save_heading_descr">Durante la registrazione salva l\'orientamento per ogni punto della traccia</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personale</string>
<string name="shared_string_downloading_formatted">Scaricamento %s</string>

2
OsmAnd/res/values-ja/strings.xml
View file

@ -3402,7 +3402,7 @@ POIの更新は利用できません</string>
<string name="shared_string_downloading_formatted">をダウンロード中</string>
<string name="rendering_value_thick_name">濃い</string>
<string name="desert_render_descr">砂漠などの過疎地に向いたマップスタイルです。</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="select_navigation_icon">ナビゲーションアイコンの選択</string>
<string name="select_map_icon">マップアイコンの選択</string>

2
OsmAnd/res/values-kn/strings.xml
View file

@ -361,7 +361,7 @@
<string name="add_new_profile_q">ಹೊಸ ಪ್ರೊಫೈಲ್ ಸೇರಿಸುವುದೇ \'%1$s\'\?</string>
<string name="save_heading">ಶೀರ್ಷಿಕೆಯನ್ನು ಸೇರಿಸಿ</string>
<string name="save_heading_descr">ರೆಕಾರ್ಡಿಂಗ್ ಮಾಡುವಾಗ ಪ್ರತಿ ಟ್ರ್ಯಾಕ್ ಪಾಯಿಂಟ್‌ಗೆ ಶೀರ್ಷಿಕೆ ಉಳಿಸಿ.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">ವೈಯಕ್ತಿಕ</string>
<string name="shared_string_downloading_formatted">ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ%s</string>

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

@ -3405,7 +3405,7 @@
<string name="added_profiles_descr">Programtillegg legger til ny profil i OsmAnd</string>
<string name="shared_string_turn_off">Skru av</string>
<string name="new_plugin_added">Nytt programtillegg lagt til</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personlig</string>
<string name="shared_string_downloading_formatted">Laster ned %s</string>

2
OsmAnd/res/values-nl/strings.xml
View file

@ -3276,7 +3276,7 @@ voor Gebied: %1$s x %2$s</string>
<string name="save_heading_descr">Sla koers naar elk trackpunt op tijdens het opnemen.</string>
<string name="save_heading">Richting toevoegen</string>
<string name="personal_category_name">Persoonlijk</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="shared_string_downloading_formatted">Downloaden %s</string>
<string name="desert_render_descr">Voor woestijnen en andere dunbevolkte gebieden. Toont meer details op schaal.</string>

2
OsmAnd/res/values-pl/strings.xml
View file

@ -3396,7 +3396,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="add_new_profile_q">Dodać nowy profil \'%1$s\'\?</string>
<string name="save_heading">Dołącz kierunek</string>
<string name="save_heading_descr">Zapisz podczas nagrywania kierunek do każdego punktu trasy.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Osobiste</string>
<string name="shared_string_downloading_formatted">Pobieranie %s</string>

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

@ -3391,7 +3391,7 @@ Pôr do Sol: %2$s</string>
<string name="add_new_profile_q">Adicionar novo perfil \'%1$s\'\?</string>
<string name="save_heading">Incluir direção</string>
<string name="save_heading_descr">Salve o cabeçalho em cada ponto da trilha durante a gravação.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Pessoal</string>
<string name="shared_string_downloading_formatted">Baixando %s</string>

2
OsmAnd/res/values-pt/strings.xml
View file

@ -3376,7 +3376,7 @@
<string name="add_new_profile_q">Adicionar novo perfil \'%1$s\'\?</string>
<string name="save_heading">Incluir a direção</string>
<string name="save_heading_descr">Gravar direção para cada ponto de pista durante a gravação.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Pessoal</string>
<string name="shared_string_downloading_formatted">Descarregando %s</string>

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

@ -2653,7 +2653,7 @@
<string name="add_new_profile_q">Adăugați un profil nou \'%1$s\'\?</string>
<string name="save_heading">Includeți titlu</string>
<string name="save_heading_descr">Salvați poziția fiecarui punct al traseului în timpul înregistrării.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personal</string>
<string name="shared_string_downloading_formatted">Descarcarea</string>

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

@ -3347,7 +3347,7 @@
<string name="rendering_value_walkingRoutesOSMCNodes_name">Узловые сети</string>
<string name="suggested_maps">Предлагаемые карты</string>
<string name="join_segments">Объединить сегменты</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="desert_render_descr">Для пустынь и других малонаселенных районов. Отображает больше деталей на шкале просмотра.</string>
<string name="select_navigation_icon">Выберите значок навигации</string>

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

@ -3398,7 +3398,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="add_new_profile_q">Annanghere su profilu nou \'%1$s\'\?</string>
<string name="save_heading">Inclue sa diretzione</string>
<string name="save_heading_descr">Sarva sa diretzione pro cada puntu cando ses registrende.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personale</string>
<string name="shared_string_downloading_formatted">Iscarrighende %s</string>

2
OsmAnd/res/values-sk/strings.xml
View file

@ -3382,7 +3382,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="add_new_profile_q">Pridať nový profil \'%1$s\'\?</string>
<string name="save_heading">Pridať nadpis</string>
<string name="save_heading_descr">Pridať nadpis ku každému bodu trasy pri zázname.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Osobné</string>
<string name="shared_string_downloading_formatted">Sťahujem %s</string>

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

@ -3274,7 +3274,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="rendering_value_walkingRoutesOSMCNodes_name">Omrežja vozlišč</string>
<string name="save_heading">Vključi glavo</string>
<string name="save_heading_descr">Shrani glavo k vsaki točki sledi med beleženjem.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Osebno</string>
<string name="shared_string_downloading_formatted">Poteka prejemanje %s</string>

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

@ -3394,7 +3394,7 @@
<string name="add_new_profile_q">Додај нови профил ’%1$s’\?</string>
<string name="save_heading">Укључи заглавље</string>
<string name="save_heading_descr">Сачувај заглавље свакој тачки праћења приликом снимања.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Лични</string>
<string name="shared_string_downloading_formatted">Преузимам %s</string>

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

@ -3359,7 +3359,7 @@
<string name="add_new_profile_q">\'%1$s\' yeni profil eklensin mi\?</string>
<string name="save_heading">Başlığı dahil et</string>
<string name="save_heading_descr">Kayıt sırasında her izleme noktasına başlığı kaydet.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Kişisel</string>
<string name="shared_string_downloading_formatted">%s indiriliyor</string>

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

@ -3394,7 +3394,7 @@
<string name="add_new_profile_q">Додати новий профіль \'%1$s\'\?</string>
<string name="save_heading">Зберегти заголовок</string>
<string name="save_heading_descr">Зберегти заголовок для кожної точки треку під час запису.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Особистий</string>
<string name="shared_string_downloading_formatted">Завантажується %s</string>

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

@ -2798,7 +2798,7 @@
<string name="download_map_dialog">下载地图对话框</string>
<string name="suggested_maps">建议的地图</string>
<string name="shared_string_turn_off">关闭</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="select_navigation_icon">选择导航图标</string>
<string name="select_map_icon">选择地图图标</string>
<string name="delete_profiles_descr">在您点击“应用”后，已删除的配置将永久丢失。</string>

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

@ -3394,7 +3394,7 @@
<string name="add_new_profile_q">新增新的設定檔「%1$s」？</string>
<string name="save_heading">包含標題</string>
<string name="save_heading_descr">在記錄時將標題儲存到每個追蹤點。</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">個人</string>
<string name="shared_string_downloading_formatted">正在下載 %s</string>

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

@ -11,6 +11,9 @@
Thx - Hardy
-->
<string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
<string name="sunset_at">Sunset at %1$s</string>
<string name="sunrise_at">Sunrise at %1$s</string>
<string name="permission_is_required">Permission is required to use this option.</string>
<string name="logcat_buffer_descr">Check and share detailed logs of the application</string>
<string name="file_does_not_contain_routing_rules">No routing rules in \'%1$s\'. Please choose another file.</string>
@ -81,7 +84,7 @@
<string name="edit_profiles_descr">OsmAnd default profiles cannot be deleted, but disabled (on the previous screen), or be sorted to the bottom.</string>
<string name="edit_profiles">Edit profiles</string>
<string name="select_nav_profile_dialog_message">The \'Navigation type\' governs how routes are calculated.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personal</string>
<string name="add_new_profile_q">Add the new profile \'%1$s\'?</string>

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

@ -954,7 +954,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
name.setTextColor(getResources().getColor(visible ? enabledColor : disabledColor));
distanceText.setText(distance);
if (model.isAddressSpecified()) {
distanceText.setText(String.format(getString(R.string.distance_and_address), distance.trim(), model.getAddress()));
distanceText.setText(String.format(getString(R.string.ltr_or_rtl_combine_via_bold_point), distance.trim(), model.getAddress()));
}
icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(),
visible ? model.getColor() : getResources().getColor(disabledIconColor), false, model));

35
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -583,9 +583,29 @@ public class ConfigureMapMenu {
}
}).createItem());
String description = "";
SunriseSunset sunriseSunset = activity.getMyApplication().getDaynightHelper().getSunriseSunset();
if (sunriseSunset != null) {
DateFormat dateFormat = DateFormat.getTimeInstance(DateFormat.SHORT);
String sunriseTime = dateFormat.format(sunriseSunset.getSunrise());
String sunsetTime = dateFormat.format(sunriseSunset.getSunset());
OsmandSettings.DayNightMode dayNightMode = activity.getMyApplication().getSettings().DAYNIGHT_MODE.get();
if (dayNightMode.isDay() || dayNightMode.isNight()) {
if (sunriseSunset.isDaytime()) {
description = String.format(app.getString(R.string.sunset_at), sunsetTime);
} else {
description = String.format(app.getString(R.string.sunrise_at), sunriseTime);
}
} else if (dayNightMode.isAuto() || dayNightMode.isSensor()) {
description = String.format(app.getString(R.string.ltr_or_rtl_combine_via_slash), sunriseTime, sunsetTime);
}
description = String.format(app.getString(R.string.ltr_or_rtl_combine_via_bold_point), getDayNightDescr(activity), description);
} else {
description = getDayNightDescr(activity);
}
adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.map_mode, activity)
.setId(MAP_MODE_ID)
.setDescription(getDayNightDescr(activity)).setLayout(R.layout.list_item_single_line_descrition_narrow)
.setDescription(description)
.setIcon(getDayNightIcon(activity)).setListener(new ItemClickListener() {
@Override
public boolean onContextMenuClick(final ArrayAdapter<ContextMenuItem> ad, int itemId,
@ -595,18 +615,7 @@ public class ConfigureMapMenu {
bld.setTitle(R.string.daynight);
final String[] items = new String[OsmandSettings.DayNightMode.values().length];
for (int i = 0; i < items.length; i++) {
items[i] = OsmandSettings.DayNightMode.values()[i].toHumanString(activity
.getMyApplication());
}
SunriseSunset sunriseSunset = activity.getMyApplication().getDaynightHelper().getSunriseSunset();
if (sunriseSunset != null) {
DateFormat dateFormat = DateFormat.getTimeInstance(DateFormat.SHORT);
String sunriseSunsetTime = "\n" + dateFormat.format(activity.getMyApplication()
.getDaynightHelper().getSunriseSunset().getSunrise()) + "/" +
dateFormat.format(activity.getMyApplication()
.getDaynightHelper().getSunriseSunset().getSunset());
items[0] += sunriseSunsetTime;
items[i] = OsmandSettings.DayNightMode.values()[i].toHumanString(app);
}
int i = view.getSettings().DAYNIGHT_MODE.get().ordinal();
bld.setNegativeButton(R.string.shared_string_dismiss, null);