Merge branch 'weblate'

# Conflicts:
#	OsmAnd/res/values-de/strings.xml

OsmAnd/res/values-ar/strings.xml

@@ -4069,4 +4069,9 @@
     <string name="delete_waypoints">حذف نقاط الطريق</string>
     <string name="copy_to_map_markers">نسخ لعلامات الخريطة</string>
     <string name="copy_to_map_favorites">نسخ للمفضلة</string>
+    <string name="upload_photo">يتم الرفع</string>
+    <string name="upload_photo_completed">اكتمال الرفع</string>
+    <string name="uploading_count">رفع %1$d من %2$d</string>
+    <string name="uploaded_count">تم رفع %1$d من %2$d</string>
+    <string name="toast_select_edits_for_upload">تحديد التعديلات للتحميل</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -4008,4 +4008,9 @@
     <string name="delete_waypoints">Wegpunkte löschen</string>
     <string name="copy_to_map_favorites">In Favoriten kopieren</string>
     <string name="copy_to_map_markers">In Kartenmarkierungen kopieren</string>
+    <string name="upload_photo">Lade hoch</string>
+    <string name="upload_photo_completed">Hochladen abgeschlossen</string>
+    <string name="uploading_count">Lade %1$d von %2$d hoch</string>
+    <string name="uploaded_count">%1$d von %2$d hochgeladen</string>
+    <string name="toast_select_edits_for_upload">Bearbeitungen zum Hochladen auswählen</string>
 </resources>

OsmAnd/res/values-et/strings.xml

@@ -3948,4 +3948,9 @@
     <string name="shared_string_last_used">Viimati kasutatud</string>
     <string name="message_server_error">Serveri viga: %1$s</string>
     <string name="message_name_is_already_exists">Selline nimi on juba olemas</string>
+    <string name="toast_select_edits_for_upload">Vali tehtud muudatused üleslaadimiseks</string>
+    <string name="uploaded_count">Üleslaaditud %1$d/%2$d</string>
+    <string name="uploading_count">Laadin üles muudatusi %1$d/%2$d</string>
+    <string name="upload_photo_completed">Sai üleslaaditud</string>
+    <string name="upload_photo">Laadin üles</string>
 </resources>

OsmAnd/res/values-fi/strings.xml

@@ -2739,4 +2739,15 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="routing_engine_vehicle_type_foot">Kävely</string>
     <string name="routing_engine_vehicle_type_bike">Polkupyörä</string>
     <string name="routing_engine_vehicle_type_car">Auto</string>
+    <string name="message_server_error">Palvelimen virhe: %1$s</string>
+    <string name="message_name_is_already_exists">Nimi on jo käytössä</string>
+    <string name="context_menu_read_full">Lue kaikki</string>
+    <string name="context_menu_edit_descr">Muokkaa kuvausta</string>
+    <string name="copy_to_map_markers">Kopioi karttamerkkeihin</string>
+    <string name="copy_to_map_favorites">Kopioi suosikkeihin</string>
+    <string name="upload_photo">Lähetetään</string>
+    <string name="upload_photo_completed">Lähetys valmis</string>
+    <string name="uploading_count">Lähetetty %1$d muutosta %2$d muutoksesta</string>
+    <string name="uploaded_count">Lähetettiin %1$d muutosta %2$d muutoksesta</string>
+    <string name="toast_select_edits_for_upload">Valitse lähetettävät muutokset</string>
 </resources>

OsmAnd/res/values-hu/phrases.xml

@@ -708,7 +708,7 @@
     <string name="poi_recycling_cars">Autó</string>
     <string name="poi_recycling_bicycles">Kerékpár</string>
     <string name="poi_landfill_waste_nuclear">Radioaktívhulladék-lerakó</string>
-    <string name="poi_basin">Vízgyűjtő</string>
+    <string name="poi_basin">Vízgyűjtő medence</string>
     <string name="poi_monitoring_station">Megfigyelőállomás</string>
     <string name="poi_crane">Daru</string>
     <string name="poi_construction">Építkezés</string>
@@ -2633,7 +2633,7 @@
     <string name="poi_lottery">Lottózó</string>
     <string name="poi_gambling">Szerencsejáték-helyszín</string>
     <string name="poi_gambling_type">Típus</string>
-    <string name="poi_gambling_lottery">Lottózó</string>
+    <string name="poi_gambling_lottery">Lottó</string>
     <string name="poi_gambling_slot_machines">Játékgépek</string>
     <string name="poi_gambling_betting">Fogadás</string>
     <string name="poi_e_cigarette">E-cigaretta-bolt</string>
@@ -3446,7 +3446,7 @@
     <string name="poi_service_vehicle_motor_yes">Motorszerelés</string>
     <string name="poi_service_vehicle_insurance_yes">Biztosítás</string>
     <string name="poi_service_vehicle_tyres_yes">Gumiszerelés</string>
-    <string name="poi_aerialway_zip_line">Kötélpálya</string>
+    <string name="poi_aerialway_zip_line">Csúszópálya</string>
     <string name="poi_climbing_adventure">Kalandpark</string>
     <string name="poi_via_ferrata">Via ferrata (vasalt út)</string>
     <string name="poi_cable_number">Sodronyok száma</string>
@@ -3524,7 +3524,7 @@
     <string name="poi_books_academic">akadémiai</string>
     <string name="poi_books_children">gyermekkönyv</string>
     <string name="poi_atoll">Atoll</string>
-    <string name="poi_toll_gantry">Útdíjellenőrző kapu</string>
+    <string name="poi_toll_gantry">Automatikus útdíjbeszedő kapu</string>
     <string name="poi_childcare">Gyermekgondozás (bölcsőde)</string>
     <string name="poi_denotation_natural_monument">Természeti emlék</string>
     <string name="poi_denotation_landmark">Tájékozódási pont</string>

OsmAnd/res/values-nl/strings.xml

@@ -931,7 +931,7 @@
     <string name="files_limit">%1$d resterende bestanden</string>
     <string name="available_downloads_left">%1$d resterende bestanden nog te downloaden</string>
     <string name="install_paid">Volledige versie</string>
-    <string name="cancel_route">Annuleer route</string>
+    <string name="cancel_route">Annuleer route \?</string>
     <string name="cancel_navigation">Stop navigatie</string>
     <string name="clear_destination">Bestemming wissen</string>
     <string name="use_magnetic_sensor_descr">Gebruik magnetische sensor in plaats van oriëntatiesensor voor het kompas.</string>
@@ -3726,14 +3726,14 @@
     <string name="plan_a_route">Plan een route</string>
     <string name="use_two_phase_routing">Gebruik de twee-fase A* route berekening methode</string>
     <string name="shared_string_graph">Grafiek</string>
-    <string name="message_graph_will_be_available_after_recalculation">Wacht op de herberekening van de route.
+    <string name="message_graph_will_be_available_after_recalculation">Wacht totdat route herberekend is.
-\nDe grafiek is beschikbaar na herberekening.</string>
+\nNa herberekening is de grafiek zichtbaar.</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="import_track_descr">Kies een trackbestand om te volgen of importeer het, vanaf uw apparaat.</string>
     <string name="app_mode_gap">Onderbreking</string>
     <string name="shared_string_custom">Aangepast</string>
     <string name="perform_oauth_authorization_description">Voer een OAuth-login uit om osm edit functies te gebruiken</string>
-    <string name="release_3_5">"• Bijgewerkte app- en profielinstellingen: instellingen zijn nu gerangschikt op type. Elk profiel kan afzonderlijk worden aangepast.
+    <string name="release_3_5">• Bijgewerkte app- en profielinstellingen: instellingen zijn nu gerangschikt op type. Elk profiel kan afzonderlijk worden aangepast.
 \n
 \n • Nieuw dialoogvenster voor het downloaden van kaarten waarin wordt voorgesteld een kaart te downloaden tijdens het browsen
 \n
@@ -3749,8 +3749,8 @@
 \n
 \n • Andere bugs opgelost
 \n
-\n"</string>
+\n</string>
-    <string name="release_3_6">"• Profielen: nu kunt u de volgorde wijzigen, het pictogram voor de kaart instellen, alle instellingen voor basisprofielen wijzigen en ze terugzetten naar de standaardinstellingen
+    <string name="release_3_6">• Profielen: nu kunt u de volgorde wijzigen, het pictogram voor de kaart instellen, alle instellingen voor basisprofielen wijzigen en ze terugzetten naar de standaardinstellingen
 \n
 \n • Exitnummer toegevoegd in de navigatie
 \n
@@ -3774,7 +3774,7 @@
 \n
 \n • Antarctica-kaart toegevoegd
 \n
-\n"</string>
+\n</string>
     <string name="what_is_new">Wat is er nieuw</string>
     <string name="snowmobile_render_descr">Voor sneeuwscooter, rijden met speciale wegen en tracks.</string>
     <string name="set_working_days_to_continue">Stel aantal werkdagen in om door te gaan</string>
@@ -3837,7 +3837,7 @@
     <string name="osm_edit_logout_success">Uitloggen gelukt</string>
     <string name="file_already_imported">Bestand is reeds geïmporteerd in OsmAnd</string>
     <string name="shared_string_local_maps">Lokale kaarten</string>
-    <string name="icon_group_amenity">Aangenaam</string>
+    <string name="icon_group_amenity">Voorziening</string>
     <string name="icon_group_special">Speciaal</string>
     <string name="icon_group_transport">Transport</string>
     <string name="icon_group_service">Onderhoud</string>
@@ -3856,7 +3856,7 @@
     <string name="open_street_map_login_mode">U moet inloggen om wijzigingen te uploaden.
 \n
 \nU kunt inloggen met de veilige OAuth-methode of uw loginnaam en wachtwoord gebruiken.</string>
-    <string name="use_login_password">Inloggen met gebruikersnaam en wachtwoord.</string>
+    <string name="use_login_password">Inloggen met gebruikersnaam en wachtwoord</string>
     <string name="login_account">Account</string>
     <string name="user_login">Gebruikersnaam</string>
     <string name="manage_subscription">Abonnement beheren</string>
@@ -3993,4 +3993,9 @@
     <string name="delete_waypoints">Waypoints verwijderen</string>
     <string name="copy_to_map_markers">Kopiëren naar Markeervlaggetjes</string>
     <string name="copy_to_map_favorites">Kopiëren naar Favorieten</string>
+    <string name="upload_photo">Opladen</string>
+    <string name="upload_photo_completed">Opladen voltooid</string>
+    <string name="uploading_count">Aan het opladen %1$d van %2$d</string>
+    <string name="uploaded_count">Opgeladen %1$d van %2$d</string>
+    <string name="toast_select_edits_for_upload">Selecteer de op te laden wijzigingen</string>
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -3986,4 +3986,10 @@
     <string name="context_menu_read_full">Читать полностью</string>
     <string name="context_menu_edit_descr">Редактировать описание</string>
     <string name="delete_waypoints">Удалить путевые точки</string>
+    <string name="routing_engine_vehicle_type_hgv">HGV</string>
+    <string name="upload_photo">Отправка</string>
+    <string name="upload_photo_completed">Отправка завершена</string>
+    <string name="uploading_count">Отправка %1$d из %2$d</string>
+    <string name="uploaded_count">Отправлено %1$d из %2$d</string>
+    <string name="toast_select_edits_for_upload">Выберите правки для отправки</string>
 </resources>

OsmAnd/res/values-sl/strings.xml

@@ -3275,14 +3275,14 @@
     <string name="select_folder">Izberi mapo</string>
     <string name="select_folder_descr">Izberi mapo ali dodaj novo</string>
     <string name="shared_string_empty">Prazno</string>
-    <string name="analyze_by_intervals">Analiziraj po intervalih (razdelitveni interval)</string>
+    <string name="analyze_by_intervals">Preuči po intervalih (razdelitveni interval)</string>
     <string name="upload_to_openstreetmap">Naloži v OpenStreetMap</string>
     <string name="edit_track">Uredi sled</string>
     <string name="rename_track">Preimenuj sled</string>
     <string name="change_folder">Spremeni mapo</string>
     <string name="shared_string_sec">sek</string>
     <string name="announcement_time_approach">Pristop</string>
-    <string name="announcement_time_prepare">Pripravi se</string>
+    <string name="announcement_time_prepare">Pripravljanje</string>
     <string name="announcement_time_off_route">Izven poti</string>
     <string name="announcement_time_arrive">Prihod na cilj</string>
     <string name="shared_string_turn">Zavoj</string>
@@ -3296,7 +3296,7 @@
     <string name="routing_engine_vehicle_type_cycling_electric">Električno kolesarjenje</string>
     <string name="routing_engine_vehicle_type_cycling_mountain">Gorsko kolesarjenje</string>
     <string name="routing_engine_vehicle_type_cycling_road">Cestno kolesarjenje</string>
-    <string name="routing_engine_vehicle_type_cycling_regular">Redno kolesarjenje</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Mestno kolesarjenje</string>
     <string name="routing_engine_vehicle_type_hgv">Težko tovorno vozilo</string>
     <string name="routing_engine_vehicle_type_small_truck">Majhno tovorno vozilo</string>
     <string name="routing_engine_vehicle_type_truck">Tovorno vozilo</string>
@@ -3309,4 +3309,51 @@
     <string name="context_menu_edit_descr">Uredi opis</string>
     <string name="delete_waypoints">Brisanje točk</string>
     <string name="copy_to_map_markers">Kopiraj na oznake na zemljevidu</string>
+    <string name="export_not_enough_space">Na napravi ni dovolj prostora.</string>
+    <string name="select_groups_for_import">Izbor skupin za uvoz.</string>
+    <string name="select_items_for_import">Izbor predmetov za uvoz.</string>
+    <string name="add_to_mapillary">Dodaj na Mapillary</string>
+    <string name="add_to_opr">Dodaj na OpenPlaceReviews</string>
+    <string name="use_dev_url_descr">Za preizkušanje pošiljanja sporočil, točk in sledi GPX preklopi iz openstreetmap.org na preizkusni dev.openstreetmap.org.</string>
+    <string name="use_dev_url">Uporabi dev.openstreetmap.org</string>
+    <string name="add_photos_descr">Program podpira prikaz fotografij različnih virov:
+\nOpenPlaceReviews – fotografije točk POI;
+\nMapillary – ulična fotografija;
+\nSplet / Wikimedia – fotografije točk POI in OpenStreetMap.</string>
+    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
+    <string name="plan_route_add_new_segment">Dodaj nov del poti</string>
+    <string name="app_mode_light_aircraft">Lahko letalo</string>
+    <string name="plan_route_join_segments">Združi dele poti</string>
+    <string name="plan_route_split_before">Razdeli pred</string>
+    <string name="plan_route_split_after">Razdeli po</string>
+    <string name="profile_type_osmand_string">Profil OsmAnd</string>
+    <string name="profile_type_user_string">Uporabniški profil</string>
+    <string name="reverse_all_points">Obrni vse točke</string>
+    <string name="profile_by_default_description">Izbor profila, ki bo prikazan ob zagonu programa.</string>
+    <string name="shared_string_last_used">Nazadnje uporabljeno</string>
+    <string name="shared_string_subtype">Podvrsta</string>
+    <string name="shared_string_vehicle">Vozilo</string>
+    <string name="shared_string_api_key">Ključ API</string>
+    <string name="shared_string_server_url">Naslov URL strežnika</string>
+    <string name="shared_string_enter_param">Vpis parametrov</string>
+    <string name="online_routing_example_hint">Naslov URL z vsemi parametri bo zapisan kot:</string>
+    <string name="test_route_calculation">Preizkusi izračun poti</string>
+    <string name="routing_engine_vehicle_type_driving">Vožnja</string>
+    <string name="routing_engine_vehicle_type_foot">Hoja</string>
+    <string name="routing_engine_vehicle_type_bike">Kolo</string>
+    <string name="routing_engine_vehicle_type_car">Avto</string>
+    <string name="copy_address">Kopiraj naslov</string>
+    <string name="announcement_time_prepare_long">Dolgo pripravljanje</string>
+    <string name="show_track_on_map">Pokaži sled na zemljevidu</string>
+    <string name="shared_string_zoom_levels">Raven približanja</string>
+    <string name="shared_string_transparency">Prosojnost</string>
+    <string name="shared_string_legend">Legenda</string>
+    <string name="terrain_empty_state_text">Prikaz višinskega senčenja na zemljevidu. Več o tem je mogoče prebrati na spletni strani programa.</string>
+    <string name="shared_string_hillshade">Senčenje</string>
+    <string name="copy_to_map_favorites">Kopiraj med priljubljene</string>
+    <string name="upload_photo">Poteka pošiljanje</string>
+    <string name="upload_photo_completed">Pošiljanje je končano</string>
+    <string name="uploading_count">Poteka pošiljanje %1$d od %2$d</string>
+    <string name="uploaded_count">Poslano %1$d od %2$d</string>
+    <string name="toast_select_edits_for_upload">Izbor sprememb za pošiljanje</string>
 </resources>