Skip to content

Commit

Permalink
Merge branch 'osmandapp:master' into hardy_Afa
Browse files Browse the repository at this point in the history
  • Loading branch information
@sonora
sonora authored Feb 29, 2024
2 parents 70c9760 + a763ecc commit 7ce87f2
Show file tree
Hide file tree
Showing 61 changed files with 3,560 additions and 3,367 deletions.
2 changes: 1 addition & 1 deletion OsmAnd-java/src/main/java/net/osmand/osm/MapRenderingTypes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public abstract class MapRenderingTypes {

private static final Log log = PlatformUtil.getLog(MapRenderingTypes.class);
public static final String[] langs = new String[] { "af", "als", "ar", "az", "be", "bg", "bn", "bpy", "br", "bs", "ca", "ceb", "ckb", "cs", "cy", "da", "de", "el", "eo", "es", "et", "eu", "fa", "fi", "fr", "fy", "ga", "gl", "he", "hi", "hsb",
"hr", "ht", "hu", "hy", "id", "is", "it", "ja", "ka", "kk", "kn", "ko", "ku", "la", "lb", "lo", "lt", "lv", "mk", "ml", "mr", "ms", "nds", "new", "nl", "nn", "no", "nv", "oc", "os", "pl", "pms", "pt", "ro", "ru", "sat", "sc", "sh", "sk", "sl", "sq", "sr", "sv", "sw", "ta", "te", "th", "tl", "tr", "uk", "vi", "vo", "zh", "zh-hans", "zh-hant", };
"hr", "ht", "hu", "hy", "id", "is", "it", "ja", "ka", "kk", "kn", "ko", "ku", "la", "lb", "lo", "lt", "lv", "mk", "ml", "mr", "ms", "nds", "new", "nl", "nn", "no", "nv", "oc", "os", "pl", "pms", "pt", "ro", "ru", "sat", "sc", "sh", "sk", "sl", "sq", "sr", "sr-latn", "sv", "sw", "ta", "te", "th", "tl", "tr", "uk", "vi", "vo", "zh", "zh-hans", "zh-hant", };


public final static byte RESTRICTION_NO_RIGHT_TURN = 1;
Expand Down
10 changes: 8 additions & 2 deletions OsmAnd/res/values-b+sr+Latn/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
<string name="int_seconds">sekundi</string>
<string name="int_min">min.</string>
<string name="max_speed_none">nijedan</string>
<string name="stop_routing_confirm">Zaustavi navođenje?</string>
<string name="stop_routing_confirm">Zaustavljaš navođenje?</string>
<string name="recording_context_menu_show">Prikaži</string>
<string name="recording_photo_description">Foto %1$s %2$s</string>
<string name="av_def_action_picture">Slikanje</string>
Expand Down Expand Up @@ -3994,7 +3994,7 @@
<string name="track_recording_stop_without_saving">Zaustavi bez snimanja</string>
<string name="track_recording_save_and_stop">Sačuvaj i zaustavi snimanje</string>
<string name="track_recording_title">Snimanje trase zaustavljeno</string>
<string name="track_recording_description">Zaustaviti snimanje?
<string name="track_recording_description">Zaustavljaš snimanje?
\nSve nesačuvani podaci će biti izgubljeni.</string>
<string name="on_pause">Na pauzi</string>
<string name="app_restart_required">Potrebno je ponovno pokretanje programa radi primene nekih podešavanja.</string>
Expand Down Expand Up @@ -5633,4 +5633,10 @@
<string name="shared_string_speedometer">Brzinomer</string>
<string name="speed_limit_warning">Upozorenje na ograničenje brzine</string>
<string name="help_article_setup_a_route_name">Podešavanje rute</string>
<string name="rendering_attr_padusDisplayMode_name">Način prikaza javnih površina</string>
<string name="rendering_attr_padusDisplayMode_description">Prema načinu pristupa ili imenu upravnika</string>
<string name="rendering_value_access_name">Prema vrsti pristupa</string>
<string name="rendering_value_managerName_name">Po imenu upravnika</string>
<string name="rendering_attr_padusHideBoundaries_name">Sakriti granice javnog zemljišta</string>
<string name="rendering_attr_padusHideBoundaries_description">Sakrivanje granice javnog zemljišta, ali napusti područja</string>
</resources>
1 change: 1 addition & 0 deletions OsmAnd/res/values-bg/phrases.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,4 +664,5 @@
<string name="poi_faculty_economics">Икономика</string>
<string name="poi_faculty_filter">Факултет</string>
<string name="poi_windmill">Вятърна мелница</string>
<string name="poi_clock_option">Допълнителни</string>
</resources>
32 changes: 32 additions & 0 deletions OsmAnd/res/values-bg/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3903,4 +3903,36 @@
<string name="shared_string_temperature">Температура</string>
<string name="help_article_personal_storage_name">Хранилище</string>
<string name="shared_string_setup">Настройки</string>
<string name="shared_string_limit">Ограничение</string>
<string name="when_exceeded">При превишаване</string>
<string name="speedometer_description">Показва текущата скорост според GPS</string>
<string name="shared_string_speedometer">Скоростомер</string>
<string name="custom_map_button_name_present">Такъв бутон вече съществува</string>
<string name="add_button">Добавяне на бутон</string>
<string name="custom_buttons">Потребителски бутони</string>
<string name="default_buttons">Подразбирани бутони</string>
<string name="shared_string_keywords">Ключови думи</string>
<string name="downloaded_maps_collect_descr">Помага ни да разберем популярността на картите по държави и региони.</string>
<string name="visited_screens_collect_descr">Помага ни да разберем кои възможности на OsmAnd са популярни.</string>
<string name="settings_privacy_and_security_desc">Изберете какви данни да споделяте</string>
<string name="shared_string_no_thank_you">Не, благодаря</string>
<string name="collected_data_descr">Определете каква информация да споделяте с OsmAnd.</string>
<string name="sorted_sufolders_toast">Папките в „%1$s“ са сортирани по: „%2$s“</string>
<string name="shared_string_activity">Активност</string>
<string name="sort_subfolders">Сортиране на подпапки</string>
<string name="shared_string_additional">Допълнителни</string>
<string name="settings_privacy_and_security">Поверителност и защита</string>
<string name="privacy_and_security_change_descr">Докоснете „Разрешаване“ ако сте съгласни с нашата %1$s</string>
<string name="shared_string_privacy_policy">Политика за поверителност</string>
<string name="help_us_make_osmand_better">Помогнете ни да направим OsmAnd по-добър</string>
<string name="choose_data_to_share">Изберете вида на информацията, която сте склонни да споделите:</string>
<string name="downloaded_maps">Изтеглени карти</string>
<string name="visited_screens">Посетени екрани</string>
<string name="collected_data">Събрана информация</string>
<string name="shared_string_allow">Разрешаване</string>
<string name="profile_name_hint">Име на профила</string>
<string name="make_osmand_better_descr">Разрешете на OsmAnd да събира и обработва анонимни данни за използването на приложението. Не събираме и не съхраняваме информация за местоположението или разглежданите от вас места на картата.
\n
\nМожете да промените избора си в „Настройки“ → „Поверителност и защита“.</string>
<string name="speed_limit_warning">Предупреждение за ограничения на скоростта</string>
</resources>
12 changes: 9 additions & 3 deletions OsmAnd/res/values-da/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5234,7 +5234,7 @@
<string name="relief_3d_description">Ej og se skalamodellen af dit nabolag eller hele kontinentet.</string>
<string name="terrain_category_description">Terrænkonturlinjer, gråtonede terrænskygger og hældningsangivelse med farveskala for at vise toppe og lavland.</string>
<string name="slope_legend_description">Hældning bruger farver til at visualisere terrænets stejlhed. Du kan læse mere om hældning i %1$s.</string>
<string name="osmand_cloud_deleting_account_descr">Om få øjeblikke vil alle dine data og konto blive slettet fra OsmAnd Cloud.
<string name="osmand_cloud_deleting_account_descr">I løbet af få øjeblikke vil alle dine data og din konto blive slettet fra OsmAnd Cloud.
\n
\nAlle data på enheden forbliver uberørte.</string>
<string name="osmand_cloud_delete_account_confirmation_descr">Slet OsmAnd Cloud-konto?
Expand All @@ -5254,9 +5254,9 @@
<string name="verify_account">Bekræft din konto</string>
<string name="osmand_cloud_deleted_account_descr">Konto og alle data blev slettet fra OsmAnd Cloud.</string>
<string name="osmand_cloud_deletion_subscriptions_warning">Dette vil ikke annullere dit OsmAnd Pro-abonnement.</string>
<string name="verify_account_deletion_descr">Vi er nødt til at verificere din konto, før vi sletter den.
<string name="verify_account_deletion_descr">Vi skal bekræfte din konto, før du sletter den.
\n
\nIndtast venligst den e-mailadresse, du registrerede dig med. En engangskode til næste trin vil blive sendt til den.</string>
\nIndtast den e-mail-adresse, du registrerede dig med. En engangskode til næste trin vil blive sendt til den.</string>
<string name="release_4_5">• BLE/ANT+ sensors: omarbejdet forbindelse, skrivning og visning af modtagne data til GPX
\n
\n • Gratis backup af favoritter og indstillinger til \"OsmAnd Cloud\"
Expand Down Expand Up @@ -5632,4 +5632,10 @@
<string name="when_exceeded">Når overskredet</string>
<string name="speedometer_description">Viser din aktuelle hastighed som rapporteret via GPS</string>
<string name="help_article_setup_a_route_name">Opret en rute</string>
<string name="rendering_attr_padusDisplayMode_description">Efter adgangstype eller forvalternavn</string>
<string name="rendering_value_access_name">Efter adgangstype</string>
<string name="rendering_value_managerName_name">Efter forvalternavn</string>
<string name="rendering_attr_padusHideBoundaries_name">Skjul grænser for offentlige arealer</string>
<string name="rendering_attr_padusHideBoundaries_description">Skjul grænserne for offentlige arealer, men bevar områderne</string>
<string name="rendering_attr_padusDisplayMode_name">Visning af offentlige arealer</string>
</resources>
36 changes: 29 additions & 7 deletions OsmAnd/res/values-de/phrases.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2100,8 +2100,8 @@
<string name="poi_scout_no">Pfadfinderlager: nein</string>
<string name="poi_group_only_yes">Nur Gruppen: ja</string>
<string name="poi_group_only_no">Nur Gruppen: nein</string>
<string name="poi_impromptu_yes">Improvisiert: ja</string>
<string name="poi_impromptu_no">Improvisiert: nein</string>
<string name="poi_impromptu_yes">Improvisiert: Ja</string>
<string name="poi_impromptu_no">Improvisiert: Nein</string>
<string name="poi_sanitary_dump_station_yes">Sanitäre Entsorgungsstation: ja</string>
<string name="poi_sanitary_dump_station_no">Sanitäre Entsorgungsstation: nein</string>
<string name="poi_refugee_yes">Flüchtlingsunterkunft</string>
Expand Down Expand Up @@ -3135,11 +3135,11 @@
<string name="poi_beds">Betten</string>
<string name="poi_winter_room_yes">Winterschutzraum: ja</string>
<string name="poi_winter_room_no">Winterschutzraum: nein</string>
<string name="poi_reservation_required">Reservierung: erforderlich</string>
<string name="poi_reservation_recommended">Reservierung: empfohlen</string>
<string name="poi_reservation_yes">Reservierung: ja</string>
<string name="poi_reservation_no">Reservierung: nein</string>
<string name="poi_reservation_members_only">Reservierung: nur für Mitglieder</string>
<string name="poi_reservation_required">Erforderlich</string>
<string name="poi_reservation_recommended">Empfohlen</string>
<string name="poi_reservation_yes">Ja</string>
<string name="poi_reservation_no">Nein</string>
<string name="poi_reservation_members_only">Nur für Mitglieder</string>
<string name="poi_boat_rental_type">Mietboote</string>
<string name="poi_boat_rental">Bootsvermietung</string>
<string name="poi_boat_motorboat_rental_yes">Motorboote: ja</string>
Expand Down Expand Up @@ -4835,4 +4835,26 @@
<string name="poi_us_maps_recreation_area_activity_ohv_open_area_riding">OHV-Geländefahren</string>
<string name="poi_blm_yes">Verwaltet vom Bureau of Land Management</string>
<string name="poi_nfs_yes">Verwaltet vom United States Forest Service</string>
<string name="poi_us_maps_recreation_area_facility_airplane_landing_strip">Flugzeuglandebahn</string>
<string name="poi_us_maps_recreation_area_facility_ranger_station_office">Ranger-Station/Feldbüro</string>
<string name="poi_us_maps_recreation_area_facility_boat_takeout">Bootsanleger</string>
<string name="poi_us_maps_recreation_area_facility_horse_stanchion">Anbindevorrichtung für Pferde</string>
<string name="poi_us_maps_recreation_area_facility_horse_corral">Pferdekoppel</string>
<string name="poi_us_maps_recreation_area_facility_lighthouse">Leuchtturm</string>
<string name="poi_us_maps_recreation_area_facility_parking">Parkplatz</string>
<string name="poi_reservation">Reservierung</string>
<string name="poi_us_maps_recreation_area_facility">Freizeitanlage</string>
<string name="poi_impromptu">Improvisiert</string>
<string name="poi_us_maps_recreation_area_activity_poi">Sehenswürdigkeit</string>
<string name="poi_us_maps_recreation_area_activity_scenic_overlook">Landschaftlicher Ausblick</string>
<string name="poi_us_maps_recreation_area_activity_day_use_site">Tagesnutzungsbereich;Tagesnutzungsplatz;Tagesnutzungsbereich;Tagesnutzungsplatz;Tageserholungsgebiet;Tageserholungsplatz</string>
<string name="poi_us_maps_recreation_area_facility_cabin">Hütte</string>
<string name="poi_us_maps_recreation_area_facility_boat_launch">Stapellauf</string>
<string name="poi_us_maps_recreation_area_facility_boat_ramp">Bootsrampe</string>
<string name="poi_us_maps_recreation_area_facility_fire_lookout">Brandwache</string>
<string name="poi_us_maps_recreation_area_facility_group_shelter">Schutzraum für Gruppen</string>
<string name="poi_us_maps_recreation_area_facility_natural_endangered_area">Natürliche/angereicherte Fläche</string>
<string name="poi_us_maps_recreation_area_facility_rapid">Stromschnelle</string>
<string name="poi_us_maps_recreation_area_facility_rv_dump_station">Wohnmobil-Entsorgungsstation</string>
<string name="poi_us_maps_recreation_area_facility_warming_hut">Wärmehütte</string>
</resources>
20 changes: 13 additions & 7 deletions OsmAnd/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5233,27 +5233,27 @@
<string name="relief_3d">3D-Relief</string>
<string name="relief_3d_description">Besitzen und beobachten Sie das maßstabsgetreue Modell Ihrer Nachbarschaft oder des ganzen Kontinents.</string>
<string name="osmand_cloud_delete_account_confirmation">Konto löschen\?</string>
<string name="osmand_cloud_deletion_subscriptions_warning">Ihr OsmAnd Pro-Abonnement wird dadurch nicht gekündigt.</string>
<string name="osmand_cloud_deletion_subscriptions_warning">Dadurch wird dein OsmAnd Pro-Abonnement nicht gekündigt.</string>
<string name="manage_subscriptions">Abonnements verwalten.</string>
<string name="delete_account_warning">Konto %1$s löschen?</string>
<string name="shared_string_deleting">Wird gelöscht</string>
<string name="deleting_complete">Löschen abgeschlossen</string>
<string name="delete_account">Konto löschen</string>
<string name="deleting_complete">Löschung vollständig</string>
<string name="delete_account">Account löschen</string>
<string name="backup_error_delete_account_email_match">E-Mail-Adresse stimmt nicht mit Anmelde-Benutzernamen überein</string>
<string name="osmand_cloud_deleted_account_descr">Konto und alle Daten wurden aus der OsmAnd Cloud gelöscht.</string>
<string name="osmand_cloud_deleted_account_descr">Das Konto und alle Daten wurden aus der OsmAnd Cloud gelöscht.</string>
<string name="action_cannot_be_undone">Diese Aktion kann nicht rückgängig gemacht werden.</string>
<string name="osmand_cloud_deletion_secondary_devices_warning">Zweitgeräte werden von OsmAnd Cloud abgemeldet und verlieren den Zugriff auf kostenpflichtige Funktionen.</string>
<string name="osmand_cloud_deletion_account_warning">Ihr Konto und alle Kontodaten werden %1$s</string>
<string name="osmand_cloud_deleting_account_descr">In Kürze werden alle Ihre Daten und Ihr Konto von OsmAnd Cloud gelöscht.
<string name="osmand_cloud_deleting_account_descr">In wenigen Augenblicken werden alle deine Daten und dein Konto aus der OsmAnd Cloud gelöscht.
\n
\nAlle Daten auf dem Gerät bleiben unangetastet.</string>
<string name="osmand_cloud_delete_account_confirmation_descr">OsmAnd Cloud-Konto löschen?
\n
\nDiese Aktion kann nicht rückgängig gemacht werden.</string>
<string name="osmand_cloud_deletion_all_data_warning">Alle Daten von OsmAnd Cloud werden %1$s. Daten auf dem Gerät bleiben unangetastet.</string>
<string name="verify_account_deletion_descr">Wir müssen Ihr Konto verifizieren, bevor wir es löschen können.
<string name="verify_account_deletion_descr">Wir müssen dein Konto verifizieren, bevor wir es löschen können.
\n
\nBitte geben Sie die E-Mail-Adresse ein, mit der Sie sich registriert haben. An diese Adresse wird ein Einmalpasswort für den nächsten Schritt gesendet.</string>
\nBitte gib die E-Mail-Adresse ein, mit der du dich registriert hast. An diese Adresse wird ein Einmalpasswort für den nächsten Schritt gesendet.</string>
<string name="verify_account">Konto bestätigen</string>
<string name="slope_legend_description">Hangneigung verwendet Farben, um den Neigungsgrad des Geländes zu visualisieren. Weitere Informationen über Hangneigung finden Sie unter %1$s.</string>
<string name="terrain_category_description">Höhenlinien, graustufige Reliefschattierungen und farbige Hangneigungskarten, zur Darstellung von Erhebungen und Niederungen.</string>
Expand Down Expand Up @@ -5631,4 +5631,10 @@
<string name="speedometer_description">Zeigt Ihre aktuelle Geschwindigkeit an, wie sie über GPS gemeldet wird</string>
<string name="shared_string_speedometer">Geschwindigkeitsmesser</string>
<string name="help_article_setup_a_route_name">Route einrichten</string>
<string name="rendering_value_access_name">Nach Zugangsart</string>
<string name="rendering_value_managerName_name">Nach Name der Verwaltung</string>
<string name="rendering_attr_padusHideBoundaries_name">Grenzen von öffentlichem Land ausblenden</string>
<string name="rendering_attr_padusHideBoundaries_description">Grenzen von öffentlichem Land ausblenden, aber Gebiete belassen</string>
<string name="rendering_attr_padusDisplayMode_description">Nach Zugangsart oder Name der Verwaltung</string>
<string name="rendering_attr_padusDisplayMode_name">Anzeigemodus für öffentliche Flächen</string>
</resources>
Loading

0 comments on commit 7ce87f2

Please sign in to comment.