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

Merge branch 'master' into check_icon_for_tablet

Browse source
This commit is contained in:
Dima-1 2020-05-04 16:02:23 +03:00
commit 73af038d30
79 changed files with 1796 additions and 1259 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/main/java/net/osmand/data/MapObject.java
View file

@ -211,6 +211,10 @@ public abstract class MapObject implements Comparable<MapObject> {
location = new LatLon(latitude, longitude);
}
public void setLocation(LatLon loc) {
location = loc;
}
@Override
public int compareTo(MapObject o) {
return OsmAndCollator.primaryCollator().compare(getName(), o.getName());

16
OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java
View file

@ -65,8 +65,12 @@ public class TransportRoute extends MapObject {
return forwardWays;
}
public void mergeForwardWays() {
mergeRouteWays(forwardWays);
resortWaysToStopsOrder(forwardWays, forwardStops);
}
public static void mergeRouteWays(List<Way> forwardWays) {
boolean changed = true;
// combine as many ways as possible
while (changed && forwardWays != null) {
@ -129,10 +133,13 @@ public class TransportRoute extends MapObject {
}
}
}
if (forwardStops.size() > 0) {
}
public static Map<Way, int[]> resortWaysToStopsOrder(List<Way> forwardWays, List<TransportStop> forwardStops) {
final Map<Way, int[]> orderWays = new HashMap<Way, int[]>();
if (forwardWays != null && forwardStops.size() > 0) {
// resort ways to stops order
final Map<Way, int[]> orderWays = new HashMap<Way, int[]>();
for (Way w : getForwardWays()) {
for (Way w : forwardWays) {
int[] pair = new int[] { 0, 0 };
Node firstNode = w.getFirstNode();
TransportStop st = forwardStops.get(0);
@ -175,6 +182,7 @@ public class TransportRoute extends MapObject {
}
}
return orderWays;
}

13
OsmAnd-java/src/main/java/net/osmand/map/TileSourceManager.java
View file

@ -67,6 +67,7 @@ public class TileSourceManager {
private String randoms;
private String[] randomsArray;
private String rule;
private String referer;
private boolean hidden; // if hidden in configure map settings, for example mapillary sources
private boolean isRuleAcceptable = true;
@ -253,7 +254,11 @@ public class TileSourceManager {
}
public String getReferer() {
return null;
return referer;
}
public void setReferer(String referer) {
this.referer = referer;
}
@Override
@ -469,12 +474,16 @@ public class TileSourceManager {
public static void createMetaInfoFile(File dir, TileSourceTemplate tm, boolean override) throws IOException {
File metainfo = new File(dir, ".metainfo"); //$NON-NLS-1$
Map<String, String> properties = new LinkedHashMap<String, String>();
if (tm.getRule() != null && tm.getRule().length() > 0) {
if (!Algorithms.isEmpty(tm.getRule())) {
properties.put("rule", tm.getRule());
}
if(tm.getUrlTemplate() != null) {
properties.put("url_template", tm.getUrlTemplate());
}
if (!Algorithms.isEmpty(tm.getReferer())) {
properties.put("referer", tm.getReferer());
}
properties.put("ext", tm.getTileFormat());
properties.put("min_zoom", tm.getMinimumZoomSupported() + "");

41
OsmAnd-java/src/main/java/net/osmand/router/TransportRoutePlanner.java
View file

@ -965,13 +965,12 @@ public class TransportRoutePlanner {
}
}
//cache for converted TransportRoutes:
private static TLongObjectHashMap<TransportRoute> convertedRoutesCache;
private static TLongObjectHashMap<TransportStop> convertedStopsCache;
public static List<TransportRouteResult> convertToTransportRoutingResult(NativeTransportRoutingResult[] res,
TransportRoutingConfiguration cfg) {
TransportRoutingConfiguration cfg) {
//cache for converted TransportRoutes:
TLongObjectHashMap<TransportRoute> convertedRoutesCache = new TLongObjectHashMap<>();
TLongObjectHashMap<TransportStop> convertedStopsCache = new TLongObjectHashMap<>();
if (res.length == 0) {
return new ArrayList<TransportRouteResult>();
}
@ -983,7 +982,7 @@ public class TransportRoutePlanner {
for (NativeTransportRouteResultSegment ntrs : ntrr.segments) {
TransportRouteResultSegment trs = new TransportRouteResultSegment();
trs.route = convertTransportRoute(ntrs.route);
trs.route = convertTransportRoute(ntrs.route, convertedRoutesCache, convertedStopsCache);
trs.walkTime = ntrs.walkTime;
trs.travelDistApproximate = ntrs.travelDistApproximate;
trs.travelTime = ntrs.travelTime;
@ -1001,7 +1000,9 @@ public class TransportRoutePlanner {
return convertedRes;
}
private static TransportRoute convertTransportRoute(NativeTransportRoute nr) {
private static TransportRoute convertTransportRoute(NativeTransportRoute nr,
TLongObjectHashMap<TransportRoute> convertedRoutesCache,
TLongObjectHashMap<TransportStop> convertedStopsCache) {
TransportRoute r = new TransportRoute();
r.setId(nr.id);
r.setLocation(nr.routeLat, nr.routeLon);
@ -1013,15 +1014,17 @@ public class TransportRoutePlanner {
}
}
r.setFileOffset(nr.fileOffset);
r.setForwardStops(convertTransportStops(nr.forwardStops));
r.setForwardStops(convertTransportStops(nr.forwardStops, convertedStopsCache));
r.setRef(nr.ref);
r.setOperator(nr.routeOperator);
r.setType(nr.type);
r.setDist(nr.dist);
r.setColor(nr.color);
if (nr.intervals != null && nr.intervals.length > 0 && nr.avgStopIntervals !=null && nr.avgStopIntervals.length > 0 && nr.avgWaitIntervals != null && nr.avgWaitIntervals.length > 0) {
r.setSchedule(new TransportSchedule(new TIntArrayList(nr.intervals), new TIntArrayList(nr.avgStopIntervals), new TIntArrayList(nr.avgWaitIntervals)));
if (nr.intervals != null && nr.intervals.length > 0 && nr.avgStopIntervals !=null
&& nr.avgStopIntervals.length > 0 && nr.avgWaitIntervals != null && nr.avgWaitIntervals.length > 0) {
r.setSchedule(new TransportSchedule(new TIntArrayList(nr.intervals),
new TIntArrayList(nr.avgStopIntervals), new TIntArrayList(nr.avgWaitIntervals)));
}
for (int i = 0; i < nr.waysIds.length; i++) {
@ -1032,16 +1035,14 @@ public class TransportRoutePlanner {
r.addWay(new Way(nr.waysIds[i], wnodes));
}
if (convertedRoutesCache == null) {
convertedRoutesCache = new TLongObjectHashMap<>();
}
if (convertedRoutesCache.get(r.getId()) == null) {
convertedRoutesCache.put(r.getId(), r);
}
return r;
}
private static List<TransportStop> convertTransportStops(NativeTransportStop[] nstops) {
private static List<TransportStop> convertTransportStops(NativeTransportStop[] nstops,
TLongObjectHashMap<TransportStop> convertedStopsCache) {
List<TransportStop> stops = new ArrayList<>();
for (NativeTransportStop ns : nstops) {
if (convertedStopsCache != null && convertedStopsCache.get(ns.id) != null) {
@ -1065,16 +1066,6 @@ public class TransportRoutePlanner {
s.distance = ns.distance;
s.x31 = ns.x31;
s.y31 = ns.y31;
// List<TransportRoute> routes1 = new ArrayList<>();
//cache routes to avoid circular conversion and just search them by id
// for (int i = 0; i < ns.routes.length; i++) {
// if (s.getRoutesIds().length == ns.routes.length && convertedRoutesCache != null
// && convertedRoutesCache.get(ns.routesIds[i]) != null) {
// s.addRoute(convertedRoutesCache.get(ns.routesIds[i]));
// } else {
// s.addRoute(convertTransportRoute(ns.routes[i]));
// }
// }
if (ns.pTStopExit_refs != null && ns.pTStopExit_refs.length > 0) {
for (int i = 0; i < ns.pTStopExit_refs.length; i++) {

17
OsmAnd-java/src/main/java/net/osmand/util/MapAlgorithms.java
View file

@ -182,11 +182,20 @@ public class MapAlgorithms {
}
}
if (outx == rightX || outx == leftX) {
if (outy >= topY && outy <= bottomY) {
bx = outx;
by = outy;
return combine2Points(bx, by);
}
}
if (outx == rightX || outx == leftX || outy == topY || outy == bottomY) {
bx = outx;
by = outy;
//return (((long) bx) << 32) | ((long) by);
if (outy == topY || outy == bottomY) {
if (leftX <= outx && outx <= rightX) {
bx = outx;
by = outy;
return combine2Points(bx, by);
}
}
return -1L;
}

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

@ -156,7 +156,7 @@
<string name="search_contacts_descr">Zoek door al uw groepen en contacten.</string>
<string name="type_contact_or_group_name">Type contact- of groepnaam</string>
<string name="shared_string_search">Zoek</string>
<string name="shared_string_appearance">Toon als</string>
<string name="shared_string_appearance">Weergave</string>
<string name="time_on_the_move">Tijd in beweging</string>
<string name="background_work">Achtergond uitvoeringen</string>
<string name="time_ago">sinds</string>

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

@ -139,7 +139,7 @@
<string name="last_available_location">Последнее местоположение</string>
<string name="sharing_status">Статус отправки</string>
<string name="location_sharing_status">Трансляция: %1$s</string>
<string name="shared_string_enabled">Включен</string>
<string name="shared_string_enabled">Включён</string>
<string name="shared_string_status">Статус</string>
<string name="no_gps_connection">Отсутствует GPS</string>
<string name="no_internet_connection">Отсутствует интернет</string>

BIN
OsmAnd/res/drawable-hdpi/map_my_location.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
OsmAnd/res/drawable-hdpi/map_quick_action.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
OsmAnd/res/drawable-hdpi/map_zoom_in.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-hdpi/map_zoom_out.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

BIN
OsmAnd/res/drawable-mdpi/map_my_location.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
OsmAnd/res/drawable-mdpi/map_quick_action.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
OsmAnd/res/drawable-mdpi/map_zoom_in.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

BIN
OsmAnd/res/drawable-mdpi/map_zoom_out.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_my_location.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_quick_action.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_zoom_in.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_zoom_out.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_my_location.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_quick_action.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_zoom_in.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_zoom_out.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

13
OsmAnd/res/drawable/map_my_location.xml Normal file
View file

@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,14C13.1046,14 14,13.1046 14,12C14,10.8954 13.1046,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M11,2H13V4.0619C16.6187,4.5131 19.4869,7.3813 19.9381,11H22V13H19.9381C19.4869,16.6187 16.6187,19.4869 13,19.9381V22H11V19.9381C7.3813,19.4869 4.5131,16.6187 4.0619,13H2V11H4.0619C4.5131,7.3813 7.3813,4.5131 11,4.0619V2ZM12,6C12.3407,6 12.6748,6.0284 13,6.083C15.5125,6.5045 17.4955,8.4875 17.917,11C17.9716,11.3252 18,11.6593 18,12C18,12.3407 17.9716,12.6748 17.917,13C17.4955,15.5125 15.5125,17.4955 13,17.917C12.6748,17.9716 12.3407,18 12,18C11.6593,18 11.3252,17.9716 11,17.917C8.4875,17.4955 6.5045,15.5125 6.083,13C6.0284,12.6748 6,12.3407 6,12C6,11.6593 6.0284,11.3252 6.083,11C6.5045,8.4875 8.4875,6.5045 11,6.083C11.3252,6.0284 11.6593,6 12,6Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</vector>

12
OsmAnd/res/drawable/map_quick_action.xml Normal file
View file

@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M3,3C3,2.4477 3.4477,2 4,2H18C18.5523,2 19,2.4477 19,3V11C19,11.5523 18.5523,12 18,12H15V6.5C15,5.1193 13.8807,4 12.5,4C11.1193,4 10,5.1193 10,6.5V12H4C3.4477,12 3,11.5523 3,11V3Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M11,23H20L20.9793,16.145C20.9931,16.0484 21,15.9511 21,15.8536V15.7973C21,15.2868 20.7972,14.7972 20.4362,14.4362C20.1525,14.1525 19.7873,13.9645 19.3915,13.8986L14,13V6.5C14,5.6716 13.3284,5 12.5,5C11.6716,5 11,5.6716 11,6.5V17L7.1063,16.0266C7.0357,16.0089 6.9632,16 6.8904,16H6.7342C6.3287,16 6,16.3287 6,16.7342C6,16.9059 6.0602,17.0723 6.1702,17.2042L11,23Z"
android:fillColor="#ffffff"/>
</vector>

9
OsmAnd/res/drawable/map_zoom_in.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M13,2H11V11H2V13H11V22H13V13H22V11H13V2Z"
android:fillColor="#727272"/>
</vector>

9
OsmAnd/res/drawable/map_zoom_out.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M22,11l-0,2l-20,0l-0,-2z"
android:fillColor="#727272"/>
</vector>

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

@ -3640,4 +3640,18 @@
\nيتم تجديد الاشتراك تلقائيًا ما لم يتم إلغاؤه قبل تاريخ التجديد. سيتم تحميل حسابك لفترة التجديد (شهر / ثلاثة أشهر / سنة) فقط في تاريخ التجديد.
\n
\nيمكنك إدارة وإلغاء الاشتراكات الخاصة بك عن طريق الذهاب إلى إعدادات Google Play الخاصة بك.</string>
<string name="search_poi_types">البحث عن أنواع poi</string>
<string name="search_poi_types_descr">اجمع أنواع النقاط المهمة من فئات مختلفة. اضغط على مفتاح التبديل لتحديد الكل ، ثم انقر على الجانب الأيسر لاختيار الفئة.</string>
<string name="tracker_item">متتبع أوسماند</string>
<string name="mapillary_item">أوسماند+ مابيلاري</string>
<string name="quick_action_item">إجراء سريع</string>
<string name="radius_ruler_item">مسطرة البوصلة</string>
<string name="measure_distance_item">قياس المسافة</string>
<string name="travel_item">السفر (Wikivoyage و Wikipedia)</string>
<string name="map_markers_item">علامات الخريطة</string>
<string name="favorites_item">المفضلة</string>
<string name="subscription_osmandlive_item">اشتراك أوسماند لايف</string>
<string name="osmand_purchases_item">مشتريات أوسماند</string>
<string name="legend_item_description">دليل رموز الخريطة</string>
<string name="navigation_profiles_item">الملفات الشخصية للملاحة</string>
</resources>

8
OsmAnd/res/values-b+kab/strings.xml
View file

@ -1298,4 +1298,12 @@
<string name="si_min_km">Tisdatin deg ukilumitr</string>
<string name="nm">nmi</string>
<string name="foot">ft</string>
<string name="osm_editing_plugin_description">Ttekki deg OpenStreetMap (OSM) srid seg usnas OSMAnd. Amedya: rnu neɣ beddel agazen yelhan n OSM, rnu neɣ beddel tizmilin OSM sakin azen iberdan-ik GPX (aya ilaq umiḍan OSM). OpenStreetMap d tarbaɛt yeldin, tamaḍalant n tkarḍa tazayazt.</string>
<string name="osm_settings">Taẓrigt OpenStreetMap</string>
<string name="osmand_accessibility_description">Rmed, deg OsmAnd, iɣewwaren n tuffart n yibenk-ik (ṣeggem arured n taɣect-ik n uɛqal n taɣect, seqdec tignit trackball i usemɣer neɣ i urmad n yilɣa s taɣect n wadig-ik).</string>
<string name="travel_item">Asikel (Wikivoyage d Wikipedia)</string>
<string name="favorites_item">Inurifen</string>
<string name="subscription_osmandlive_item">Ajerred - OsmAnd Srid</string>
<string name="osmand_purchases_item">Tiɣin deg OsmAnd</string>
<string name="navigation_profiles_item">Imuɣna n tunigin</string>
</resources>

38
OsmAnd/res/values-bn/phrases.xml
View file

@ -85,4 +85,42 @@
<string name="poi_telescope_type">ধরণ</string>
<string name="poi_vending_type">ভেন্ডিং টাইপ</string>
<string name="poi_fuel_avia_type">জ্বালানির ধরণ (এভিয়া)</string>
<string name="poi_washing_machine">ওয়াশিং মেশিন</string>
<string name="poi_tents">তাঁবু</string>
<string name="poi_massage_type">ম্যাসাজ টাইপ</string>
<string name="poi_health_specialty">স্বাস্থ্য বিশেষত্ব</string>
<string name="poi_diet">ডায়েট</string>
<string name="poi_nudism">নগ্নতাবাদ</string>
<string name="poi_beach_surface_type">পৃষ্ঠতল</string>
<string name="poi_water_characteristic">জলের বৈশিষ্ট্য</string>
<string name="poi_seasonal">মৌসুমী</string>
<string name="poi_fireplace">অগ্নিকুণ্ড</string>
<string name="poi_shelter_type">ধরণ</string>
<string name="poi_recycling_accepted_waste">গৃহীত বর্জ্য</string>
<string name="poi_recycling_type">ধরণ</string>
<string name="poi_beauty_salon_service">সেবা</string>
<string name="poi_microbrewery">মাইক্রোব্রিয়ারি</string>
<string name="poi_cocktails">ককটেল</string>
<string name="poi_takeaway">টেক আওয়ায়</string>
<string name="poi_drive_through">ড্রাইভ থ্রু</string>
<string name="poi_drive_in">ড্রাইভ ইন</string>
<string name="poi_delivery">ডেলিভারি</string>
<string name="poi_smoking">ধূমপান</string>
<string name="poi_fee">ফি</string>
<string name="poi_outdoor_seating">বাইরে বসার ব্যবস্থা</string>
<string name="poi_theatre_genre">জেনরে</string>
<string name="poi_piste_grooming">স্কি স্থান এর গ্রুমিং</string>
<string name="poi_piste_difficulty">স্কি স্থান এর কাঠিন্য</string>
<string name="poi_resort_type">ধরণ</string>
<string name="poi_backcountry">গ্রাম্য এলাকা</string>
<string name="poi_scout_camp">স্কাউট ক্যাম্প</string>
<string name="poi_clock_option">অতিরিক্ত</string>
<string name="poi_information_contents">বিষয়বস্তু</string>
<string name="poi_information_type">ধরণ</string>
<string name="poi_denomination">আখ্যা</string>
<string name="poi_religion_type">ধর্ম</string>
<string name="poi_star_rating">ষ্টার রেটিং</string>
<string name="poi_archaeological_site_type">ধরণ</string>
<string name="poi_free_flying_characteristics">বিশিষ্ট</string>
<string name="poi_healthcare_alternative_types">বিশিষ্টতা</string>
</resources>

3
OsmAnd/res/values-bn/strings.xml
View file

@ -21,4 +21,7 @@
<string name="recalc_angle_dialog_title">আমার অবস্থান ও গন্তব্য এর মধ্যকার সর্বনিম্ন কোন</string>
<string name="shared_string_preparing">তৈরী করা হচ্ছে</string>
<string name="shared_string_nothing_selected">কিছু নির্বাচন করা হয়নি</string>
<string name="osmand_purchases_item">ওএসএমও কেনাকাটা</string>
<string name="legend_item_description">একটি মানচিত্রের প্রতীকের জন্য গাইড</string>
<string name="navigation_profiles_item">ন্যাভিগেশন প্রোফাইল</string>
</resources>

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

@ -3647,4 +3647,16 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="some_articles_may_not_available_in_lang">Nogle Wikipedia-artikler er muligvis ikke tilgængelige på dit sprog.</string>
<string name="extra_maps_menu_group">Ekstra kort</string>
<string name="download_unsupported_action">Ikke understøttet handling %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="search_poi_types">Søg efter IP-typer</string>
<string name="search_poi_types_descr">Kombiner IP-typer fra forskellige kategorier. Tryk på knappen for at vælge alt, tryk på venstre side for valg af kategori.</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="quick_action_item">Genveje</string>
<string name="radius_ruler_item">Radiusmåler</string>
<string name="measure_distance_item">Mål afstand</string>
<string name="travel_item">Rejser (Wikivoyage og Wikipedia)</string>
<string name="map_markers_item">Kortmarkører</string>
<string name="favorites_item">Favoritter</string>
<string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
<string name="navigation_profiles_item">Navigationsprofiler</string>
</resources>

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

@ -3669,4 +3669,19 @@ Lon %2$s</string>
<string name="additional_actions_descr">Sie können auf diese Aktionen zugreifen, indem Sie auf die Schaltfläche „Aktionen“ tippen.</string>
<string name="select_wikipedia_article_langs">Wählen Sie die Sprachen aus, in denen Wikipedia-Artikel auf der Karte erscheinen sollen. Sie können zwischen allen verfügbaren Sprachen wechseln, während Sie den Artikel lesen.</string>
<string name="hidden_items_descr">Diese Elemente werden aus dem Menü ausgeblendet, aber die dargestellten Optionen oder Plugins funktionieren weiterhin.</string>
<string name="reorder_or_hide_from">Ordnen Sie Elemente aus %1$s neu an oder blenden Sie sie aus.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">Die Bezahlung wird nach der Bestätigung des Kaufs von ihrem Google Play Account abgebucht.
\n
\nDas Abonnement verlängert sich automatisch, sofern es nicht vor dem Verlängerungsdatum gekündigt wird. Erst nach dem Verlängerungsdatum wird die Bezahlung für die Verlängerungsperiode (1 Monat/ 3 Monate/ 1 Jahr) von ihrem Account abgebucht.
\n
\nSie können ihre Abonnements in ihrem Google Play Einstellungen verwalten oder kündigen.</string>
<string name="search_poi_types">Suche nach POI-Typen</string>
<string name="search_poi_types_descr">Kombinieren Sie POI-Typen aus verschiedenen Kategorien. Tippen Sie auf den Schalter, um alle auszuwählen, tippen Sie auf die linke Seite, um die Kategorie auszuwählen.</string>
<string name="shared_string_divider"/>
<string name="quick_action_item">Schnellaktion</string>
<string name="radius_ruler_item">Zirkel</string>
<string name="measure_distance_item">Entfernungsmesser</string>
<string name="map_markers_item">Kartenmarkierungen</string>
<string name="favorites_item">Favoriten</string>
</resources>

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

@ -1923,9 +1923,9 @@ Lon: %2$s</string>
<string name="first_usage_item">Unua uzo</string>
<string name="first_usage_item_description">Kiel elŝuti mapojn, bazaj agordoj.</string>
<string name="navigation_item_description">Navigadaj agordoj.</string>
<string name="planning_trip_item">Planado de vojaĝo</string>
<string name="map_viewing_item">Map-foliumado</string>
<string name="search_on_the_map_item">Serĉado en mapo</string>
<string name="planning_trip_item">Plani vojaĝon</string>
<string name="map_viewing_item">Foliumi mapon</string>
<string name="search_on_the_map_item">Serĉi en la mapo</string>
<string name="instalation_troubleshooting_item">Instalado kaj problemoj</string>
<string name="techical_articles_item">Teĥnikaj artikoloj</string>
<string name="versions_item">Versioj</string>
@ -3596,18 +3596,18 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="app_mode_ski_snowmobile">Motorsledo</string>
<string name="custom_osmand_plugin">Propra OsmAnd-kromprogramo</string>
<string name="replace_point_descr">Anstataŭigi alian punkton per tiu ĉi</string>
<string name="changes_applied_to_profile">Aplikis ŝanĝojn al la profilo %1$s.</string>
<string name="settings_item_read_error">Ne povas legi %1$s.</string>
<string name="settings_item_write_error">Ne povas skribi %1$s.</string>
<string name="settings_item_import_error">Ne povas enporti %1$s.</string>
<string name="changes_applied_to_profile">Aplikis ŝanĝojn al la profilo “%1$s”.</string>
<string name="settings_item_read_error">Ne povas legi el “%1$s”.</string>
<string name="settings_item_write_error">Ne povas skribi al “%1%s”.</string>
<string name="settings_item_import_error">Ne povas enporti el “%1$s”.</string>
<string name="select_track_file">Elekti dosieron de spuro</string>
<string name="shared_string_languages">Lingvoj</string>
<string name="shared_string_language">Lingvo</string>
<string name="shared_string_all_languages">Ĉiuj lingvoj</string>
<string name="wiki_menu_download_descr">Kromaj mapoj estas necesaj por vidigi punktojn de Vikipedio sur la mapo.</string>
<string name="main_actions_descr">Ĉefaj agoj povas enhavi nur 4 butonojn.</string>
<string name="main_actions_descr">La “ĉefaj agoj” povas enhavi nur 4 butonojn.</string>
<string name="main_actions">Ĉefaj agoj</string>
<string name="additional_actions_descr">Vi povas aliri tiujn ĉi agojn per la butono “agoj”.</string>
<string name="additional_actions_descr">Vi povas aliri tiujn ĉi agojn per la butono “pliaj agoj”.</string>
<string name="move_inside_category">Vi povas movi elementojn nur ene tiu ĉi kategorio.</string>
<string name="developer_plugin">Programista kromprogramo</string>
<string name="shared_string_items">Elementoj</string>
@ -3623,7 +3623,7 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="divider_descr">La jenaj elementoj troviĝos en la menuo sub la horizontala linio.</string>
<string name="hidden_items_descr">La jenaj elementoj estas kaŝitaj el la menuo, sed la rilataj eblaĵoj kaj kromprogramoj plue funkcios.</string>
<string name="shared_string_hidden">Kaŝitaj</string>
<string name="reset_items_descr">Agordoj restarigos al la implicitaj valoroj post kaŝiĝo.</string>
<string name="reset_items_descr">Per kaŝi agordojn, ili revenos al la implicitaj valoroj.</string>
<string name="select_wikipedia_article_langs">Elektu lingvojn, en kiuj artikoloj de Vikipedio montriĝos sur la mapo. Vi povos baskuli inter ĉiuj disponeblaj lingvoj dum legi artikolon.</string>
<string name="some_articles_may_not_available_in_lang">Iuj artikoloj de Vikipedio povas ne esti disponeblaj en via lingvo.</string>
<string name="lang_zhyue">Kantona</string>
@ -3657,11 +3657,19 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="extra_maps_menu_group">Kromaj mapoj</string>
<string name="download_unsupported_action">Nesubtenata ago %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">Pago estos prenita per via konto Google Play post konfirmi aĉeton.
\n
\nLa abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La abonpago estos prenita por la specifa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo.
\n
\nVi povas administri kaj rezigni la abonon en agordoj de Google Play.</string>
<string name="osm_live_payment_subscription_management">La pago estos prenita el via konto Google Play kiam aĉeti abonon kaj kiam ĝi malvalidiĝos (por monato/tri monatoj/jaro), kaj ne renoviĝos aŭtomate post esti rezignita per agordoj de Google Play.</string>
<string name="search_poi_types_descr">Miksi specojn de interesejoj el diversaj kategorioj. Frapetu “ŝaltilon” por elekti ĉiujn, frapetu ĉe maldekstre por elekti el la kategorio.</string>
<string name="search_poi_types">Serĉi specojn de interesejoj</string>
<string name="favorites_item">Ŝatataj ejoj</string>
<string name="subscription_osmandlive_item">Aboni OsmAnd Live</string>
<string name="osmand_purchases_item">Aĉeti OsmAnd</string>
<string name="tracker_item">Enreta spurilo</string>
<string name="quick_action_item">Butono de rapida ago</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="radius_ruler_item">Radius‑mezurilo</string>
<string name="measure_distance_item">Distanc-mezurilo</string>
<string name="travel_item">Vojaĝo (Vikivojaĝoj kaj Vikipedio)</string>
<string name="map_markers_item">Map‑markoj</string>
<string name="legend_item_description">Priskribo al simboloj sur la mapo</string>
<string name="navigation_profiles_item">Profiloj de navigo</string>
</resources>

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

@ -3612,9 +3612,9 @@ Lon %2$s</string>
<string name="app_mode_ski_snowmobile">Motonieve</string>
<string name="custom_osmand_plugin">Complemento personalizado de OsmAnd</string>
<string name="replace_point_descr">Reemplaza otro punto con esto</string>
<string name="settings_item_read_error">No se pudo leer «%1$s».</string>
<string name="settings_item_write_error">No se pudo escribir «%1$s».</string>
<string name="settings_item_import_error">No se pudo importar «%1$s».</string>
<string name="settings_item_read_error">No se pudo leer desde «%1$s».</string>
<string name="settings_item_write_error">No se pudo escribir en «%1$s».</string>
<string name="settings_item_import_error">No se pudo importar desde «%1$s».</string>
<string name="changes_applied_to_profile">Cambios aplicados al perfil «%1$s».</string>
<string name="ui_customization_description">Personaliza la cantidad de elementos en el menú lateral, la configuración del mapa y el menú contextual.
\n
@ -3628,10 +3628,10 @@ Lon %2$s</string>
<string name="divider_descr">Los elementos debajo de este punto están separados por un divisor.</string>
<string name="shared_string_hidden">Oculto</string>
<string name="hidden_items_descr">Estos elementos no se muestran en el menú, pero las opciones o complementos que representan seguirán funcionando.</string>
<string name="reset_items_descr">Los ajustes se restablecerán al estado original después de ocultarse.</string>
<string name="main_actions_descr">Las acciones principales contienen sólo 4 botones.</string>
<string name="reset_items_descr">Ocultar los ajustes, los restablece a su estado original.</string>
<string name="main_actions_descr">Las «Acciones principales» sólo contienen 4 botones.</string>
<string name="main_actions">Acciones principales</string>
<string name="additional_actions_descr">Puedes acceder a estas acciones, pulsando el botón «Acciones».</string>
<string name="additional_actions_descr">Puedes acceder a estas acciones, pulsando el botón «Acciones adicionales».</string>
<string name="move_inside_category">Sólo puedes mover objetos dentro de esta categoría.</string>
<string name="developer_plugin">Complemento de desarrollador</string>
<string name="shared_string_items">Elementos</string>
@ -3675,9 +3675,21 @@ Lon %2$s</string>
<string name="extra_maps_menu_group">Mapas adicionales</string>
<string name="download_unsupported_action">Acción «%1$s» no admitida</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">El pago será cargado a la cuenta de Google Play al confirmar la compra.
\n
\nLa suscripción se renueva automáticamente a menos que se cancele antes de la fecha de renovación. La cuenta será cargada por el período de renovación (mes/trimestre/año) sólo en la fecha de renovación.
\n
\nPuedes administrar y cancelar las suscripciones accediendo a los ajustes de Google Play.</string>
<string name="osm_live_payment_subscription_management">La cuenta de Google Play se carga al comprar una suscripción
\ny al expirar (mes/trimestre/año),
\nno se renovará si se cancela antes de esa fecha en los ajustes de Google Play.</string>
<string name="search_poi_types">Buscar por tipos de PDI</string>
<string name="search_poi_types_descr">Combina tipos de PDI de diferentes categorías. Pulsa «Alternar» para marcar todo, pulsa el lado izquierdo para elegir una categoría.</string>
<string name="tracker_item">OsmAnd Tracker</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="quick_action_item">Acción rápida</string>
<string name="radius_ruler_item">Regla radial</string>
<string name="measure_distance_item">Medir distancia</string>
<string name="travel_item">Viajes (Wikiviajes y Wikipedia)</string>
<string name="map_markers_item">Marcadores del mapa</string>
<string name="favorites_item">Favoritos</string>
<string name="subscription_osmandlive_item">Suscripción - OsmAnd Live</string>
<string name="osmand_purchases_item">Compras de OsmAnd</string>
<string name="legend_item_description">La guía para la simbología de un mapa</string>
<string name="navigation_profiles_item">Perfiles de navegación</string>
</resources>

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

@ -3612,33 +3612,83 @@ Lon %2$s</string>
<string name="custom_osmand_plugin">Complemento personalizado de OsmAnd</string>
<string name="replace_point_descr">Reemplaza otro punto con esto</string>
<string name="changes_applied_to_profile">Cambios aplicados al perfil «%1$s».</string>
<string name="settings_item_read_error">No se pudo leer «%1$s».</string>
<string name="settings_item_write_error">No se pudo escribir «%1$s».</string>
<string name="settings_item_import_error">No se pudo importar «%1$s».</string>
<string name="settings_item_read_error">No se pudo leer desde «%1$s».</string>
<string name="settings_item_write_error">No se pudo escribir en «%1$s».</string>
<string name="settings_item_import_error">No se pudo importar desde «%1$s».</string>
<string name="wikipedia_poi_languages_promo">Algunos artículos de Wikipedia pueden no estar disponibles en tu idioma, elige los idiomas en los que los artículos de Wikipedia aparecerán en el mapa.
\nPodrás cambiar entre todos los idiomas disponibles mientras lees el artículo.</string>
<string name="wiki_menu_download_descr">Se necesitan mapas adicionales para ver los puntos de interés de Wikipedia en el mapa.</string>
<string name="ui_customization_short_descr">Elementos del cajón, menú contextual</string>
<string name="ui_customization_description">Personaliza la cantidad de elementos en el cajón, el la configuración del mapa y el menú contextual.
\n
\nPuedes desactivar los complementos no utilizados, para ocultar todos sus controles de la aplicación «%1$s».</string>
<string name="ui_customization">Personalización de la interfaz de usuario</string>
<string name="ui_customization_short_descr">Elementos del menú lateral y menú contextual</string>
<string name="ui_customization_description">Personaliza la cantidad de elementos en el menú lateral, la configuración del mapa y el menú contextual.
\n
\nPuedes desactivar los complementos no utilizados, para ocultar todos sus controles desde «%1$s».</string>
<string name="ui_customization">Personalizar interfaz de usuario</string>
<string name="shared_string_languages">Idiomas</string>
<string name="shared_string_language">Idioma</string>
<string name="shared_string_items">Elementos</string>
<string name="shared_string_hidden">Oculto</string>
<string name="shared_string_drawer">Cajón</string>
<string name="shared_string_drawer">Menú lateral</string>
<string name="shared_string_divider">Divisor</string>
<string name="shared_string_all_languages">Todos los idiomas</string>
<string name="select_track_file">Marca el archivo de la traza</string>
<string name="reset_items_descr">Los ajustes se restablecerán al estado original después de ocultarse.</string>
<string name="reorder_or_hide_from">Reordenar u ocultar elementos de «%1$s».</string>
<string name="reset_items_descr">Ocultar los ajustes, los restablece a su estado original.</string>
<string name="reorder_or_hide_from">Reordena u oculta elementos en «%1$s».</string>
<string name="move_inside_category">Sólo puedes mover objetos dentro de esta categoría.</string>
<string name="main_actions_descr">Las acciones principales contienen sólo 4 botones.</string>
<string name="main_actions_descr">Las «Acciones principales» sólo contienen 4 botones.</string>
<string name="main_actions">Acciones principales</string>
<string name="hidden_items_descr">Estos elementos están ocultos en el menú, pero las opciones o complementos representados siguen funcionando.</string>
<string name="divider_descr">Elementos debajo de este punto separados por un divisor.</string>
<string name="hidden_items_descr">Estos elementos no se muestran en el menú, pero las opciones o complementos que representan seguirán funcionando.</string>
<string name="divider_descr">Los elementos debajo de este punto están separados por un divisor.</string>
<string name="developer_plugin">Complemento de desarrollador</string>
<string name="context_menu_actions">Acciones del menú contextual</string>
<string name="additional_actions_descr">Puedes acceder a estas acciones, pulsando el botón «Acciones».</string>
<string name="additional_actions_descr">Puedes acceder a estas acciones, pulsando el botón «Acciones adicionales».</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="travel_item">Viajes (Wikiviajes y Wikipedia)</string>
<string name="tracker_item">OsmAnd Tracker</string>
<string name="subscription_osmandlive_item">Suscripción - OsmAnd Live</string>
<string name="some_articles_may_not_available_in_lang">Es posible que algunos artículos de Wikipedia no estén disponibles en tu idioma.</string>
<string name="select_wikipedia_article_langs">Marca los idiomas en los que los artículos de Wikipedia aparecerán en el mapa. Puedes cambiar entre todos los idiomas disponibles mientras lees el artículo.</string>
<string name="search_poi_types_descr">Combina tipos de PDI de diferentes categorías. Pulsa «Alternar» para marcar todo, pulsa el lado izquierdo para elegir una categoría.</string>
<string name="search_poi_types">Buscar por tipos de PDI</string>
<string name="radius_ruler_item">Regla radial</string>
<string name="quick_action_item">Acción rápida</string>
<string name="osmand_purchases_item">Compras de OsmAnd</string>
<string name="osm_live_payment_subscription_management">La cuenta de Google Play se carga al comprar una suscripción
\ny al expirar (mes/trimestre/año),
\nno se renovará si se cancela antes de esa fecha en los ajustes de Google Play.</string>
<string name="navigation_profiles_item">Perfiles de navegación</string>
<string name="measure_distance_item">Medir distancia</string>
<string name="map_markers_item">Marcadores del mapa</string>
<string name="legend_item_description">La guía para la simbología de un mapa</string>
<string name="lang_zhyue">Cantonés</string>
<string name="lang_zhminnan">Min del Sur</string>
<string name="lang_yo">Yoruba</string>
<string name="lang_war">Waray</string>
<string name="lang_uz">Uzbeko</string>
<string name="lang_ur">Urdu</string>
<string name="lang_tt">Tártaro</string>
<string name="lang_tg">Tayiko</string>
<string name="lang_sco">Escocés</string>
<string name="lang_scn">Siciliano</string>
<string name="lang_pnb">Punjabi</string>
<string name="lang_ne">Nepalí</string>
<string name="lang_nap">Napolitano</string>
<string name="lang_my">Birmano</string>
<string name="lang_mn">Mongol</string>
<string name="lang_min">Minangkabau</string>
<string name="lang_mg">Malgache</string>
<string name="lang_lmo">Lombardo</string>
<string name="lang_ky">Kirguís</string>
<string name="lang_kk">Kazajo</string>
<string name="lang_jv">Javanés</string>
<string name="lang_gu">Gujarati</string>
<string name="lang_cv">Chuvash</string>
<string name="lang_ce">Checheno</string>
<string name="lang_bar">Bávaro</string>
<string name="lang_ba">Bashkir</string>
<string name="lang_an">Aragonés</string>
<string name="favorites_item">Favoritos</string>
<string name="extra_maps_menu_group">Mapas adicionales</string>
<string name="download_unsupported_action">Acción «%1$s» no admitida</string>
<string name="custom_color">Color personalizado</string>
</resources>

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

@ -2139,7 +2139,7 @@
<string name="plugins_menu_group">افزونه‌ها</string>
<string name="first_usage_item">اولین استفاده</string>
<string name="first_usage_item_description">نحوهٔ دانلود نقشه‌ها و انجام تنظیمات پایه.</string>
<string name="search_on_the_map_item">جست‌وجوی نقشه</string>
<string name="search_on_the_map_item">جست‌وجو در نقشه</string>
<string name="instalation_troubleshooting_item">نصب و اشکال‌زدایی</string>
<string name="techical_articles_item">مقاله‌های فنی</string>
<string name="save_poi_too_many_uppercase">حروف بزرگ زیادی در نام وجود دارد. ادامه می‌دهید؟</string>
@ -3640,10 +3640,10 @@
<string name="app_mode_ski_snowmobile">برف‌رو</string>
<string name="custom_osmand_plugin">افزونهٔ سفارشی OsmAnd</string>
<string name="replace_point_descr">نقطهٔ دیگری را جانشین این کنید</string>
<string name="changes_applied_to_profile">تغییرات روی پروفایل %1$s به کار رفت.</string>
<string name="settings_item_read_error">خواندن %1$s ناموفق بود.</string>
<string name="settings_item_write_error">نوشتن %1$s ناموفق بود.</string>
<string name="settings_item_import_error">درون‌برد %1$s ناموفق بود.</string>
<string name="changes_applied_to_profile">تغییرات بر پروفایل %1$s به کار گرفته شد.</string>
<string name="settings_item_read_error">خواندن از %1$s ناموفق بود.</string>
<string name="settings_item_write_error">نوشتن در %1$s ناموفق بود.</string>
<string name="settings_item_import_error">درون‌برد از %1$s ناموفق بود.</string>
<string name="wiki_menu_download_descr">برای مشاهدهٔ نقاط ویکی‌پدیا روی نقشه باید نقشهٔ دیگری را نیز دانلود کنید.</string>
<string name="multimedia_rec_split_title">تقسیمگر ضبط‌کننده</string>
<string name="select_track_file">انتخاب فایل رد</string>
@ -3653,8 +3653,8 @@
<string name="ui_customization_description">تعداد اقلام کشو را به‌دلخواه تنظیم کنید، نقشه و منوی زمینه را پیکربندی نمایید.
\n
\nمی‌توانید افزونهٔ بی‌استفاده را غیرفعال کنید تا همهٔ کنترل‌های آن از برنامه پنهان شود.</string>
<string name="reset_items_descr">تنظیمات پس از پنهان‌سازی به حالت اولیه بازنشانی می‌شود.</string>
<string name="hidden_items_descr">این اقلام در منو پنهان می‌شوند، اما گزینه‌ها یا افزونه‌های متناظر همچنان کار می‌کنند.</string>
<string name="reset_items_descr">پنهان‌سازی تنظیمات آن‌ها را به حالت اولیه بازنشانی می‌کند.</string>
<string name="hidden_items_descr">این اقلام از منو پنهان می‌شوند، اما گزینه‌ها یا افزونه‌های متناظر همچنان کار می‌کنند.</string>
<string name="shared_string_hidden">پنهان</string>
<string name="shared_string_divider">جداکننده</string>
<string name="reorder_or_hide_from">مرتب‌سازی یا پنهان‌سازی اقلام %1$s.</string>
@ -3662,9 +3662,9 @@
<string name="ui_customization_short_descr">اقلام کشو، منوی زمینه</string>
<string name="ui_customization">سفارشی‌سازی واسط کاربری</string>
<string name="context_menu_actions">کنش‌های منوی زمینه</string>
<string name="main_actions_descr">کنش‌های اصلی فقط ۴ دکمه دارند.</string>
<string name="main_actions_descr">کنش‌های اصلی فقط ۴ دکمه است.</string>
<string name="main_actions">کنش‌های اصلی</string>
<string name="additional_actions_descr">با زدن روی دکمهٔ «کنش‌ها» می‌توانید به این کنش‌ها دسترسی پیدا کنید.</string>
<string name="additional_actions_descr">با زدن روی دکمهٔ «کنش‌های بیشتر» می‌توانید به این کنش‌ها دسترسی پیدا کنید.</string>
<string name="developer_plugin">افزونهٔ توسعه‌دهنده</string>
<string name="divider_descr">چیزهایی که از این نقطه به پایین قرار می‌گیرند، با جداکننده جدا می‌شوند.</string>
<string name="move_inside_category">اقلام را فقط درون این دسته می‌توانید جابه‌جا کنید.</string>
@ -3677,4 +3677,41 @@
<string name="lang_tg">تاجیکی</string>
<string name="extra_maps_menu_group">نقشه‌های بیشتر</string>
<string name="download_unsupported_action">کنش پشتیبانی‌نشده %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">هنگام خرید اشتراک، بها از حساب گوگل‌پلی شما پرداخت می‌شود
\nو هنگامی که مدت اشتراک پایان می‌یابد (ماهانه/سه‌ماهه/سالانه)،
\nاگر پیش از پایان زمان اشتراک، اشتراک خود را از تنظیمات گوگل‌پلی لغو کرده باشید، به‌طور خودکار تمدید نخواهد شد.</string>
<string name="tracker_item">OsmAnd tracker</string>
<string name="legend_item_description">راهنمای نمادهای نقشه</string>
<string name="navigation_profiles_item">پروفایل‌های ناوبری</string>
<string name="lang_zhyue">کانتونی</string>
<string name="lang_zhminnan">مین‌نانی</string>
<string name="lang_yo">یوروبایی</string>
<string name="lang_war">وینارایی</string>
<string name="lang_uz">ازبکی</string>
<string name="lang_tt">تاتاری</string>
<string name="lang_sco">اسکاتلندی</string>
<string name="lang_ne">نپالی</string>
<string name="lang_nap">ناپلی</string>
<string name="lang_my">برمه‌ای</string>
<string name="lang_mn">مغولی</string>
<string name="lang_min">مینانگ‌کابائو</string>
<string name="lang_mg">مالاگاسی</string>
<string name="lang_ky">قرقیزی</string>
<string name="lang_jv">جاوه‌ای</string>
<string name="lang_gu">گوجراتی</string>
<string name="lang_cv">چوواشی</string>
<string name="lang_ce">چچنی</string>
<string name="lang_bar">باواریایی</string>
<string name="lang_ba">باشقیری</string>
<string name="lang_an">آراگونی</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="quick_action_item">کنش فوری</string>
<string name="radius_ruler_item">خط‌کش شعاعی</string>
<string name="measure_distance_item">اندازه‌گیری مسافت</string>
<string name="travel_item">مسافرت (ویکی‌سفر و ویکی‌پدیا)</string>
<string name="map_markers_item">نشانه‌های نقشه</string>
<string name="favorites_item">برگزیده‌ها</string>
<string name="subscription_osmandlive_item">اشتراک - OsmAnd Live</string>
<string name="osmand_purchases_item">خریدهای OsmAnd</string>
</resources>

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

@ -3412,7 +3412,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="import_profile">Importer un profil</string>
<string name="monitoring_prefs_descr">Navigation, fiabilité d\'enregistrement</string>
<string name="multimedia_notes_prefs_descr">Taille de l\'image, qualité audio et vidéo</string>
<string name="osm_editing_prefs_descr">Login, mot de passe, édition hors-ligne</string>
<string name="osm_editing_prefs_descr">Connexion, mot de passe, édition hors-ligne</string>
<string name="accessibility_prefs_descr">Choisissez l\'icône, la couleur et le nom</string>
<string name="live_monitoring_descr">Permet le partage de votre position grâce à l\'enregistrement du trajet.</string>
<string name="live_monitoring">Suivi en ligne</string>
@ -3551,8 +3551,8 @@ représentant la zone : %1$s x %2$s</string>
<string name="shared_string_importing">Import en cours</string>
<string name="items_added">Éléments ajoutés</string>
<string name="shared_string_import_complete">Import terminé</string>
<string name="checking_for_duplicate_description">OsmAnd vérifie que l\'élément %1$s n\'existe pas déjà dans l\'application.
\n
<string name="checking_for_duplicate_description">OsmAnd vérifie que l\'élément %1$s n\'existe pas déjà dans l\'application.
\n
\nCela peut prendre un certain temps.</string>
<string name="import_complete_description">Les données de %1$s ont été importées, vous pouvez utiliser les boutons ci-dessous pour ouvrir la partie adéquate de l\'application pour les gérer.</string>
<string name="recalculate_route_distance_promo">L\'itinéraire sera recalculé lorsque la distance entre l\'itinéraire et votre position est supérieure à la valeur indiquée.</string>
@ -3589,10 +3589,10 @@ représentant la zone : %1$s x %2$s</string>
<string name="app_mode_ski_snowmobile">Motoneige</string>
<string name="custom_osmand_plugin">Greffon OsmAnd personnalisé</string>
<string name="replace_point_descr">Remplacer un point par celui-ci</string>
<string name="changes_applied_to_profile">Modifications appliquées au profil %1$s.</string>
<string name="settings_item_read_error">Impossible de lire %1$s.</string>
<string name="settings_item_write_error">Impossible d\'écrire %1$s.</string>
<string name="settings_item_import_error">Impossible d\'importer %1$s.</string>
<string name="changes_applied_to_profile">Modifications appliquées au profil \'%1$s\'.</string>
<string name="settings_item_read_error">Impossible de lire depuis \'%1$s\'.</string>
<string name="settings_item_write_error">Impossible d\'écrire dans \'%1$s\'.</string>
<string name="settings_item_import_error">Impossible d\'importer depuis \'%1$s\'.</string>
<string name="select_track_file">Sélectionnez le fichier de trace</string>
<string name="shared_string_languages">Langues</string>
<string name="shared_string_language">Langue</string>
@ -3601,10 +3601,10 @@ représentant la zone : %1$s x %2$s</string>
<string name="divider_descr">Éléments sous ce point isolés par un séparateur.</string>
<string name="ui_customization_description">Personnalisez le nombre d’éléments dans le panneau déroulant, paramétrez la carte et le menu contextuel.
\n
\nVous pouvez désactiver les greffons inutilisés, pour masquer tous leurs contrôles dans l’application %1$s.</string>
<string name="hidden_items_descr">Ces éléments sont masqués dans le menu mais les options présentes ou les greffons fonctionneront toujours.</string>
<string name="reset_items_descr">Les paramètres seront réinitialisés à leurs valeurs par défaut après avoir été masqués.</string>
<string name="additional_actions_descr">Vous pouvez accéder à ces actions en appuyant sur le bouton « Actions ».</string>
\nVous pouvez désactiver les greffons inutilisés, pour masquer leurs contrôles dans l’application %1$s.</string>
<string name="hidden_items_descr">Ces éléments sont masqués dans le menu mais les options présentes ou les greffons continueront à fonctionner.</string>
<string name="reset_items_descr">Masquer les paramètres les réinitialise à leurs valeurs par défaut.</string>
<string name="additional_actions_descr">Vous pouvez accéder à ces actions en appuyant sur le bouton « Actions supplémentaires ».</string>
<string name="ui_customization_short_descr">Éléments du panneau déroulant, menu contextuel</string>
<string name="shared_string_drawer">Panneau déroulant</string>
<string name="reorder_or_hide_from">Réorganisez ou masquez les éléments à partir de %1$s.</string>
@ -3649,12 +3649,22 @@ représentant la zone : %1$s x %2$s</string>
<string name="download_unsupported_action">Action %1$s non prise en charge</string>
<string name="lang_ky">Kirghize</string>
<string name="lang_gu">Gujarati</string>
<string name="osm_live_payment_subscription_management">Le paiement sera débité de votre compte Google Play dès confirmation de l\'achat.
\n
\nL\'abonnement sera reconduit automatiquement à moins qu\'il ne soit annulé avant sa date de renouvellement. Votre compte ne sera débité pour une nouvelle durée (mensuelle / trimestrielle / annuelle) qu\'à la date de renouvellement.
\n
\nVous pouvez gérer et annuler vos abonnements depuis vos paramètres Google Play.</string>
<string name="osm_live_payment_subscription_management">Le paiement sera débité de votre compte Google Play dès confirmation de l\'abonnement
\npuis automatiquement à la fin de chaque échéance (mensuelle / trimestrielle / annuelle).
\nVous pouvez gérer et annuler ces abonnements depuis vos paramètres Google Play.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="search_poi_types_descr">Combiner des types de PI de différentes catégories. Appuyez pour tout sélectionner, appuyez sur le côté gauche pour sélectionner la catégorie.</string>
<string name="search_poi_types">Rechercher des types de points d\'intérêt</string>
<string name="search_poi_types_descr">Combinez des PI de différentes catégories. Appuyez pour tout sélectionner, appuyez sur le côté gauche pour sélectionner les catégories.</string>
<string name="search_poi_types">Rechercher des types de PI</string>
<string name="radius_ruler_item">Règle de mesure par rayon</string>
<string name="map_markers_item">Marques</string>
<string name="legend_item_description">Le guide des symboles cartographiques</string>
<string name="tracker_item">OsmAnd Tracker</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="quick_action_item">Action rapide</string>
<string name="measure_distance_item">Mesurer une distance</string>
<string name="travel_item">Voyage (Wikivoyage et Wikipédia)</string>
<string name="favorites_item">Favoris</string>
<string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
<string name="osmand_purchases_item">Achats OsmAnd</string>
<string name="navigation_profiles_item">Profils de navigation</string>
</resources>

49
OsmAnd/res/values-he/phrases.xml
View file

@ -5,7 +5,7 @@
<string name="poi_emergency">שרותי חירום</string>
<string name="poi_transportation">תחבורה</string>
<string name="poi_road_obstacle">חסימות דרכים</string>
<string name="poi_filling_station">תחנת דלק</string>
<string name="poi_filling_station">תחנת מילוי</string>
<string name="poi_personal_transport">תחבורה אישית</string>
<string name="poi_public_transport">תחבורה ציבורית</string>
<string name="poi_air_transport">תחבורה אווירית</string>
@ -116,7 +116,7 @@
<string name="poi_musical_instrument">חנות כלי נגינה</string>
<string name="poi_newsagent">סוכנות חדשות</string>
<string name="poi_optician">אופטומטריסט</string>
<string name="poi_organic">חנות מזון אורגני</string>
<string name="poi_organic">מוצרים אורגניים</string>
<string name="poi_outdoor">חנות ציוד טבע</string>
<string name="poi_paint">חנות ציור</string>
<string name="poi_pet">חנות בעלי חיים</string>
@ -157,7 +157,7 @@
<string name="poi_payment_toll_type">סוג התשלום</string>
<string name="poi_traffic_signals_sound">קול</string>
<string name="poi_highway_crossing_type">סוג</string>
<string name="poi_tactile_paving">ריצוף מובלט</string>
<string name="poi_tactile_paving">ריצוף מישושי</string>
<string name="poi_brushless">בראשלס</string>
<string name="poi_self_service">שירות עצמי</string>
<string name="poi_automated">אוטומטי</string>
@ -1310,8 +1310,8 @@
<string name="poi_internet_access_service">גישה לאינטרנט: שירות</string>
<string name="poi_internet_access_yes">גישה לאינטרנט: יש</string>
<string name="poi_internet_access_no">גישה לאינטרנט: אין</string>
<string name="poi_internet_access_fee_yes">גישה לאינטרנט - בתשלום עמלה</string>
<string name="poi_internet_access_fee_no">גישה לאינטרנט - ללא תשלום</string>
<string name="poi_internet_access_fee_yes">גישה לאינטרנט: בתשלום עמלה</string>
<string name="poi_internet_access_fee_no">גישה לאינטרנט: ללא תשלום</string>
<string name="poi_monastery">מנזר</string>
<string name="poi_religious">אזור דת</string>
<string name="poi_wayside_cross">צלב בצד הדרך</string>
@ -2120,4 +2120,43 @@
<string name="poi_fuel_autogas">גפ״מ</string>
<string name="poi_fuel_jeta1">דלק מטוסים A-1</string>
<string name="poi_fuel_adblue">תוסף AdBlue</string>
<string name="poi_atm">כספומט</string>
<string name="poi_car_pooling">מקום בנסיעה שיתופית</string>
<string name="poi_denomination_wesleyan">וסליאן</string>
<string name="poi_denomination_united_church_of_christ">הכנסייה המאוחדת של ישו</string>
<string name="poi_denomination_church_of_christ">כנסיית ישו</string>
<string name="poi_denomination_spiritist">ספיריטיזם</string>
<string name="poi_denomination_nazarene">נזרין</string>
<string name="poi_attraction_amusement_ride">מתקן שעשועים</string>
<string name="poi_historic_tank">טנק היסטורי</string>
<string name="poi_historic_aircraft">כלי טיס היסטורי</string>
<string name="poi_storage_tank">מיכל אחסון</string>
<string name="poi_gasometer">מד גז</string>
<string name="poi_water_works">אספקת מים</string>
<string name="poi_standpipe">משאבת מים</string>
<string name="poi_escape_lane">נתיב מילוט</string>
<string name="poi_fuel_coal">דלק: פחם טבעי</string>
<string name="poi_fuel_charcoal">דלק: פחם</string>
<string name="poi_fuel_wood">דלק: עץ</string>
<string name="poi_video_telephone">סרטון</string>
<string name="poi_sms">מסרון</string>
<string name="poi_volcano_status">מצב</string>
<string name="poi_volcano_type">סוג</string>
<string name="poi_bath_open_air">האוויר הפתוח</string>
<string name="poi_bath_type">סוג</string>
<string name="poi_cash_withdrawal_bank_card">משיכת מזומנים</string>
<string name="poi_access_disabled">גישה לנכים</string>
<string name="poi_access_goods">גישה למשאית קלה</string>
<string name="poi_access_hgv">גישה למשאית משא</string>
<string name="poi_access_mofa">גישה לטוסטוסון (Mofa)</string>
<string name="poi_access_moped">גישה לטוסטוס</string>
<string name="poi_access_motorcycle">גישה לאופנועים</string>
<string name="poi_access_trailer">גישה לנגררים</string>
<string name="poi_access_motorhome">גישה לבית ממונע</string>
<string name="poi_access_caravan">גישה לקרוואן</string>
<string name="poi_access_bus">גישה לאוטובוס</string>
<string name="poi_snowmobile_filter">גישה לאופנוע שלג</string>
<string name="poi_climbing_crag">כן</string>
<string name="poi_climbing_crag_filter">מצוק טיפוס</string>
<string name="poi_rtsa_scale_filter">קטגוריית קושי</string>
</resources>

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

@ -3595,10 +3595,10 @@
<string name="live_monitoring_tracking_interval">מרווח מעקב</string>
<string name="monitoring_min_distance_descr">מסנן זה מונע תיעוד כפילות של נקודות כשלא הייתה מספיק תנועה, יוצר תצוגה מרחבית נאה יותר של מסלולים שלא עוברים עיבוד לאחר מכן.</string>
<string name="replace_point_descr">החלפת נקודה אחרת בזו</string>
<string name="changes_applied_to_profile">השינויים על הפרופיל %1$s חלו.</string>
<string name="settings_item_read_error">לא ניתן לקרוא את %1$s.</string>
<string name="settings_item_write_error">לא ניתן לכתוב את %1$s.</string>
<string name="settings_item_import_error">לא ניתן לייבא את %1$s.</string>
<string name="changes_applied_to_profile">השינויים לפרופיל ‚%1$s’ חלו.</string>
<string name="settings_item_read_error">לא ניתן לקרוא מתוך ‚%1$s’.</string>
<string name="settings_item_write_error">לא ניתן לכתוב אל ‚%1$s’.</string>
<string name="settings_item_import_error">לא ניתן לייבא מתוך ‚%1$s’.</string>
<string name="monitoring_min_speed_descr">זה מסנן שחותך מהירויות נמוכות כדי לא להקליט נקודות מתחת למהירות מסוימת. הפעלת המסנן תגרום לכך שהמסלולים ייראו חלקים יותר כשמסתכלים על המפה.</string>
<string name="app_mode_ski_touring">טיולי סקי</string>
<string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
@ -3617,9 +3617,9 @@
\nניתן יהיה להחליף בין כל השפות הזמינות בזמן קריאת הערך.</string>
<string name="shared_string_items">פריטים</string>
<string name="developer_plugin">תוסף מפתח</string>
<string name="ui_customization_description">התאמת כמות הפריטים במגירה, הגדרת מפה ותפריט הקשר.
\n
\nניתן להשבית את התוספים שאינם בשימוש כדי להסתיר את כל הפקדים שלהם מהיישומון %1$s.</string>
<string name="ui_customization_description">התאמת כמות הפריטים במגירה, הגדרת המפה ותפריט ההקשר.
\n
\nניתן לכבות את התוספים שאינם בשימוש כדי להסתיר את כל הפקדים שלהם מהיישומון %1$s.</string>
<string name="ui_customization_short_descr">פריטי מגירה, תפריט הקשר</string>
<string name="ui_customization">התאמות מנשק משתמש</string>
<string name="shared_string_drawer">מגירה</string>
@ -3628,11 +3628,11 @@
<string name="shared_string_divider">קו הפרדה</string>
<string name="divider_descr">הפריטים מתחת לנקודה זו מופרדים בקו הפרדה.</string>
<string name="shared_string_hidden">מוסתר</string>
<string name="hidden_items_descr">הפריטים האלו מוסתרים מהתפריט אבל האפשרויות המיוצגות או התוספים יישארו זמינים.</string>
<string name="reset_items_descr">ההגדרות יאופסו למצב המקורי לאחר ההסתרה.</string>
<string name="main_actions_descr">פעולות ראשיות מכילות 4 כפתורים בלבד.</string>
<string name="hidden_items_descr">הפריטים האלו מוסתרים מהתפריט אבל האפשרויות המיוצגות או התוספים ימשיכו לעבוד.</string>
<string name="reset_items_descr">הסתרת הגדרות מאפסת אותן למצבן ההתחלתי.</string>
<string name="main_actions_descr">‚פעולות ראשיות’ מכילות 4 כפתורים בלבד.</string>
<string name="main_actions">פעולות ראשית</string>
<string name="additional_actions_descr">ניתן לגשת לפעולות האלה על ידי לחיצה על הכפתור „פעולות”.</string>
<string name="additional_actions_descr">ניתן לגשת לפעולות האלה על ידי לחיצה על הכפתור „פעולות נוספות”.</string>
<string name="move_inside_category">ניתן להעביר פריטים בתוך קטגוריה זו בלבד.</string>
<string name="select_wikipedia_article_langs">נא לבחור את השפות בהן יופיעו ערכים של ויקיפדיה במפה. ניתן להחליף בין כל השפות הזמינות בזמן קריאת הערך.</string>
<string name="some_articles_may_not_available_in_lang">יתכן שחלק מהערכים בוויקיפדיה לא יהיו זמינים בשפה שלך.</string>
@ -3666,4 +3666,22 @@
<string name="extra_maps_menu_group">מפות נוספות</string>
<string name="lang_war">וראי</string>
<string name="download_unsupported_action">הפעולה %1$s אינה נתמכת</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">חשבון ה־Google Play שלך יחויב בעת רכישת מנוי
\nועם תפוגתו (חודש/שלושה חודשים/שנה),
\nהוא לא יחדש את עצמו או יבוטל טרם החידוש מההגדרות שלך ב־Google Play.</string>
<string name="search_poi_types">חיפוש סוגי נקודות עניין</string>
<string name="search_poi_types_descr">שילוב סוגי נקודות עניין מקטגוריות שונות. יש לגעת ב„החלפה” כדי לבחור את כולן, נגיעה בצד השמאלי לבחירת קטגוריה.</string>
<string name="tracker_item">עוקב OsmAnd</string>
<string name="mapillary_item">OsmAnd ו־Mapillary</string>
<string name="quick_action_item">פעולה מהירה</string>
<string name="radius_ruler_item">סרגל רדיוס</string>
<string name="measure_distance_item">מדידת מרחק</string>
<string name="travel_item">טיול (ויקימסע וויקיפדיה)</string>
<string name="map_markers_item">סמני מפה</string>
<string name="favorites_item">מועדפים</string>
<string name="subscription_osmandlive_item">מינוי - OsmAnd Live</string>
<string name="osmand_purchases_item">רכישות OsmAnd</string>
<string name="legend_item_description">המדריך לסמלי מפה</string>
<string name="navigation_profiles_item">פרופילי ניווט</string>
</resources>

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

@ -939,7 +939,7 @@ Ferill %2$s</string>
<string name="continuous_rendering">Samfelld myndgerð</string>
<string name="show_point_options">Nota staðsetningu …</string>
<string name="renderers_descr">Veldu útlit myndgerðar</string>
<string name="download_type_to_filter">skrifaðu að sía</string>
<string name="download_type_to_filter">skrifaðu til að sía</string>
<string name="use_high_res_maps">Skjár með háupplausn</string>
<string name="context_menu_item_search_transport">Leita að almenningssamgöngum</string>
<string name="voices">Talskilaboð</string>
@ -3655,7 +3655,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
<string name="select_wikipedia_article_langs">Veldu þau tungumál sem Wikipedia-greinarnar ættu að birtast á á kortinu. Þú munt geta skipt á milli allra tiltækra tungumála á meðan þú lest greinar.</string>
<string name="some_articles_may_not_available_in_lang">Sumar Wikipedia-greinar gætu verið ekki tiltækar á þínu tungumáli.</string>
<string name="lang_zhyue">Kantónska</string>
<string name="lang_zhminnan">Suður-mín</string>
<string name="lang_zhminnan">Suður-Mín</string>
<string name="lang_yo">Yórúba</string>
<string name="lang_war">Waray</string>
<string name="lang_uz">Úsbekíska</string>
@ -3682,4 +3682,13 @@ Stendur fyrir svæði: %1$s x %2$s</string>
<string name="lang_an">Aragónska</string>
<string name="lang_lmo">Lombardíska</string>
<string name="custom_color">Sérsniðinn litur</string>
<string name="osm_live_payment_subscription_management">Greiðsla verður gjaldfærð á Google Play reikninginn þinn við staðfestingu á kaupunum.
\n
\nÁskrift endurnýjast sjálfkrafa nema hún sé felld niður fyrir endurnýjunardag. Reikningur þinn verður einungis gjaldfærður fyrir endurnýjunartímabil (mánuður / þrír mánuðir / ár) á endurnýjunardegi.
\n
\nÞú getur stýrt og aflýst áskriftunum þínum með því að fara í Google Play stillingarnar þínar.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="search_poi_types">Leita í tegundum merkisstaða</string>
<string name="search_poi_types_descr">Sameina gerðir merkisstaða úr mismunandi flokkum. Ýttu á hnappinn til að velja allt, ýttu vinstra megin til að fara í val á flokkum.</string>
<string name="download_unsupported_action">Óstudd aðgerð %1$s</string>
</resources>

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

@ -3531,4 +3531,8 @@
<string name="profile_prefs_reset_successful">Alle profilinnstillinger gjenopprettet til forvalg.</string>
<string name="shared_string_transparency">Gjennomsiktighet</string>
<string name="shared_string_legend">Tegnforklaring</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="reset_plugin_to_default">Tilbakestill programtilleggsinnstillinger til forvalg</string>
<string name="download_unsupported_action">Ustøttet handling %1$s</string>
<string name="extra_maps_menu_group">Ekstra kart</string>
</resources>

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

@ -117,7 +117,7 @@
<string name="fav_export_confirmation">Er is al een bestand met geëxporteerde favorieten. Wil je dat bestand overschrijven?</string>
<string name="profile_settings">Instellingen voor profiel</string>
<string name="settings_preset">Standaardprofiel</string>
<string name="settings_preset_descr">Kaart en navigatie instellingen worden per profiel onthouden. Kies hier het standaardprofiel.</string>
<string name="settings_preset_descr">Kaart- en navigatie instellingen worden per profiel onthouden. Kies hier het standaardprofiel.</string>
<string name="routing_settings">Navigatie</string>
<string name="routing_settings_descr">Opties voor navigatie.</string>
<string name="global_settings">Algemene instellingen</string>
@ -326,7 +326,7 @@
<string name="voice_is_not_available_title">Kies een stem-begeleidingspakket</string>
<string name="daynight_mode_day">Dag</string>
<string name="daynight_mode_night">Nacht</string>
<string name="daynight_mode_auto">Zonsopgang/-ondergang</string>
<string name="daynight_mode_auto">Zonsopgang/Zonsondergang</string>
<string name="daynight_mode_sensor">Lichtsensor</string>
<string name="daynight_descr">Regel omschakeling tussen dag- en nachtmodus.</string>
<string name="daynight">Dag/nacht modus</string>
@ -372,7 +372,7 @@
<string name="rotate_map_bearing_opt">In beweegrichting</string>
<string name="rotate_map_none_opt">Niet roteren (noorden boven)</string>
<string name="rotate_map_to_bearing_descr">Kaart-uitlijning:</string>
<string name="rotate_map_to_bearing">Kaartrotatie</string>
<string name="rotate_map_to_bearing">Kaart oriëntatie</string>
<string name="show_route">Route-details</string>
<string name="fav_imported_sucessfully">Favorieten succesvol geïmporteerd</string>
<string name="fav_file_to_load_not_found">GPX-bestand met favorieten niet gevonden op {0}</string>
@ -484,7 +484,7 @@
<string name="route_general_information">Totale afstand %1$s, reistijd %2$d u %3$d min.</string>
<string name="router_service_descr">Online of offline routeberekening-dienst.</string>
<string name="router_service">Routeberekening</string>
<string name="sd_dir_not_accessible">Opslagmap op SD kaart is niet toegankelijk!</string>
<string name="sd_dir_not_accessible">De opslagmap op de geheugenkaart is niet toegankelijk!</string>
<string name="download_question">Download {0} - {1} ?</string>
<string name="download_question_exist">Offline gegevens voor {0} bestaan al ({1}). Wil je deze bijwerken ({2})?</string>
<string name="address">Adres</string>
@ -500,8 +500,8 @@
<string name="mark_final_location_first">Kies eerst een bestemming</string>
<string name="get_directions">Routebeschrijving</string>
<string name="opening_hours">Openingstijden</string>
<string name="opening_changeset">Changeset wordt geopend…</string>
<string name="closing_changeset">Changeset wordt gesloten…</string>
<string name="opening_changeset">Wijzigingsset openen…</string>
<string name="closing_changeset">Wijzigingsset sluiten…</string>
<string name="commiting_node">Punt wordt vastgelegd…</string>
<string name="loading_poi_obj">Interessepunt wordt geladen…</string>
<string name="auth_failed">Authorisatie mislukt</string>
@ -645,8 +645,8 @@
\n
\nTegelkaarten zijn direct via online bronnen verkrijgbaar of kunnen voor offline gebruik gereedgemaakt worden (en handmatig gekopieerd naar de OsmAnd gegevensmap) als SQLite database door diverse hulpprogramma\'s van derden.</string>
<string name="osmand_background_plugin_description">Instellingen om tracking en navigatie te kunnen gebruiken met het scherm uit (schakelt de GPS periodiek in).</string>
<string name="osmand_accessibility_description">Deze plugin maakt de toegankelijkheids-opties van uw toestel beschikbaar in OsmAnd. Het vergemakkelijkt o.a. het aanpassen van de spreeksnelheid van tekst-naar-spraak stemmen, het configureren van D-pad scherm navigatie door gebruik van een trackbal voor zoomregeling of het gebruiken van tekst-naar-spraak opties voor het automatisch aankondigen van uw positie.</string>
<string name="osmand_development_plugin_description">Deze plugin toont de instellingen voor ontwikkel- en debug-opties, zoals routetest en -simulatie, schermweergave-prestaties, en spraaksturing. Deze instellingen zijn bedoeld voor programmeurs die OsmAnd willen verbeteren en zijn niet nodig voor normaal gebruik.</string>
<string name="osmand_accessibility_description">Deze plug-in maakt de toegankelijkheids-opties van uw toestel beschikbaar in OsmAnd. Het vergemakkelijkt o.a. het aanpassen van de spreeksnelheid van tekst-naar-spraak stemmen, het configureren van D-pad scherm navigatie door gebruik van een trackbal voor zoomregeling of het gebruiken van tekst-naar-spraak opties voor het automatisch aankondigen van uw positie.</string>
<string name="osmand_development_plugin_description">Deze plug-in toont de instellingen voor ontwikkel- en debug-opties, zoals routetest en -simulatie, schermweergave-prestaties, en spraaksturing. Deze instellingen zijn bedoeld voor programmeurs die OsmAnd willen verbeteren en zijn niet nodig voor normaal gebruik.</string>
<string name="plugins_screen">Plugins beheren</string>
<string name="prefs_plugins_descr">Schakel plugins in voor speciale functies en extra instellingen.</string>
<string name="prefs_plugins">Plugin-manager</string>
@ -718,7 +718,7 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
<string name="route_updated_loc_found">Route wordt herberekend als positie gevonden is</string>
<string name="continue_follow_previous_route_auto">Vorige navigatie was nog niet klaar. Nu daarmee doorgaan? (%1$s seconden)</string>
<string name="show_cameras">Snelheidscamera\'s</string>
<string name="show_traffic_warnings">Verkeers waarschuwingen</string>
<string name="show_traffic_warnings">Verkeerswaarschuwingen</string>
<string name="avoid_toll_roads">Geen tolwegen</string>
<string name="map_widget_top_text">Straatnaam</string>
<string name="map_widget_config">Configuratie</string>
@ -950,7 +950,7 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
<string name="plugin_distance_point">Punt</string>
<string name="gpx_file_name">GPX-bestandsnaam</string>
<string name="gpx_saved_sucessfully">GPX-bestand succesvol opgeslagen als {0}</string>
<string name="osmand_distance_planning_plugin_description">Deze plugin voorziet een kaart-widget waarmee u een route kan ontwerpen door op de kaart te tikken, of gebruik te maken (of wijzigen) van bestaande GPX-bestanden. Plan zo een reis en bereken de afstand tussen punten. Het resultaat kan worden bewaard als GPX-bestand, om later te gebruiken als navigatieroute.</string>
<string name="osmand_distance_planning_plugin_description">Deze plug-in voorziet een kaart-widget waarmee u een route kan ontwerpen door op de kaart te tikken, of gebruik te maken (of wijzigen) van bestaande GPX-bestanden. Plan zo een reis en bereken de afstand tussen punten. Het resultaat kan worden bewaard als GPX-bestand, om later te gebruiken als navigatieroute.</string>
<string name="osmand_distance_planning_plugin_name">Afstand meten en Route plannen</string>
<string name="use_distance_measurement_help">* Tik om een punt te markeren.
\n* Druk lang op de kaart om het vorige punt te verwijderen.
@ -981,8 +981,8 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
<string name="av_camera_focus_continuous">Voortdurend blijven scherpstellen</string>
<string name="av_photo_play_sound_descr">Kies of er al dan niet een sluitergeluid wordt afgespeeld bij foto opname.</string>
<string name="speak_speed_limit">Snelheidslimiet</string>
<string name="speak_cameras">Snelheidscamera\'s</string>
<string name="speak_traffic_warnings">Verkeers Waarschuwingen</string>
<string name="speak_cameras">Flitspalen</string>
<string name="speak_traffic_warnings">Verkeerswaarschuwingen</string>
<string name="route_from">Van:</string>
<string name="osb_author_or_password_not_specified">Specificeer OSM-gebruikersnaam en -wachtwoord in Instellingen</string>
<string name="clear_intermediate_points">Wis Tussenpunten</string>
@ -1028,7 +1028,7 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
<string name="auto_zoom_close">Zoom naar close-up</string>
<string name="auto_zoom_far">Zoom naar gemiddelde afstand</string>
<string name="auto_zoom_farthest">Zoom naar grote afstand</string>
<string name="animate_routing_route_not_calculated">U moet eerst een route berekenen</string>
<string name="animate_routing_route_not_calculated">Gelieve eerst de route te berekenen</string>
<string name="animate_routing_route">"Routesimulatie met de berekende route "</string>
<string name="animate_routing_gpx">Routesimulatie met een GPX-track</string>
<string name="local_osm_changes_delete_all_confirm">Bent u zeker om %1$d OSM-wijzigingen te verwijderen\?</string>
@ -1309,7 +1309,7 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
<string name="everything_up_to_date">Alle bestanden zijn bijgewerkt</string>
<string name="use_opengl_render">Gebruik OpenGL</string>
<string name="use_opengl_render_descr">Gebruik snelle hardware-gebaseerde OpenGL weergave (gebruikt mogelijk meer stroom en werkt mogelijk niet op oudere apparaten).</string>
<string name="error_avoid_specific_road">Er is geen alternatieve weg gevonden</string>
<string name="error_avoid_specific_road">Geen omweg gevonden</string>
<string name="no_internet_connection">Downloaden mislukt. Controleer de internetverbinding.</string>
<string name="download_tab_downloads">Alle downloads</string>
<string name="download_tab_updates">Updates</string>
@ -1334,8 +1334,8 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
<string name="traffic_warning_railways">Spoorwegovergang</string>
<string name="traffic_warning_pedestrian">Voetgangers oversteekplaats</string>
<string name="show_railway_warnings">Spoorwegovergangen</string>
<string name="show_pedestrian_warnings">Voetgangers oversteekplaatsen</string>
<string name="speak_pedestrian">Voetgangers oversteekplaatsen</string>
<string name="show_pedestrian_warnings">Zebrapaden</string>
<string name="speak_pedestrian">Zebrapaden</string>
<string name="parking_place">Parkeerplek</string>
<string name="remove_the_tag">Verwijder de parkeerlocatie</string>
<string name="gps_status">GPS-status</string>
@ -1842,7 +1842,7 @@ Lengtegraad:\t\t%2$s</string>
<string name="shared_string_remove">Verwijder</string>
<string name="clear_updates_proposition_message">Je kan gedownloade updates verwijderen en terugkeren naar de originele kaart</string>
<string name="add_time_span">Periode toevoegen</string>
<string name="road_blocked">Weg geblokkeerd</string>
<string name="road_blocked">Weg afgesloten</string>
<string name="shared_string_select">Kies</string>
<string name="reports_for">Verslag over</string>
<string name="data_is_not_available">Gegevens niet beschikbaar</string>
@ -1860,7 +1860,7 @@ Lengtegraad:\t\t%2$s</string>
<string name="osm_user_stat">%1$s bewerkingen, rang %2$s, wereldwijd: %3$s bewerkingen</string>
<string name="osm_editors_ranking">OSM-Bijdragersplaats</string>
<string name="osm_live_subscription">OsmAnd Live abonnement</string>
<string name="osm_live_subscribe_btn">Abonneren</string>
<string name="osm_live_subscribe_btn">Abonneer</string>
<string name="osm_live_email_desc">Nodig om u updates te bezorgen over uw bijdragen.</string>
<string name="osm_live_user_public_name">Openbare naam</string>
<string name="osm_live_hide_user_name">Mijn naam niet tonen in verslagen</string>
@ -1957,7 +1957,7 @@ Lengtegraad:\t\t%2$s</string>
<string name="access_direction_haptic_feedback_descr">Geef de richting van de bestemming aan met trillingen.</string>
<string name="move_marker_bottom_sheet_title">Verplaats de kaart om de positie van de markering te wijzigen</string>
<!-- string name="lat_lon_pattern">Lat: %1$.5f Lon: %2$.5f</string -->
<string name="map_widget_battery">Accuniveau</string>
<string name="map_widget_battery">Batterij niveau</string>
<string name="lang_hu_formal">Hongaars (formeel)</string>
<string name="current_track">Huidig pad</string>
<string name="change_markers_position">Verschuif markering</string>
@ -1968,10 +1968,10 @@ Lengtegraad:\t\t%2$s</string>
<string name="lang_ast">Asturisch</string>
<string name="app_mode_bus">Lijnbus</string>
<string name="app_mode_train">Trein</string>
<string name="coords_format">Coördinatensysteem</string>
<string name="coords_format">Coördinaten formaat</string>
<string name="shared_string_is_open_24_7">24/7 geopend</string>
<string name="storage_directory_card">Geheugenkaart</string>
<string name="coords_format_descr">Formaat voor de geografische coördinaten.</string>
<string name="coords_format_descr">Formaat voor geografische coördinaten.</string>
<string name="map_widget_search">Zoek</string>
<string name="search_categories">Categorie</string>
<string name="postcode">Postcode</string>
@ -2010,7 +2010,7 @@ Lengtegraad:\t\t%2$s</string>
<string name="no_update_info">Geen updates tonen</string>
<string name="clear_tile_data">Alle opgeslagen kaarttegels wissen</string>
<string name="osm_live_payment_desc">Het abonnementsgeld is maandelijks. Het abonnement kan elk moment via Google Play worden gestopt.</string>
<string name="donation_to_osm">Gift aan de OSM-gemeenschap</string>
<string name="donation_to_osm">Gift aan de OpenStreetMap community</string>
<string name="donation_to_osm_desc">Een deel van de gift gaat naar OSM-medewerkers. Het abonnementsgeld verandert niet.</string>
<string name="osm_live_subscription_desc">Het abonnement geeft toegang tot Live Updates (elk uur, elke dag of elke week) en onbeperkte downloads van kaarten van de gehele wereld.</string>
<string name="get_it">Abonnement nemen</string>
@ -2039,7 +2039,7 @@ Lengtegraad:\t\t%2$s</string>
<string name="search_hint">Plaatsnaam, adres of naam invoeren</string>
<string name="rendering_value_light_brown_name">Lichtbruin</string>
<string name="rendering_value_dark_brown_name">Donkerbruin</string>
<string name="rendering_attr_contourColorScheme_name">Kleurschema hoogtelijnen</string>
<string name="rendering_attr_contourColorScheme_name">Hoogtelijnen kleurenschema</string>
<string name="rendering_attr_surfaceIntegrity_name">Kwaliteit van het wegdek</string>
<string name="christmas_poi">Kerstmis-POI</string>
<string name="christmas_desc">Voor Kerst en Oud en Nieuw: u kan kiezen om de POI voor kerstbomen en kerstmarkten enz. tonen.</string>
@ -2060,7 +2060,7 @@ Lengtegraad:\t\t%2$s</string>
<string name="gpx_no_tracks_title">Je hebt nog geen GPX-tracks</string>
<string name="gpx_no_tracks_title_folder">Je kunt ook GPX-tracks toevoegen aan de map</string>
<string name="gpx_add_track">Meer toevoegen…</string>
<string name="shared_string_appearance">GPX-stijl</string>
<string name="shared_string_appearance">Weergave</string>
<string name="trip_rec_notification_settings">Snelle opname activeren</string>
<string name="trip_rec_notification_settings_desc">Toon systeemmelding waarmee ritopname toegestaan wordt.</string>
<string name="shared_string_notifications">Meldingen</string>
@ -2078,7 +2078,7 @@ Lengtegraad:\t\t%2$s</string>
<string name="lang_sr_latn">Servisch (Latijns schrift)</string>
<string name="lang_zh_hk">Chinees (Hong Kong)</string>
<string name="rendering_attr_contourDensity_description">Hoogtelijnen: dichtheid</string>
<string name="rendering_attr_contourDensity_name">Hoogtelijnen dichtheid</string>
<string name="rendering_attr_contourDensity_name">Dichtheid hoogtelijnen</string>
<string name="rendering_value_high_name">Hoog</string>
<string name="rendering_value_medium_w_name">Gemiddeld</string>
<string name="rendering_value_low_name">Laag</string>
@ -2242,12 +2242,12 @@ voor Gebied: %1$s x %2$s</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Vlak</string>
<string name="routing_attr_driving_style_speed_name">Kortere routes</string>
<string name="routing_attr_driving_style_balance_name">Uitgebalanceerd</string>
<string name="routing_attr_driving_style_safety_name">Bij voorkeur secundaire wegen</string>
<string name="routing_attr_driving_style_safety_name">Verkies binnenwegen</string>
<string name="relief_smoothness_factor_descr">Terrein-voorkeur: vlakke- of heuvelachtige wegen.</string>
<string name="favorite_group_name">Groepsnaam</string>
<string name="change_color">Kleur wijzigen</string>
<string name="edit_name">Naam wijzigen</string>
<string name="animate_my_location">Verlevendig eigen positie</string>
<string name="animate_my_location">Animeer eigen positie</string>
<string name="animate_my_location_desc">Schakel levendige kaartverschuiving in van \'Mijn positie\' tijdens navigatie.</string>
<string name="shared_string_slope">Helling</string>
<string name="add_new_folder">Nieuwe map toevoegen</string>
@ -2563,15 +2563,15 @@ voor Gebied: %1$s x %2$s</string>
<string name="wikivoyage_travel_guide_descr">Voert je binnen OsmAnd naar de meest interessante plaatsen op aarde, zonder internetverbinding.</string>
<string name="monthly_map_updates">Maandelijkse kaartupdates</string>
<string name="daily_map_updates">Kaartupdates: Elk uur</string>
<string name="in_app_purchase">"In-app aankopen "</string>
<string name="in_app_purchase">In-app aankoop</string>
<string name="in_app_purchase_desc">Eenmalige betaling</string>
<string name="in_app_purchase_desc_ex">Na aankoop is het permanent voor je beschikbaar.</string>
<string name="in_app_purchase_desc_ex">"Eens aangekocht, kun je het permanent blijven gebruiken."</string>
<string name="purchase_unlim_title">%1$s Kopen</string>
<string name="wikivoyage_offline">Wikivoyage offline</string>
<string name="unlimited_downloads">Onbeperkte downloads</string>
<string name="wikipedia_offline">Wikipedia offline</string>
<string name="contour_lines_hillshade_maps">Kaarten met hoogtelijnen en reliëfschaduw</string>
<string name="unlock_all_features">Alle mogelijkheden van OsmAnd ontsluiten</string>
<string name="contour_lines_hillshade_maps">Hoogtelijnen &amp; Reliëfschaduwkaarten</string>
<string name="unlock_all_features">Ontgrendel alle OsmAnd mogelijkheden</string>
<string name="purchase_dialog_title">Kies je aankoop</string>
<string name="purchase_dialog_travel_description">Kies een van onderstaande aankopen om de offline reisgids te kunnen gebruiken:</string>
<string name="purchase_dialog_subtitle">Kies een passend product</string>
@ -2599,7 +2599,7 @@ voor Gebied: %1$s x %2$s</string>
<string name="use_two_digits_longitude">"Twee cijfers gebruiken voor lengtegraad (i.p.v. drie) "</string>
<string name="shared_string_travel_guides">"Reisgids "</string>
<string name="nothing_found_in_radius">Niets gevonden:</string>
<string name="clear_all_intermediates">Alle tussenpunten wissen</string>
<string name="clear_all_intermediates">Wis alle tussenpunten</string>
<string name="group_deleted">"Groep verwijderd "</string>
<string name="rendering_attr_whiteWaterSports_name">Wildwatersporten</string>
<string name="distance_farthest">Het verste eerst</string>
@ -2641,8 +2641,8 @@ voor Gebied: %1$s x %2$s</string>
<string name="rendering_attr_hidePOILabels_name">POI-namen</string>
<string name="shared_string_without_name">Zonder naam</string>
<string name="what_is_here">Wat is dit hier:</string>
<string name="open_from">Geopend vanaf</string>
<string name="open_till">Geopend tot</string>
<string name="open_from">Open van</string>
<string name="open_till">Open tot</string>
<string name="will_close_at">Sluit om</string>
<string name="will_open_at">Gaat open om</string>
<string name="shared_string_total">Totaal</string>
@ -2917,7 +2917,7 @@ voor Gebied: %1$s x %2$s</string>
<string name="files_failed">Kopiëren van %1$d bestanden mislukt (%2$s).</string>
<string name="files_present">%1$d bestanden (%2$s) aanwezig op de vorige locatie \'%3$s\'.</string>
<string name="dont_move_maps">Niet verplaatsen</string>
<string name="public_transport_no_route_title">Helaas kan OsmAnd geen route vinden die bij jouw instellingen past.</string>
<string name="public_transport_no_route_title">Helaas, OsmAnd kan geen route vinden die geschikt is voor jouw instellingen.</string>
<string name="shared_string_no_thank_you">Nee, dankje</string>
<string name="shared_string_allow">Toestaan</string>
<string name="app_mode_taxi">Taxi</string>
@ -2931,7 +2931,7 @@ voor Gebied: %1$s x %2$s</string>
<string name="new_profile">Nieuw profiel</string>
<string name="app_mode_ufo">UFO</string>
<string name="route_way">Weg</string>
<string name="searching_gps">GPS locatie zoeken</string>
<string name="searching_gps">Aan het zoeken naar GPS</string>
<string name="routing_profile_straightline">Rechte lijn</string>
<string name="configure_profile_info">Profielinstellingen:</string>
<string name="utm_format_descr">OsmAnd gebruikt het UTM Standard formaat. Dit lijkt sterk op het UTM Nato formaat, maar is niet identiek.</string>
@ -2971,7 +2971,7 @@ voor Gebied: %1$s x %2$s</string>
<string name="profile_alert_cant_delete_base">Basisprofielen van OsmAnd kun je niet verwijderen</string>
<string name="profile_alert_need_save_title">Wijzigingen opslaan</string>
<string name="profile_alert_need_save_msg">Sla wijzigingen aan het profiel eerst op</string>
<string name="profile_alert_delete_title">Verwijder profiel</string>
<string name="profile_alert_delete_title">Profiel verwijderen</string>
<string name="profile_alert_delete_msg">Weet je zeker dat je profiel \"%s\" wilt verwijderen</string>
<string name="select_base_profile_dialog_title">Selecteer een profiel om mee te starten</string>
<string name="select_nav_profile_dialog_title">Selecteer navigatietype</string>
@ -2986,10 +2986,10 @@ voor Gebied: %1$s x %2$s</string>
<string name="shared_string_color_magenta">Magenta</string>
<string name="shared_string_icon">Icoon</string>
<string name="press_again_to_change_the_map_orientation">Tik nogmaals om de kaartoriëntatie te wijzigen</string>
<string name="default_speed_setting_title">Standaardsnelheid</string>
<string name="default_speed_setting_descr">Standaard snelheden instellingen aanpassen</string>
<string name="minmax_speed_dialog_title">Stel min/max snelheid in</string>
<string name="shared_string_crash">Vastgelopen</string>
<string name="default_speed_setting_title">Standaard snelheid</string>
<string name="default_speed_setting_descr">Standaard snelheidsinstellingen aanpassen</string>
<string name="minmax_speed_dialog_title">Min/max snelheid instellen</string>
<string name="shared_string_crash">Crash</string>
<string name="app_mode_monowheel">Monowheel, Hoverboard</string>
<string name="edit_profile_setup_title">Profiel instellen</string>
<string name="edit_profile_setup_subtitle">Het profiel behoudt haar eigen instellingen</string>
@ -3083,7 +3083,7 @@ voor Gebied: %1$s x %2$s</string>
<string name="route_start_point">Vertrekpunt</string>
<string name="swap_start_and_destination">Begin- en eindpunt omwisselen</string>
<string name="public_transport_type">Transporttype</string>
<string name="coordinates_widget">Coördinatenwidget</string>
<string name="coordinates_widget">Coördinaten widget</string>
<string name="osmand_routing_promo">Je kunt je eigen, aangepaste versie van routing.xml in ..osmand/routing toevoegen</string>
<string name="application_profiles">Profielen</string>
<string name="app_mode_scooter">Scooter</string>
@ -3142,7 +3142,7 @@ voor Gebied: %1$s x %2$s</string>
<string name="rendering_attr_showCycleNodeNetworkRoutes_name">Toon knooppunt van de fietsroutes</string>
<string name="contour_lines_and_hillshade">Hoogtelijnen en reliëflaag</string>
<string name="send_log">Verzend log</string>
<string name="move_maps">Verplaats kaarten</string>
<string name="move_maps">Kaarten verplaatsen</string>
<string name="rate_dialog_descr">Deel alstublieft uw terugkoppeling en waardeer ons werk op Google Play.</string>
<string name="shared_string_privacy_policy">Privacybeleid</string>
<string name="make_osmand_better_descr">Sta OsmAnd toe om app gebruik anoniem te verzamelen en bewerken. Er wordt geen enkele data over uw positie of locatie verzameld..
@ -3191,7 +3191,7 @@ voor Gebied: %1$s x %2$s</string>
<string name="routing_attr_freeride_policy_description">Freeride en off-piste zijn officieuze routes en passages. Officieel meestal niet geprepareerd en onderhouden, en niet \'s avonds gecheckt. Op eigen risico betreden.</string>
<string name="collected_data">Verzamelde data</string>
<string name="last_launch_crashed">Laatste OsmAnd uitvoering gecrasht. Help ons alstublieft OsmAnd te verbeteren door de foutmelding te delen.</string>
<string name="app_mode_personal_transporter">Persoonlijke transporter</string>
<string name="app_mode_personal_transporter">Persoonlijk vervoer</string>
<string name="app_mode_offroad">Offroad</string>
<string name="sett_wunderlinq_ext_input">WunderLINQ</string>
<string name="routeInfo_roadClass_name">Wegtype</string>
@ -3201,7 +3201,7 @@ voor Gebied: %1$s x %2$s</string>
\nBerekening: %.1f sec, %d wegen, %d tegels)</string>
<string name="lang_oc">Occitaans</string>
<string name="app_mode_wagon">Stationwagon</string>
<string name="app_mode_pickup_truck">Pickup truck</string>
<string name="app_mode_pickup_truck">Pick-up truck</string>
<string name="get_discount_title">Verkrijg %1$d %2$s met %3$s korting.</string>
<string name="get_discount_first_part">%1$s voor de eerste %2$s</string>
<string name="get_discount_first_few_part">%1$s voor de eerste %2$s</string>
@ -3316,7 +3316,7 @@ voor Gebied: %1$s x %2$s</string>
<string name="live_monitoring">Online volgen</string>
<string name="save_track_logging_accuracy">Opnamenauwkeurigheid</string>
<string name="tracks_view_descr">U kan al uw opgenomen tracks terugvinden bij %1$s of in OsmAnd-map met een bestand verkenner.</string>
<string name="multimedia_notes_view_descr">U kan al uw notities terugvinden in %1$s</string>
<string name="multimedia_notes_view_descr">U kan al uw notities terugvinden in %1$s.</string>
<string name="video_notes">Videonotities</string>
<string name="photo_notes">Fotonotities</string>
<string name="route_recalculation">Route herberekening</string>

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

@ -3408,7 +3408,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="personal_category_name">Osobiste</string>
<string name="shared_string_downloading_formatted">Pobieranie %s</string>
<string name="desert_render_descr">Dla pustyń i innych słabo zaludnionych obszarów. Bardziej szczegółowa.</string>
<string name="rendering_attr_showCycleNodeNetworkRoutes_name">Pokaż punkty sieci tras rowerowych</string>
<string name="rendering_attr_showCycleNodeNetworkRoutes_name">Pokaż trasy rowerowe z sieci węzłów</string>
<string name="rendering_value_thick_name">Gruby</string>
<string name="select_navigation_icon">Ikona położenia podczas ruchu</string>
<string name="select_map_icon">Ikona położenia podczas spoczynku</string>
@ -3576,7 +3576,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="shared_string_importing">Importowanie</string>
<string name="items_added">Dodano elementy</string>
<string name="shared_string_import_complete">Zakończono importowanie</string>
<string name="import_complete_description">Zaimportowano wszystkie dane z %1$s. Można użyć poniższych przycisków, aby otworzyć wymaganą cześć aplikacji w celu zarządzania nią.</string>
<string name="import_complete_description">Zaimportowano wszystkie dane z %1$s. Możesz użyć poniższych przycisków, aby otworzyć część aplikacji zarządzającą nimi.</string>
<string name="recalculate_route_distance_promo">Trasa zostanie ponownie obliczona, jeśli odległość od trasy do bieżącej lokalizacji jest większa niż wybrana wartość.</string>
<string name="select_distance_route_will_recalc">Wybierz odległość, po której trasa zostanie ponownie obliczona.</string>
<string name="recalculate_route_in_deviation">Przelicz trasę w przypadku odchylenia</string>
@ -3605,8 +3605,8 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="select_shape">Wybierz kształt</string>
<string name="hillshade_download_description">Cieniowanie wzniesień wymaga dodatkowych map.</string>
<string name="shared_string_hillshade">Cieniowanie wzniesień</string>
<string name="checking_for_duplicate_description">OsmAnd wyszukuje duplikatów %1$s w istniejących rzeczach w aplikacji.
\n
<string name="checking_for_duplicate_description">OsmAnd wyszukuje duplikaty %1$s wśród istniejących elementów.
\n
\nTo może zająć chwilę.</string>
<string name="shared_string_min">Min</string>
<string name="shared_string_octagon">Ośmiokąt</string>
@ -3614,10 +3614,10 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="app_mode_ski_snowmobile">Skuter śnieżny</string>
<string name="replace_point_descr">Zastąp tym inny punkt</string>
<string name="custom_osmand_plugin">Niestandardowa wtyczka OsmAnd</string>
<string name="changes_applied_to_profile">Zmiany zastosowano do profilu %1$s.</string>
<string name="settings_item_read_error">Nie udało się odczytać %1$s.</string>
<string name="settings_item_write_error">Nie udało się napisać %1$s.</string>
<string name="settings_item_import_error">Nie udało się zaimportować %1$s.</string>
<string name="changes_applied_to_profile">Zmiany zastosowano do profilu \"%1$s\".</string>
<string name="settings_item_read_error">Nie udało się odczytać z \"%1$s\".</string>
<string name="settings_item_write_error">Nie udało się zapisać do \"%1$s\".</string>
<string name="settings_item_import_error">Nie udało się zaimportować z \"%1$s\".</string>
<string name="ui_customization_short_descr">Elementy menu bocznego, menu podręczne</string>
<string name="ui_customization">Ustawienia interfejsu użytkownika</string>
<string name="shared_string_drawer">Menu boczne</string>
@ -3628,9 +3628,9 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="shared_string_hidden">Ukryte</string>
<string name="hidden_items_descr">Te elementy są ukryte w menu, jednak reprezentowane opcje i wtyczki będą wciąż działać.</string>
<string name="reset_items_descr">Ustawienia zostaną zrestetowane po schowaniu.</string>
<string name="main_actions_descr">Główne działania zajmują tylko 4 przyciski.</string>
<string name="main_actions_descr">\"Główne czynności\" zawierają tylko 4 przyciski.</string>
<string name="main_actions">Główne działania</string>
<string name="additional_actions_descr">Możesz uzyskać dostęp do tych akcji, naciskając przycisk „Działania”.</string>
<string name="additional_actions_descr">Możesz uzyskać dostęp do tych czynności, naciskając przycisk „Dodatkowe czynności”.</string>
<string name="move_inside_category">Możesz przemieszczać elementy tylko wewnątrz tej kategorii.</string>
<string name="developer_plugin">Wtyczka deweloperska</string>
<string name="shared_string_items">Elementy</string>
@ -3643,7 +3643,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="wiki_menu_download_descr">Potrzebne są dodatkowe mapy, żeby przeglądać UM Wikipedii na mapie.</string>
<string name="some_articles_may_not_available_in_lang">Pewne artykuły Wikipedii mogą być nie dostępne w wybranym języku.</string>
<string name="custom_color">Dostosowany kolor</string>
<string name="select_wikipedia_article_langs">Wybierz języki, w których będą pojawiać się artykuły z Wikipedii na mapie. Możesz przełączać się pomiędzy wszystkimi dostępnymi językami podczas czytania artykułu.</string>
<string name="select_wikipedia_article_langs">Wybierz języki, w których będą pojawiać się artykuły z Wikipedii na mapie. Możesz przełączać się pomiędzy dostępnymi językami podczas czytania artykułu.</string>
<string name="lang_zhyue">Kantoński</string>
<string name="lang_uz">Uzbecki</string>
<string name="lang_ur">Urdu</string>
@ -3662,21 +3662,32 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="lang_scn">Sycylijski</string>
<string name="lang_cv">Czuwaski</string>
<string name="lang_my">Birmański</string>
<string name="lang_zhminnan"/>
<string name="lang_min"/>
<string name="lang_mg"/>
<string name="lang_zhminnan">Południowy min</string>
<string name="lang_min">Minangkabau</string>
<string name="lang_mg">Malgaski</string>
<string name="lang_pnb">Pendżabski</string>
<string name="download_unsupported_action"/>
<string name="download_unsupported_action">Nieobsługiwana czynność %1$s</string>
<string name="lang_ba">Baszkirski</string>
<string name="lang_war"/>
<string name="lang_sco"/>
<string name="lang_war">Waray</string>
<string name="lang_sco">Scots</string>
<string name="lang_an">Aragoński</string>
<string name="lang_gu"/>
<string name="lang_yo"/>
<string name="ui_customization_description">Dostosuj liczbę elementów w menu bocznym, wyglądzie mapy i menu kontekstowym.
\n
\nMożesz wyłączyć nieużywane wtyczki, aby ukryć ich elementy z aplikacji %1$s.</string>
<string name="lang_gu">Gudźarati</string>
<string name="lang_yo">Joruba</string>
<string name="ui_customization_description">Dostosuj liczbę elementów w menu bocznym, wyglądzie mapy i menu kontekstowym.
\n
\nMożesz wyłączyć nieużywane wtyczki, aby ukryć ich elementy w aplikacji %1$s.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="search_poi_types">Szukaj typów poi</string>
<string name="search_poi_types_descr">Łącz typy POI z różnych kategorii. Stuknij przełącznik, aby zaznaczyć wszystko, stuknij lewą stronę, aby wybrać kategorię.</string>
<string name="search_poi_types">Szukaj typów użytecznych miejsc</string>
<string name="search_poi_types_descr">Łącz typy użytecznych zmian z różnych kategorii. Stuknij przełącznik, aby zaznaczyć wszystko, stuknij lewą stronę, aby wybrać kategorię.</string>
<string name="legend_item_description">Przewodnik po symbolach mapy</string>
<string name="navigation_profiles_item">Profile nawigacji</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="quick_action_item">Szybka czynność</string>
<string name="radius_ruler_item">Pomiar kąta</string>
<string name="measure_distance_item">Mierzenie odległości</string>
<string name="travel_item">Podróże (Wikipodróże i Wikipedia)</string>
<string name="map_markers_item">Znaczniki</string>
<string name="favorites_item">Ulubione</string>
<string name="subscription_osmandlive_item">Subskrypcja - OsmAnd Live</string>
<string name="osmand_purchases_item">Zakupy w OsmAnd</string>
</resources>

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

@ -1784,7 +1784,7 @@ Pôr do Sol: %2$s</string>
<string name="faq_item">Perguntas frequentes</string>
<string name="faq_item_description">Respostas às perguntas frequentes</string>
<string name="map_viewing_item">Visualização de mapa</string>
<string name="search_on_the_map_item">Pesquisa no mapa</string>
<string name="search_on_the_map_item">Pesquisando no mapa</string>
<string name="instalation_troubleshooting_item">Instalação e solução de problemas</string>
<string name="techical_articles_item">Artigos técnicos</string>
<string name="versions_item">Versões</string>
@ -3598,18 +3598,18 @@ Pôr do Sol: %2$s</string>
<string name="app_mode_ski_snowmobile">Moto de neve</string>
<string name="custom_osmand_plugin">Plug-in OsmAnd personalizado</string>
<string name="replace_point_descr">Substitua outro ponto por este</string>
<string name="changes_applied_to_profile">Alterações aplicadas ao perfil %1$s.</string>
<string name="settings_item_read_error">Não foi possível ler %1$s.</string>
<string name="settings_item_write_error">Não foi possível escrever %1$s.</string>
<string name="settings_item_import_error">Não foi possível importar %1$s.</string>
<string name="changes_applied_to_profile">Alterações aplicadas ao perfil \'%1$s\'.</string>
<string name="settings_item_read_error">"Não foi possível ler a partir de \'%1$s\'."</string>
<string name="settings_item_write_error">Não foi possível escrever para \'%1$s\'.</string>
<string name="settings_item_import_error">Não foi possível importar de \'%1$s\'.</string>
<string name="select_track_file">Selecionar arquivo de faixa</string>
<string name="shared_string_languages">Idiomas</string>
<string name="shared_string_language">Idioma</string>
<string name="shared_string_all_languages">Todos os idiomas</string>
<string name="wiki_menu_download_descr">Mapas adicionais são necessários para visualizar os POIs da Wikipédia no mapa.</string>
<string name="ui_customization_description">Personalize a quantidade de itens na Gaveta, Configurar mapa e menu de contexto.
<string name="ui_customization_description">Personalize a quantidade de itens na gaveta, configure o mapa e o menu de contexto.
\n
\nVocê pode desativar plugins não utilizados para ocultar todos os seus controles do aplicativo %1$s.</string>
\nVocê pode desativar os plugins não utilizados para ocultar todos os controles do aplicativo %1$s.</string>
<string name="ui_customization_short_descr">Itens da gaveta, menu de contexto</string>
<string name="ui_customization">Personalização da interface do usuário</string>
<string name="shared_string_drawer">Gaveta</string>
@ -3619,10 +3619,10 @@ Pôr do Sol: %2$s</string>
<string name="divider_descr">Elementos abaixo deste ponto separados por um divisor.</string>
<string name="shared_string_hidden">Escondido</string>
<string name="hidden_items_descr">Esses itens estão ocultos no menu, mas as opções ou plug-ins representados continuarão funcionando.</string>
<string name="reset_items_descr">As configurações serão redefinidas para o estado original após ocultar.</string>
<string name="main_actions_descr">As ações principais contêm apenas 4 botões.</string>
<string name="reset_items_descr">Ocultar configurações redefine-as para o estado original.</string>
<string name="main_actions_descr">\'Ações principais\' contém apenas 4 botões.</string>
<string name="main_actions">Principais ações</string>
<string name="additional_actions_descr">Você pode acessar essas ações tocando no botão \"Ações\".</string>
<string name="additional_actions_descr">Você pode acessar essas ações tocando no botão \"Ações adicionais\".</string>
<string name="move_inside_category">Você pode mover itens somente dentro desta categoria.</string>
<string name="developer_plugin">Plugin do desenvolvedor</string>
<string name="shared_string_items">Itens</string>
@ -3659,9 +3659,21 @@ Pôr do Sol: %2$s</string>
<string name="extra_maps_menu_group">Mapas extras</string>
<string name="download_unsupported_action">Ação não suportada %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">O pagamento será cobrado na sua conta do Google Play na confirmação da compra.
\n
\nA assinatura é renovada automaticamente, a menos que seja cancelada antes da data de renovação. Sua conta será cobrada pelo período de renovação (mês/três meses/ano) somente na data de renovação.
\n
\nVocê pode gerenciar e cancelar suas assinaturas acessando as configurações do Google Play.</string>
<string name="osm_live_payment_subscription_management">Sua conta do Google Play é cobrada mediante a compra de uma assinatura
\ne quando expirar (mês/três meses/ano),
\nele não será renovado se for cancelado antes pelas configurações do Google Play.</string>
<string name="search_poi_types">Pesquisar tipos de POI</string>
<string name="search_poi_types_descr">Combine tipos de PIs de diferentes categorias. Toque em \"Alternar\" para selecionar todos, toque no lado esquerdo para selecionar a categoria.</string>
<string name="tracker_item">Rastreador do OsmAnd</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="quick_action_item">Ação rápida</string>
<string name="radius_ruler_item">Régua de raio</string>
<string name="measure_distance_item">Medir distância</string>
<string name="travel_item">Viagem (Wikivoyage e Wikipédia)</string>
<string name="map_markers_item">Marcadores de mapa</string>
<string name="favorites_item">Favoritos</string>
<string name="subscription_osmandlive_item">Assinatura - OsmAnd Live</string>
<string name="osmand_purchases_item">Compras de OsmAnd</string>
<string name="legend_item_description">O guia para a simbologia de um mapa</string>
<string name="navigation_profiles_item">Perfis de navegação</string>
</resources>

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

@ -1747,7 +1747,7 @@
<string name="upload_anonymously">Enviar anonimamente</string>
<string name="download_files_error_not_enough_space">Não há espaço suficiente! O espaço de armazenamento necessário é {3} MB temporariamente, {1} MB permanentemente. O espaço disponível é apenas {2} MB.</string>
<string name="download_files_question_space_with_temp">Descarregar mesmo {0} ficheiro(s)\? Isso precisa de {3} MB temporariamente e {1} MB permanentemente. ({2} MB disponíveis.)</string>
<string name="upload_osm_note_description">Pode enviar a sua anotação OSM anonimamente ou utilizando o seu perfil do OpenStreetMap.org.</string>
<string name="upload_osm_note_description">Envie a sua anotação OSM anonimamente ou utilizando o seu perfil do OpenStreetMap.org.</string>
<string name="upload_osm_note">Enviar a anotação OSM</string>
<string name="map_marker_1st">Primeiro marcador de mapa</string>
<string name="map_marker_2nd">Segundo marcador de mapa</string>
@ -1945,26 +1945,26 @@
<string name="change_color">Mudar cor</string>
<string name="edit_name">Editar nome</string>
<string name="animate_my_location">Animar a própria posição</string>
<string name="animate_my_location_desc">Ativar animação panorâmica do mapa da \'Minha Posição\' durante navegação.</string>
<string name="animate_my_location_desc">Ativar animação panorâmica do mapa da \'Minha posição\' durante navegação.</string>
<string name="shared_string_overview">Visão Geral</string>
<string name="select_street">Selecionar rua</string>
<string name="shared_string_in_name">em %1$s</string>
<string name="type_address">Escreva morada</string>
<string name="type_city_town">Escreva cidade ou município</string>
<string name="type_city_town">Digite cidade/vila/localidade</string>
<string name="type_postcode">Escreva código postal</string>
<string name="nearest_cities">Cidades próximas</string>
<string name="select_city">Selecionar cidade</string>
<string name="select_postcode">Selecionar código postal</string>
<string name="select_postcode">Pesquisa por código postal</string>
<string name="quick_action_auto_zoom">Auto zoom do mapa ativado/desativado</string>
<string name="quick_action_auto_zoom_desc">Selecionar o botão de ação irá ativar/desativar o auto zoom do mapa de acordo com a sua velocidade.</string>
<string name="quick_action_auto_zoom_on">Ativar auto zoom do mapa</string>
<string name="quick_action_auto_zoom_off">Desativar auto zoom do mapa</string>
<string name="quick_action_add_destination">Adicionar destino</string>
<string name="quick_action_auto_zoom_desc">Botão para ativar ou desativar o zoom automático controlado por velocidade.</string>
<string name="quick_action_auto_zoom_on">Ativar o zoom automático</string>
<string name="quick_action_auto_zoom_off">Desativar o zoom automático</string>
<string name="quick_action_add_destination">Definir destino</string>
<string name="quick_action_replace_destination">Substituir destino</string>
<string name="quick_action_add_first_intermediate">Adicionar primeiro intermediário</string>
<string name="quick_action_add_destination_desc">Tocando no botão de ação irá adicionar um destino ao localização do centro do ecrã. Destinos definidos anteriormente tornam-se o último ponto intermediário.</string>
<string name="quick_action_replace_destination_desc">Tocando neste botão de ação torna o centro do ecrã o novo destino de rota, substituindo o destino selecionado anteriormente (se houver).</string>
<string name="quick_action_add_first_intermediate_desc">Tocando neste botão de ação torna o centro do ecrã o primeiro destino intermediário.</string>
<string name="quick_action_add_destination_desc">Um botão para fazer com que o ecrã centralize o destino da rota, um destino selecionado anteriormente se tornaria o último destino intermediário.</string>
<string name="quick_action_replace_destination_desc">Um botão para fazer com que o ecrã centralize o novo destino da rota, substituindo o destino selecionado anteriormente (se houver).</string>
<string name="quick_action_add_first_intermediate_desc">Um botão para fazer com que o ecrã centralize o primeiro destino intermediário.</string>
<string name="no_overlay">Sem sobreposição</string>
<string name="no_underlay">Sem subposição</string>
<string name="subscribe_email_error">Erro</string>
@ -1980,7 +1980,7 @@
<string name="shared_string_visible">Visível</string>
<string name="restore_purchases">Restaurar compras</string>
<string name="fonts_header">Fontes do mapa</string>
<string name="right_side_navigation">Condução destra</string>
<string name="right_side_navigation">Circulação pela direita</string>
<string name="driving_region_automatic">Automático</string>
<string name="do_not_send_anonymous_app_usage">Não envie estatísticas anónimas de utilização da aplicação</string>
<string name="do_not_send_anonymous_app_usage_desc">OsmAnd recolhe informação sobre as secções da aplicação que abriu. Não são enviadas: a sua localização; a informação que introduz na aplicação; detalhes de áreas que veja, procure ou descarregue.</string>
@ -1998,7 +1998,7 @@
<string name="shared_string_slope">Encosta</string>
<string name="add_new_folder">Adicionar nova pasta</string>
<string name="points_delete_multiple_succesful">Ponto(s) eliminado(s).</string>
<string name="points_delete_multiple">Vai eliminar %1$d ponto(s). Tem a certeza\?</string>
<string name="points_delete_multiple">Tem certeza de que deseja apagar %1$d ponto(s)\?</string>
<string name="route_points_category_name">Mudanças de direção a passar neste percurso</string>
<string name="track_points_category_name">Pontos de passagem, pontos de interesse, elementos com nome</string>
<string name="shared_string_gpx_track">Percurso</string>
@ -2011,7 +2011,7 @@
<string name="shared_string_end_time">Hora de fim</string>
<string name="shared_string_color">Cor</string>
<string name="select_gpx_folder">Selecionar diretório do ficheiro GPX</string>
<string name="file_can_not_be_moved">Ficheiro não pode ser movido.</string>
<string name="file_can_not_be_moved">Não foi possível mover o ficheiro.</string>
<string name="shared_string_move">Mover</string>
<string name="shared_string_gpx_tracks">Percursos</string>
<string name="routing_attr_driving_style_name">Estilo de condução</string>
@ -2044,10 +2044,10 @@
<string name="legacy_search">Pesquisa antiga</string>
<string name="show_legacy_search">Mostrar pesquisa antiga</string>
<string name="show_legacy_search_desc">Adicionar pesquisa antiga à lista da gaveta</string>
<string name="routing_attr_allow_motorway_name">Permitir vias de motociclos</string>
<string name="routing_attr_allow_motorway_description">Permitir vias de motociclos.</string>
<string name="routing_attr_allow_motorway_name">Utilizar autoestradas</string>
<string name="routing_attr_allow_motorway_description">Permite autoestradas.</string>
<string name="wiki_around">Artigos da Wikipédia próximos</string>
<string name="search_map_hint">Procurar cidade ou região</string>
<string name="search_map_hint">Cidade ou região</string>
<string name="route_roundabout_short">Use a saída %1$d e continue</string>
<string name="upload_poi">Enviar Pontos de Interesse (POI)</string>
<string name="route_calculation">Cálculo da rota</string>
@ -2055,8 +2055,8 @@
<string name="gpx_no_tracks_title_folder">Também pode adicionar ficheiros GPX ao diretório</string>
<string name="gpx_add_track">Adicionar mais…</string>
<string name="shared_string_appearance">Aparência</string>
<string name="trip_rec_notification_settings">Ativar a gravação de início rápido</string>
<string name="trip_rec_notification_settings_desc">Mostrar uma notificação de sistema que permite iniciar a gravação da viagem.</string>
<string name="trip_rec_notification_settings">Ativar gravação rápida</string>
<string name="trip_rec_notification_settings_desc">Mostrar uma notificação de sistema que permite a gravação da viagem.</string>
<string name="shared_string_notifications">Notificações</string>
<string name="shared_string_continue">Continuar</string>
<string name="shared_string_pause">Pausa</string>
@ -2073,7 +2073,7 @@
<string name="save_track_precision">Acuidade mínima para registo</string>
<string name="save_track_precision_descr">Filtro: Definir acuidade mínima para um ponto poder ser registado.</string>
<string name="christmas_poi">Pontos de interesse (POI) de Natal</string>
<string name="christmas_desc">Antes do Natal e Ano Novo, pode escolher mostrar pontos de interesse (POI) relacionados com o Natal: Árvores de Natal, mercados, etc.</string>
<string name="christmas_desc">Antes do Natal e Ano Novo, pode escolher mostrar os pontos de interesse (POI) relacionados com o Natal como árvores de Natal, mercados, etc.</string>
<string name="christmas_desc_q">Mostrar pontos de interesse (POI) de Natal?</string>
<string name="rendering_value_light_brown_name">Castanho claro</string>
<string name="rendering_value_dark_brown_name">Castanho escuro</string>
@ -2094,12 +2094,12 @@
<string name="new_filter">Novo filtro</string>
<string name="new_filter_desc">Por favor introduza o nome do novo filtro, este vai ser adicionado ao seu separador \'Categorias\'.</string>
<string name="osm_live_payment_desc">A assinatura é cobrada mensalmente. Cancele a assinatura no Google Play a qualquer altura.</string>
<string name="donation_to_osm">Doação para a comunidade OpenStreetMap</string>
<string name="donation_to_osm_desc">Parte da sua doação é enviada aos utilizadores OSM que submetem alterações ao OpenStreetMap. O custo da assinatura continua a ser o mesmo.</string>
<string name="donation_to_osm">Doação para a comunidade OSM</string>
<string name="donation_to_osm_desc">Parte da sua doação é enviada aos colaboradores do OSM. O custo da assinatura permanece o mesmo.</string>
<string name="osm_live_subscription_desc">Subscrição permite atualizações a cada hora, diárias, semanais, e descarregamentos ilimitados de todos os mapas globalmente.</string>
<string name="get_it">Comprá-lo</string>
<string name="get_for">Comprar por %1$s</string>
<string name="osm_live_banner_desc">Obter descarregamentos ilimitados de mapas e atualizações de mapas mais do que uma vez por mês: semanal, diário, ou a cada hora.</string>
<string name="osm_live_banner_desc">Obter descarregamentos ilimitados de mapas, adicionando atualizações semanais, diárias e a cada hora.</string>
<string name="osmand_plus_banner_desc">Descarregamentos ilimitados de mapas, atualizações e complemento Wikipédia.</string>
<string name="si_mi_meters">Milhas/metros</string>
<string name="search_map">À procura de mapas…</string>
@ -3401,7 +3401,7 @@
<string name="track_saved">Caminho gravado</string>
<string name="empty_filename">O nome do ficheiro está vazio</string>
<string name="shared_string_revert">Reverter</string>
<string name="quick_action_directions_from_desc">Um botão para centrar o ecrã no ponto de partida e calcular a rota até ao destino ou abrir um diálogo para selecionar o destino se o marcador de destino não estiver no mapa.</string>
<string name="quick_action_directions_from_desc">Um botão para centrar o ecrã no ponto de partida. Em seguida, solicitará para definir o destino ou acionar o cálculo da rota.</string>
<string name="rendering_attr_showCycleNodeNetworkRoutes_name">Mostrar nós da rede de ciclovias</string>
<string name="clear_confirmation_msg">Limpar %1$s\?</string>
<string name="download_map_dialog">Diálogo de descarregar mapas</string>
@ -3623,7 +3623,7 @@
<string name="shared_string_divider">Divisor</string>
<string name="divider_descr">Elementos abaixo deste ponto separados por um divisor.</string>
<string name="shared_string_hidden">Ocultado</string>
<string name="hidden_items_descr">Esses itens estão ocultos no menu, mas as opções ou plug-ins representados ainda estão funcionando.</string>
<string name="hidden_items_descr">Esses itens estão ocultos no menu, mas as opções ou plug-ins representados continuarão funcionando.</string>
<string name="reset_items_descr">As configurações serão redefinidas para o estado original após ocultar.</string>
<string name="main_actions_descr">As ações principais contêm apenas 4 botões.</string>
<string name="main_actions">Principais ações</string>
@ -3638,4 +3638,55 @@
<string name="wikipedia_poi_languages_promo">Alguns artigos da Wikipédia podem não estar disponíveis em seu nome. Selecione os idiomas nos quais os artigos da Wikipédia aparecerão no mapa.
\nPoderá alternar entre todos os idiomas disponíveis enquanto lê o artigo.</string>
<string name="wiki_menu_download_descr">Mapas adicionais são necessários para visualizar os POIs da Wikipédia no mapa.</string>
<string name="select_wikipedia_article_langs">Selecione os idiomas em que os artigos da Wikipédia aparecerão no mapa. Pode alternar entre todos os idiomas disponíveis enquanto lê o artigo.</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="tracker_item">Rastreador do OsmAnd</string>
<string name="quick_action_item">Ação rápida</string>
<string name="radius_ruler_item">Régua de raio</string>
<string name="measure_distance_item">Medir distância</string>
<string name="travel_item">Viagem (Wikivoyage e Wikipédia)</string>
<string name="map_markers_item">Marcadores de mapa</string>
<string name="favorites_item">Favoritos</string>
<string name="subscription_osmandlive_item">Assinatura - OsmAnd Live</string>
<string name="osmand_purchases_item">Compras de OsmAnd</string>
<string name="legend_item_description">O guia para a simbologia de um mapa</string>
<string name="navigation_profiles_item">Perfis de navegação</string>
<string name="search_poi_types">Pesquisar tipos de poi</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">O pagamento será cobrado na sua conta do Google Play na confirmação da compra.
\n
\nA assinatura é renovada automaticamente, a menos que seja cancelada antes da data de renovação. Sua conta será cobrada pelo período de renovação (mensal/trimestrial/anual) somente na data de renovação.
\n
\nPode gerir e cancelar suas assinaturas acessando as configurações do Google Play.</string>
<string name="download_unsupported_action">Ação %1$s não suportada</string>
<string name="extra_maps_menu_group">Mapas adicionais</string>
<string name="some_articles_may_not_available_in_lang">Alguns artigos da Wikipédia podem não estar disponíveis no seu idioma.</string>
<string name="lang_zhyue">Cantonês</string>
<string name="lang_zhminnan">Min do Sul</string>
<string name="lang_yo">Iorubá</string>
<string name="lang_war">Samarenho</string>
<string name="lang_uz">Uzbeque</string>
<string name="lang_ur">Urdu</string>
<string name="lang_tt">Tártaro</string>
<string name="lang_tg">Tajique</string>
<string name="lang_sco">Ânglico Escocês</string>
<string name="lang_scn">Siciliano</string>
<string name="lang_pnb">Panjábi</string>
<string name="lang_ne">Nepali</string>
<string name="lang_nap">Napolitano</string>
<string name="lang_my">Birmanês</string>
<string name="lang_mn">Mongol</string>
<string name="lang_min">Minangkabau</string>
<string name="lang_mg">Malgaxe</string>
<string name="lang_ky">Quirguiz</string>
<string name="lang_kk">Cazaque</string>
<string name="lang_jv">Javanês</string>
<string name="lang_gu">Guzerate</string>
<string name="lang_cv">Tchuvache</string>
<string name="lang_ce">Checheno</string>
<string name="lang_bar">Bávaro</string>
<string name="lang_ba">Basquires</string>
<string name="lang_an">Aragonês</string>
<string name="lang_lmo">Lombardo</string>
<string name="custom_color">Cor customizada</string>
</resources>

274
OsmAnd/res/values-ru/phrases.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="poi_bakery">Булочная</string>
<string name="poi_alcohol">Вино-водочный магазин;Алкоголь</string>
<string name="poi_alcohol">Винно-водочный магазин;Алкоголь</string>
<string name="poi_convenience">Продукты</string>
<string name="poi_mall">Торговый центр</string>
<string name="poi_beverages">Напитки</string>
@ -105,7 +105,7 @@
<string name="poi_games">Магазин игр;Игры</string>
<string name="poi_garden_furniture">Садовая мебель, аксессуары</string>
<string name="poi_furnace">Системы отопления</string>
<string name="poi_leather">Магазин кожи, галантарея</string>
<string name="poi_leather">Магазин кожи, галантерея</string>
<string name="poi_pyrotechnics">Пиротехника;Фейерверки</string>
<string name="poi_weapons">Оружие</string>
<string name="poi_model">Масштабные модели</string>
@ -239,7 +239,7 @@
<string name="poi_recycling_batteries">Батарейки</string>
<string name="poi_recycling_plastic_bottles">Пластиковые бутылки</string>
<string name="poi_recycling_green_waste">Растительный мусор</string>
<string name="poi_recycling_waste">Мусор (черные мешки)</string>
<string name="poi_recycling_waste">Мусор (чёрные мешки)</string>
<string name="poi_recycling_plastic_packaging">Пластиковая тара</string>
<string name="poi_recycling_newspaper">Газеты</string>
<string name="poi_recycling_cartons">Картон для пищевых упаковок</string>
@ -318,7 +318,7 @@
<string name="poi_government">Государственное учреждение;Госучреждение</string>
<string name="poi_bailiff">Служба судебных приставов;Судебные приставы</string>
<string name="poi_prosecutor">Прокуратура</string>
<string name="poi_pension_fund">Пенсионый фонд</string>
<string name="poi_pension_fund">Пенсионный фонд</string>
<string name="poi_migration">Миграционная служба</string>
<string name="poi_tax_inspection">Налоговая инспекция</string>
<string name="poi_office_administrative">Административное учреждение</string>
@ -353,7 +353,7 @@
<string name="poi_lawyer">Юридические услуги;Юрист</string>
<string name="poi_office_telecommunication">Телекоммуникационная компания</string>
<string name="poi_ngo">Общественная организация</string>
<string name="poi_townhall">Администрация населенного пункта</string>
<string name="poi_townhall">Администрация населённого пункта</string>
<string name="poi_employment_agency">Биржа труда</string>
<string name="poi_research">Исследовательский центр</string>
<string name="poi_it">Информационные технологии</string>
@ -427,7 +427,7 @@
<string name="poi_table_tennis">Пинг-понг</string>
<string name="poi_tennis">Теннис</string>
<string name="poi_toboggan">Санный спорт</string>
<string name="poi_volleyball">Воллейбол</string>
<string name="poi_volleyball">Волейбол</string>
<string name="poi_museum">Музей</string>
<string name="poi_attraction">Достопримечательность</string>
<string name="poi_memorial">Памятник, мемориал</string>
@ -469,7 +469,7 @@
<string name="poi_wayside_shrine">Придорожная святыня</string>
<string name="poi_information">Информация</string>
<string name="poi_clock">Часы</string>
<string name="poi_travel_agent">Турагентство;Туристическое агенство</string>
<string name="poi_travel_agent">Турагентство;Туристическое агентство</string>
<string name="poi_viewpoint">Место с хорошим видом;Обзорная площадка</string>
<string name="poi_camp_site">Место для лагеря</string>
<string name="poi_caravan_site">Ночлег</string>
@ -503,7 +503,7 @@
<string name="poi_club_hunting">Клуб охотников</string>
<string name="poi_club_shooting">Оружейный клуб</string>
<string name="poi_club_tourism">Туристический клуб</string>
<string name="poi_club_charity">Благотворительский клуб</string>
<string name="poi_club_charity">Благотворительный клуб</string>
<string name="poi_library">Библиотека</string>
<string name="poi_arts_centre">Центр искусств</string>
<string name="poi_cinema">Кинотеатр</string>
@ -658,7 +658,7 @@
<string name="poi_signal_station_traffic">Сигнальная станция</string>
<string name="poi_signal_station_warning">Сигнал опасности</string>
<string name="poi_small_craft_facility">Лодочная станция</string>
<string name="poi_seamark_rock">Скала</string>
<string name="poi_seamark_rock">Скала (навигационный ориентир)</string>
<string name="poi_seamark_wreck">Кораблекрушение (навигационный ориентир)</string>
<string name="poi_seamark_light_major">Большой маяк (навигационный ориентир)</string>
<string name="poi_seamark_light_minor">Небольшой маяк (навигационный ориентир)</string>
@ -739,12 +739,12 @@
<string name="poi_man_made">Сооружения</string>
<string name="poi_administrative">Административные объекты</string>
<string name="poi_seamark">Морские объекты</string>
<string name="poi_internet_access_wlan">Доступ в Интернет: беспроводной</string>
<string name="poi_internet_access_terminal">Доступ в Интернет: терминал</string>
<string name="poi_internet_access_wired">Доступ в Интернет: проводное подключение</string>
<string name="poi_internet_access_public">Доступ в Интернет: общедоступный</string>
<string name="poi_internet_access_yes">Доступ в Интернет: есть</string>
<string name="poi_internet_access_no">Доступ в Интернет: отсутствует</string>
<string name="poi_internet_access_wlan">Доступ в интернет: беспроводной</string>
<string name="poi_internet_access_terminal">Доступ в интернет: терминал</string>
<string name="poi_internet_access_wired">Доступ в интернет: проводное подключение</string>
<string name="poi_internet_access_public">Доступ в интернет: общедоступный</string>
<string name="poi_internet_access_yes">Доступ в интернет: есть</string>
<string name="poi_internet_access_no">Доступ в интернет: отсутствует</string>
<string name="poi_farm">Фермерский магазин</string>
<string name="poi_personal_transport">Личный транспорт</string>
<string name="poi_public_transport">Общественный транспорт</string>
@ -752,7 +752,7 @@
<string name="poi_water_transport">Водный транспорт</string>
<string name="poi_bicycle_transport">Велосипедный транспорт</string>
<string name="poi_sightseeing">Достопримечательности</string>
<string name="poi_internet_access">Доступ в Интернет</string>
<string name="poi_internet_access">Доступ в интернет</string>
<string name="poi_club">Клуб</string>
<string name="poi_cafe_and_restaurant">Кафе и ресторан</string>
<string name="poi_shop_food">Продуктовый магазин и супермаркет</string>
@ -820,7 +820,7 @@
<string name="poi_residential">Жилой район</string>
<string name="poi_religious">Религиозное землепользование</string>
<!-- <string name="poi_general_tourist_attraction_yes">Достопримечательность (тип неизвестен)</string>-->
<string name="poi_attraction_amusement_ride">Атракцион</string>
<string name="poi_attraction_amusement_ride">Аттракцион</string>
<string name="poi_wilderness_hut">Лесной домик</string>
<string name="poi_hunting_lodge">Охотничий домик</string>
<string name="poi_picnic_table">Стол для пикника</string>
@ -830,13 +830,13 @@
<string name="poi_gallery">Художественная галерея</string>
<string name="poi_ski_resort">Горнолыжный курорт</string>
<string name="poi_recreation_ground">Площадка для игр</string>
<string name="poi_payment_terminal">Платежный терминал</string>
<string name="poi_payment_terminal">Платёжный терминал</string>
<string name="poi_opening_hours">Часы работы</string>
<string name="poi_collection_times">Время выемки</string>
<string name="poi_description">Описание</string>
<string name="poi_phone">Телефон</string>
<string name="poi_website">Веб-сайт</string>
<string name="poi_email">Email</string>
<string name="poi_email">Эл. почта</string>
<string name="poi_fax">Факс</string>
<string name="poi_mobile">Сотовый телефон</string>
<string name="poi_service_times">Время обслуживания</string>
@ -886,7 +886,7 @@
<string name="poi_access_private">Частный доступ</string>
<string name="poi_access_no">Нет доступа</string>
<string name="poi_access_destination">Доступ: пункт назначения</string>
<string name="poi_access_permissive">Доступ разрешен владельцем</string>
<string name="poi_access_permissive">Доступ разрешён владельцем</string>
<string name="poi_access_customers">Доступ для клиентов</string>
<string name="poi_access_delivery">Доступ только для доставки</string>
<string name="poi_access_agricultural">Доступ только для с/х техники</string>
@ -957,7 +957,7 @@
<string name="poi_trees_mango">Манго</string>
<string name="poi_trees_rubber">Каучук</string>
<string name="poi_trees_date">Финики</string>
<string name="poi_trees_coffea">Кофe</string>
<string name="poi_trees_coffea">Кофе</string>
<string name="poi_trees_pomegranate">Гранат</string>
<string name="poi_height">Высота</string>
<string name="poi_ele">Высота над уровнем моря</string>
@ -991,7 +991,7 @@
<string name="poi_pump_no">Без насоса</string>
<string name="poi_pump_yes">Есть</string>
<string name="poi_water_characteristic">Характеристика воды</string>
<string name="poi_water_characteristic_mineral">Минеральная</string>
<string name="poi_water_characteristic_mineral">Характеристика воды: минеральная</string>
<string name="poi_water_characteristic_mud">Характеристика воды: грязь</string>
<string name="poi_water_characteristic_sulfuric">Серная</string>
<string name="poi_water_point">Пункт водоснабжения</string>
@ -1191,7 +1191,7 @@
<string name="poi_payment_type">Тип оплаты</string>
<string name="poi_payment_fuel_type">Топливные карты</string>
<string name="poi_fuel_type">Вид топлива</string>
<string name="poi_fuel_avia_type">Вид топлива (для самолетов)</string>
<string name="poi_fuel_avia_type">Вид топлива (для самолётов)</string>
<string name="poi_payment_coins_yes">Монеты</string>
<string name="poi_payment_coins_no">Монеты не принимаются</string>
<string name="poi_payment_coins_0_5">Монеты по $0.5</string>
@ -1281,21 +1281,21 @@
<string name="poi_payment_ep_avant_yes">AvantCard</string>
<string name="poi_payment_ep_avant_no">AvantCard не принимаются</string>
<string name="poi_payment_ep_mep_yes">MEP</string>
<string name="poi_payment_ep_mep_no">MEP не принимется</string>
<string name="poi_payment_ep_mep_no">MEP не принимаются</string>
<string name="poi_payment_ep_minipay_yes">Minipay</string>
<string name="poi_payment_ep_minipay_no">Minipay не принимается</string>
<string name="poi_payment_ep_minipay_no">Minipay не принимаются</string>
<string name="poi_payment_ep_minicash_yes">miniCash</string>
<string name="poi_payment_ep_minicash_no">miniCash не принимается</string>
<string name="poi_payment_ep_minicash_no">miniCash не принимаются</string>
<string name="poi_payment_ep_moneo_yes">Moneo</string>
<string name="poi_payment_ep_moneo_no">Moneo не принимается</string>
<string name="poi_payment_ep_moneo_no">Moneo не принимаются</string>
<string name="poi_payment_ep_monedero4b_yes">Monedero 4B</string>
<string name="poi_payment_ep_monedero4b_no">Monedero 4B не принимается</string>
<string name="poi_payment_ep_monedero4b_no">Monedero 4B не принимаются</string>
<string name="poi_payment_ep_monedero_yes">Monedero</string>
<string name="poi_payment_ep_monedero_no">Monedero не принимается</string>
<string name="poi_payment_ep_monedero_no">Monedero не принимаются</string>
<string name="poi_payment_bankaxess_yes">BankAxess</string>
<string name="poi_payment_bankaxess_no">BankAxess не принимается</string>
<string name="poi_payment_bankaxess_no">BankAxess не принимаются</string>
<string name="poi_payment_coinkite_yes">Coinkite</string>
<string name="poi_payment_coinkite_no">Оплата через Coinkite не принимается</string>
<string name="poi_payment_coinkite_no">Оплата через Coinkite не принимаются</string>
<string name="poi_payment_roadrunner_yes">Roadrunner</string>
<string name="poi_payment_roadrunner_no">Roadrunner карты не принимаются</string>
<string name="poi_payment_svg_yes">SVG</string>
@ -1309,7 +1309,7 @@
<string name="poi_payment_sube_yes">SUBE</string>
<string name="poi_payment_sube_no">Карты SUBE не принимаются</string>
<string name="poi_payment_via_verde_yes">Via Verde</string>
<string name="poi_payment_via_verde_no">Via Verde не принимается</string>
<string name="poi_payment_via_verde_no">Via Verde не принимаются</string>
<string name="poi_payment_meal_voucher_yes">Талоны на питание</string>
<string name="poi_payment_meal_voucher_no">Талоны на питание не принимаются</string>
<string name="poi_payment_paypal_yes">PayPal</string>
@ -1341,9 +1341,9 @@
<string name="poi_diet_vegetarian_yes">Вегетарианское питание</string>
<string name="poi_diet_vegetarian_no">Вегетарианское питание не предлагается</string>
<string name="poi_diet_vegan_filter_yes">Для веганов</string>
<string name="poi_diet_vegan_only">Только веганское питание</string>
<string name="poi_diet_vegan_yes">Веганское питание</string>
<string name="poi_diet_vegan_no">Веганское питание не предлагается</string>
<string name="poi_diet_vegan_only">Только вегетарианское питание</string>
<string name="poi_diet_vegan_yes">Вегетарианское питание</string>
<string name="poi_diet_vegan_no">Вегетарианское питание не предлагается</string>
<string name="poi_diet_gluten_free_filter_yes">Безглютеновое питание</string>
<string name="poi_diet_gluten_free_only">Только безглютеновое питание</string>
<string name="poi_diet_gluten_free_yes">Безглютеновое питание</string>
@ -1575,7 +1575,7 @@
<string name="poi_internet_access_type_wlan">Беспроводной</string>
<string name="poi_internet_access_type_wired">Кабельный</string>
<string name="poi_internet_access_type_public">Публичный доступ в интернет</string>
<string name="poi_internet_access_type_no">Без доступа в Интернет</string>
<string name="poi_internet_access_type_no">Без доступа в интернет</string>
<string name="poi_internet_access_type_yes">C доступом в интернет</string>
<string name="poi_maxwidth">Максимальная ширина</string>
<string name="poi_iata">Код IATA</string>
@ -1589,7 +1589,7 @@
<string name="poi_artwork_type_stone">Тип: камень</string>
<string name="poi_artwork_type_bust">Тип: бюст</string>
<string name="poi_artwork_type_installation">Тип: инсталляция</string>
<string name="poi_artwork_type_mosaic">Тип: мозайка</string>
<string name="poi_artwork_type_mosaic">Тип: мозаика</string>
<string name="poi_artwork_type_relief">Тип: барельеф</string>
<string name="poi_artwork_type_graffiti">Тип: граффити</string>
<string name="poi_artwork_type_stele">Тип: стела</string>
@ -1771,9 +1771,9 @@
<string name="poi_religion_multifaith">Многоконфессиональность</string>
<string name="poi_religion_jain">Джайнизм</string>
<string name="poi_religion_scientologist">Саентология</string>
<string name="poi_denomination_united_reformed">Объединенная реформированная церковь</string>
<string name="poi_denomination_united_reformed">Объединённая реформированная церковь</string>
<string name="poi_denomination_nazarene">Назаряне</string>
<string name="poi_denomination_united_methodist">Объединенная методистская церковь</string>
<string name="poi_denomination_united_methodist">Объединённая методистская церковь</string>
<string name="poi_denomination_congregational">Конгрегационная церковь</string>
<string name="poi_denomination_dutch_reformed">Нидерландская реформатская церковь</string>
<string name="poi_denomination_apostolic">Апостольская церковь</string>
@ -1880,7 +1880,7 @@
<string name="poi_content_salt">Содержимое: соль</string>
<string name="poi_content_grain">Содержимое: зерно</string>
<string name="poi_nudism">Нудизм</string>
<string name="poi_nudism_yes">Разрешен</string>
<string name="poi_nudism_yes">Разрешён</string>
<string name="poi_nudism_no">Запрещён</string>
<string name="poi_nudism_obligatory">Обязательно</string>
<string name="poi_nudism_customary">Приветствуется</string>
@ -2004,7 +2004,7 @@
<string name="poi_power_supply">Источник питания</string>
<string name="poi_power_supply_yes">Есть</string>
<string name="poi_power_supply_no">Источник питания: отсутствует</string>
<string name="poi_power_supply_cee_17_blue">Источник питания (разъём): CEE 17 blue</string>
<string name="poi_power_supply_cee_17_blue">Источник питания (разъём): CEE 17 синий</string>
<string name="poi_power_supply_cee_7_4">Источник питания (разъём): CEE 7/4</string>
<string name="poi_power_supply_cee_7_5">Источник питания (разъём): CEE 7/5</string>
<string name="poi_power_supply_nema_5_15">Источник питания (разъём): NEMA 5-15</string>
@ -2052,7 +2052,7 @@
<string name="poi_bandstand">Отдельностоящая сцена</string>
<string name="poi_kiln">Печь для обжига</string>
<string name="poi_product_brick">Производимый продукт: кирпич</string>
<string name="poi_product_quicklime">Производимый продукт: негашеная известь</string>
<string name="poi_product_quicklime">Производимый продукт: негашёная известь</string>
<string name="poi_product_leather">Производимый продукт: кожа</string>
<string name="poi_product_lime">Производимый продукт: известь</string>
<string name="poi_product_beer">Производимый продукт: пиво</string>
@ -2430,7 +2430,7 @@
<string name="poi_firepit">Место для разведения огня</string>
<string name="poi_street_cabinet">Распределительный шкаф</string>
<string name="poi_fair_trade_yes">Справедливая торговля (Fairtrade): есть</string>
<string name="poi_fair_trade_no">Справедливая торговля (Fairtrade): no</string>
<string name="poi_fair_trade_no">Справедливая торговля (Fairtrade): нет</string>
<string name="poi_fair_trade_only">Только товары с маркировкой Справедливой торговли (Fairtrade)</string>
<string name="poi_ice_hockey">Хоккей с шайбой</string>
<string name="poi_bandy">Хоккей с мячом</string>
@ -2440,7 +2440,7 @@
<string name="poi_protection_object_nature">Объект охраны: природа</string>
<string name="poi_protection_object_habitat">Объект охраны: среда обитания</string>
<string name="poi_protection_object_water">Объект охраны: вода</string>
<string name="poi_nuclear_explosion_country">Страна, произведшая взрыв</string>
<string name="poi_nuclear_explosion_country">Страна, произвёдшая взрыв</string>
<string name="poi_nuclear_explosion_site">Название места взрыва</string>
<string name="poi_nuclear_explosion_type_underground_shaft">Тип взрыва: подземный, шахта</string>
<string name="poi_nuclear_explosion_type_underground_tunnel">Тип взрыва: подземный, туннель</string>
@ -2504,8 +2504,8 @@
<string name="poi_free_flying_paragliding_no">Парапланеризм: нет</string>
<string name="poi_free_flying_hanggliding_yes">Дельтапланеризм</string>
<string name="poi_free_flying_hanggliding_no">Дельтапланеризм: нет</string>
<string name="poi_free_flying_rigid_yes">Дельтаплан с жестким крылом</string>
<string name="poi_free_flying_rigid_no">Дельтаплан с жестким крылом: нет</string>
<string name="poi_free_flying_rigid_yes">Дельтаплан с жёстким крылом</string>
<string name="poi_free_flying_rigid_no">Дельтаплан с жёстким крылом: нет</string>
<string name="poi_free_flying_site_orientation_n">Ориентация площадки для свободного полёта: С</string>
<string name="poi_free_flying_site_orientation_ne">Ориентация площадки для свободного полёта: СВ</string>
<string name="poi_free_flying_site_orientation_e">Ориентация площадки для свободного полёта: В</string>
@ -2514,7 +2514,7 @@
<string name="poi_free_flying_site_orientation_sw">Ориентация площадки для свободного полёта: ЮЗ</string>
<string name="poi_free_flying_site_orientation_w">Ориентация площадки для свободного полёта: З</string>
<string name="poi_free_flying_site_orientation_nw">Ориентация площадки для свободного полёта: СЗ</string>
<string name="poi_free_flying_no_flight_time">Запрещенное для свободного полёта время</string>
<string name="poi_free_flying_no_flight_time">Запрещённое для свободного полёта время</string>
<string name="poi_free_flying_guest_guidelines_yes">Инструктаж для посетителей: есть</string>
<string name="poi_free_flying_guest_guidelines_no">Инструктаж для посетителей: нет</string>
<string name="poi_tanning_salon">Солярий</string>
@ -2540,8 +2540,8 @@
<string name="poi_health_service_prevention_no">Медицинские услуги: профилактика: нет</string>
<string name="poi_health_service_prevention_vaccination_yes">Медицинские услуги: вакцинация: есть</string>
<string name="poi_health_service_prevention_vaccination_no">Медицинские услуги: вакцинация: нет</string>
<string name="poi_health_service_support_yes">Медицинские услуги: support: есть</string>
<string name="poi_health_service_support_no">Медицинские услуги: support: нет</string>
<string name="poi_health_service_support_yes">Медицинские услуги: поддержание: есть</string>
<string name="poi_health_service_support_no">Медицинские услуги: поддержание: нет</string>
<string name="poi_health_service_test_yes">Медицинские услуги: тестирование: есть</string>
<string name="poi_health_service_test_no">Медицинские услуги: тестирование: нет</string>
<string name="poi_health_facility_type_office">Медицинский офис</string>
@ -2569,7 +2569,7 @@
<string name="poi_health_person_type_nurse">Роль медработника: медсестра</string>
<string name="poi_health_person_type_paramedic">Роль медработника: фельдшер</string>
<string name="poi_health_person_type_physician">Роль медработника: врач</string>
<string name="poi_health_person_type_podologist">Роль медработника: подолог</string>
<string name="poi_health_person_type_podologist">Роль медработника: ортопед</string>
<string name="poi_health_person_type_psychologist">Роль медработника: психолог</string>
<string name="poi_health_person_type_therapist">Роль медработника: терапевт</string>
<string name="poi_health_person_type_physician_assitant">Роль медработника: ассистент врача</string>
@ -2648,7 +2648,7 @@
<string name="poi_disease_aids_no">СПИД: нет</string>
<string name="poi_office_physician">Офис врача</string>
<string name="poi_office_therapist">Офис терапевта</string>
<string name="poi_office_podologist">Офис подолога</string>
<string name="poi_office_podologist">Офис ортопеда</string>
<string name="poi_office_healer">Офис целителя</string>
<string name="poi_office_psychologist">Офис психолога</string>
<string name="poi_office_nursing_service">Офис службы ухода за больными</string>
@ -2681,7 +2681,7 @@
<string name="poi_bicycle_parking_tree">Велопарковка в форме дерева</string>
<string name="poi_bicycle_parking_streetpod">Открытый отсек</string>
<string name="poi_depth">Глубина</string>
<string name="poi_salt_yes">Соль</string>
<string name="poi_salt_yes">Соль: есть</string>
<string name="poi_salt_no">Соль: нет</string>
<string name="poi_wheelchair_designated">Только для инвалидных кресел</string>
<string name="poi_spoil_heap">Отвал породы</string>
@ -2690,25 +2690,25 @@
<string name="poi_crossing_activation_automatic">Управление переездом: автоматическое</string>
<string name="poi_crossing_activation_local">Управление переездом: местное</string>
<string name="poi_crossing_activation_remote">Управление переездом: дистанционное</string>
<string name="poi_crossing_barrier_no">Барьер на перезде: нет</string>
<string name="poi_crossing_barrier_yes">Барьер на переезде</string>
<string name="poi_crossing_barrier_no">Барьер на переезде: нет</string>
<string name="poi_crossing_barrier_yes">Барьер на переезде: есть</string>
<string name="poi_crossing_barrier_full">Барьер на переезде: полный</string>
<string name="poi_crossing_barrier_half">Барьер на переезде: половинный</string>
<string name="poi_crossing_barrier_double_half">Барьер на переезде: двойной половинный</string>
<string name="poi_crossing_bell_yes">Звуковой сигнал у переезда</string>
<string name="poi_crossing_bell_yes">Звуковой сигнал у переезда: есть</string>
<string name="poi_crossing_bell_no">Звуковой сигнал у переезда: нет</string>
<string name="poi_crossing_light_yes">Светофор у переезда</string>
<string name="poi_crossing_light_yes">Светофор у переезда: есть</string>
<string name="poi_crossing_light_no">Светофор у переезда: нет</string>
<string name="poi_crossing_on_demand_yes">Пересечение переезда по требованию</string>
<string name="poi_crossing_on_demand_yes">Пересечение переезда по требованию: есть</string>
<string name="poi_crossing_on_demand_no">Пересечение переезда по требованию: нет</string>
<string name="poi_crossing_saltire_yes">Знак у переезда</string>
<string name="poi_crossing_saltire_yes">Знак у переезда: есть</string>
<string name="poi_crossing_saltire_no">Знак у переезда: нет</string>
<string name="poi_crossing_supervision_yes">Наблюдение за переездом</string>
<string name="poi_crossing_supervision_no">Наблюдение за переездом: отсутствует</string>
<string name="poi_crossing_supervision_yes">Наблюдение за переездом: есть</string>
<string name="poi_crossing_supervision_no">Наблюдение за переездом: нет</string>
<string name="poi_crossing_supervision_attendant">Наблюдение за переездом: смотрящий</string>
<string name="poi_crossing_supervision_camera">Наблюдение за переездом: камера</string>
<string name="poi_pharmacy_dispensing">Продажа лекарств по рецептам</string>
<string name="poi_dispensing_yes">Есть</string>
<string name="poi_dispensing_yes">Продажа лекарств по рецептам: есть</string>
<string name="poi_dispensing_no">Продажа лекарств по рецептам: нет</string>
<string name="poi_aerodrome_type_international">Международный</string>
<string name="poi_aerodrome_type_regional">Региональный</string>
@ -2758,18 +2758,18 @@
<string name="poi_generator_output_biogas_yes">Производит: биогаз</string>
<string name="poi_pumping_station">Насосная станция</string>
<string name="poi_display_yes">Дисплей: есть</string>
<string name="poi_display_no">Дисплей: отсутствует</string>
<string name="poi_display_no">Дисплей: нет</string>
<string name="poi_display_analog_yes">Аналоговый дисплей</string>
<string name="poi_display_digital_yes">Цифровой дисплей</string>
<string name="poi_display_sundial_yes">Солнечные часы</string>
<string name="poi_clock_option">Дополнительно</string>
<string name="poi_barometer_yes">Барометр</string>
<string name="poi_barometer_no">Барометр: отсутствует</string>
<string name="poi_thermometer_yes">Термометр</string>
<string name="poi_thermometer_no">Термометр: отсутствует</string>
<string name="poi_hygrometer_yes">Гигрометр</string>
<string name="poi_hygrometer_no">Гигрометр: отсутствует</string>
<string name="poi_date_yes">Дата</string>
<string name="poi_barometer_yes">Барометр: есть</string>
<string name="poi_barometer_no">Барометр: нет</string>
<string name="poi_thermometer_yes">Термометр: есть</string>
<string name="poi_thermometer_no">Термометр: нет</string>
<string name="poi_hygrometer_yes">Гигрометр: есть</string>
<string name="poi_hygrometer_no">Гигрометр: нет</string>
<string name="poi_date_yes">Дата: есть</string>
<string name="poi_date_no">Дата: нет</string>
<string name="poi_support_pole">Опора: столб</string>
<string name="poi_support_wall_mounted">Опора: стена</string>
@ -2782,7 +2782,7 @@
<string name="poi_support_roof">Опора: крыша</string>
<string name="poi_support_tower">Опора: башня</string>
<string name="poi_passenger_information_display_yes">Информационный дисплей пассажира: есть</string>
<string name="poi_passenger_information_display_no">Информационный дисплей пассажира: отсутствует</string>
<string name="poi_passenger_information_display_no">Информационный дисплей пассажира: нет</string>
<string name="poi_aquaculture">Аквакультура</string>
<string name="poi_aquaculture_shrimp">Разведение креветок</string>
<string name="poi_aquaculture_fish">Разведение рыбы</string>
@ -2796,7 +2796,7 @@
<string name="poi_embassy_type">Вид</string>
<string name="poi_diplomatic_consulate">Консульство</string>
<string name="poi_diplomatic_consulate_general">Генеральное консульство</string>
<string name="poi_diplomatic_honorary_consulate">Почетное консульство</string>
<string name="poi_diplomatic_honorary_consulate">Почётное консульство</string>
<string name="poi_diplomatic_permanent_mission">Постоянное представительство</string>
<string name="poi_diplomatic_delegation">Делегация</string>
<string name="poi_diplomatic_ambassadors_residence">Резиденция посла</string>
@ -3041,7 +3041,7 @@
<string name="poi_zoo_petting_zoo">Контактный зоопарк</string>
<string name="poi_zoo_wildlife_park">Парк дикой природы</string>
<string name="poi_zoo_enclosure">Клетки</string>
<string name="poi_zoo_safari_park">Сафари парк</string>
<string name="poi_zoo_safari_park">Сафари-парк</string>
<string name="poi_zoo_birds">Птицы</string>
<string name="poi_zoo_aviary">Вольер для птиц</string>
<string name="poi_zoo_falconry">Соколиная охота</string>
@ -3049,19 +3049,19 @@
<string name="poi_zoo_type">Тип</string>
<string name="poi_stands">Спортивная трибуна</string>
<string name="poi_motorcycle_services">Услуги</string>
<string name="poi_motorcycle_sales_yes">Продажа</string>
<string name="poi_motorcycle_sales_yes">Продажа: есть</string>
<string name="poi_motorcycle_sales_no">Продажа: нет</string>
<string name="poi_motorcycle_sales_yes_used">Продажа: есть, б/у</string>
<string name="poi_motorcycle_sales_used">Продажа: б/у</string>
<string name="poi_motorcycle_rental_yes">Аренда</string>
<string name="poi_motorcycle_rental_yes">Аренда: есть</string>
<string name="poi_motorcycle_rental_no">Аренда: нет</string>
<string name="poi_motorcycle_repair_yes">Ремонт</string>
<string name="poi_motorcycle_repair_yes">Ремонт: есть</string>
<string name="poi_motorcycle_repair_no">Ремонт: нет</string>
<string name="poi_motorcycle_parts_yes">Запчасти</string>
<string name="poi_motorcycle_parts_yes">Запчасти: есть</string>
<string name="poi_motorcycle_parts_no">Запчасти: нет</string>
<string name="poi_motorcycle_tyres_yes">Шины</string>
<string name="poi_motorcycle_tyres_yes">Шины: есть</string>
<string name="poi_motorcycle_tyres_no">Шины: нет</string>
<string name="poi_motorcycle_clothes_yes">Мотоциклетная одежда</string>
<string name="poi_motorcycle_clothes_yes">Мотоциклетная одежда: есть</string>
<string name="poi_motorcycle_clothes_no">Мотоциклетная одежда: нет</string>
<string name="poi_motorcycle_type">Тип мотоциклов</string>
<string name="poi_motorcycle_type_scooter">Мотороллеры</string>
@ -3108,27 +3108,27 @@
<string name="poi_winter_room_no">Зимняя комната: нет</string>
<string name="poi_reservation_required">Бронирование: требуется</string>
<string name="poi_reservation_recommended">Бронирование: рекомендуется</string>
<string name="poi_reservation_yes">Бронирование: возможно</string>
<string name="poi_reservation_no">Бронирование: не предусмотрено</string>
<string name="poi_reservation_yes">Бронирование: есть</string>
<string name="poi_reservation_no">Бронирование: нет</string>
<string name="poi_reservation_members_only">Бронирование: для узкого круга лиц</string>
<string name="poi_beds">Кровати</string>
<string name="poi_boat_rental_type">Арендуемые лодки</string>
<string name="poi_boat_rental">Прокат лодок</string>
<string name="poi_boat_motorboat_rental_yes">Моторные лодки: да</string>
<string name="poi_boat_motorboat_rental_yes">Моторные лодки: есть</string>
<string name="poi_boat_motorboat_rental_no">Моторные лодки: нет</string>
<string name="poi_boat_houseboat_rental_yes">Плавучие дома: да</string>
<string name="poi_boat_houseboat_rental_yes">Плавучие дома: есть</string>
<string name="poi_boat_houseboat_rental_no">Плавучие дома: нет</string>
<string name="poi_boat_pedalboat_rental_yes">Педальные лодки: да</string>
<string name="poi_boat_pedalboat_rental_yes">Педальные лодки: есть</string>
<string name="poi_boat_pedalboat_rental_no">Педальные лодки: нет</string>
<string name="poi_boat_jetski_rental_yes">Гидроциклы: да</string>
<string name="poi_boat_jetski_rental_yes">Гидроциклы: есть</string>
<string name="poi_boat_jetski_rental_no">Гидроциклы: нет</string>
<string name="poi_boat_sailboat_rental_yes">Парусники: да</string>
<string name="poi_boat_sailboat_rental_yes">Парусники: есть</string>
<string name="poi_boat_sailboat_rental_no">Парусники: нет</string>
<string name="poi_boat_dinghy_rental_rental_yes">Шлюпки: да</string>
<string name="poi_boat_dinghy_rental_rental_yes">Шлюпки: есть</string>
<string name="poi_boat_dinghy_rental_rental_no">Шлюпки: нет</string>
<string name="poi_boat_kayak_rental_rental_yes">Каяки: да</string>
<string name="poi_boat_kayak_rental_rental_yes">Каяки: есть</string>
<string name="poi_boat_kayak_rental_rental_no">Каяки: нет</string>
<string name="poi_boat_canoe_rental_rental_yes">Каноэ: да</string>
<string name="poi_boat_canoe_rental_rental_yes">Каноэ: есть</string>
<string name="poi_boat_canoe_rental_rental_no">Каноэ: нет</string>
<string name="poi_government_archive">Архив</string>
<string name="poi_government_ministry">Министерство</string>
@ -3180,35 +3180,35 @@
<string name="poi_water_place_access_family">Семья</string>
<string name="poi_water_place_access_multifamilies">Несколько семей</string>
<string name="poi_socket_cee_blue">Разъём: CEE blue</string>
<string name="poi_socket_cee_blue_current">Разъём: CEE blue: ток</string>
<string name="poi_socket_cee_blue_output">Разъём: CEE blue: мощность</string>
<string name="poi_socket_cee_red_16a">Разъём: CEE red 16A</string>
<string name="poi_socket_cee_red_16a_current">Разъём: CEE red 16A: ток</string>
<string name="poi_socket_cee_red_16a_output">Разъём: CEE red 16A: мощность</string>
<string name="poi_socket_cee_red_32a">Разъём: CEE red 32A</string>
<string name="poi_socket_cee_red_32a_current">Разъём: CEE red 32A: ток</string>
<string name="poi_socket_cee_red_32a_output">Разъём: CEE red 32A: мощность</string>
<string name="poi_socket_cee_red_64a">Разъём: CEE red 64A</string>
<string name="poi_socket_cee_red_64a_current">Разъём: CEE red 64A: ток</string>
<string name="poi_socket_cee_red_64a_output">Разъём: CEE red 64A: мощность</string>
<string name="poi_socket_cee_red_125a">Разъём: CEE red 125A</string>
<string name="poi_socket_cee_red_125a_current">Разъём: CEE red 125A: ток</string>
<string name="poi_socket_cee_red_125a_output">Разъём: CEE red 125A: мощность</string>
<string name="poi_socket_type1">Разъём: Type 1</string>
<string name="poi_socket_type1_current">Разъём: Type 1: ток</string>
<string name="poi_socket_type1_output">Разъём: Type 1: мощность</string>
<string name="poi_socket_type1_combo">Разъём: Type 1 combo</string>
<string name="poi_socket_type1_combo_current">Разъём: Type 1 combo: ток</string>
<string name="poi_socket_type1_combo_output">Разъём: Type 1 combo: мощность</string>
<string name="poi_socket_type2">Разъём: Type 2</string>
<string name="poi_socket_type2_current">Разъём: Type 2: ток</string>
<string name="poi_socket_type2_output">Разъём: Type 2: мощность</string>
<string name="poi_socket_type2_combo">Разъём: Type 2 combo</string>
<string name="poi_socket_type2_combo_current">Разъём: Type 2 combo: ток</string>
<string name="poi_socket_type2_combo_output">Разъём: Type 2 combo: мощность</string>
<string name="poi_socket_type3">Разъём: Type 3</string>
<string name="poi_socket_type3_current">Разъём: Type 3: ток</string>
<string name="poi_socket_type3_output">Разъём: Type 3: мощность</string>
<string name="poi_socket_cee_blue_current">Разъём: CEE синий: ток</string>
<string name="poi_socket_cee_blue_output">Разъём: CEE синий: мощность</string>
<string name="poi_socket_cee_red_16a">Разъём: CEE красный 16A</string>
<string name="poi_socket_cee_red_16a_current">Разъём: CEE красный 16A: ток</string>
<string name="poi_socket_cee_red_16a_output">Разъём: CEE красный 16A: мощность</string>
<string name="poi_socket_cee_red_32a">Разъём: CEE красный 32A</string>
<string name="poi_socket_cee_red_32a_current">Разъём: CEE красный 32A: ток</string>
<string name="poi_socket_cee_red_32a_output">Разъём: CEE красный 32A: мощность</string>
<string name="poi_socket_cee_red_64a">Разъём: CEE красный 64A</string>
<string name="poi_socket_cee_red_64a_current">Разъём: CEE красный 64A: ток</string>
<string name="poi_socket_cee_red_64a_output">Разъём: CEE красный 64A: мощность</string>
<string name="poi_socket_cee_red_125a">Разъём: CEE красный 125A</string>
<string name="poi_socket_cee_red_125a_current">Разъём: CEE красный 125A: ток</string>
<string name="poi_socket_cee_red_125a_output">Разъём: CEE красный 125A: мощность</string>
<string name="poi_socket_type1">Разъём: Тип 1</string>
<string name="poi_socket_type1_current">Разъём: Тип 1: ток</string>
<string name="poi_socket_type1_output">Разъём: Тип 1: мощность</string>
<string name="poi_socket_type1_combo">Разъём: Тип 1 combo</string>
<string name="poi_socket_type1_combo_current">Разъём: Тип 1 combo: ток</string>
<string name="poi_socket_type1_combo_output">Разъём: Тип 1 combo: мощность</string>
<string name="poi_socket_type2">Разъём: Тип 2</string>
<string name="poi_socket_type2_current">Разъём: Тип 2: ток</string>
<string name="poi_socket_type2_output">Разъём: Тип 2: мощность</string>
<string name="poi_socket_type2_combo">Разъём: Тип 2 combo</string>
<string name="poi_socket_type2_combo_current">Разъём: Тип 2 combo: ток</string>
<string name="poi_socket_type2_combo_output">Разъём: Тип 2 combo: мощность</string>
<string name="poi_socket_type3">Разъём: Тип 3</string>
<string name="poi_socket_type3_current">Разъём: Тип 3: ток</string>
<string name="poi_socket_type3_output">Разъём: Тип 3: мощность</string>
<string name="poi_socket_chademo">Разъём: CHAdeMO</string>
<string name="poi_socket_chademo_current">Разъём: CHAdeMO: ток</string>
<string name="poi_socket_chademo_output">Разъём: CHAdeMO: мощность</string>
@ -3250,7 +3250,7 @@
<string name="poi_scooter_no">Скутер: нет</string>
<string name="poi_truck_yes">Грузовик: да</string>
<string name="poi_truck_no">Грузовик: нет</string>
<string name="poi_parking_fee_yes">Оплата за парковку: да</string>
<string name="poi_parking_fee_yes">Оплата за парковку: есть</string>
<string name="poi_parking_fee_no">Оплата за парковку: нет</string>
<string name="poi_amperage">Ток</string>
<string name="poi_charging_station_output">Мощность зарядной станции</string>
@ -3276,7 +3276,7 @@
<string name="poi_google_plus">Google+</string>
<string name="poi_content_wastewater">Содержимое: стоки</string>
<string name="poi_enforcement_check">Требование: контроль</string>
<string name="poi_payment_account_cards_no">Платежные карты не принимаются</string>
<string name="poi_payment_account_cards_no">Платёжные карты не принимаются</string>
<string name="poi_payment_prepaid_ticket_yes">Предоплаченные билеты</string>
<string name="poi_depot">Депо</string>
<string name="poi_letter_box">Абонентский почтовый ящик</string>
@ -3503,7 +3503,7 @@
<string name="poi_fire_hydrant_position_green">Трава</string>
<string name="poi_fire_hydrant_position_lane">Полоса движения</string>
<string name="poi_fire_hydrant_style_wsh">Дизайн гидранта: wsh</string>
<string name="poi_payment_account_cards_yes">Платежные карты</string>
<string name="poi_payment_account_cards_yes">Платёжные карты</string>
<string name="poi_memorial_koshinto">Косинто</string>
<string name="poi_fuel_autogas">Автогаз</string>
<string name="poi_dolphin">Дельфинариум</string>
@ -3519,15 +3519,15 @@
<string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
<string name="poi_socket_schuko_yes">Schuko/Шуко</string>
<string name="poi_socket_schuko_yes">Schuko</string>
<string name="poi_socket_bs1363_yes">BS 1363</string>
<string name="poi_socket_as3112_yes">AS/NZS 3112</string>
<string name="poi_socket_chademo_output_filter">CHAdeMO вывод</string>
<string name="poi_socket_type2_output_filter">Type 2 вывод</string>
<string name="poi_socket_type2_combo_output_filter">Type 2 combo вывод</string>
<string name="poi_socket_type3_output_filter">Type 3 вывод</string>
<string name="poi_socket_cee_blue_output_filter">CEE blue вывод</string>
<string name="poi_socket_schuko_output_filter">Schuko вывод</string>
<string name="poi_socket_chademo_output_filter">Выход: CHAdeMO</string>
<string name="poi_socket_type2_output_filter">Выход: Тип 2</string>
<string name="poi_socket_type2_combo_output_filter">Выход: Тип 2 combo</string>
<string name="poi_socket_type3_output_filter">Выход: Тип 3</string>
<string name="poi_socket_cee_blue_output_filter">Выход: CEE синий</string>
<string name="poi_socket_schuko_output_filter">Выход: Schuko</string>
<string name="poi_car_pooling">Точка сбора карпулинга</string>
<string name="poi_park_ride_hov">Полоса HOV; Карпул; Полоса для проезда загруженного пассажирского транспорта</string>
<string name="poi_hazard">Опасность</string>
@ -3561,8 +3561,8 @@
<string name="poi_access_motorcycle">Доступ для мотоциклов</string>
<string name="poi_access_moped">Доступ для мопедов</string>
<string name="poi_access_mofa">Доступ для мопедов Mofa</string>
<string name="poi_access_hgv">Доступ для тяжелых грузовых автомобилей (HGV)</string>
<string name="poi_access_goods">Доступ для легких грузовых автомобилей (LGV)</string>
<string name="poi_access_hgv">Доступ для тяжёлых грузовых автомобилей (HGV)</string>
<string name="poi_access_goods">Доступ для лёгких грузовых автомобилей (LGV)</string>
<string name="poi_vehicle_yes">Доступ для транспортных средств: да</string>
<string name="poi_vehicle_private">Доступ для транспортных средств: частный</string>
<string name="poi_vehicle_no">Доступ для транспортных средств: нет</string>
@ -3589,12 +3589,12 @@
<string name="poi_motor_vehicle_delivery">Доступ для механического транспортного средства: курьеры/доставка</string>
<string name="poi_motor_vehicle_forestry">Доступ для механического транспортного средства: лесное хозяйство</string>
<string name="poi_motor_vehicle_agricultural">Доступ для механического транспортного средства: сельскохозяйственные</string>
<string name="poi_hgv_private">Доступ для тяжелых грузовых автомобилей (HGV): частный</string>
<string name="poi_hgv_no">Доступ для тяжелых грузовых автомобилей (HGV): нет</string>
<string name="poi_hgv_agricultural">Доступ для тяжелых грузовых автомобилей (HGV): сельскохозяйственные</string>
<string name="poi_hgv_discouraged">Доступ для тяжелых грузовых автомобилей (HGV): затруднен</string>
<string name="poi_hgv_unsuitable">Доступ для тяжелых грузовых автомобилей (HGV): непригоден</string>
<string name="poi_goods_no">Доступ для легких грузовых автомобилей (LGV): нет</string>
<string name="poi_hgv_private">Доступ для тяжёлых грузовых автомобилей (HGV): частный</string>
<string name="poi_hgv_no">Доступ для тяжёлых грузовых автомобилей (HGV): нет</string>
<string name="poi_hgv_agricultural">Доступ для тяжёлых грузовых автомобилей (HGV): сельскохозяйственные</string>
<string name="poi_hgv_discouraged">Доступ для тяжёлых грузовых автомобилей (HGV): затруднён</string>
<string name="poi_hgv_unsuitable">Доступ для тяжёлых грузовых автомобилей (HGV): непригоден</string>
<string name="poi_goods_no">Доступ для лёгких грузовых автомобилей (LGV): нет</string>
<string name="poi_motorcycle_private">Доступ для мотоциклов: частный</string>
<string name="poi_motorcycle_no">Доступ для мотоциклов: нет</string>
<string name="poi_moped_no">Доступ для мопедов: нет</string>
@ -3749,4 +3749,8 @@
<string name="poi_surface_metal_grid">Металлическая сетка</string>
<string name="poi_surface_decoturf">DecoTurf</string>
<string name="poi_surface_tartan">Тартан</string>
<string name="poi_snowmobile_permissive">С разрешения</string>
<string name="poi_motorcycle_permissive">С разрешения</string>
<string name="poi_hgv_permissive">С разрешения</string>
<string name="poi_seamark_obstruction">Препятствие</string>
</resources>

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

File diff suppressed because it is too large Load diff

1
OsmAnd/res/values-sk/phrases.xml
View file

@ -3554,4 +3554,5 @@
<string name="poi_dive_centre">Potápačské centrum</string>
<string name="poi_video_telephone">Video</string>
<string name="poi_sms">SMS</string>
<string name="poi_climbing_crag_filter">Lezecká stena</string>
</resources>

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

@ -3600,10 +3600,10 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="app_mode_ski_snowmobile">Snežný skúter</string>
<string name="custom_osmand_plugin">Vlastný modul pre OsmAnd</string>
<string name="replace_point_descr">Nahradiť iný bod týmto</string>
<string name="changes_applied_to_profile">Zmeny boli použité na profil %1$s.</string>
<string name="settings_item_read_error">Nepodarilo sa prečítať %1$s.</string>
<string name="settings_item_write_error">Nepodarilo sa zapísať %1$s.</string>
<string name="settings_item_import_error">Nepodarilo sa importovať %1$s.</string>
<string name="changes_applied_to_profile">Zmeny boli použité na profil \"%1$s\".</string>
<string name="settings_item_read_error">Nepodarilo sa prečítať z \"%1$s\".</string>
<string name="settings_item_write_error">Nepodarilo sa zapísať do \"%1$s\".</string>
<string name="settings_item_import_error">Nepodarilo sa importovať z \"%1$s\".</string>
<string name="select_track_file">Zvoľte súbor stopy</string>
<string name="shared_string_languages">Jazyky</string>
<string name="shared_string_language">Jazyk</string>
@ -3623,10 +3623,10 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="divider_descr">Položky pod týmto bodom sú oddelené rozdeľovačom.</string>
<string name="shared_string_hidden">Skryté</string>
<string name="hidden_items_descr">Tieto položky sú skryté z menu, ale ich možnosti a moduly zostanú funkčné.</string>
<string name="reset_items_descr">Po skrytí sa nastavenia resetujú do pôvodného stavu.</string>
<string name="main_actions_descr">Hlavné akcie sú obmedzené na 4 tlačidlá.</string>
<string name="reset_items_descr">Skrytie nastavení ich resetuje do pôvodného stavu.</string>
<string name="main_actions_descr">\"Hlavné akcie\" obsahujú len 4 tlačidlá.</string>
<string name="main_actions">Hlavné akcie</string>
<string name="additional_actions_descr">K akciám môžete pristúpiť stlačením tlačidla \"Akcie\".</string>
<string name="additional_actions_descr">K týmto akciám môžete pristúpiť stlačením tlačidla \"Ďalšie akcie\".</string>
<string name="move_inside_category">Môžete presúvať položky len v rámci tejto kategórie.</string>
<string name="developer_plugin">Doplnok pre vývojárov</string>
<string name="shared_string_items">Položky</string>
@ -3662,4 +3662,22 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="lang_ba">Baškirsky</string>
<string name="lang_an">Aragonsky</string>
<string name="lang_lmo">Lombardsky</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">Platba bude stiahnutá z vášho účtu Google Play po zakúpení predplatného
\n a keď dôjde k uplynutiu jeho platnosti (mesiac/štvrťrok/rok),
\navšak nepredĺži sa automaticky ak ho zrušíte v nastaveniach Google Play.</string>
<string name="search_poi_types">Hľadať typy bodov záujmu</string>
<string name="search_poi_types_descr">Skombinovať typy bodov záujmov z rôznych kategórií. Stlačte \"Prepnúť\" pre zvolenie všetkých, stlačte ľavú stranu pre výber kategórií.</string>
<string name="tracker_item">Stopovanie OsmAnd</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="quick_action_item">Rýchla akcia</string>
<string name="radius_ruler_item">Polomerové pravítko</string>
<string name="measure_distance_item">Merať vzdialenosť</string>
<string name="travel_item">Cestovanie (Wikivoyage a Wikipédia)</string>
<string name="map_markers_item">Mapové značky</string>
<string name="favorites_item">Obľúbené</string>
<string name="subscription_osmandlive_item">Predplatné - OsmAnd Live</string>
<string name="osmand_purchases_item">Nákupy v OsmAnd</string>
<string name="legend_item_description">Sprievodca symbolmi na mape</string>
<string name="navigation_profiles_item">Navigačné profily</string>
</resources>

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

@ -2229,7 +2229,7 @@
<string name="postcode">Posta-kodu</string>
<string name="shared_string_from">-dan</string>
<string name="map_widget_search">Ara</string>
<string name="use_osm_live_routing">OsmAnd Canlı navigasyon</string>
<string name="use_osm_live_routing">OsmAnd Live navigasyon</string>
<string name="access_collapsed_list">Daraltılmış liste</string>
<string name="access_expanded_list">Genişletilmiş liste</string>
<string name="no_map_markers_found">Lütfen harita üzerinden harita işaretleyicileri ekleyin</string>
@ -3406,7 +3406,7 @@
<string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Navigasyon sırasında veya harekete halindeyken gösterilen simge.</string>
<string name="select_map_icon_descr">Dinlenme anında gösterilen simge.</string>
<string name="logcat_buffer_descr">Uygulamanın detaylı log kayıtlarını kontrol edin ve paylaşın</string>
<string name="logcat_buffer_descr">Uygulamanın detaylı log kayıtlarına göz atın ve paylaşın</string>
<string name="search_offline_geo_error">Geo intent \'%s\' ayrıştırılamadı.</string>
<string name="tracks_view_descr">Kayıtlı yollarınız %1$s veya OsmAnd klasöründe.</string>
<string name="multimedia_notes_view_descr">OSM notlarınız %1$s içindedir.</string>
@ -3535,8 +3535,8 @@
<string name="import_complete_description">%1$s\'deki tüm veriler içe aktarıldı, yönetmek amacıyla uygulamanın gerekli bölümünü açmak için aşağıdaki düğmeleri kullanabilirsiniz.</string>
<string name="shared_string_import_complete">İçe aktarma tamamlandı</string>
<string name="items_added">Eklenen ögeler</string>
<string name="checking_for_duplicate_description">OsmAns, uygulamadaki mevcut ögelerle yinelenme durumu için %1$s\'i kontrol ediyor.
\n
<string name="checking_for_duplicate_description">OsmAnd, uygulamadaki mevcut ögelerle yinelenme durumu için %1$s\'i denetliyor.
\n
\nBu biraz zaman alabilir.</string>
<string name="shared_string_importing">İçe aktarılıyor</string>
<string name="importing_from">Veriler %1$s\'den içe aktarılıyor</string>
@ -3566,10 +3566,10 @@
<string name="app_mode_ski_touring">Kayak turu</string>
<string name="app_mode_ski_snowmobile">Kar arabası</string>
<string name="custom_osmand_plugin">Özel OsmAnd eklentisi</string>
<string name="changes_applied_to_profile">%1$s profiline değişiklikler uygulandı.</string>
<string name="settings_item_read_error">%1$s okunamadı.</string>
<string name="settings_item_write_error">%1$s yazılamadı.</string>
<string name="settings_item_import_error">%1$s içe aktarılamadı.</string>
<string name="changes_applied_to_profile">\'%1$s\' profiline değişiklikler uygulandı.</string>
<string name="settings_item_read_error">\'%1$s\'den okunamadı.</string>
<string name="settings_item_write_error">\'%1$s\'e yazılamadı.</string>
<string name="settings_item_import_error">\'%1$s\'den içe aktarılamadı.</string>
<string name="select_track_file">İzlenen yol dosyasını seç</string>
<string name="shared_string_languages">Diller</string>
<string name="shared_string_language">Dil</string>
@ -3577,11 +3577,11 @@
<string name="wiki_menu_download_descr">Wikipedia POI\'lerini haritada görüntülemek için ek haritalara ihtiyaç vardır.</string>
<string name="ui_customization_short_descr">Çekmece ögeleri, içerik menüsü</string>
<string name="shared_string_drawer">Çekmece</string>
<string name="reset_items_descr">Gizlendikten sonra ayarlar orijinal durumuna sıfırlanacaktır.</string>
<string name="reset_items_descr">Ayarları gizlemek onları orijinal durumlarına sıfırlar.</string>
<string name="shared_string_items">Ögeler</string>
<string name="ui_customization_description">Çekmecedeki ögelerin sayısını özelleştirin, haritayı ve içerik menüsünü yapılandırın.
\n
\n%1$s uygulamasından tüm denetimlerini gizlemek için kullanılmayan eklentileri devre dışı bırakabilirsiniz.</string>
<string name="ui_customization_description">Çekmecedeki ögelerin sayısını özelleştirin, haritayı ve içerik menüsünü yapılandırın.
\n
\n%1$s uygulamasından tüm denetimlerini gizlemek için kullanılmayan eklentileri kapatabilirsiniz.</string>
<string name="ui_customization">Kullanıcı Arayüzü Özelleştirme</string>
<string name="context_menu_actions">İçerik menüsü eylemleri</string>
<string name="reorder_or_hide_from">%1$s\'den ögeleri yeniden sırala veya gizle.</string>
@ -3589,9 +3589,9 @@
<string name="divider_descr">Bu noktanın altındaki ögeler bir bölücü ile ayrılır.</string>
<string name="shared_string_hidden">Gizli</string>
<string name="hidden_items_descr">Bu ögeler menüden gizlenir, ancak temsil edilen seçenekler veya eklentiler çalışmaya devam eder.</string>
<string name="main_actions_descr">Ana eylemler sadece 4 düğme içerir.</string>
<string name="main_actions_descr">\'Ana eylemler\' sadece 4 düğme içerir.</string>
<string name="main_actions">Ana eylemler</string>
<string name="additional_actions_descr">Bu eylemlere “Eylemler” düğmesine dokunarak erişebilirsiniz.</string>
<string name="additional_actions_descr">Bu eylemlere “Ek eylemler” düğmesine dokunarak erişebilirsiniz.</string>
<string name="move_inside_category">Ögeleri yalnızca bu kategorinin içine taşıyabilirsiniz.</string>
<string name="developer_plugin">Geliştirici Eklentisi</string>
<string name="select_wikipedia_article_langs">Wikipedia makalelerinin haritada görüneceği dilleri seçin. Makaleyi okurken kullanılabilir bütün diller arasında geçiş yapabilirsiniz.</string>
@ -3627,9 +3627,21 @@
<string name="extra_maps_menu_group">Ekstra haritalar</string>
<string name="download_unsupported_action">Desteklenmeyen eylem %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">Ödeme, satın almayı onayladıktan sonra Google Play hesabınıza yansıtılacaktır.
\n
\nYenileme tarihinden önce iptal edilmediği sürece abonelik otomatik olarak yenilenir. Hesabınızdan yenileme süresi (ay/üç ay/yıl) için sadece yenileme tarihinde ücret alınacaktır.
\n
\nGoogle Play ayarlarınıza giderek aboneliklerinizi yönetebilir ve iptal edebilirsiniz.</string>
<string name="osm_live_payment_subscription_management">Google Play hesabınız bir abonelik satın aldıktan sonra ve süresi
\ndolduğunda (ay/üç ay/yıl) ücretlendirilir,
\nGoogle Play ayarlarınızdan daha önce iptal edilirse yenilenmeyecektir.</string>
<string name="search_poi_types">POI türleri ara</string>
<string name="search_poi_types_descr">Farklı kategorilerdeki POI türlerini birleştirin. Tümünü seçmek için düğmeye dokunun, kategori seçimi için sol tarafa dokunun.</string>
<string name="radius_ruler_item">Yarıçap cetveli</string>
<string name="tracker_item">OsmAnd izleyici</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="quick_action_item">Hızlı eylem</string>
<string name="measure_distance_item">Mesafe ölç</string>
<string name="travel_item">Seyahat (Wikivoyage ve Wikipedia)</string>
<string name="map_markers_item">Harita işaretleyicileri</string>
<string name="favorites_item">Sık kullanılanlar</string>
<string name="subscription_osmandlive_item">Abonelik - OsmAnd Live</string>
<string name="osmand_purchases_item">OsmAnd satın almaları</string>
<string name="legend_item_description">Bir haritadaki sembollerin rehberi</string>
<string name="navigation_profiles_item">Navigasyon profilleri</string>
</resources>

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

@ -1734,7 +1734,7 @@
<string name="faq_item">常見問題</string>
<string name="faq_item_description">常見的問題</string>
<string name="map_viewing_item">地圖檢視</string>
<string name="search_on_the_map_item">查詢地圖</string>
<string name="search_on_the_map_item">正在地圖上搜尋</string>
<string name="planning_trip_item">規劃一次旅程</string>
<string name="instalation_troubleshooting_item">安裝和疑難排除</string>
<string name="techical_articles_item">技術文章</string>
@ -3602,18 +3602,18 @@
<string name="app_mode_ski_snowmobile">雪地摩托車</string>
<string name="custom_osmand_plugin">自訂 OsmAnd 外掛程式</string>
<string name="replace_point_descr">以此取代另一點</string>
<string name="changes_applied_to_profile">變更已套用至 %1$s 設定檔。</string>
<string name="settings_item_read_error">無法讀取 %1$s。</string>
<string name="settings_item_write_error">無法寫入 %1$s。</string>
<string name="settings_item_import_error">無法匯入 %1$s。</string>
<string name="changes_applied_to_profile">變更已套用至「%1$s」設定檔。</string>
<string name="settings_item_read_error">無法從「%1$s」讀取。</string>
<string name="settings_item_write_error">無法寫入至「%1$s」。</string>
<string name="settings_item_import_error">無法從「%1$s」匯入。</string>
<string name="select_track_file">選取軌跡檔案</string>
<string name="shared_string_languages">語言</string>
<string name="shared_string_language">語言</string>
<string name="shared_string_all_languages">所有語言</string>
<string name="wiki_menu_download_descr">需要額外的地圖才能在地圖上檢視維基百科的 POI。</string>
<string name="ui_customization_description">在「抽屜」、「設定地圖」與情境選單中自訂項目數量。
\n
\n您可以停用未使用的外掛程式，以從應用程式 %1$s 中隱藏其控制元件。</string>
<string name="ui_customization_description">在「抽屜」、「設定地圖」與情境選單中自訂項目數量。
\n
\n您可以關閉未使用的外掛程式，以從應用程式 %1$s 中隱藏它們的控制元件。</string>
<string name="ui_customization_short_descr">抽屜項目，情境選單</string>
<string name="ui_customization">自訂使用者介面</string>
<string name="shared_string_drawer">抽屜</string>
@ -3623,10 +3623,10 @@
<string name="divider_descr">低於此點的元素將由分隔符分離。</string>
<string name="shared_string_hidden">已隱藏</string>
<string name="hidden_items_descr">這些項目已從選單隱藏，但對應的選項或外掛程式將會繼續運作。</string>
<string name="reset_items_descr">隱藏後，設定將會重設回原始狀態。</string>
<string name="reset_items_descr">隱藏設定將會把它們重設回原始狀態。</string>
<string name="main_actions_descr">主要動作僅包含 4 個按鈕。</string>
<string name="main_actions">主要動作</string>
<string name="additional_actions_descr">您可以透過輕點「動作」按鈕來存取這些動作。</string>
<string name="additional_actions_descr">您可以透過輕點「額外動作」按鈕來存取這些動作。</string>
<string name="move_inside_category">您只能在此分類中移動項目。</string>
<string name="developer_plugin">開發者外掛程式</string>
<string name="shared_string_items">項目</string>
@ -3663,9 +3663,21 @@
<string name="extra_maps_menu_group">額外地圖</string>
<string name="download_unsupported_action">不支援的動作 %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">確認購賣時，款項將會從您的 Google Play 帳號中扣除。
\n
\n除非您在續訂日期前取消，否則將會自動續訂。您的帳號將僅會在續訂日期前收取續訂週期的費用。
\n
\n您可以到您的 Google Play 設定管理與取消您的訂閱。</string>
<string name="osm_live_payment_subscription_management">購買訂閱時會從您的 Google Play 帳號扣款，
\n而過期時（一個月／三個月／一年），
\n若您在這之前於 Google Play 設定中取消的話就不會續訂。</string>
<string name="search_poi_types">搜尋 POI 類型</string>
<string name="search_poi_types_descr">組合來自不同分類的 POI 類型。點擊開關以全選，點擊左側選取分類。</string>
<string name="tracker_item">OsmAnd tracker</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="quick_action_item">快速動作</string>
<string name="radius_ruler_item">半徑尺規</string>
<string name="measure_distance_item">測量距離</string>
<string name="travel_item">旅行（維基導遊與維基百科）</string>
<string name="map_markers_item">地圖標記</string>
<string name="favorites_item">收藏</string>
<string name="subscription_osmandlive_item">訂閱 - OsmAnd Live</string>
<string name="osmand_purchases_item">OsmAnd 購買</string>
<string name="legend_item_description">地圖符號系統指南</string>
<string name="navigation_profiles_item">導航設定檔</string>
</resources>

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

@ -12,6 +12,7 @@
-->
<string name="navigation_profiles_item">Navigation profiles</string>
<string name="legend_item_description">The guide to a map\'s symbology</string>
<string name="osmand_purchases_item">OsmAnd purchases</string>
<string name="subscription_osmandlive_item">Subscription - OsmAnd Live</string>
<string name="favorites_item">Favorites</string>
@ -24,9 +25,9 @@
<string name="tracker_item">OsmAnd tracker</string>
<string name="download_unsupported_action">Unsupported action %1$s</string>
<string name="extra_maps_menu_group">Extra maps</string>
<string name="search_poi_types_descr">Combine POI types from different categories. Tap switch to select all, tap left side to category selection.</string>
<string name="search_poi_types">Search poi types</string>
<string name="osm_live_payment_subscription_management">Payment will be charged to your Google Play account at the confirmation of purchase.\n\nSubscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period(month/three month/year) only on the renewal date.\n\nYou can manage and cancel your subscriptions by going to your Google Play settings.</string>
<string name="search_poi_types_descr">Combine POI types from different categories. Tap \"Switch\" to select all, tap the left side for category selection.</string>
<string name="search_poi_types">Search for POI types</string>
<string name="osm_live_payment_subscription_management">Your Google Play account is charged upon purchase of a subscription\nand when it expires (month/three month/year),\nit will not renew itself if canceled before then from your Google Play settings.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="custom_color">Custom color</string>
<string name="lang_lmo">Lombard</string>
@ -57,16 +58,16 @@
<string name="lang_zhminnan">Southern Min</string>
<string name="lang_zhyue">Cantonese</string>
<string name="some_articles_may_not_available_in_lang">Some Wikipedia articles may not be available in your language.</string>
<string name="select_wikipedia_article_langs">Select the languages ​​in which Wikipedia articles will appear on the map. You can switch between all available languages ​​while reading the article.</string>
<string name="select_wikipedia_article_langs">Select the languages ​​in which Wikipedia articles will appear on the map. You can switch between all available languages​​ while reading the article.</string>
<string name="wiki_menu_download_descr">Additional maps are needed to view Wikipedia POIs on the map.</string>
<string name="shared_string_all_languages">All languages</string>
<string name="shared_string_language">Language</string>
<string name="shared_string_languages">Languages</string>
<string name="select_track_file">Select track file</string>
<string name="settings_item_import_error">Could not import %1$s.</string>
<string name="settings_item_write_error">Could not write %1$s.</string>
<string name="settings_item_read_error">Could not read %1$s.</string>
<string name="changes_applied_to_profile">Changes applied to %1$s profile.</string>
<string name="settings_item_import_error">Could not import from \'%1$s\'.</string>
<string name="settings_item_write_error">Could not write to \'%1$s\'.</string>
<string name="settings_item_read_error">Could not read from \'%1$s\'.</string>
<string name="changes_applied_to_profile">Changes applied to the \'%1$s\' profile.</string>
<string name="shared_string_items">Items</string>
<string name="custom_osmand_plugin">Custom OsmAnd plugin</string>
<string name="app_mode_ski_snowmobile">Snowmobile</string>
@ -74,11 +75,11 @@
<string name="replace_point_descr">Replace another point with this</string>
<string name="developer_plugin">Developer Plugin</string>
<string name="move_inside_category">You can move items only inside this category.</string>
<string name="additional_actions_descr">You can access these actions by tapping the “Actions” button.</string>
<string name="additional_actions_descr">You can access these actions by tapping the \"Additional actions\" button.</string>
<string name="main_actions">Main actions</string>
<string name="main_actions_descr">Main actions containt only 4 buttons.</string>
<string name="reset_items_descr">Settings will be reset to the original state after hiding.</string>
<string name="hidden_items_descr">These items are hidden from the menu, but the represented options or plugins will remain working.</string>
<string name="main_actions_descr">\'Main actions\' only contains 4 buttons.</string>
<string name="reset_items_descr">Hiding settings resets them to their original state.</string>
<string name="hidden_items_descr">These items are hidden from the menu, but the represented options or plugins will continue to work.</string>
<string name="shared_string_hidden">Hidden</string>
<string name="divider_descr">Elements below this point separated by a divider.</string>
<string name="shared_string_divider">Divider</string>
@ -87,7 +88,7 @@
<string name="shared_string_drawer">Drawer</string>
<string name="ui_customization">UI Customization</string>
<string name="ui_customization_short_descr">Drawer items, context menu</string>
<string name="ui_customization_description">Customize the quantity of items in Drawer, Configure map and context menu.\n\nYou can disable unused plugins, to hide all its controls from the application %1$s.</string>
<string name="ui_customization_description">Customize the quantity of items in Drawer, configure the map and context menu.\n\nYou can turn off unused plugins, to hide all their controls from the app %1$s.</string>
<string name="shared_string_min">Min</string>
<string name="shared_string_square">Square</string>
<string name="shared_string_octagon">Octagon</string>
@ -112,10 +113,10 @@
<string name="profile_backup_failed">Could not back up profile.</string>
<string name="importing_from">Importing data from %1$s</string>
<string name="shared_string_importing">Importing</string>
<string name="checking_for_duplicate_description">OsmAnd check %1$s for duplicates with existing items in the application.\n\nIt may take some time.</string>
<string name="checking_for_duplicate_description">OsmAnd check %1$s for duplicates with existing items in the app.\n\nIt may take some time.</string>
<string name="items_added">Items added</string>
<string name="shared_string_import_complete">Import complete</string>
<string name="import_complete_description">All data from the %1$s is imported, you can use buttons below to open needed part of the application to manage it.</string>
<string name="import_complete_description">All data from the %1$s is imported, you can use buttons below to open needed part of the app to manage it.</string>
<string name="shared_string_hillshade">Hillshade</string>
<string name="terrain_empty_state_text">Enable to view hillshade or slope map. You can read more about this map types on our site</string>
<string name="shared_string_legend">Legend</string>
@ -152,7 +153,7 @@
<string name="no_recalculation_setting">Disable recalculation</string>
<string name="open_settings">Open settings</string>
<string name="plugin_disabled">Plugin disabled</string>
<string name="plugin_disabled_descr">This plugin is a separate application, you will need to remove it separately if you no longer plan to use it.\n\nThe plugin will remain on the device after removing OsmAnd.</string>
<string name="plugin_disabled_descr">This plugin is a separate app, you will need to remove it separately if you no longer plan to use it.\n\nThe plugin will remain on the device after removing OsmAnd.</string>
<string name="shared_string_menu">Menu</string>
<string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
<string name="route_recalculation_dist_title">Minimal distance to recalculate route</string>
@ -195,7 +196,7 @@
<string name="import_profile_dialog_description">The imported profile contains additional data. Click Import to import only profile data or select additional data to import.</string>
<string name="export_profile_dialog_description">You can select additional data to export along with the profile.</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="logcat_buffer_descr">Check and share detailed logs of the app</string>
<string name="file_does_not_contain_routing_rules">No routing rules in \'%1$s\'. Please choose another file.</string>
<string name="not_support_file_type_with_ext">Select a supported %1$s extension file instead.</string>
<string name="monitoring_min_speed_descr">This is a low-speed cut-off filter to not record points below a certain speed. This may make recorded tracks look "smoother" when viewed on the map.</string>

8
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -14,6 +14,8 @@ import android.content.res.Resources;
import android.os.AsyncTask;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import net.osmand.AndroidUtils;
@ -617,7 +619,7 @@ public class AppInitializer implements IProgress {
});
}
public static void loadRoutingFiles(final OsmandApplication app, final LoadRoutingFilesCallback callback) {
public static void loadRoutingFiles(@NonNull final OsmandApplication app, @Nullable final LoadRoutingFilesCallback callback) {
new AsyncTask<Void, Void, Map<String, RoutingConfiguration.Builder>>() {
@Override
@ -653,7 +655,9 @@ public class AppInitializer implements IProgress {
app.getCustomRoutingConfigs().putAll(customConfigs);
}
app.avoidSpecificRoads.initRouteObjects(false);
callback.onRoutingFilesLoaded();
if (callback != null) {
callback.onRoutingFilesLoaded();
}
}
private Map<String, String> getDefaultAttributes() {

25
OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java
View file

@ -14,7 +14,6 @@ import net.osmand.JsonUtils;
import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
import net.osmand.map.ITileSource;
import net.osmand.map.TileSourceManager;
import net.osmand.map.WorldRegion;
import net.osmand.plus.SettingsHelper.AvoidRoadsSettingsItem;
import net.osmand.plus.SettingsHelper.MapSourcesSettingsItem;
@ -45,6 +44,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@ -265,17 +265,20 @@ public class CustomOsmandPlugin extends OsmandPlugin {
List<ITileSource> mapSources = mapSourcesSettingsItem.getItems();
for (ITileSource tileSource : mapSources) {
if (tileSource instanceof TileSourceManager.TileSourceTemplate) {
TileSourceManager.TileSourceTemplate sourceTemplate = (TileSourceManager.TileSourceTemplate) tileSource;
File tPath = app.getAppPath(IndexConstants.TILES_INDEX_DIR);
File dir = new File(tPath, sourceTemplate.getName());
Algorithms.removeAllFiles(dir);
} else if (tileSource instanceof SQLiteTileSource) {
SQLiteTileSource sqLiteTileSource = ((SQLiteTileSource) tileSource);
sqLiteTileSource.closeDB();
String tileSourceName = tileSource.getName();
if (tileSource instanceof SQLiteTileSource) {
tileSourceName += SQLITE_EXT;
}
ITileSource savedTileSource = app.getSettings().getTileSourceByName(tileSourceName, false);
if (savedTileSource != null) {
if (savedTileSource instanceof SQLiteTileSource) {
SQLiteTileSource sqLiteTileSource = ((SQLiteTileSource) savedTileSource);
sqLiteTileSource.closeDB();
}
File tPath = app.getAppPath(IndexConstants.TILES_INDEX_DIR);
File dir = new File(tPath, sqLiteTileSource.getName() + SQLITE_EXT);
File dir = new File(tPath, tileSourceName);
Algorithms.removeAllFiles(dir);
}
}
@ -368,7 +371,7 @@ public class CustomOsmandPlugin extends OsmandPlugin {
public static List<CustomRegion> collectRegionsFromJson(@NonNull Context ctx, JSONArray jsonArray) throws JSONException {
List<CustomRegion> customRegions = new ArrayList<>();
Map<String, CustomRegion> flatRegions = new HashMap<>();
Map<String, CustomRegion> flatRegions = new LinkedHashMap<>();
for (int i = 0; i < jsonArray.length(); i++) {
JSONObject regionJson = jsonArray.getJSONObject(i);
CustomRegion region = CustomRegion.fromJson(ctx, regionJson);

23
OsmAnd/src/net/osmand/plus/CustomRegion.java
View file

@ -32,6 +32,8 @@ import java.util.Map;
public class CustomRegion extends WorldRegion {
public static final int INVALID_ID = -1;
private static final Log LOG = PlatformUtil.getLog(CustomRegion.class);
private String scopeId;
@ -51,7 +53,7 @@ public class CustomRegion extends WorldRegion {
private Map<String, String> icons = new HashMap<>();
private Map<String, String> headers = new HashMap<>();
private int headerColor = -1;
private int headerColor = INVALID_ID;
private CustomRegion(String scopeId, String path, String type) {
@ -75,6 +77,11 @@ public class CustomRegion extends WorldRegion {
@ColorInt
public int getHeaderColor() {
if (headerColor != INVALID_ID) {
return headerColor;
} else if (superregion instanceof CustomRegion) {
return ((CustomRegion) superregion).getHeaderColor();
}
return headerColor;
}
@ -83,6 +90,10 @@ public class CustomRegion extends WorldRegion {
return descriptionInfo;
}
public String getIconName(Context ctx) {
return JsonUtils.getLocalizedResFromMap(ctx, icons, null);
}
public static CustomRegion fromJson(@NonNull Context ctx, JSONObject object) throws JSONException {
String scopeId = object.optString("scope-id", null);
String path = object.optString("path", null);
@ -117,9 +128,9 @@ public class CustomRegion extends WorldRegion {
String headerColor = object.optString("header-color", null);
try {
region.headerColor = Algorithms.isEmpty(headerColor) ? 0 : Algorithms.parseColor(headerColor);
region.headerColor = Algorithms.isEmpty(headerColor) ? INVALID_ID : Algorithms.parseColor(headerColor);
} catch (IllegalArgumentException e) {
region.headerColor = 0;
region.headerColor = INVALID_ID;
}
region.descriptionInfo = DownloadDescriptionInfo.fromJson(object.optJSONObject("description"));
@ -138,6 +149,9 @@ public class CustomRegion extends WorldRegion {
JsonUtils.writeLocalizedMapToJson("icon", jsonObject, icons);
JsonUtils.writeLocalizedMapToJson("header", jsonObject, headers);
if (headerColor != INVALID_ID) {
jsonObject.putOpt("header-color", Algorithms.colorToString(headerColor));
}
if (descriptionInfo != null) {
jsonObject.putOpt("description", descriptionInfo.toJson());
}
@ -216,6 +230,7 @@ public class CustomRegion extends WorldRegion {
if ("json".equalsIgnoreCase(dynamicDownloadItems.format)) {
dynamicItemsJson = mapJsonItems(result);
}
app.getDownloadThread().runReloadIndexFilesSilent();
}
}
};
@ -259,7 +274,7 @@ public class CustomRegion extends WorldRegion {
if (value instanceof String) {
String key = (String) value;
int index = key.indexOf("@");
if (index != -1) {
if (index != INVALID_ID) {
key = key.substring(index + 1);
}
return json.opt(key);

3
OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
View file

@ -92,7 +92,7 @@ public class SQLiteTileSource implements ITileSource {
public SQLiteTileSource(OsmandApplication ctx, String name, int minZoom, int maxZoom, String urlTemplate,
String randoms, boolean isEllipsoid, boolean invertedY, String referer,
boolean timeSupported, long expirationTimeMillis, boolean inversiveZoom) {
boolean timeSupported, long expirationTimeMillis, boolean inversiveZoom, String rule) {
this.ctx = ctx;
this.name = name;
this.urlTemplate = urlTemplate;
@ -102,6 +102,7 @@ public class SQLiteTileSource implements ITileSource {
this.expirationTimeMillis = expirationTimeMillis;
this.randoms = randoms;
this.referer = referer;
this.rule = rule;
this.invertedY = invertedY;
this.timeSupported = timeSupported;
this.inversiveZoom = inversiveZoom;

23
OsmAnd/src/net/osmand/plus/SettingsHelper.java
View file

@ -16,6 +16,7 @@ import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
import net.osmand.map.ITileSource;
import net.osmand.map.TileSourceManager;
import net.osmand.map.TileSourceManager.TileSourceTemplate;
import net.osmand.map.WorldRegion;
import net.osmand.osm.MapPoiTypes;
import net.osmand.osm.PoiCategory;
@ -2005,8 +2006,8 @@ public class SettingsHelper {
boolean ellipsoid = object.optBoolean("ellipsoid", false);
boolean invertedY = object.optBoolean("inverted_y", false);
String referer = object.optString("referer");
boolean timesupported = object.optBoolean("timesupported", false);
long expire = object.optLong("expire");
boolean timeSupported = object.optBoolean("timesupported", false);
long expire = object.optLong("expire", -1);
boolean inversiveZoom = object.optBoolean("inversiveZoom", false);
String ext = object.optString("ext");
int tileSize = object.optInt("tileSize");
@ -2014,11 +2015,23 @@ public class SettingsHelper {
int avgSize = object.optInt("avgSize");
String rule = object.optString("rule");
if (expire > 0 && expire < 3600000) {
expire = expire * 60 * 1000L;
}
ITileSource template;
if (!sql) {
template = new TileSourceManager.TileSourceTemplate(name, url, ext, maxZoom, minZoom, tileSize, bitDensity, avgSize);
TileSourceTemplate tileSourceTemplate = new TileSourceTemplate(name, url, ext, maxZoom, minZoom, tileSize, bitDensity, avgSize);
tileSourceTemplate.setRule(rule);
tileSourceTemplate.setRandoms(randoms);
tileSourceTemplate.setReferer(referer);
tileSourceTemplate.setEllipticYTile(ellipsoid);
tileSourceTemplate.setInvertedYTile(invertedY);
tileSourceTemplate.setExpirationTimeMillis(timeSupported ? expire : -1);
template = tileSourceTemplate;
} else {
template = new SQLiteTileSource(app, name, minZoom, maxZoom, url, randoms, ellipsoid, invertedY, referer, timesupported, expire, inversiveZoom);
template = new SQLiteTileSource(app, name, minZoom, maxZoom, url, randoms, ellipsoid, invertedY, referer, timeSupported, expire, inversiveZoom, rule);
}
items.add(template);
}
@ -2046,7 +2059,7 @@ public class SettingsHelper {
jsonObject.put("inverted_y", template.isInvertedYTile());
jsonObject.put("referer", template.getReferer());
jsonObject.put("timesupported", template.isTimeSupported());
jsonObject.put("expire", template.getExpirationTimeMillis());
jsonObject.put("expire", template.getExpirationTimeMinutes());
jsonObject.put("inversiveZoom", template.getInversiveZoom());
jsonObject.put("ext", template.getTileFormat());
jsonObject.put("tileSize", template.getTileSize());

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

@ -100,7 +100,7 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
contextMenuAdapter.addItem(createItem(R.string.faq_item,
R.string.faq_item_description, "feature_articles/faq.html"));
contextMenuAdapter.addItem(createItem(R.string.map_legend,
R.string.faq_item_description, "feature_articles/map-legend.html"));
R.string.legend_item_description, "feature_articles/map-legend.html"));
}
private void createSocialNetworksItems(ContextMenuAdapter contextMenuAdapter) {

81
OsmAnd/src/net/osmand/plus/download/ui/DownloadGroupViewHolder.java
View file

@ -4,18 +4,25 @@ import android.graphics.drawable.Drawable;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.DrawableRes;
import net.osmand.AndroidUtils;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.CustomRegion;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.DownloadResourceGroup;
import net.osmand.plus.download.DownloadResourceGroup.DownloadResourceGroupType;
import net.osmand.plus.download.IndexItem;
public class DownloadGroupViewHolder {
TextView textView;
private DownloadActivity ctx;
private TextView textView;
public DownloadGroupViewHolder(DownloadActivity ctx, View v) {
this.ctx = ctx;
textView = (TextView) v.findViewById(R.id.title);
@ -23,52 +30,64 @@ public class DownloadGroupViewHolder {
private boolean isParentWorld(DownloadResourceGroup group) {
return group.getParentGroup() == null
|| group.getParentGroup().getType() == DownloadResourceGroup.DownloadResourceGroupType.WORLD;
|| group.getParentGroup().getType() == DownloadResourceGroupType.WORLD;
}
private Drawable getIconForGroup(DownloadResourceGroup group) {
Drawable iconStart;
if (group.getType() == DownloadResourceGroup.DownloadResourceGroupType.VOICE_REC
|| group.getType() == DownloadResourceGroup.DownloadResourceGroupType.VOICE_TTS) {
iconStart = ctx.getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_volume_up);
} else if (group.getType() == DownloadResourceGroup.DownloadResourceGroupType.FONTS) {
iconStart = ctx.getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_map_language);
OsmandApplication app = ctx.getMyApplication();
UiUtilities cache = app.getUIUtilities();
if (group.getType() == DownloadResourceGroupType.VOICE_REC
|| group.getType() == DownloadResourceGroupType.VOICE_TTS) {
iconStart = cache.getThemedIcon(R.drawable.ic_action_volume_up);
} else if (group.getType() == DownloadResourceGroupType.FONTS) {
iconStart = cache.getThemedIcon(R.drawable.ic_action_map_language);
} else {
UiUtilities cache = ctx.getMyApplication().getUIUtilities();
if (group.getRegion() instanceof CustomRegion) {
String iconName = ((CustomRegion) group.getRegion()).getIconName(ctx);
int iconId = AndroidUtils.getDrawableId(app, iconName);
if (iconId != 0) {
iconStart = getIconForDownloadedItems(group, iconId);
return iconStart != null ? iconStart : cache.getThemedIcon(iconId);
}
}
if (isParentWorld(group) || isParentWorld(group.getParentGroup())) {
iconStart = cache.getThemedIcon(R.drawable.ic_world_globe_dark);
} else {
DownloadResourceGroup ggr = group
.getSubGroupById(DownloadResourceGroup.DownloadResourceGroupType.REGION_MAPS.getDefaultId());
iconStart = cache.getThemedIcon(R.drawable.ic_map);
if (ggr != null && ggr.getIndividualResources() != null) {
IndexItem item = null;
for (IndexItem ii : ggr.getIndividualResources()) {
if (ii.getType() == DownloadActivityType.NORMAL_FILE
|| ii.getType() == DownloadActivityType.ROADS_FILE) {
if (ii.isDownloaded() || ii.isOutdated()) {
item = ii;
break;
}
}
}
if (item != null) {
if (item.isOutdated()) {
iconStart = cache.getIcon(R.drawable.ic_map, R.color.color_distance);
} else {
iconStart = cache.getIcon(R.drawable.ic_map, R.color.color_ok);
}
}
iconStart = getIconForDownloadedItems(group, R.drawable.ic_map);
if (iconStart == null) {
iconStart = cache.getThemedIcon(R.drawable.ic_map);
}
}
}
return iconStart;
}
private Drawable getIconForDownloadedItems(DownloadResourceGroup group, @DrawableRes int iconId) {
DownloadResourceGroup ggr = group.getSubGroupById(DownloadResourceGroupType.REGION_MAPS.getDefaultId());
if (ggr != null && ggr.getIndividualResources() != null) {
IndexItem item = null;
for (IndexItem ii : ggr.getIndividualResources()) {
if (ii.getType() == DownloadActivityType.NORMAL_FILE
|| ii.getType() == DownloadActivityType.ROADS_FILE) {
if (ii.isDownloaded() || ii.isOutdated()) {
item = ii;
break;
}
}
}
if (item != null) {
int color = item.isOutdated() ? R.color.color_distance : R.color.color_ok;
return ctx.getMyApplication().getUIUtilities().getIcon(iconId, color);
}
}
return null;
}
public void bindItem(DownloadResourceGroup group) {
String name = group.getName(ctx);
textView.setText(name);
Drawable iconStart = getIconForGroup(group);
AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(textView, iconStart, null, null, null);
}
}
}

9
OsmAnd/src/net/osmand/plus/download/ui/DownloadItemFragment.java
View file

@ -19,6 +19,8 @@ import androidx.fragment.app.DialogFragment;
import androidx.viewpager.widget.ViewPager;
import net.osmand.AndroidUtils;
import net.osmand.map.WorldRegion;
import net.osmand.plus.CustomRegion;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
@ -161,6 +163,13 @@ public class DownloadItemFragment extends DialogFragment implements DownloadEven
updateActionButtons(activity, descriptionInfo, indexItem, buttonsContainer, R.layout.bottom_buttons, nightMode);
}
}
WorldRegion region = group.getParentGroup().getRegion();
if (region instanceof CustomRegion) {
int headerColor = ((CustomRegion) region).getHeaderColor();
if (headerColor != CustomRegion.INVALID_ID) {
toolbar.setBackgroundColor(headerColor);
}
}
}
static void updateActionButtons(final DownloadActivity ctx, DownloadDescriptionInfo descriptionInfo,

157
OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupAdapter.java Normal file
View file

@ -0,0 +1,157 @@
package net.osmand.plus.download.ui;
import android.content.res.Resources;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import net.osmand.plus.R;
import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
import net.osmand.plus.download.CustomIndexItem;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadResourceGroup;
import net.osmand.plus.download.IndexItem;
import java.util.ArrayList;
import java.util.List;
public class DownloadResourceGroupAdapter extends OsmandBaseExpandableListAdapter {
private List<DownloadResourceGroup> data = new ArrayList<DownloadResourceGroup>();
private DownloadActivity ctx;
private DownloadResourceGroup mainGroup;
public DownloadResourceGroupAdapter(DownloadActivity ctx) {
this.ctx = ctx;
}
public void update(DownloadResourceGroup mainGroup) {
this.mainGroup = mainGroup;
data = mainGroup.getGroups();
notifyDataSetChanged();
}
@Override
public Object getChild(int groupPosition, int childPosition) {
DownloadResourceGroup drg = data.get(groupPosition);
if (drg.getType().containsIndexItem()) {
return drg.getItemByIndex(childPosition);
}
return drg.getGroupByIndex(childPosition);
}
@Override
public long getChildId(int groupPosition, int childPosition) {
return groupPosition * 10000 + childPosition;
}
@Override
public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
View convertView, ViewGroup parent) {
final Object child = getChild(groupPosition, childPosition);
if (child instanceof IndexItem) {
IndexItem item = (IndexItem) child;
DownloadResourceGroup group = getGroupObj(groupPosition);
ItemViewHolder viewHolder;
if (convertView != null && convertView.getTag() instanceof ItemViewHolder) {
viewHolder = (ItemViewHolder) convertView.getTag();
} else {
convertView = LayoutInflater.from(parent.getContext()).inflate(
R.layout.two_line_with_images_list_item, parent, false);
viewHolder = new ItemViewHolder(convertView, ctx);
viewHolder.setShowRemoteDate(true);
convertView.setTag(viewHolder);
}
if (mainGroup.getType() == DownloadResourceGroup.DownloadResourceGroupType.REGION &&
group != null && group.getType() == DownloadResourceGroup.DownloadResourceGroupType.REGION_MAPS
&& !(item instanceof CustomIndexItem)) {
viewHolder.setShowTypeInName(true);
viewHolder.setShowTypeInDesc(false);
} else if (group != null && (group.getType() == DownloadResourceGroup.DownloadResourceGroupType.SRTM_HEADER
|| group.getType() == DownloadResourceGroup.DownloadResourceGroupType.HILLSHADE_HEADER)) {
viewHolder.setShowTypeInName(false);
viewHolder.setShowTypeInDesc(false);
} else {
viewHolder.setShowTypeInDesc(true);
}
viewHolder.bindIndexItem(item);
} else {
DownloadResourceGroup group = (DownloadResourceGroup) child;
DownloadGroupViewHolder viewHolder;
if (convertView != null && convertView.getTag() instanceof DownloadGroupViewHolder) {
viewHolder = (DownloadGroupViewHolder) convertView.getTag();
} else {
convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.simple_list_menu_item,
parent, false);
viewHolder = new DownloadGroupViewHolder(ctx, convertView);
convertView.setTag(viewHolder);
}
viewHolder.bindItem(group);
}
return convertView;
}
@Override
public View getGroupView(int groupPosition, boolean isExpanded, final View convertView, final ViewGroup parent) {
View v = convertView;
String section = getGroup(groupPosition);
if (v == null) {
LayoutInflater inflater = LayoutInflater.from(ctx);
v = inflater.inflate(R.layout.download_item_list_section, parent, false);
}
TextView nameView = ((TextView) v.findViewById(R.id.title));
nameView.setText(section);
v.setOnClickListener(null);
TypedValue typedValue = new TypedValue();
Resources.Theme theme = ctx.getTheme();
theme.resolveAttribute(R.attr.activity_background_color, typedValue, true);
v.setBackgroundColor(typedValue.data);
return v;
}
@Override
public int getChildrenCount(int groupPosition) {
return data.get(groupPosition).size();
}
public DownloadResourceGroup getGroupObj(int groupPosition) {
return data.get(groupPosition);
}
@Override
public String getGroup(int groupPosition) {
DownloadResourceGroup drg = data.get(groupPosition);
int rid = drg.getType().getResourceId();
if (rid != -1) {
return ctx.getString(rid);
}
return "";
}
@Override
public int getGroupCount() {
return data.size();
}
@Override
public long getGroupId(int groupPosition) {
return groupPosition;
}
@Override
public boolean hasStableIds() {
return false;
}
@Override
public boolean isChildSelectable(int groupPosition, int childPosition) {
return true;
}
}

219
OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java
View file

@ -3,11 +3,9 @@ package net.osmand.plus.download.ui;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -28,19 +26,17 @@ import androidx.fragment.app.DialogFragment;
import net.osmand.AndroidNetworkUtils;
import net.osmand.AndroidUtils;
import net.osmand.map.WorldRegion;
import net.osmand.plus.CustomRegion;
import net.osmand.plus.LockableViewPager;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
import net.osmand.plus.download.CustomIndexItem;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadActivity.BannerAndDownloadFreeVersion;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
import net.osmand.plus.download.DownloadResourceGroup;
import net.osmand.plus.download.DownloadResourceGroup.DownloadResourceGroupType;
import net.osmand.plus.download.DownloadResources;
import net.osmand.plus.download.DownloadValidationManager;
import net.osmand.plus.download.IndexItem;
@ -53,9 +49,7 @@ import org.json.JSONException;
import org.json.JSONObject;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static net.osmand.plus.download.ui.DownloadItemFragment.updateActionButtons;
@ -438,6 +432,13 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow
if (group != null) {
listAdapter.update(group);
toolbar.setTitle(group.getName(activity));
WorldRegion region = group.getRegion();
if (region instanceof CustomRegion) {
int headerColor = ((CustomRegion) region).getHeaderColor();
if (headerColor != CustomRegion.INVALID_ID) {
toolbar.setBackgroundColor(headerColor);
}
}
}
expandAllGroups();
}
@ -565,208 +566,4 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow
fragment.setArguments(bundle);
return fragment;
}
private static class DownloadGroupViewHolder {
TextView textView;
private DownloadActivity ctx;
public DownloadGroupViewHolder(DownloadActivity ctx, View v) {
this.ctx = ctx;
textView = (TextView) v.findViewById(R.id.title);
}
private boolean isParentWorld(DownloadResourceGroup group) {
return group.getParentGroup() == null
|| group.getParentGroup().getType() == DownloadResourceGroupType.WORLD;
}
private Drawable getIconForGroup(DownloadResourceGroup group) {
Drawable iconStart;
if (group.getType() == DownloadResourceGroupType.VOICE_REC
|| group.getType() == DownloadResourceGroupType.VOICE_TTS) {
iconStart = ctx.getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_volume_up);
} else if (group.getType() == DownloadResourceGroupType.FONTS) {
iconStart = ctx.getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_map_language);
} else {
UiUtilities cache = ctx.getMyApplication().getUIUtilities();
if (isParentWorld(group) || isParentWorld(group.getParentGroup())) {
iconStart = cache.getThemedIcon(R.drawable.ic_world_globe_dark);
} else {
DownloadResourceGroup ggr = group
.getSubGroupById(DownloadResourceGroupType.REGION_MAPS.getDefaultId());
iconStart = cache.getThemedIcon(R.drawable.ic_map);
if (ggr != null && ggr.getIndividualResources() != null) {
IndexItem item = null;
for (IndexItem ii : ggr.getIndividualResources()) {
if (ii.getType() == DownloadActivityType.NORMAL_FILE
|| ii.getType() == DownloadActivityType.ROADS_FILE) {
if (ii.isDownloaded() || ii.isOutdated()) {
item = ii;
break;
}
}
}
if (item != null) {
if (item.isOutdated()) {
iconStart = cache.getIcon(R.drawable.ic_map, R.color.color_distance);
} else {
iconStart = cache.getIcon(R.drawable.ic_map, R.color.color_ok);
}
}
}
}
}
return iconStart;
}
public void bindItem(DownloadResourceGroup group) {
String name = group.getName(ctx);
textView.setText(name);
Drawable iconStart = getIconForGroup(group);
AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(textView, iconStart, null, null, null);
}
}
public static class DownloadResourceGroupAdapter extends OsmandBaseExpandableListAdapter {
private List<DownloadResourceGroup> data = new ArrayList<DownloadResourceGroup>();
private DownloadActivity ctx;
private DownloadResourceGroup mainGroup;
public DownloadResourceGroupAdapter(DownloadActivity ctx) {
this.ctx = ctx;
}
public void update(DownloadResourceGroup mainGroup) {
this.mainGroup = mainGroup;
data = mainGroup.getGroups();
notifyDataSetChanged();
}
@Override
public Object getChild(int groupPosition, int childPosition) {
DownloadResourceGroup drg = data.get(groupPosition);
if (drg.getType().containsIndexItem()) {
return drg.getItemByIndex(childPosition);
}
return drg.getGroupByIndex(childPosition);
}
@Override
public long getChildId(int groupPosition, int childPosition) {
return groupPosition * 10000 + childPosition;
}
@Override
public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
View convertView, ViewGroup parent) {
final Object child = getChild(groupPosition, childPosition);
if (child instanceof IndexItem) {
IndexItem item = (IndexItem) child;
DownloadResourceGroup group = getGroupObj(groupPosition);
ItemViewHolder viewHolder;
if (convertView != null && convertView.getTag() instanceof ItemViewHolder) {
viewHolder = (ItemViewHolder) convertView.getTag();
} else {
convertView = LayoutInflater.from(parent.getContext()).inflate(
R.layout.two_line_with_images_list_item, parent, false);
viewHolder = new ItemViewHolder(convertView, ctx);
viewHolder.setShowRemoteDate(true);
convertView.setTag(viewHolder);
}
if (mainGroup.getType() == DownloadResourceGroupType.REGION &&
group != null && group.getType() == DownloadResourceGroupType.REGION_MAPS
&& !(item instanceof CustomIndexItem)) {
viewHolder.setShowTypeInName(true);
viewHolder.setShowTypeInDesc(false);
} else if (group != null && (group.getType() == DownloadResourceGroupType.SRTM_HEADER
|| group.getType() == DownloadResourceGroupType.HILLSHADE_HEADER)) {
viewHolder.setShowTypeInName(false);
viewHolder.setShowTypeInDesc(false);
} else {
viewHolder.setShowTypeInDesc(true);
}
viewHolder.bindIndexItem(item);
} else {
DownloadResourceGroup group = (DownloadResourceGroup) child;
DownloadGroupViewHolder viewHolder;
if (convertView != null && convertView.getTag() instanceof DownloadGroupViewHolder) {
viewHolder = (DownloadGroupViewHolder) convertView.getTag();
} else {
convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.simple_list_menu_item,
parent, false);
viewHolder = new DownloadGroupViewHolder(ctx, convertView);
convertView.setTag(viewHolder);
}
viewHolder.bindItem(group);
}
return convertView;
}
@Override
public View getGroupView(int groupPosition, boolean isExpanded, final View convertView, final ViewGroup parent) {
View v = convertView;
String section = getGroup(groupPosition);
if (v == null) {
LayoutInflater inflater = LayoutInflater.from(ctx);
v = inflater.inflate(R.layout.download_item_list_section, parent, false);
}
TextView nameView = ((TextView) v.findViewById(R.id.title));
nameView.setText(section);
v.setOnClickListener(null);
TypedValue typedValue = new TypedValue();
Resources.Theme theme = ctx.getTheme();
theme.resolveAttribute(R.attr.activity_background_color, typedValue, true);
v.setBackgroundColor(typedValue.data);
return v;
}
@Override
public int getChildrenCount(int groupPosition) {
return data.get(groupPosition).size();
}
public DownloadResourceGroup getGroupObj(int groupPosition) {
return data.get(groupPosition);
}
@Override
public String getGroup(int groupPosition) {
DownloadResourceGroup drg = data.get(groupPosition);
int rid = drg.getType().getResourceId();
if (rid != -1) {
return ctx.getString(rid);
}
return "";
}
@Override
public int getGroupCount() {
return data.size();
}
@Override
public long getGroupId(int groupPosition) {
return groupPosition;
}
@Override
public boolean hasStableIds() {
return false;
}
@Override
public boolean isChildSelectable(int groupPosition, int childPosition) {
return true;
}
}
}

6
OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
View file

@ -854,6 +854,12 @@ public class ImportHelper {
if (!Algorithms.isEmpty(plugin.getDownloadMaps())) {
app.getDownloadThread().runReloadIndexFilesSilent();
}
if (!Algorithms.isEmpty(plugin.getRendererNames())) {
app.getRendererRegistry().updateExternalRenderers();
}
if (!Algorithms.isEmpty(plugin.getRouterNames())) {
loadRoutingFiles(app, null);
}
if (activity != null) {
plugin.onInstall(app, activity);
}

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
View file

@ -1079,7 +1079,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
LatLon latLon = getLatLon();
return mapActivity.getMapActions().getContextMenuItemClickListener(latLon.getLatitude(), latLon.getLatitude(), menuAdapter);
return mapActivity.getMapActions().getContextMenuItemClickListener(latLon.getLatitude(), latLon.getLongitude(), menuAdapter);
}
return null;
}

3
OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
View file

@ -467,6 +467,9 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
if (entity != null) {
if (!isWay && entity instanceof Node) {
// check whether this is node (because id of node could be the same as relation)
if (object instanceof NativeLibrary.RenderedObject && object.getLocation() == null) {
object.setLocation(((NativeLibrary.RenderedObject) object).getLabelLatLon());
}
if (MapUtils.getDistance(entity.getLatLon(), object.getLocation()) < 50) {
if (object instanceof Amenity) {
return replaceEditOsmTags((Amenity) object, entity);

82
OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java
View file

@ -162,11 +162,10 @@ public class OsmandRenderer {
return dashEffect.get(dashes);
}
public Shader getShader(String resId){
if(shaders.get(resId) == null){
public Shader getShader(String resId) {
if (shaders.get(resId) == null) {
Bitmap bmp = RenderingIcons.getIcon(context, resId, true);
if(bmp != null){
if (bmp != null) {
Shader sh = new BitmapShader(bmp, TileMode.REPEAT, TileMode.REPEAT);
shaders.put(resId, sh);
} else {
@ -326,17 +325,17 @@ public class OsmandRenderer {
bounds.inset(-bounds.width()/4, -bounds.height()/4);
QuadTree<RectF> boundIntersections = new QuadTree<RectF>(bounds, 4, 0.6f);
List<RectF> result = new ArrayList<RectF>();
for (IconDrawInfo icon : rc.iconsToDraw) {
if (icon.resId != null) {
Bitmap ico = RenderingIcons.getIcon(context, icon.resId, true);
Drawable ico = RenderingIcons.getDrawableIcon(context, icon.resId, true);
if (ico != null) {
if (icon.y >= 0 && icon.y < rc.height && icon.x >= 0 && icon.x < rc.width) {
int visbleWidth = icon.iconSize >= 0 ? (int) icon.iconSize : ico.getWidth();
int visbleHeight = icon.iconSize >= 0 ? (int) icon.iconSize : ico.getHeight();
int visbleWidth = icon.iconSize >= 0 ? (int) icon.iconSize : ico.getIntrinsicWidth();
int visbleHeight = icon.iconSize >= 0 ? (int) icon.iconSize : ico.getIntrinsicHeight();
boolean intersects = false;
float coeff = rc.getDensityValue(rc.screenDensityRatio * rc.textScale);
RectF rf = calculateRect(rc, icon, ico.getWidth(), ico.getHeight());
RectF rf = calculateRect(rc, icon, ico.getIntrinsicWidth(), ico.getIntrinsicHeight());
RectF visibleRect = null;
if (visbleHeight > 0 && visbleWidth > 0) {
visibleRect = calculateRect(rc, icon, visbleWidth, visbleHeight);
@ -350,37 +349,29 @@ public class OsmandRenderer {
}
if (!intersects) {
Bitmap shield = icon.shieldId == null ? null : RenderingIcons.getIcon(context, icon.shieldId, true);
if(shield != null) {
RectF shieldRf = calculateRect(rc, icon, shield.getWidth(), shield.getHeight());
if (coeff != 1f) {
Rect src = new Rect(0, 0, shield.getWidth(), shield.getHeight());
drawBitmap(cv, shield, shieldRf, src);
} else {
drawBitmap(cv, shield, shieldRf);
}
Drawable shield = icon.shieldId == null ? null : RenderingIcons.getDrawableIcon(context, icon.shieldId, true);
boolean fillRect = coeff != 1f;
if (shield != null) {
cv.save();
RectF shieldRf = calculateRect(rc, icon, shield.getIntrinsicWidth(), shield.getIntrinsicHeight());
cv.translate(shieldRf.left, shieldRf.top);
draw(cv, shield, shieldRf, fillRect);
cv.restore();
}
if (coeff != 1f) {
Rect src = new Rect(0, 0, ico.getWidth(), ico.getHeight());
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId_1, true), rf, src);
drawBitmap(cv, ico, rf, src);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId2, true), rf, src);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId3, true), rf, src);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId4, true), rf, src);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId5, true), rf, src);
} else {
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId_1, true), rf);
drawBitmap(cv, ico, rf);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId2, true), rf);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId3, true), rf);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId4, true), rf);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId5, true), rf);
}
if(visibleRect != null) {
cv.save();
cv.translate(rf.left, rf.top);
draw(cv, RenderingIcons.getDrawableIcon(context, icon.resId_1, true), rf, fillRect);
draw(cv, ico, rf, fillRect);
draw(cv, RenderingIcons.getDrawableIcon(context, icon.resId2, true), rf, fillRect);
draw(cv, RenderingIcons.getDrawableIcon(context, icon.resId3, true), rf, fillRect);
draw(cv, RenderingIcons.getDrawableIcon(context, icon.resId4, true), rf, fillRect);
draw(cv, RenderingIcons.getDrawableIcon(context, icon.resId5, true), rf, fillRect);
if (visibleRect != null) {
visibleRect.inset(-visibleRect.width() / 4, -visibleRect.height() / 4);
boundIntersections.insert(visibleRect,
new QuadRect(visibleRect.left, visibleRect.top, visibleRect.right, visibleRect.bottom));
}
cv.restore();
}
}
}
@ -391,23 +382,16 @@ public class OsmandRenderer {
}
}
public Drawable getShieldDrawable(String shieldId){
Bitmap shield = RenderingIcons.getIcon(context, shieldId, true);
return new BitmapDrawable(context.getResources(),shield);
}
protected void drawBitmap(Canvas cv, Bitmap ico, RectF rf) {
if(ico == null) {
protected void draw(Canvas cv, Drawable ico, RectF rf, boolean fillRect) {
if (ico == null) {
return;
}
cv.drawBitmap(ico, rf.left, rf.top, paintIcon);
}
protected void drawBitmap(Canvas cv, Bitmap ico, RectF rf, Rect src) {
if(ico == null) {
return;
if (fillRect) {
ico.setBounds(0, 0, (int) rf.width(), (int) rf.height());
} else {
ico.setBounds(0, 0, ico.getIntrinsicWidth(), ico.getIntrinsicHeight());
}
cv.drawBitmap(ico, src, rf, paintIcon);
ico.draw(cv);
}
private RectF calculateRect(RenderingContext rc, IconDrawInfo icon, int visbleWidth, int visbleHeight) {

82
OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
View file

@ -1,17 +1,5 @@
package net.osmand.plus.render;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.LinkedHashMap;
import java.util.Map;
import net.osmand.PlatformUtil;
import net.osmand.plus.R;
import net.osmand.plus.R.drawable;
import org.apache.commons.logging.Log;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@ -23,6 +11,18 @@ import android.os.Build;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import net.osmand.PlatformUtil;
import net.osmand.plus.R;
import net.osmand.plus.R.drawable;
import org.apache.commons.logging.Log;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.LinkedHashMap;
import java.util.Map;
public class RenderingIcons {
private static final Log log = PlatformUtil.getLog(RenderingIcons.class);
@ -30,6 +30,7 @@ public class RenderingIcons {
private static Map<String, Integer> smallIcons = new LinkedHashMap<String, Integer>();
private static Map<String, Integer> bigIcons = new LinkedHashMap<String, Integer>();
private static Map<String, Bitmap> iconsBmp = new LinkedHashMap<String, Bitmap>();
private static Map<String, Drawable> iconsDrawable = new LinkedHashMap<String, Drawable>();
// private static DisplayMetrics dm;
private static Bitmap cacheBmp = null;
@ -42,9 +43,11 @@ public class RenderingIcons {
return bigIcons.containsKey(s);
}
public static synchronized byte[] getBitmapFromVectorDrawable(Context context, int drawableId) {
public static synchronized Bitmap getBitmapFromVectorDrawable(Context context, int drawableId) {
Drawable drawable = ContextCompat.getDrawable(context, drawableId);
if (drawable == null) {
return null;
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
drawable = (DrawableCompat.wrap(drawable)).mutate();
}
@ -57,20 +60,27 @@ public class RenderingIcons {
Canvas canvas = new Canvas(cacheBmp);
drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
drawable.draw(canvas);
return cacheBmp;
}
private static synchronized byte[] getPngFromVectorDrawable(Context context, int drawableId) {
Bitmap bmp = getBitmapFromVectorDrawable(context, drawableId);
if (bmp == null) {
return null;
}
ByteArrayOutputStream baos = new ByteArrayOutputStream();
cacheBmp.compress(Bitmap.CompressFormat.PNG, 100, baos);
bmp.compress(Bitmap.CompressFormat.PNG, 100, baos);
return baos.toByteArray();
}
public static byte[] getIconRawData(Context ctx, String s) {
Integer resId = shaderIcons.get(s);
if(resId == null) {
if (resId == null) {
resId = smallIcons.get(s);
}
if(resId == null)
if (resId == null) {
return null;
}
try {
final InputStream inputStream = ctx.getResources().openRawResource(resId.intValue());
final ByteArrayOutputStream proxyOutputStream = new ByteArrayOutputStream(1024);
@ -82,7 +92,7 @@ public class RenderingIcons {
inputStream.close();
final byte[] bitmapData = proxyOutputStream.toByteArray();
if (isVectorData(bitmapData)) {
return getBitmapFromVectorDrawable(ctx, resId.intValue());
return getPngFromVectorDrawable(ctx, resId.intValue());
}
// log.info("Icon data length is " + bitmapData.length); //$NON-NLS-1$
// Bitmap dm = android.graphics.BitmapFactory.decodeByteArray(bitmapData, 0, bitmapData.length) ;
@ -128,7 +138,13 @@ public class RenderingIcons {
}
return null;
}
/**
* Return vector icon as bitmap. Used for java rendering only.
*
* @deprecated Use getDrawableIcon instead.
*/
@Deprecated
public static Bitmap getIcon(Context ctx, String s, boolean includeShader) {
if(s == null) {
return null;
@ -139,7 +155,7 @@ public class RenderingIcons {
if (!iconsBmp.containsKey(s)) {
Integer resId = s.startsWith("h_") ? shaderIcons.get(s.substring(2)) : smallIcons.get(s);
if (resId != null) {
Bitmap bmp = BitmapFactory.decodeResource(ctx.getResources(), resId, null);
Bitmap bmp = getBitmapFromVectorDrawable(ctx, resId);
iconsBmp.put(s, bmp);
} else {
iconsBmp.put(s, null);
@ -147,7 +163,29 @@ public class RenderingIcons {
}
return iconsBmp.get(s);
}
public static Drawable getDrawableIcon(Context ctx, String s, boolean includeShader) {
if (s == null) {
return null;
}
if (includeShader && shaderIcons.containsKey(s)) {
s = "h_" + s;
}
Drawable d = iconsDrawable.get(s);
if (d == null) {
Integer drawableId = s.startsWith("h_") ? shaderIcons.get(s.substring(2)) : smallIcons.get(s);
if (drawableId != null) {
d = ContextCompat.getDrawable(ctx, drawableId);
if (d != null) {
d = DrawableCompat.wrap(d);
d.mutate();
iconsDrawable.put(s, d);
}
}
}
return d;
}
public static Integer getResId(String id) {
return id.startsWith("h_") ? shaderIcons.get(id.substring(2)) : smallIcons.get(id);
}

23
OsmAnd/src/net/osmand/plus/render/TextRenderer.java
View file

@ -31,6 +31,8 @@ import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import org.apache.commons.logging.Log;
public class TextRenderer {
@ -315,19 +317,20 @@ public class TextRenderer {
public void drawShieldIcon(RenderingContext rc, Canvas cv, TextDrawInfo text, String sr) {
if (sr != null) {
float coef = rc.getDensityValue(rc.screenDensityRatio * rc.textScale);
Bitmap ico = RenderingIcons.getIcon(context, sr, true);
Drawable ico = RenderingIcons.getDrawableIcon(context, sr, true);
if (ico != null) {
float left = text.centerX - ico.getWidth() / 2 * coef - 0.5f;
float top = text.centerY - ico.getHeight() / 2 * coef - paintText.descent() * 1.5f;
if(rc.screenDensityRatio != 1f){
RectF rf = new RectF(left, top, left + ico.getWidth() * coef,
top + ico.getHeight() * coef);
Rect src = new Rect(0, 0, ico.getWidth(), ico
.getHeight());
cv.drawBitmap(ico, src, rf, paintIcon);
float left = text.centerX - ico.getIntrinsicWidth() / 2f * coef - 0.5f;
float top = text.centerY - ico.getIntrinsicHeight() / 2f * coef - paintText.descent() * 1.5f;
cv.save();
cv.translate(left, top);
if (rc.screenDensityRatio != 1f) {
ico.setBounds(0, 0, (int) (ico.getIntrinsicWidth() * coef), (int) (ico.getIntrinsicHeight() * coef));
ico.draw(cv);
} else {
cv.drawBitmap(ico, left, top, paintIcon);
ico.setBounds(0, 0, ico.getIntrinsicWidth(), ico.getIntrinsicHeight());
ico.draw(cv);
}
cv.restore();
}
}
}

6
OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java
View file

@ -491,7 +491,7 @@ public class TransportRoutingHelper {
}
GeneralRouter prouter = config.getRouter(params.mode.getRoutingProfile());
TransportRoutingConfiguration cfg = new TransportRoutingConfiguration(prouter, params.params);
TransportRoutePlanner planner = new TransportRoutePlanner();
TransportRoutingContext ctx = new TransportRoutingContext(cfg, library, files);
ctx.calculationProgress = params.calculationProgress;
if (ctx.library != null && !settings.PT_SAFE_MODE.get()) {
@ -501,9 +501,9 @@ public class TransportRoutingHelper {
MapUtils.get31TileNumberX(params.end.getLongitude()),
MapUtils.get31TileNumberY(params.end.getLatitude()),
cfg, ctx.calculationProgress);
List<TransportRouteResult> res = TransportRoutePlanner.convertToTransportRoutingResult(nativeRes, cfg);
return res;
return TransportRoutePlanner.convertToTransportRoutingResult(nativeRes, cfg);
} else {
TransportRoutePlanner planner = new TransportRoutePlanner();
return planner.buildRoute(ctx, params.start, params.end);
}
}

2
OsmAnd/src/net/osmand/plus/search/QuickSearchListFragment.java
View file

@ -99,7 +99,7 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
showResult(sr);
} else {
if (sr.objectType == ObjectType.CITY || sr.objectType == ObjectType.VILLAGE) {
if (sr.objectType == ObjectType.CITY || sr.objectType == ObjectType.VILLAGE || sr.objectType == ObjectType.STREET) {
showResult = true;
}
dialogFragment.completeQueryWithObject(sr);

6
OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java
View file

@ -271,11 +271,7 @@ public class ImportDuplicatesFragment extends BaseOsmAndFragment implements View
public void onSettingsImportFinished(boolean succeed, @NonNull List<SettingsItem> items) {
if (succeed) {
app.getRendererRegistry().updateExternalRenderers();
AppInitializer.loadRoutingFiles(app, new AppInitializer.LoadRoutingFilesCallback() {
@Override
public void onRoutingFilesLoaded() {
}
});
AppInitializer.loadRoutingFiles(app, null);
FragmentManager fm = getFragmentManager();
if (fm != null && file != null) {
ImportCompleteFragment.showInstance(fm, items, file.getName());

1
OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java
View file

@ -170,6 +170,7 @@ public class ChangeDataStorageBottomSheet extends BasePreferenceBottomSheet {
fragment.setNewDirectory(newDirectory);
fragment.setTargetFragment(target, 0);
fragment.setUsedOnMap(usedOnMap);
fragment.setArguments(args);
fragment.show(fm, TAG);
return true;
}

4
OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
View file

@ -819,7 +819,9 @@ public class MapControlsLayer extends OsmandMapLayer {
compassHud.forceHideCompass = forceHideCompass;
compassHud.updateVisibility(!forceHideCompass && shouldShowCompass());
if (layersHud.setIconResId(settings.getApplicationMode().getMapIconRes())) {
ApplicationMode appMode = settings.getApplicationMode();
layersHud.setIconColorId(appMode.getIconColorInfo().getColor(isNight));
if (layersHud.setIconResId(appMode.getMapIconRes())) {
layersHud.update(app, isNight);
}
layersHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && !isInMeasurementToolMode() && !isInPlanRouteMode()

20
OsmAnd/src/net/osmand/plus/views/OsmandMapLayer.java
View file

@ -14,8 +14,8 @@ import android.graphics.Path;
import android.graphics.PointF;
import android.graphics.PorterDuff.Mode;
import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.util.Pair;
import android.view.MotionEvent;
@ -170,7 +170,7 @@ public abstract class OsmandMapLayer {
private Bitmap arrowBitmap;
private Bitmap walkArrowBitmap;
private Bitmap anchorBitmap;
private Map<Pair<Integer, Bitmap>, Bitmap> stopBitmapsCache = new HashMap<>();
private Map<Pair<Integer, Drawable>, Bitmap> stopBitmapsCache = new HashMap<>();
private Map<Integer, Bitmap> stopSmallBitmapsCache = new HashMap<>();
public GeometryWayContext(Context ctx, float density) {
@ -317,8 +317,8 @@ public abstract class OsmandMapLayer {
return anchorBitmap;
}
public Bitmap getStopShieldBitmap(int color, Bitmap stopBitmap) {
Bitmap bmp = stopBitmapsCache.get(new Pair<>(color, stopBitmap));
public Bitmap getStopShieldBitmap(int color, Drawable stopDrawable) {
Bitmap bmp = stopBitmapsCache.get(new Pair<>(color, stopDrawable));
if (bmp == null) {
int fillColor = UiUtilities.getContrastColor(getApp(), color, true);
int strokeColor = getStrokeColor(color);
@ -344,15 +344,15 @@ public abstract class OsmandMapLayer {
paint.setStyle(Paint.Style.STROKE);
canvas.drawRoundRect(rect, routeShieldCornerRadius, routeShieldCornerRadius, paint);
if (stopBitmap != null) {
paint.setFilterBitmap(true);
paint.setColorFilter(new PorterDuffColorFilter(strokeColor, Mode.SRC_IN));
Rect src = new Rect(0, 0, stopBitmap.getWidth(), stopBitmap.getHeight());
if (stopDrawable != null) {
stopDrawable.setColorFilter(new PorterDuffColorFilter(strokeColor, Mode.SRC_IN));
float marginBitmap = 1f * density;
rect.inset(marginBitmap, marginBitmap);
canvas.drawBitmap(stopBitmap, src, rect, paint);
stopDrawable.setBounds(0, 0, (int) rect.width(), (int) rect.height());
canvas.translate(rect.left, rect.top);
stopDrawable.draw(canvas);
}
stopBitmapsCache.put(new Pair<>(color, stopBitmap), bmp);
stopBitmapsCache.put(new Pair<>(color, stopDrawable), bmp);
}
return bmp;
}

22
OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
View file

@ -61,11 +61,11 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
public static final org.apache.commons.logging.Log log = PlatformUtil.getLog(POIMapLayer.class);
private Paint paintIcon;
private Paint paintIconBackground;
private Bitmap poiBackground;
private Bitmap poiBackgroundSmall;
private PorterDuffColorFilter poiColorFilter;
private int poiSize;
private OsmandMapTileView view;
@ -176,11 +176,8 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
public void initLayer(OsmandMapTileView view) {
this.view = view;
paintIcon = new Paint();
//paintIcon.setStrokeWidth(1);
//paintIcon.setStyle(Style.STROKE);
//paintIcon.setColor(Color.BLUE);
paintIcon.setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN));
poiSize = dpToPx(view.getContext(), 16f);
poiColorFilter = new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN);
paintIconBackground = new Paint();
poiBackground = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_white_orange_poi_shield);
poiBackgroundSmall = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_white_orange_poi_shield_small);
@ -263,9 +260,14 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
}
}
if (id != null) {
Bitmap bmp = RenderingIcons.getIcon(view.getContext(), id, false);
if (bmp != null) {
canvas.drawBitmap(bmp, x - bmp.getWidth() / 2, y - bmp.getHeight() / 2, paintIcon);
Drawable img = RenderingIcons.getDrawableIcon(view.getContext(), id, false);
if (img != null) {
canvas.save();
canvas.translate(x - poiSize / 2f, y - poiSize / 2f);
img.setBounds(0, 0, poiSize, poiSize);
img.setColorFilter(poiColorFilter);
img.draw(canvas);
canvas.restore();
}
}
}

7
OsmAnd/src/net/osmand/plus/views/RouteLayer.java
View file

@ -11,6 +11,7 @@ import android.graphics.Path;
import android.graphics.PointF;
import android.graphics.PorterDuff.Mode;
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.util.Pair;
@ -559,7 +560,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
private static class GeometryTransportWayStyle extends GeometryWayStyle {
private TransportRouteResultSegment segment;
private Bitmap stopBitmap;
private Drawable stopDrawable;
protected Integer pointColor;
GeometryTransportWayStyle(GeometryWayContext context, TransportRouteResultSegment segment) {
@ -579,7 +580,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
type = TransportStopType.findType("bus");
}
if (type != null) {
stopBitmap = RenderingIcons.getIcon(getCtx(), type.getResName(), false);
stopDrawable = RenderingIcons.getDrawableIcon(getCtx(), type.getResName(), false);
}
}
@ -607,7 +608,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
}
public Bitmap getStopBitmap() {
return getContext().getStopShieldBitmap(color, stopBitmap);
return getContext().getStopShieldBitmap(color, stopDrawable);
}
public Bitmap getStopSmallBitmap() {

21
OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
View file

@ -4,11 +4,13 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.PointF;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable;
import android.util.DisplayMetrics;
import android.view.WindowManager;
@ -48,8 +50,8 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
private OsmandMapTileView view;
private Paint paintIcon;
private Paint paintLightIcon;
private Paint paintDarkIcon;
private ColorFilter paintLightIconFilter;
private ColorFilter paintDarkIconFilter;
private Bitmap backgroundIcon;
private Bitmap stopBus;
private Bitmap stopSmall;
@ -81,10 +83,8 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
WindowManager wmgr = (WindowManager) view.getContext().getSystemService(Context.WINDOW_SERVICE);
wmgr.getDefaultDisplay().getMetrics(dm);
paintIcon = new Paint();
paintLightIcon = new Paint();
paintLightIcon.setColorFilter(new PorterDuffColorFilter(ContextCompat.getColor(mapActivity, R.color.active_buttons_and_links_text_light), PorterDuff.Mode.SRC_IN));
paintDarkIcon = new Paint();
paintDarkIcon.setColorFilter(new PorterDuffColorFilter(ContextCompat.getColor(mapActivity, R.color.active_buttons_and_links_text_dark), PorterDuff.Mode.SRC_IN));
paintLightIconFilter = new PorterDuffColorFilter(ContextCompat.getColor(mapActivity, R.color.active_buttons_and_links_text_light), PorterDuff.Mode.SRC_IN);
paintDarkIconFilter = new PorterDuffColorFilter(ContextCompat.getColor(mapActivity, R.color.active_buttons_and_links_text_dark), PorterDuff.Mode.SRC_IN);
path = new Path();
stopBus = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_transport_stop_bus);
stopSmall = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_transport_stop_small);
@ -253,9 +253,14 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
if (stopRoute != null) {
TransportStopType type = TransportStopType.findType(stopRoute.route.getType());
if (type != null) {
Bitmap foregroundIcon = RenderingIcons.getIcon(mapActivity, type.getResName(), false);
Drawable foregroundIcon = RenderingIcons.getDrawableIcon(mapActivity, type.getResName(), false);
canvas.drawBitmap(backgroundIcon, x - backgroundIconHalfWidth, y - backgroundIconHalfHeight, paintIcon);
canvas.drawBitmap(foregroundIcon, x - foregroundIcon.getWidth() / 2f, y - foregroundIcon.getHeight() / 2f, nightMode ? paintDarkIcon : paintLightIcon);
canvas.save();
canvas.translate(x - foregroundIcon.getIntrinsicWidth() / 2f, y - foregroundIcon.getIntrinsicHeight() / 2f);
foregroundIcon.setBounds(0, 0, foregroundIcon.getIntrinsicWidth(), foregroundIcon.getIntrinsicHeight());
foregroundIcon.setColorFilter(nightMode ? paintDarkIconFilter : paintLightIconFilter);
foregroundIcon.draw(canvas);
canvas.restore();
}
} else {
Bitmap b = stopBus;

21
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -59,6 +59,7 @@ import net.osmand.plus.helpers.WaypointDialogHelper;
import net.osmand.plus.helpers.WaypointHelper;
import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
import net.osmand.plus.render.OsmandRenderer;
import net.osmand.plus.render.RenderingIcons;
import net.osmand.plus.render.TextRenderer;
import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
import net.osmand.plus.routepreparationmenu.ShowAlongTheRouteBottomSheet;
@ -1130,7 +1131,6 @@ public class MapInfoWidgetsFactory {
}
private boolean setRoadShield(ImageView view, RouteDataObject object) {
String nameTag = null;
String name = null;
StringBuilder additional = new StringBuilder();
@ -1144,7 +1144,6 @@ public class MapInfoWidgetsFactory {
additional.append(key).append("=").append(val).append(";");
}
}
// LOG.debug("Additionals (names): " + additional.toString() );
Context context = topBar.getContext();
int[] tps = object.getTypes();
@ -1197,13 +1196,13 @@ public class MapInfoWidgetsFactory {
}
if (shieldRes != -1) {
float xSize;
float ySize;
Bitmap shield;
shield = BitmapFactory.decodeResource(app.getResources(), shieldRes);
ySize = shield.getHeight();
xSize = shield.getWidth();
float xyRatio = xSize/ySize;
Drawable shield = ContextCompat.getDrawable(view.getContext(), shieldRes);
if (shield == null) {
return false;
}
float xSize = shield.getIntrinsicWidth();
float ySize = shield.getIntrinsicHeight();
float xyRatio = xSize / ySize;
//setting view propotions (height is fixed by toolbar size - 48dp);
int viewHeightPx = AndroidUtils.dpToPx(context, 48);
int viewWidthPx = (int) (viewHeightPx * xyRatio);
@ -1215,9 +1214,9 @@ public class MapInfoWidgetsFactory {
//creating bitmap according to size of resource
Bitmap bitmap = Bitmap.createBitmap((int) xSize, (int) ySize, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap);
text.fillProperties(rc, rreq, xSize/2, ySize/2 - p.getFontMetrics().ascent/2f);
text.fillProperties(rc, rreq, xSize / 2f, ySize / 2f - p.getFontMetrics().ascent / 2f);
textRenderer.drawShieldIcon(rc, canvas, text, text.getShieldResIcon());
textRenderer.drawWrappedText(canvas, text, 20);
textRenderer.drawWrappedText(canvas, text, 20f);
view.setImageBitmap(bitmap);
return true;