diff --git a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java index 792bfb64c8..0efc6b1cde 100644 --- a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java +++ b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java @@ -101,6 +101,8 @@ public class BinaryRoutePlanner { if(TRACE_ROUTING){ printRoad(">", segment, !forwardSearch); } + if(segment.getParentRoute() != null) + System.out.println(segment.getRoad().getId() + " - " + segment.getParentRoute().getRoad().getId()); if(segment instanceof FinalRouteSegment) { if(RoutingContext.SHOW_GC_SIZE){ log.warn("Estimated overhead " + (ctx.memoryOverhead / (1<<20))+ " mb"); @@ -312,8 +314,8 @@ public class BinaryRoutePlanner { pr = ""; } String p = ""; - if(reverseWaySearch != null) { - p = (reverseWaySearch?"B" : "F"); + if (reverseWaySearch != null) { + p = (reverseWaySearch ? "B" : "F"); } println(p+prefix +"" + segment.road + " dir="+segment.getDirectionAssigned()+" ind=" + segment.getSegmentStart() + " ds=" + ((float)segment.distanceFromStart) + " es="+((float)segment.distanceToEnd) + pr); diff --git a/OsmAnd/res/drawable-hdpi/map_arrow_to_destination.png b/OsmAnd/res/drawable-hdpi/map_arrow_to_destination.png index cac47c25f0..f4a7fafb39 100644 Binary files a/OsmAnd/res/drawable-hdpi/map_arrow_to_destination.png and b/OsmAnd/res/drawable-hdpi/map_arrow_to_destination.png differ diff --git a/OsmAnd/res/drawable-hdpi/map_bicycle_bearing.png b/OsmAnd/res/drawable-hdpi/map_bicycle_bearing.png index 62dbcc0a8a..481818358f 100644 Binary files a/OsmAnd/res/drawable-hdpi/map_bicycle_bearing.png and b/OsmAnd/res/drawable-hdpi/map_bicycle_bearing.png differ diff --git a/OsmAnd/res/drawable-hdpi/map_bicycle_location.png b/OsmAnd/res/drawable-hdpi/map_bicycle_location.png index 088b538b43..9f7b3aafef 100644 Binary files a/OsmAnd/res/drawable-hdpi/map_bicycle_location.png and b/OsmAnd/res/drawable-hdpi/map_bicycle_location.png differ diff --git a/OsmAnd/res/drawable-hdpi/map_car_bearing.png b/OsmAnd/res/drawable-hdpi/map_car_bearing.png index 2b1549d149..a9b7e35474 100644 Binary files a/OsmAnd/res/drawable-hdpi/map_car_bearing.png and b/OsmAnd/res/drawable-hdpi/map_car_bearing.png differ diff --git a/OsmAnd/res/drawable-hdpi/map_car_location.png b/OsmAnd/res/drawable-hdpi/map_car_location.png index f00dfcbade..9f02c3e80d 100644 Binary files a/OsmAnd/res/drawable-hdpi/map_car_location.png and b/OsmAnd/res/drawable-hdpi/map_car_location.png differ diff --git a/OsmAnd/res/drawable-hdpi/map_default_location.png b/OsmAnd/res/drawable-hdpi/map_default_location.png index ae5e645879..f70ab4b862 100644 Binary files a/OsmAnd/res/drawable-hdpi/map_default_location.png and b/OsmAnd/res/drawable-hdpi/map_default_location.png differ diff --git a/OsmAnd/res/drawable-hdpi/map_pedestrian_bearing.png b/OsmAnd/res/drawable-hdpi/map_pedestrian_bearing.png index a8e5661264..11d347b5a3 100644 Binary files a/OsmAnd/res/drawable-hdpi/map_pedestrian_bearing.png and b/OsmAnd/res/drawable-hdpi/map_pedestrian_bearing.png differ diff --git a/OsmAnd/res/drawable-hdpi/map_pedestrian_location.png b/OsmAnd/res/drawable-hdpi/map_pedestrian_location.png index 263eb07778..f70ab4b862 100644 Binary files a/OsmAnd/res/drawable-hdpi/map_pedestrian_location.png and b/OsmAnd/res/drawable-hdpi/map_pedestrian_location.png differ diff --git a/OsmAnd/res/drawable-hdpi/monitoring_rec_big_day.png b/OsmAnd/res/drawable-hdpi/monitoring_rec_big_day.png new file mode 100644 index 0000000000..26745426a3 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/monitoring_rec_big_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/monitoring_rec_big_night.png b/OsmAnd/res/drawable-hdpi/monitoring_rec_big_night.png new file mode 100644 index 0000000000..a7a200ae25 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/monitoring_rec_big_night.png differ diff --git a/OsmAnd/res/drawable-hdpi/monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-hdpi/monitoring_rec_inactive_day.png new file mode 100644 index 0000000000..3726e06e1c Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/monitoring_rec_inactive_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-hdpi/monitoring_rec_inactive_night.png new file mode 100644 index 0000000000..c43719fef4 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/monitoring_rec_inactive_night.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_altitude_day.png b/OsmAnd/res/drawable-hdpi/widget_altitude_day.png new file mode 100644 index 0000000000..755c8f99d1 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_altitude_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_altitude_night.png b/OsmAnd/res/drawable-hdpi/widget_altitude_night.png new file mode 100644 index 0000000000..dd55d76103 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_altitude_night.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_distance_day.png b/OsmAnd/res/drawable-hdpi/widget_distance_day.png new file mode 100644 index 0000000000..2f689bd456 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_distance_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_distance_night.png b/OsmAnd/res/drawable-hdpi/widget_distance_night.png new file mode 100644 index 0000000000..1512862d68 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_distance_night.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_gps_info_day.png b/OsmAnd/res/drawable-hdpi/widget_gps_info_day.png new file mode 100644 index 0000000000..9d250b4a30 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_gps_info_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_gps_info_night.png b/OsmAnd/res/drawable-hdpi/widget_gps_info_night.png new file mode 100644 index 0000000000..8c9691b5f9 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_gps_info_night.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_day.png b/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_day.png new file mode 100644 index 0000000000..ca14f8c2da Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_night.png b/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_night.png new file mode 100644 index 0000000000..9dec9fc472 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_night.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_parking_day.png b/OsmAnd/res/drawable-hdpi/widget_parking_day.png new file mode 100644 index 0000000000..d6d90a7217 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_parking_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_parking_night.png b/OsmAnd/res/drawable-hdpi/widget_parking_night.png new file mode 100644 index 0000000000..5e3502f325 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_parking_night.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_speed_day.png b/OsmAnd/res/drawable-hdpi/widget_speed_day.png new file mode 100644 index 0000000000..8b9ec7518f Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_speed_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_speed_night.png b/OsmAnd/res/drawable-hdpi/widget_speed_night.png new file mode 100644 index 0000000000..e2f476429f Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_speed_night.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_target_day.png b/OsmAnd/res/drawable-hdpi/widget_target_day.png new file mode 100644 index 0000000000..4619096a30 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_target_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_target_night.png b/OsmAnd/res/drawable-hdpi/widget_target_night.png new file mode 100644 index 0000000000..0447d9968f Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_target_night.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_time_day.png b/OsmAnd/res/drawable-hdpi/widget_time_day.png new file mode 100644 index 0000000000..280267e0b0 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_time_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_time_night.png b/OsmAnd/res/drawable-hdpi/widget_time_night.png new file mode 100644 index 0000000000..11b69882f1 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_time_night.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_time_to_distance_day.png b/OsmAnd/res/drawable-hdpi/widget_time_to_distance_day.png new file mode 100644 index 0000000000..572f95321a Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_time_to_distance_day.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_time_to_distance_night.png b/OsmAnd/res/drawable-hdpi/widget_time_to_distance_night.png new file mode 100644 index 0000000000..1ffb9bdea5 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_time_to_distance_night.png differ diff --git a/OsmAnd/res/drawable-large/map_arrow_to_destination.png b/OsmAnd/res/drawable-large/map_arrow_to_destination.png index cac47c25f0..f4a7fafb39 100644 Binary files a/OsmAnd/res/drawable-large/map_arrow_to_destination.png and b/OsmAnd/res/drawable-large/map_arrow_to_destination.png differ diff --git a/OsmAnd/res/drawable-large/map_bicycle_bearing.png b/OsmAnd/res/drawable-large/map_bicycle_bearing.png index 62dbcc0a8a..481818358f 100644 Binary files a/OsmAnd/res/drawable-large/map_bicycle_bearing.png and b/OsmAnd/res/drawable-large/map_bicycle_bearing.png differ diff --git a/OsmAnd/res/drawable-large/map_bicycle_location.png b/OsmAnd/res/drawable-large/map_bicycle_location.png index 088b538b43..ed13e10d89 100644 Binary files a/OsmAnd/res/drawable-large/map_bicycle_location.png and b/OsmAnd/res/drawable-large/map_bicycle_location.png differ diff --git a/OsmAnd/res/drawable-large/map_car_bearing.png b/OsmAnd/res/drawable-large/map_car_bearing.png index 2b1549d149..a9b7e35474 100644 Binary files a/OsmAnd/res/drawable-large/map_car_bearing.png and b/OsmAnd/res/drawable-large/map_car_bearing.png differ diff --git a/OsmAnd/res/drawable-large/map_car_location.png b/OsmAnd/res/drawable-large/map_car_location.png index f00dfcbade..bef16c9cc9 100644 Binary files a/OsmAnd/res/drawable-large/map_car_location.png and b/OsmAnd/res/drawable-large/map_car_location.png differ diff --git a/OsmAnd/res/drawable-large/map_default_location.png b/OsmAnd/res/drawable-large/map_default_location.png index ae5e645879..f70ab4b862 100644 Binary files a/OsmAnd/res/drawable-large/map_default_location.png and b/OsmAnd/res/drawable-large/map_default_location.png differ diff --git a/OsmAnd/res/drawable-large/map_pedestrian_bearing.png b/OsmAnd/res/drawable-large/map_pedestrian_bearing.png index a8e5661264..11d347b5a3 100644 Binary files a/OsmAnd/res/drawable-large/map_pedestrian_bearing.png and b/OsmAnd/res/drawable-large/map_pedestrian_bearing.png differ diff --git a/OsmAnd/res/drawable-large/map_pedestrian_location.png b/OsmAnd/res/drawable-large/map_pedestrian_location.png index 263eb07778..f70ab4b862 100644 Binary files a/OsmAnd/res/drawable-large/map_pedestrian_location.png and b/OsmAnd/res/drawable-large/map_pedestrian_location.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_arrow_to_destination.png b/OsmAnd/res/drawable-mdpi/map_arrow_to_destination.png new file mode 100644 index 0000000000..1ebbe7b457 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_arrow_to_destination.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_bicycle_bearing.png b/OsmAnd/res/drawable-mdpi/map_bicycle_bearing.png new file mode 100644 index 0000000000..1e5c27e2ef Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_bicycle_bearing.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_bicycle_location.png b/OsmAnd/res/drawable-mdpi/map_bicycle_location.png new file mode 100644 index 0000000000..70e79b791f Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_bicycle_location.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_car_bearing.png b/OsmAnd/res/drawable-mdpi/map_car_bearing.png new file mode 100644 index 0000000000..3c7b2b86b1 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_car_bearing.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_car_location.png b/OsmAnd/res/drawable-mdpi/map_car_location.png new file mode 100644 index 0000000000..a776a3415f Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_car_location.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_default_location.png b/OsmAnd/res/drawable-mdpi/map_default_location.png new file mode 100644 index 0000000000..236dde5ee5 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_default_location.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_pedestrian_bearing.png b/OsmAnd/res/drawable-mdpi/map_pedestrian_bearing.png new file mode 100644 index 0000000000..5c48cf7cc6 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_pedestrian_bearing.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_pedestrian_location.png b/OsmAnd/res/drawable-mdpi/map_pedestrian_location.png new file mode 100644 index 0000000000..236dde5ee5 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_pedestrian_location.png differ diff --git a/OsmAnd/res/drawable-mdpi/monitoring_rec_big_day.png b/OsmAnd/res/drawable-mdpi/monitoring_rec_big_day.png new file mode 100644 index 0000000000..aa60c2b2ad Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/monitoring_rec_big_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/monitoring_rec_big_night.png b/OsmAnd/res/drawable-mdpi/monitoring_rec_big_night.png new file mode 100644 index 0000000000..b56e1480b5 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/monitoring_rec_big_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-mdpi/monitoring_rec_inactive_day.png new file mode 100644 index 0000000000..3b6b93e033 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/monitoring_rec_inactive_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-mdpi/monitoring_rec_inactive_night.png new file mode 100644 index 0000000000..2d51a845c3 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/monitoring_rec_inactive_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_altitude_day.png b/OsmAnd/res/drawable-mdpi/widget_altitude_day.png new file mode 100644 index 0000000000..7526009986 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_altitude_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_altitude_night.png b/OsmAnd/res/drawable-mdpi/widget_altitude_night.png new file mode 100644 index 0000000000..102b5ff003 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_altitude_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_distance_day.png b/OsmAnd/res/drawable-mdpi/widget_distance_day.png new file mode 100644 index 0000000000..ebceccda8a Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_distance_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_distance_night.png b/OsmAnd/res/drawable-mdpi/widget_distance_night.png new file mode 100644 index 0000000000..6a6aa918ea Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_distance_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_gps_info_day.png b/OsmAnd/res/drawable-mdpi/widget_gps_info_day.png new file mode 100644 index 0000000000..83caf487ce Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_gps_info_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_gps_info_night.png b/OsmAnd/res/drawable-mdpi/widget_gps_info_night.png new file mode 100644 index 0000000000..edf9c4940c Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_gps_info_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_day.png b/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_day.png new file mode 100644 index 0000000000..efbd5f3c6d Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_night.png b/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_night.png new file mode 100644 index 0000000000..40d730cbab Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_parking_day.png b/OsmAnd/res/drawable-mdpi/widget_parking_day.png new file mode 100644 index 0000000000..4683885023 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_parking_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_parking_night.png b/OsmAnd/res/drawable-mdpi/widget_parking_night.png new file mode 100644 index 0000000000..94035be5da Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_parking_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_speed_day.png b/OsmAnd/res/drawable-mdpi/widget_speed_day.png new file mode 100644 index 0000000000..16089a43f2 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_speed_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_speed_night.png b/OsmAnd/res/drawable-mdpi/widget_speed_night.png new file mode 100644 index 0000000000..cb8b5f5f3d Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_speed_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_target_day.png b/OsmAnd/res/drawable-mdpi/widget_target_day.png new file mode 100644 index 0000000000..96b8c88142 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_target_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_target_night.png b/OsmAnd/res/drawable-mdpi/widget_target_night.png new file mode 100644 index 0000000000..596e722d4f Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_target_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_time_day.png b/OsmAnd/res/drawable-mdpi/widget_time_day.png new file mode 100644 index 0000000000..c776050242 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_time_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_time_night.png b/OsmAnd/res/drawable-mdpi/widget_time_night.png new file mode 100644 index 0000000000..9c7e6052a0 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_time_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_time_to_distance_day.png b/OsmAnd/res/drawable-mdpi/widget_time_to_distance_day.png new file mode 100644 index 0000000000..a5ae614bcf Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_time_to_distance_day.png differ diff --git a/OsmAnd/res/drawable-mdpi/widget_time_to_distance_night.png b/OsmAnd/res/drawable-mdpi/widget_time_to_distance_night.png new file mode 100644 index 0000000000..9f72ed52ef Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/widget_time_to_distance_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_arrow_to_destination.png b/OsmAnd/res/drawable-xhdpi/map_arrow_to_destination.png new file mode 100644 index 0000000000..bcd01a3b27 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_arrow_to_destination.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_bicycle_bearing.png b/OsmAnd/res/drawable-xhdpi/map_bicycle_bearing.png new file mode 100644 index 0000000000..4e221f39b2 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_bicycle_bearing.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_bicycle_location.png b/OsmAnd/res/drawable-xhdpi/map_bicycle_location.png new file mode 100644 index 0000000000..6c251d4e48 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_bicycle_location.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_car_bearing.png b/OsmAnd/res/drawable-xhdpi/map_car_bearing.png new file mode 100644 index 0000000000..83e9a37606 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_car_bearing.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_car_location.png b/OsmAnd/res/drawable-xhdpi/map_car_location.png new file mode 100644 index 0000000000..1bdeaff424 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_car_location.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_default_location.png b/OsmAnd/res/drawable-xhdpi/map_default_location.png new file mode 100644 index 0000000000..732ca853e1 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_default_location.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_pedestrian_bearing.png b/OsmAnd/res/drawable-xhdpi/map_pedestrian_bearing.png new file mode 100644 index 0000000000..5b7776917a Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_pedestrian_bearing.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_pedestrian_location.png b/OsmAnd/res/drawable-xhdpi/map_pedestrian_location.png new file mode 100644 index 0000000000..732ca853e1 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_pedestrian_location.png differ diff --git a/OsmAnd/res/drawable-xhdpi/monitoring_rec_big_day.png b/OsmAnd/res/drawable-xhdpi/monitoring_rec_big_day.png new file mode 100644 index 0000000000..cca0a2530d Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/monitoring_rec_big_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/monitoring_rec_big_night.png b/OsmAnd/res/drawable-xhdpi/monitoring_rec_big_night.png new file mode 100644 index 0000000000..30881bf822 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/monitoring_rec_big_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-xhdpi/monitoring_rec_inactive_day.png new file mode 100644 index 0000000000..e01b172c35 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/monitoring_rec_inactive_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-xhdpi/monitoring_rec_inactive_night.png new file mode 100644 index 0000000000..2655c78e27 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/monitoring_rec_inactive_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_altitude_day.png b/OsmAnd/res/drawable-xhdpi/widget_altitude_day.png new file mode 100644 index 0000000000..923d6435b5 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_altitude_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_altitude_night.png b/OsmAnd/res/drawable-xhdpi/widget_altitude_night.png new file mode 100644 index 0000000000..d5cc53749f Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_altitude_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_distance_day.png b/OsmAnd/res/drawable-xhdpi/widget_distance_day.png new file mode 100644 index 0000000000..8b81e6ef48 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_distance_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_distance_night.png b/OsmAnd/res/drawable-xhdpi/widget_distance_night.png new file mode 100644 index 0000000000..e265f9a525 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_distance_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_gps_info_day.png b/OsmAnd/res/drawable-xhdpi/widget_gps_info_day.png new file mode 100644 index 0000000000..81ab1594b0 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_gps_info_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_gps_info_night.png b/OsmAnd/res/drawable-xhdpi/widget_gps_info_night.png new file mode 100644 index 0000000000..74ba9bd3c0 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_gps_info_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_day.png b/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_day.png new file mode 100644 index 0000000000..883d9bc606 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_night.png b/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_night.png new file mode 100644 index 0000000000..7f5c88317e Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_parking_day.png b/OsmAnd/res/drawable-xhdpi/widget_parking_day.png new file mode 100644 index 0000000000..a31e73698f Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_parking_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_parking_night.png b/OsmAnd/res/drawable-xhdpi/widget_parking_night.png new file mode 100644 index 0000000000..f9135e3094 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_parking_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_speed_day.png b/OsmAnd/res/drawable-xhdpi/widget_speed_day.png new file mode 100644 index 0000000000..fb2d0860d3 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_speed_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_speed_night.png b/OsmAnd/res/drawable-xhdpi/widget_speed_night.png new file mode 100644 index 0000000000..10444ed996 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_speed_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_target_day.png b/OsmAnd/res/drawable-xhdpi/widget_target_day.png new file mode 100644 index 0000000000..eb89ea1574 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_target_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_target_night.png b/OsmAnd/res/drawable-xhdpi/widget_target_night.png new file mode 100644 index 0000000000..26140686e4 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_target_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_time_day.png b/OsmAnd/res/drawable-xhdpi/widget_time_day.png new file mode 100644 index 0000000000..f4d397a489 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_time_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_time_night.png b/OsmAnd/res/drawable-xhdpi/widget_time_night.png new file mode 100644 index 0000000000..155bc5049d Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_time_night.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_day.png b/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_day.png new file mode 100644 index 0000000000..a146b1b83e Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_day.png differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_night.png b/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_night.png new file mode 100644 index 0000000000..20f3ea91aa Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_arrow_to_destination.png b/OsmAnd/res/drawable-xxhdpi/map_arrow_to_destination.png new file mode 100644 index 0000000000..507f7f0e58 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_arrow_to_destination.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_bicycle_bearing.png b/OsmAnd/res/drawable-xxhdpi/map_bicycle_bearing.png new file mode 100644 index 0000000000..e2ef854b82 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_bicycle_bearing.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_bicycle_location.png b/OsmAnd/res/drawable-xxhdpi/map_bicycle_location.png new file mode 100644 index 0000000000..f377095850 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_bicycle_location.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_car_bearing.png b/OsmAnd/res/drawable-xxhdpi/map_car_bearing.png new file mode 100644 index 0000000000..36f780c16f Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_car_bearing.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_car_location.png b/OsmAnd/res/drawable-xxhdpi/map_car_location.png new file mode 100644 index 0000000000..6c927d5052 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_car_location.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_default_location.png b/OsmAnd/res/drawable-xxhdpi/map_default_location.png new file mode 100644 index 0000000000..3af9febf2d Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_default_location.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_pedestrian_bearing.png b/OsmAnd/res/drawable-xxhdpi/map_pedestrian_bearing.png new file mode 100644 index 0000000000..0e0c28b648 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_pedestrian_bearing.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_pedestrian_location.png b/OsmAnd/res/drawable-xxhdpi/map_pedestrian_location.png new file mode 100644 index 0000000000..3af9febf2d Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_pedestrian_location.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/monitoring_rec_big.png b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_big.png new file mode 100644 index 0000000000..2f627af68f Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_big.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/monitoring_rec_big_day.png b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_big_day.png new file mode 100644 index 0000000000..b71faa16ea Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_big_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/monitoring_rec_big_night.png b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_big_night.png new file mode 100644 index 0000000000..c3deccbf92 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_big_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/monitoring_rec_inactive.png b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_inactive.png new file mode 100644 index 0000000000..2f80fc487e Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_inactive.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_inactive_day.png new file mode 100644 index 0000000000..738418fda2 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_inactive_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_inactive_night.png new file mode 100644 index 0000000000..659fd3a0f2 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/monitoring_rec_inactive_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_altitude.png b/OsmAnd/res/drawable-xxhdpi/widget_altitude.png index 661605292b..a8d9920426 100644 Binary files a/OsmAnd/res/drawable-xxhdpi/widget_altitude.png and b/OsmAnd/res/drawable-xxhdpi/widget_altitude.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_altitude_day.png b/OsmAnd/res/drawable-xxhdpi/widget_altitude_day.png new file mode 100644 index 0000000000..b10fd9bf1f Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_altitude_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_altitude_night.png b/OsmAnd/res/drawable-xxhdpi/widget_altitude_night.png new file mode 100644 index 0000000000..4c41e6d61a Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_altitude_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_distance.png b/OsmAnd/res/drawable-xxhdpi/widget_distance.png index 1cddc341d8..c195c9ffd6 100644 Binary files a/OsmAnd/res/drawable-xxhdpi/widget_distance.png and b/OsmAnd/res/drawable-xxhdpi/widget_distance.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_distance_day.png b/OsmAnd/res/drawable-xxhdpi/widget_distance_day.png new file mode 100644 index 0000000000..82f47adc26 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_distance_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_distance_night.png b/OsmAnd/res/drawable-xxhdpi/widget_distance_night.png new file mode 100644 index 0000000000..cf42160d5d Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_distance_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_gps_info.png b/OsmAnd/res/drawable-xxhdpi/widget_gps_info.png new file mode 100644 index 0000000000..c18ae4a476 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_gps_info.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_gps_info_day.png b/OsmAnd/res/drawable-xxhdpi/widget_gps_info_day.png new file mode 100644 index 0000000000..dea28b37c3 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_gps_info_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_gps_info_night.png b/OsmAnd/res/drawable-xxhdpi/widget_gps_info_night.png new file mode 100644 index 0000000000..35003b649a Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_gps_info_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_day.png b/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_day.png new file mode 100644 index 0000000000..1f41ab9267 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_night.png b/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_night.png new file mode 100644 index 0000000000..d26b7572a3 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_parking.png b/OsmAnd/res/drawable-xxhdpi/widget_parking.png new file mode 100644 index 0000000000..1612c64920 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_parking.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_parking_day.png b/OsmAnd/res/drawable-xxhdpi/widget_parking_day.png new file mode 100644 index 0000000000..d21d271ab6 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_parking_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_parking_night.png b/OsmAnd/res/drawable-xxhdpi/widget_parking_night.png new file mode 100644 index 0000000000..321d1f3fb0 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_parking_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_speed.png b/OsmAnd/res/drawable-xxhdpi/widget_speed.png index 8231d72e64..65a6e69ac5 100644 Binary files a/OsmAnd/res/drawable-xxhdpi/widget_speed.png and b/OsmAnd/res/drawable-xxhdpi/widget_speed.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_speed_day.png b/OsmAnd/res/drawable-xxhdpi/widget_speed_day.png new file mode 100644 index 0000000000..74692521e3 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_speed_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_speed_night.png b/OsmAnd/res/drawable-xxhdpi/widget_speed_night.png new file mode 100644 index 0000000000..48d9c86b31 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_speed_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_target.png b/OsmAnd/res/drawable-xxhdpi/widget_target.png index 183f5ff281..286dbf139c 100644 Binary files a/OsmAnd/res/drawable-xxhdpi/widget_target.png and b/OsmAnd/res/drawable-xxhdpi/widget_target.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_target_day.png b/OsmAnd/res/drawable-xxhdpi/widget_target_day.png new file mode 100644 index 0000000000..60749b7a02 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_target_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_target_night.png b/OsmAnd/res/drawable-xxhdpi/widget_target_night.png new file mode 100644 index 0000000000..08800c0052 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_target_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_time_day.png b/OsmAnd/res/drawable-xxhdpi/widget_time_day.png new file mode 100644 index 0000000000..77d7522e71 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_time_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_time_night.png b/OsmAnd/res/drawable-xxhdpi/widget_time_night.png new file mode 100644 index 0000000000..f99a5bc6ed Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_time_night.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_day.png b/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_day.png new file mode 100644 index 0000000000..1373854bd1 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_day.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_night.png b/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_night.png new file mode 100644 index 0000000000..2445ef4a92 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_night.png differ diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index c29bbe661c..5c28634090 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -113,7 +113,7 @@ Grænsekontrol Bumb Bumb - Pude bumb + Pudebumb Chikane Rumlestriber Plateau bumb @@ -138,7 +138,7 @@ Trolleybus stoppested Busstoppested Sporvognsstoppested - Sporvognsstoppestedet + Sporvognsstoppested Offentligtransport station Busstation Banegård @@ -381,7 +381,7 @@ Kloster Historisk kloster Vejside kors - Vejkants alter + Vejkantsalter Turistinformation Ur Rejsebureau @@ -409,7 +409,7 @@ Fanklub Lystfiskerklub Veteranforening - Linux klub + Linuxklub Teaterklub Historieklub Musikklub @@ -550,7 +550,7 @@ Holm Ankerplads - Ankerplads + Forankringsplads Båke Kompasbåke Sidebåke @@ -604,7 +604,7 @@ Lille landsby Bebyggelse Forstad - Kvarter + Nabolag Lokalitet Alternativ medicin @@ -676,7 +676,7 @@ Turisme Fritid Mad og spise - Tjenesteydelse + Tjenesteydelse og håndværk Finansiel Natur Maritimt @@ -746,7 +746,7 @@ Gasbeholder Kolonihaver - Plantage + Skovbrug Kanal Bænk diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml index a49ff12b4d..472f3b66ba 100644 --- a/OsmAnd/res/values-ja/phrases.xml +++ b/OsmAnd/res/values-ja/phrases.xml @@ -366,4 +366,79 @@ 代替医療(Alternative medicine) 聴覚医(Audiologist) 血液バンク(Blood bank) + 総合病院・メディカルセンター(Medical center) + 助産師(Midwife) + 作業療法士(Occupational therapist) + 検眼医(Optometrist) + 理学療法士(Physiotherapist) + 足病医(Podiatrist) + 心理療法士(Psychotherapist) + リハビリテーション(Rehabilitation) + 言語聴覚士(Speech therapist) + 医療機関(Medical facility) + + 会社(Company) + 保険(Insurance) + 不動産屋(Estate agent) + 法律事務所(Lawyer) + 通信会社事務所(Telecommunication office) + NGO・非政府組織(NGO) + 町役場・市庁舎(Town hall) + 職業紹介所(Employment office) + 研究所(Research office) + IT関連事務所(IT office) + 新聞社(Newspaper office) + 建築設計事務所(Architect office) + 広告代理店(Advertising agency) + 教育団体事務所(Educational institution) + テレビ・ラジオ・録音スタジオ(Studio) + 賭博場(Bookmaker) + + スタジアム(Stadium) + 総合スポーツ場(Sports center) + ゴルフ場(Golf course) + アイススケート場(Ice rink) + 運動場(Pitch) + 競技トラック(Sports track) + ランニングトラック・陸上競技場(Running track) + 自転車トラック・競輪場(Bicycle track) + 競馬場(Horse track) + 自動車レース場(Raceway) + 9ピンボーリング場(Nine pin bowling) + 10ピンボーリング場(Ten pin bowling) + アーチェリー(Archery) + 陸上競技(Athletics) + アメリカンフットボール(American football) + オーストラリアンフットボール(Australian football) + ベースジャンピング(Base jumping) + 野球(Baseball) + バスケットボール(Basketball) + ビーチバレー(Beach volleyball) + BMX(BMX) + ペタンク・ブール(Boules) + ローンボウルズ(Bowls) + カナディアンフットボール(Canadian football) + カヌー(Canoe) + チェス(Chess) + ロッククライミング(Climbing) + クリケット(Cricket) + クロケット(Croquet) + サイクリング(Cycling) + ダイビング(Diving) + スキューバダイビング(Scuba diving) + ドッグレース(Dog racing) + 馬術・乗馬(Equestrian) + フィールドホッケー(Field hockey) + ゴルフ(Golf) + 体操競技(Gymnastics) + ハンドボール(Handball) + ホッケー(Hockey) + 競馬(Horse racing) + アイススケート(Ice skating) + アイスストック(Ice stock) + コーフボール(Korfbal) + モータースポーツ(Motor sport) + 総合競技・複合競技(Multi sport) + オリエンテーリング(Orienteering) + パドルテニス(Paddle tennis) diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml index 32eea4ff71..d6af5f5be4 100644 --- a/OsmAnd/res/values-ja/strings.xml +++ b/OsmAnd/res/values-ja/strings.xml @@ -749,7 +749,7 @@ POIの更新は利用できません フルバージョン ルートを却下 ナビを停止 - 目的地を削除 + 選択した目的地、経由地点を削除します、よろしいですか？ 現在Wi-Fiに接続されていません。現在のインターネット接続を使用したままダウンロードを続行しますか？ 通り 家屋番号 @@ -825,7 +825,7 @@ POIの更新は利用できません 記録中 %1$s %3$s %2$s 記録中 停止 - メモ + 記録 音声/ビデオメモ オフライン等高線のためのOsmAndプラグイン 距離の測定 @@ -835,7 +835,7 @@ POIの更新は利用できません シミュレーション開始 左側通行に設定 車が道路を左側通行する国は選択してください - 経由地点も削除します、よろしいですか？ + 選択地点の削除 経由地点 %1$s 経由地点 %1$s 最後の経由地点として追加 diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index e93e5be42f..bd92195f60 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -1,4 +1,5 @@ -Iskanje + +Iskanje Iskanje @@ -191,7 +192,7 @@ Prikaži izohipse Oddalji Približaj - Povečava je + Nivo povečave je sever sever-severovzhod severovzhod @@ -210,11 +211,11 @@ sever-severozahod Spredaj Spredaj desno - Desno + Na desno Zadaj desno Zadaj Zadaj levo - Levo + Na levo Spredaj levo uri proti @@ -626,7 +627,7 @@ Info Nazaj na mesto Pomoč - Pokaži podrobnosti + Pokaži podrobnosti lokacije Razširitve dostopnosti za stare različice Android Razširitve dostopnosti Način dostopnosti @@ -1255,7 +1256,7 @@ Nastavi kot cilj Najprej morate izbrati kraj ali ulico Iskanje ulice v sosednjih krajih - Vmesne točke so razvrščene po vrsti na poti do cilja. + Vmesne točke so razvrščene po vrsti na poti od trenutne lokacije do cilja. Uspešno ustvarjena datoteka sprememb za OSM %1$s Varnostna kopija sprememb za OSM ni uspela Varnostna kopija sprememb za OSM @@ -1523,7 +1524,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Letalo Obiščite https://code.google.com/p/osmand/wiki/FAQ za ogled pogosto zastavljenih vprašanj. Pogosto zastavljena vprašanja - Izbrisali boste %1$d osm sprememb. Ali ste prepričani? + Izbrisali boste %1$d OSM sprememb. Ali ste prepričani? Izbriši vse Upodabljanje zemljevida Pomorski znak @@ -2002,7 +2003,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Za namestitev tega vtičnika potrebujete internetno povezavo. Pridobi -Smučarske proge +Smušišča "Prosto %1$s " Pomnilnik naprave Teptanje smučarskih prog @@ -2012,7 +2013,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Sprememba dejanja Brisanje dejanja OSM urejanje - hmOstaja Parkirno mesto časovno omejeno + hmostaja Parkiranje časovno omejeno na Vaše spremembe Seznam Šir %1$s\n Dol %2$s @@ -2041,4 +2042,10 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Spletni zemljevid Le ceste Izdano - \ No newline at end of file + Odpri + Sporočilo + Dobrodošli + Pojdi + prekoračen čas + Kraji + diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index c041f8d517..64a0fe4d1b 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1838,7 +1838,7 @@ Börja sväng-efter-sväng-navigering efter … Kör Du håller på att skicka %1$d ändringar till OSM. Är du säker? - Vill du ta bort historiken? + Vill du tömma historiken? Gruppnamn bör vara minst tre tecken långa! Aktuell rutt OSM-ändringar lades till i lokala ändringar diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java index 04b8e7ef86..823c91546e 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java @@ -14,16 +14,13 @@ import android.widget.TextView; public class TextInfoWidget { private String contentTitle; - private View view; private ImageView imageView; private TextView textView; private TextView smallTextView; private ImageView topImageView; private TextView topTextView; - private boolean explicitlyVisible; - private OsmandApplication app; @@ -47,7 +44,7 @@ public class TextInfoWidget { } public void setImageDrawable(int res) { - setImageDrawable(app.getIconsCache().getIcon(res, R.color.map_widget_icon_color), false); + setImageDrawable(app.getIconsCache().getIcon(res, 0), false); } @@ -172,4 +169,4 @@ public class TextInfoWidget { -} \ No newline at end of file +}