Merge branch 'master' into rzr-splice-overlapped

osmandapp · Mar 2, 2025 · f3d16e3 · f3d16e3
2 parents 2165b2f + 70dee12
commit f3d16e3
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 6 deletions.
diff --git a/OsmAnd-api/build.gradle b/OsmAnd-api/build.gradle
@@ -27,12 +27,10 @@ android {
     }
     publishing {
         singleVariant('release') {
-            withSourcesJar()
             withJavadocJar()
         }
 
         singleVariant('debug') {
-            withSourcesJar()
             withJavadocJar()
         }
     }

diff --git a/OsmAnd/build-library.gradle b/OsmAnd/build-library.gradle
@@ -70,6 +70,13 @@ android {
 			osmandTask.dependsOn(copyMapPOIIcons)
 			osmandTask.dependsOn(copyLargePOIIcons)
 		}
+		def generateResources= "generate${taskName}Resources"
+		tasks.named(generateResources).configure { osmandTask ->
+			println(osmandTask.getName() + " generate resources")
+			osmandTask.dependsOn(copyMapShaderIcons)
+			osmandTask.dependsOn(copyMapPOIIcons)
+			osmandTask.dependsOn(copyLargePOIIcons)
+		}
 	}
 }
 

diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
@@ -213,7 +213,7 @@ android {
 		}
 		def generateResources= "generate${taskName}Resources"
 		tasks.named(generateResources).configure { osmandTask ->
-			println(osmandTask.getName() + " merge resources")
+			println(osmandTask.getName() + " generate resources")
 			osmandTask.dependsOn(collectExternalResources)
 		}
 	}

diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -1906,7 +1906,7 @@
     <string name="storage_directory_card">Memorijska kartica</string>
     <string name="shared_string_is_open_24_7">Otvoreno 24/7</string>
     <string name="map_widget_search">Traži</string>
-    <string name="city_type_neighbourhood">Sused</string>
+    <string name="city_type_neighbourhood">Kvart</string>
     <string name="city_type_district">Distrikt</string>
     <string name="shared_string_from">iz</string>
     <string name="postcode">Poštanski broj</string>

diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
@@ -4220,7 +4220,7 @@
     <string name="poi_post_office_type">Tegund</string>
     <string name="poi_board_type_sport">Íþróttir</string>
     <string name="poi_changing_table_filter">Skiptiborð</string>
-    <string name="poi_landuse_education">Menntun</string>
+    <string name="poi_landuse_education">Kennslusvæði</string>
     <string name="poi_hospice">Líknarsel</string>
     <string name="poi_museum_paleontology">Steingervingar</string>
     <string name="poi_museum_health">Heilsutengt</string>

diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
@@ -5683,11 +5683,22 @@
     <string name="show_grids_description">Leyfa birtingu hnitanets yfir landakortinu</string>
     <string name="show_utm_grids">Nota UTM í stað WGS84</string>
     <string name="map_grid">Hnitanet korts</string>
-    <string name="show_utm_grids_description">Birta hnitanet í UTM-metum í staðinn fyrir WGS84-gráður</string>
+    <string name="show_utm_grids_description">Birta hnitanet í UTM-metum í staðinn fyrir WGS84</string>
     <string name="show_grids">Birta hnitanet á korti</string>
     <string name="no_places_available">Engir staðir tiltækir</string>
     <string name="no_photo_for_location_desc">Engum notendamyndum hefur ennþá verið bætt við þessa staðsetningu</string>
     <string name="hmd_promo_description">Ókeypis aðgangur að eiginleikum á borð við ótakmörkuð niðurhöl korta, þrívíddarlandslag, o.fl. fyrir %1$s á mánuði</string>
     <string name="shared_string_road_exit">Útkeyrsla</string>
     <string name="hmd_promo">HMD-kynning í %1$s mánuði</string>
+    <string name="original_shape_description">Hver punktur myndi halda sinni lögun.</string>
+    <string name="apply_to_all_points">Beita á alla punkta</string>
+    <string name="original_color_description">Hver punktur myndi halda sínum lit.</string>
+    <string name="original_icon_description">Hver punktur myndi halda sinni táknmynd.</string>
+    <string name="save_favorite_default_appearance">Virkja breytingar á fyrirliggjandi punkta í möppunni eða aðeins á nýja punkta?</string>
+    <string name="show_mercator_grids">Nota Mercator í staðinn fyrir WGS84 eða UTM</string>
+    <string name="show_dms_grids">Nota DMS í staðinn fyrir gráður</string>
+    <string name="show_dm_grids_description">Birta hnitanet í gráðum og mínútum í staðinn fyrir gráður eða DMS</string>
+    <string name="show_mercator_grids_description">Birta hnitanet í Mercator-km í staðinn fyrir WGS84 eða UTM</string>
+    <string name="show_dms_grids_description">Birta hnitanet í gráður, mínútur, sekúndur í staðinn fyrir gráður</string>
+    <string name="show_dm_grids">Nota DM í staðinn fyrir gráður eða DMS</string>
 </resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
@@ -4433,4 +4433,88 @@
     <string name="poi_route_activity_type_parachuting_skydiving">Парашютный спорт (прыжки с парашютом)</string>
     <string name="poi_route_activity_type_inline_skates">Роликовые коньки</string>
     <string name="poi_route_activity_type_golfing">Гольф</string>
+    <string name="poi_climbing_bolt">Анкерный болт</string>
+    <string name="poi_hiking_filter">Подходит для хайкинга</string>
+    <string name="poi_socket_type2_voltage_medium">Среднее</string>
+    <string name="poi_socket_type2_combo_voltage_low">Низкое</string>
+    <string name="poi_socket_chademo_voltage_high">Высокое</string>
+    <string name="poi_socket_type2_combo_voltage_high">Высокое</string>
+    <string name="poi_socket_type2_cable_voltage_high">Высокое</string>
+    <string name="poi_socket_type2_cable_voltage_medium">Среднее</string>
+    <string name="poi_socket_type2_voltage_high">Высокое</string>
+    <string name="poi_climbing_rock_basalt">Место для скалолазания: базальт</string>
+    <string name="poi_socket_chademo_voltage_low">Низкое</string>
+    <string name="poi_socket_chademo_voltage_medium">Среднее</string>
+    <string name="poi_camp_site_type">Тип зоны для кемпинга</string>
+    <string name="poi_socket_type3a_voltage_high">Высокое</string>
+    <string name="poi_socket_type3c_voltage_medium">Среднее</string>
+    <string name="poi_socket_type3a_voltage_medium">Среднее</string>
+    <string name="poi_socket_type3a_voltage_low">Низкое</string>
+    <string name="poi_socket_type3c_voltage_high">Высокое</string>
+    <string name="poi_socket_type3c_voltage_low">Низкое</string>
+    <string name="poi_socket_typee_voltage_high">Высокое</string>
+    <string name="poi_socket_schuko_voltage_low">Низкое</string>
+    <string name="poi_socket_typee_voltage_medium">Среднее</string>
+    <string name="poi_playground_water">Вода</string>
+    <string name="poi_climbing_grade_french_max">Сложнейший маршрут (по французской шкале)</string>
+    <string name="poi_climbing_grade_saxon_max">Сложнейший маршрут (по шкале Saxon)</string>
+    <string name="poi_climbing_grade_french_mean">Средний маршрут (по французской шкале)</string>
+    <string name="poi_climbing_grade_uiaa_mean">Средний маршрут (по шкале UIAA)</string>
+    <string name="poi_climbing_grade_uiaa">Шкала скалолазания UIAA</string>
+    <string name="poi_socket_cee_blue_voltage_medium">Среднее</string>
+    <string name="poi_us_maps_recreation_area_open_status">Статус доступа зоны отдыха</string>
+    <string name="poi_shop_general">Общецелевой магазин</string>
+    <string name="poi_socket_type2_voltage_low">Низкое</string>
+    <string name="poi_socket_type2_combo_voltage_medium">Среднее</string>
+    <string name="poi_socket_schuko_voltage_high">Высокое</string>
+    <string name="poi_socket_schuko_voltage_medium">Среднее</string>
+    <string name="poi_us_maps_recreation_area_facility">Зона отдыха</string>
+    <string name="poi_climbing_rock_gritstone">Место для скалолазания: гравелит</string>
+    <string name="poi_climbing_grade_uiaa_max">Сложнейший маршрут (по шкале UIAA)</string>
+    <string name="poi_socket_typee_voltage_low">Низкое</string>
+    <string name="poi_vending_machine_fuel_filter">Автоматические раздатчики топлива; Топливный автомат</string>
+    <string name="poi_cafe_filter">Кафе</string>
+    <string name="poi_socket_type2_cable_voltage_low">Низкое</string>
+    <string name="poi_socket_cee_blue_voltage_high">Высокое</string>
+    <string name="poi_socket_cee_blue_voltage_low">Низкое</string>
+    <string name="poi_climbing_rock_conglomerate">Место для скалолазания: конгломерат</string>
+    <string name="poi_playground_splash_pad">Водная площадка</string>
+    <string name="poi_climbing_grade_saxon_mean">Средний маршрут (по шкале Saxon)</string>
+    <string name="poi_climbing_grade_elite">Элита</string>
+    <string name="poi_climbing_grade_super_elite">Супер элита</string>
+    <string name="poi_recycling_coffee_capsules">Кофейные капсулы</string>
+    <string name="poi_recycling_others">Другое</string>
+    <string name="poi_recycling_pallets">Поддоны</string>
+    <string name="poi_hiking_yes">Да</string>
+    <string name="poi_recycling_oil">Нефть</string>
+    <string name="poi_recycling_aerosol_cans">Аэрозольные баллончики</string>
+    <string name="poi_lifeguard">Спасатель</string>
+    <string name="poi_self_checkout_yes">Да</string>
+    <string name="poi_lifeguard_tower">Вышка спасателя</string>
+    <string name="poi_recycling_belts">Ремни</string>
+    <string name="poi_recycling_boats">Лодки</string>
+    <string name="poi_recycling_electrical_appliances">Электроприборы</string>
+    <string name="poi_self_checkout_only">Только</string>
+    <string name="poi_recycling_pens">Ручки</string>
+    <string name="poi_recycling_bags">Пакеты</string>
+    <string name="poi_recycling_food">Еда</string>
+    <string name="poi_climbing_grade_novice">Начинающий</string>
+    <string name="poi_climbing_grade_intermediate">Продолжающий</string>
+    <string name="poi_climbing_grade_expert">Эксперт</string>
+    <string name="poi_climbing_grade_beginner">Новичок</string>
+    <string name="poi_climbing_grade_advanced">Продвинутый</string>
+    <string name="poi_climbing_grade_super_expert">Супер эксперт</string>
+    <string name="poi_climbing_grade_saxon">Шкала скалолазания Saxon</string>
+    <string name="poi_recycling_glass_jars">Стеклянные банки</string>
+    <string name="poi_recycling_marine_waste">Морские отходы</string>
+    <string name="poi_recycling_metal_packaging">Металлическая упаковка</string>
+    <string name="poi_climbing_grade_french">Французская шкала скалолазания</string>
+    <string name="poi_recycling_pet">PET</string>
+    <string name="poi_climbing_bolt_anchor">Крюк</string>
+    <string name="poi_climbing_bolts_yes">Да</string>
+    <string name="poi_climbing_bolts_no">Нет</string>
+    <string name="poi_recycling_electronics">Электроника</string>
+    <string name="poi_recycling_gas_bottles">Газовые баллоны</string>
+    <string name="poi_recycling_glass_bottles_colour">Цветные стеклянные бутылки</string>
+    <string name="poi_self_checkout_no">Самостоятельный выход: нет</string>
 </resources>