Merge branch 'master' into rzr-relations

osmandapp · Feb 12, 2025 · e766f73 · e766f73
2 parents 3cfa1f8 + 3a307cb
commit e766f73
Show file tree

Hide file tree

Showing 38 changed files with 644 additions and 389 deletions.
diff --git a/OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java b/OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java
@@ -201,6 +201,7 @@ public interface OsmAndCustomizationConstants {
 	String FRAGMENT_DRAWER_ID = FRAGMENT_ID + "drawer";
 	String FRAGMENT_TRIPLTEK_PROMO_ID = FRAGMENT_ID + "tripltek_promo";
 	String FRAGMENT_HUGEROCK_PROMO_ID = FRAGMENT_ID + "hugerock_promo";
+	String FRAGMENT_HMD_PROMO_ID = FRAGMENT_ID + "hmd_promo";
 
 	//Map Context Menu rows:
 	String MAP_CONTEXT_MENU_ROWS = "context.menu.rows.";

diff --git a/OsmAnd/res/layout/context_menu_action_item.xml b/OsmAnd/res/layout/context_menu_action_item.xml
@@ -22,7 +22,7 @@
 		android:layout_height="wrap_content"
 		android:ellipsize="end"
 		android:maxLines="1"
-		android:textColor="@color/text_color_secondary_light"
+		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/default_desc_text_size"
 		android:textStyle="normal" />
 

diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -5687,4 +5687,7 @@
     <string name="show_utm_grids">Koristite UTM umesto WGS84</string>
     <string name="no_photo_for_location_desc">Još uvek nije dodata nijedna korisnička fotografija na ovu lokaciju</string>
     <string name="no_places_available">Nema slobodnih mesta</string>
+    <string name="shared_string_road_exit">Izlaz</string>
+    <string name="hmd_promo_description">Besplatan pristup funkcijama uključujući neograničeno preuzimanje mapa, 3D reljef itd. za %1$s mesec</string>
+    <string name="hmd_promo">HMD promocija za %1$s meseci</string>
 </resources>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
@@ -5701,4 +5701,7 @@
     <string name="map_grid">Mapové mřížky</string>
     <string name="no_places_available">Žádná volná místa</string>
     <string name="no_photo_for_location_desc">K této lokalitě zatím nebyly přidány žádné uživatelské fotografie</string>
+    <string name="hmd_promo_description">Bezplatný přístup k funkcím včetně neomezeného stahování map, 3D reliéfu a dalších na %1$s měsíců</string>
+    <string name="shared_string_road_exit">Výjezd</string>
+    <string name="hmd_promo">HMD Promo na %1$s měsíců</string>
 </resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
@@ -5733,4 +5733,7 @@
     <string name="show_grids_description">Tillad visning af gradnet over kortet</string>
     <string name="no_places_available">Ingen steder til rådighed</string>
     <string name="no_photo_for_location_desc">Der er endnu ikke tilføjet nogen brugerbilleder til dette sted</string>
+    <string name="hmd_promo_description">Gratis adgang til funktioner, herunder ubegrænsede kortdownloads, 3D-relief etc. i %1$s måneder</string>
+    <string name="shared_string_road_exit">Afkørsel</string>
+    <string name="hmd_promo">HMD Promo i %1$s måneder</string>
 </resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
@@ -5717,4 +5717,7 @@
     <string name="show_utm_grids_description">Gitter in UTM-Metern statt in WGS84-Grad anzeigen</string>
     <string name="no_places_available">Keine Plätze verfügbar</string>
     <string name="no_photo_for_location_desc">Es wurden noch keine Benutzerfotos zu diesem Ort hinzugefügt</string>
+    <string name="shared_string_road_exit">Ausfahrt</string>
+    <string name="hmd_promo_description">Kostenloser Zugriff auf Funktionen wie unbegrenzte Karten-Downloads, 3D-Reliefs usw. für einen Monat (%1$s)</string>
+    <string name="hmd_promo">HMD Promo für %1$s Monate</string>
 </resources>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
@@ -5688,4 +5688,15 @@
     <string name="plugin_ais_tracker_name">Suivi AIS du navire</string>
     <string name="no_places_available">Aucun lieu disponible</string>
     <string name="no_photo_for_location_desc">Aucune photo d\'utilisateur n\'a encore été ajoutée pour ce lieu</string>
+    <string name="ais_object_lost_timeout_description">Définir le délai d\'expiration pour la visibilité des objets AIS : après ce délai sans réception de signal, l\'objet sera retiré de l\'écran.</string>
+    <string name="ais_cpa_warning_time">Délai d\'avertissement pour atteindre le Point d\'Approche le plus proche (CPA)</string>
+    <string name="ais_cpa_warning_distance_description">Les navires sont marqués en rouge si le CPA est inférieur à cette valeur et s\'il est atteint dans un futur proche (voir « Délai d\'avertissement pour atteindre le Point d\'Approche le plus proche (CPA) »).</string>
+    <string name="plugin_ais_tracker_disclaimer">CLAUSE DE NON-RESPONSABILITÉ\n\nCette extension est un projet de loisir et n\'est pas conçu pour la fiabilité et l\'intégrité. NE VOUS FIEZ PAS à ce logiciel de quelque manière que ce soit, y compris le guidage et/ou votre sécurité.</string>
+    <string name="ais_ship_lost_timeout_description">Définir le délai pour la visibilité des bateaux : après ce délai sans réception de signal, le symbole du bateau changera sur l\'écran : il sera barré.</string>
+    <string name="ais_cpa_settings">Paramètres liés au CPA</string>
+    <string name="ais_cpa_settings_description">Ces valeurs définissent l\'apparence des objets AIS qui pourraient devenir trop proches de votre position.</string>
+    <string name="ais_cpa_warning_distance">Distance d\'avertissement pour le Point d\'Approche le plus proche (CPA)</string>
+    <string name="ais_cpa_warning_time_description">Si le TCPA (temps pour atteindre le CPA avec un autre navire) est inférieur à cette valeur, le navire sera marqué en rouge.</string>
+    <string name="ais_ship_lost_timeout">Délai d\'expiration pour la visibilité des bateaux lorsque aucun signal n\'est reçu</string>
+    <string name="plugin_ais_tracker_description">Affiche les positions AIS et des informations à propos des navires à proximité. Les données AIS sont reçues via le réseau à partir d\'un récepteur AIS externe.</string>
 </resources>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
@@ -5658,4 +5658,7 @@
     <string name="show_utm_grids_description">WGS84 fokok helyett UTM méterben mutatja a rácsot</string>
     <string name="no_photo_for_location_desc">Még nem adtak hozzá felhasználói fotókat ehhez a helyhez</string>
     <string name="no_places_available">Nincsenek helyek</string>
+    <string name="hmd_promo_description">Ingyenes hozzáférés %1$s hónapig a funkciókhoz, beleértve a korlátlan térképletöltést, a 3D domborzatot stb</string>
+    <string name="shared_string_road_exit">Kijárat</string>
+    <string name="hmd_promo">%1$s hónapos HMD promóció</string>
 </resources>
diff --git a/OsmAnd/res/values-in/strings.xml b/OsmAnd/res/values-in/strings.xml
@@ -4040,7 +4040,7 @@
     <string name="trip_recording_duration_widget_desc">Menampilkan waktu perekaman trek, durasi dalam menit/jam dari perjalanan yang sedang direkam.</string>
     <string name="download_tiles">Unduh ubin</string>
     <string name="connect_with_straight_line">Hubungkan dengan garis lurus</string>
-    <string name="attach_roads_descr">Perkirakan trek Anda ke jalan yang diperbolehkan untuk merute antara titik dan kaitkan instruksi belokan tepat dan properti rute.</string>
+    <string name="attach_roads_descr">Pasang trek Anda pada jalan untuk mendapatkan informasi rute detail, termasuk petunjuk putaran dan atribut jalan.</string>
     <string name="auto_backup_title">Pencadangan otomatis</string>
     <string name="without_profiles_changing">Tanpa perubahan profil</string>
     <string name="shared_string_only_missing">Hanya hilang</string>
@@ -6094,4 +6094,6 @@
     <string name="show_utm_grids_description">Tampilkan kisi dalam meter UTM daripada derajat WGS84</string>
     <string name="show_grids_description">Perbolehkan menampilkan kisi pada peta</string>
     <string name="show_grids">Tampilkan kisi peta</string>
+    <string name="no_places_available">Tidak ada tempat yang tersedia</string>
+    <string name="no_photo_for_location_desc">Belum ada foto pengguna yang ditambahkan ke tempat ini</string>
 </resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
@@ -5697,7 +5697,7 @@
     <string name="ais_object_lost_timeout_description">Imposta il timeout per la visibilità degli oggetti AIS: trascorso questo periodo di tempo senza ricezione del segnale, l\'oggetto AIS verrà rimosso dallo schermo.</string>
     <string name="ais_port_nmea_local_description">Definisci la porta UDP in cui OsmOnd riceve i dati NMEA</string>
     <string name="ais_ship_lost_timeout_description">Imposta il timeout per la visibilità della nave: trascorso questo periodo di tempo senza ricezione del segnale, il simbolo della nave cambierà stato sullo schermo: sarà barrato.</string>
-    <string name="ais_cpa_settings">Impostazioni relative al CPA</string>
+    <string name="ais_cpa_settings">Impostazioni relative al PAV</string>
     <string name="ais_cpa_settings_description">Questi valori definiscono la presentazione degli oggetti AIS che potrebbero avvicinarsi troppo alla propria posizione.</string>
     <string name="ais_address_settings">Impostazioni dell\'indirizzo IP</string>
     <string name="ais_address_settings_description">Scegli il protocollo NMEA (UDP/TCP) e definisci gli indirizzi</string>
@@ -5721,4 +5721,7 @@
     <string name="show_grids">Mostra griglia mappa</string>
     <string name="no_photo_for_location_desc">Ancora nessuna foto è stata aggiunta dagli utenti a questo luogo</string>
     <string name="no_places_available">Nessun luogo disponibile</string>
+    <string name="shared_string_road_exit">Uscita</string>
+    <string name="hmd_promo_description">Accesso gratuito alle funzionalità, inclusi scaricamenti mappe illimitati, rilievi 3D, ecc. per %1$s mese</string>
+    <string name="hmd_promo">Promozione HMD per%1$s mesi</string>
 </resources>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
@@ -3285,4 +3285,6 @@
     <string name="keep_both_desc">შემოტანილი ელემენტები პრეფიქსით დაემატება</string>
     <string name="units_and_formats">ერთეულები და ფორმატები</string>
     <string name="switch_start_finish">საწყისი წერტილის და დანიშნულების პუნქტის შებრუნება</string>
+    <string name="weather_wind_kilimeters_per_hour">კილომეტრი საათში</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
 </resources>
diff --git a/OsmAnd/res/values-nb/phrases.xml b/OsmAnd/res/values-nb/phrases.xml
@@ -1971,4 +1971,8 @@
     <string name="poi_route_activity_type_e_biking">El-sykling</string>
     <string name="poi_cafe_filter">Kafé</string>
     <string name="poi_us_maps_recreation_area_activity_mountain_biking">Terrengsykling</string>
+    <string name="poi_sled_yes">Slede: ja</string>
+    <string name="poi_sled_no">Slede: nei</string>
+    <string name="poi_dog_sled_yes">Hundeslede: ja</string>
+    <string name="poi_dog_sled_no">Hundeslede: nei</string>
 </resources>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
@@ -4774,7 +4774,7 @@
     <string name="turn_on_nautical_depth_description">Slå på for å vise nautiske dybdedata på kartet.</string>
     <string name="weather_wind_kmh">km/t</string>
     <string name="weather_wind_ms">m/s</string>
-    <string name="attach_roads_descr">Tilnærm sporet ditt til tillatte veier for å rute mellom punkter og tilknytte nøyaktige svinginstruksjoner og ruteegenskaper.</string>
+    <string name="attach_roads_descr">Forbind sporet ditt til veier for å få detaljert ruteinformasjon, inkludert sving-for-sving-instruksjoner og veiegenskaper.</string>
     <string name="mtb_scale">Terrengsykkel-skala</string>
     <string name="mtb_segment_classification">Segmentklassifisering</string>
     <string name="rendering_attr_showMtbScale_description">Vis løyper ifølge deres terrengsykkel-skala.</string>
@@ -5703,4 +5703,10 @@
     <string name="type_of_activity">Aktivitetstype</string>
     <string name="quick_action_showhide_osm_edits_descr">Knapp for å vise eller skjule lokale OSM-redigeringer på kartet.</string>
     <string name="my_location_action_descr">Sentrerer kartet på din gjeldende posisjon.</string>
+    <string name="show_grids">Vis kartrutenett</string>
+    <string name="map_grid">Kartrutenett</string>
+    <string name="show_utm_grids">Bruk UTM istedenfor WGS84</string>
+    <string name="show_grids_description">Tillat visning av rutenett over kartet</string>
+    <string name="shared_string_road_exit">Avkjøring</string>
+    <string name="show_utm_grids_description">Vis rutenett i UTM-meter istedenfor WGS84-grader</string>
 </resources>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -5997,4 +5997,12 @@
     <string name="calculate_size">Calcular tamanho</string>
     <string name="ais_port_nmea_local_description">Definir a porta UPD em que o OsmAnd recebe dados NMEA</string>
     <string name="ais_ship_lost_timeout">Tempo limite para a visibilidade do navio quando nenhum sinal é recebido</string>
+    <string name="ais_address_settings">Configurações de endereço IP</string>
+    <string name="ais_address_settings_description">Escolha o protocolo NMEA (UDP/TCP) e defina os endereços</string>
+    <string name="ais_nmea_protocol">Protocolo para recepção de dados NMEA</string>
+    <string name="ais_nmea_protocol_description">Escolha o protocolo para a recepção de dados NMEA</string>
+    <string name="ais_address_nmea_server">Endereço IP da fonte de dados NMEA</string>
+    <string name="ais_address_nmea_server_description">Definir o endereço IP da fonte de dados NMEA (se for usado TCP)</string>
+    <string name="ais_port_nmea_server">Porta TCP da fonte de dados NMEA</string>
+    <string name="hmd_promo_description">Acesso gratuito a recursos, incluindo downloads ilimitados de mapas, relevo 3D etc. por %1$s mês</string>
 </resources>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
@@ -5929,4 +5929,5 @@
     <string name="display_distance_to_first_intermediate_summary">Виджет показывает время и расстояние до следующей остановки. Отключите эту опцию, чтобы всегда показывать данные до конечного пункта.</string>
     <string name="no_places_available">Нет доступных мест</string>
     <string name="no_photo_for_location_desc">Пока что в это местоположение не добавлено ни одной пользовательской фотографии</string>
+    <string name="shared_string_road_exit">Съезд</string>
 </resources>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
@@ -5691,4 +5691,7 @@
     <string name="map_grid">Мреже мапе</string>
     <string name="no_places_available">Нема слободних места</string>
     <string name="no_photo_for_location_desc">Још увек није додата ниједна корисничка фотографија на ову локацију</string>
+    <string name="hmd_promo_description">Бесплатан приступ функцијама укључујући неограничено преузимање мапа, 3Д рељеф итд. за %1$s месец</string>
+    <string name="shared_string_road_exit">Излаз</string>
+    <string name="hmd_promo">ХМД промоција за %1$s месеци</string>
 </resources>