From 35378099172b3b952634b1edd3aa2902a23fe810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 28 Jan 2019 16:48:06 +0100 Subject: [PATCH 1/2] New strings reworked --- OsmAnd/res/values/strings.xml | 90 +++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 6e8b921463..45b6d2d4f5 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -18,73 +18,73 @@ Swap start and destination Add destination Add intermediate - Add Start point + Add starting point Intermediate point: %1$s Waypoints: %1$s - transfers: %1$s - on foot: %1$s + Transfers: %1$s + On foot: %1$s Way: %1$s - Points of interests(POI) - Waiting for route calculation + Points of interest (POI) + Calculating route… Public transport - Select road on the map or from the list below that you want to avoid during navigation: + Select a road you want to avoid during navigation, either on the map, or from the list below: Show along the route Simulate navigation Choose track file to follow Voice announcements - Intermediate destinations: %1$s + Intermediate waypoints: %1$s Arrive at %1$s Subscriptions - Powered by OsmAnd + By OsmAnd Plan & Pricing - Pay monthly - Pay once in 3 months - Pay once a year + Monthly + Every three months + Annually %1$s / month %1$.2f %2$s / month Save %1$s! - Your current subscription + Current subscription Renews monthly Renews quarterly Renews annually %1$.2f %2$s Select the payment period convenient for you: - Part of income goes to OpenStreetMap contributors. - Delete Map marker \'%s\'? + Part of the income goes to OpenStreetMap contributors. + Delete map marker \'%s\'? Edit map marker - Third-party application + Third-party app Search street Select the city first Restore Markers added as a group of Favorites or GPX waypoints marked "Passed" will remain on the map. If the group is not active, the markers will disappear from the map. Keep passed markers on the map There is more transport on this stop. - Please give OsmAnd permission for location to continue. - Thank you for feedback + Please grant OsmAnd location access to continue. + Thank you for your feedback Node or way cannot be found. No search results?\nGive us feedback • Fixed crash on startup that occurred on some devices\n\n - • New Markers feature: display the markers that have already been traversed\n\n - • Search history now shows the categories you have searched for previously\n\n + • New Markers feature: Display already traversed markers\n\n + • Search history now shows previously searched categories\n\n • Fixed crash on startup that occurred with non-latin maps\n\n • Improve rendering speed issues on Android 8.0 devices\n\n • Support for polygon (non-amenity) objects editing\n\n - • Measure distance: add Measure button to Actions in the context menu\n\n + • Measure distance: Add \"Measure\" button to Actions in the context menu\n\n • Navigation: Fix progress bar, fast swapping of the start and end point of the route\n\n - • Map markers: fix turn on/off groups, ability to hide markers from the map\n\n + • Map markers: Fix turning on/off groups, ability to hide markers from the map\n\n • OSM Edit: Ability to edit tags for non-point objects and ways, fix missing comments on notes, backup of edits\n\n • Improve Wikipedia and Wikivoyage parsing, updated files are already available\n\n - • Context menu: fix transport shields color in the night mode, fix additional menu sizes\n\n - • Boat navigation: support for waterway fairway\n\n - • Other bug fixes\n\n + • Context menu: Fix transport shields color in the night mode, fix additional menu sizes\n\n + • Boat navigation: Support for waterway fairway\n\n + • Other bugfixes\n\n Committing way… Increase search radius to %1$s \"%1$s\", as well as your location.

- We do not collect personal information, we only need search data to improve the search algorithm.
]]> + No personal info is collected, search data is only used to improve the search algorithm.
]]> Send search query? World Point %1$s deleted @@ -460,9 +460,9 @@ Add destination Replace destination Add first intermediate - Tapping this action button makes the screen center the route destination, any previously selected destination becomes the last intermediate destination. + Tapping this action button makes the screen center the route destination, any previously selected destination becomes the last intermediate waypoint. Tapping this action button makes the screen center the new route destination, replacing the previously selected destination (if any). - Tapping this action button makes the screen center the first intermediate destination. + Tapping this action button makes the screen center the first intermediate waypoint. No overlay No underlay Error @@ -1559,7 +1559,7 @@ Avoid motorways Avoid stairs Avoid stairs - Avoid border crossing + Avoid border crossings Avoid crossing national borders Weight limit Specify permitted vehicle weight limit on routes. @@ -1592,7 +1592,7 @@ Please calculate the route first Simulate using calculated route Simulate using GPX track - Please add intermediate destinations if no path is found for this long route within 10 mins. + Please add intermediate waypoints if no path is found for this long route within 10 mins. No auto zoom To close-up To mid-range @@ -1632,9 +1632,9 @@ Speed cameras Traffic warnings Please specify OSM user and password in \'Settings\' - Clear intermediate destinations - Keep intermediate destinations - You already have intermediate destinations set. + Clear intermediate waypoints + Keep intermediate waypoints + You already have intermediate waypoints set. Directions to Directions from Map: @@ -1651,7 +1651,7 @@ Set as destination Select city or street first Search for street in neighborhood cities - Optimized order of intermediate destinations en-route to the destination. + Optimized order of intermediate waypoints en-route to the destination. Sort door-to-door OSM change file was generated %1$s Could not back up OSM changes @@ -1714,7 +1714,7 @@ Contour lines Audio/Video data Are you sure you want to stop the navigation? - Are you sure you want to clear your destination (and intermediate destinations)? + Are you sure you want to clear your destination (and intermediate waypoints)? Calculate precise routes without glitches. Still distance-limited and slow. Precise routing (alpha) Show @@ -1779,31 +1779,31 @@ Roads-only maps Run the app in safe mode (using slower Android instead of native code). Safe mode - The app is running in safe mode (disable it in \'Settings\'). + The app is running in safe mode (turn it off in \'Settings\'). Close changeset ZXing Barcode Scanner app not installed. Search in Google Play? Select a road color scheme: Road color scheme Show destination direction - Enable the Trip recording plugin to use position logging services (GPX logging, online tracking) + Enable the \"Trip recording\" plugin to use position logging services (GPX logging, online tracking) Calculate possibly non-optimal route over long distances Please enable GPS in the settings Logging services No route Remove destination Destination %1$s - Intermediate destination %1$s - Add as last intermediate destination - Add as first intermediate destination - Add as last intermediate destination - Add as first intermediate destination + Intermediate waypoint %1$s + Add as last intermediate waypoint + Add as first intermediate waypoint + Add as last intermediate waypoint + Add as first intermediate waypoint Replace the destination You have already set a destination: Destinations - Intermediate destination %1$s is too far from the nearest road. - You have arrived at your intermediate destination - Add as intermediate destination - Intermediate destination + Intermediate waypoint %1$s is too far from the nearest road. + Intermediate waypoint reached + Add as intermediate waypoint + Intermediate waypoint Intermediate time Ending point too far from nearest road. Add Tag From 1b540be17f1cd94474aad57b8db796ea480be241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 18 Feb 2019 00:11:57 +0100 Subject: [PATCH 2/2] Reverted to intermediate destination/s, one ! avoided --- OsmAnd/res/values/strings.xml | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 45b6d2d4f5..e68f294822 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -32,7 +32,7 @@ Simulate navigation Choose track file to follow Voice announcements - Intermediate waypoints: %1$s + Intermediate destinations: %1$s Arrive at %1$s Subscriptions By OsmAnd @@ -42,7 +42,7 @@ Annually %1$s / month %1$.2f %2$s / month - Save %1$s! + Save %1$s. Current subscription Renews monthly Renews quarterly @@ -460,9 +460,9 @@ Add destination Replace destination Add first intermediate - Tapping this action button makes the screen center the route destination, any previously selected destination becomes the last intermediate waypoint. + Tapping this action button makes the screen center the route destination, any previously selected destination becomes the last intermediate destination. Tapping this action button makes the screen center the new route destination, replacing the previously selected destination (if any). - Tapping this action button makes the screen center the first intermediate waypoint. + Tapping this action button makes the screen center the first intermediate destination. No overlay No underlay Error @@ -1592,7 +1592,7 @@ Please calculate the route first Simulate using calculated route Simulate using GPX track - Please add intermediate waypoints if no path is found for this long route within 10 mins. + Please add intermediate destinations if no path is found for this long route within 10 mins. No auto zoom To close-up To mid-range @@ -1632,9 +1632,9 @@ Speed cameras Traffic warnings Please specify OSM user and password in \'Settings\' - Clear intermediate waypoints - Keep intermediate waypoints - You already have intermediate waypoints set. + Clear intermediate destinations + Keep intermediate destinations + You already have intermediate destinations set. Directions to Directions from Map: @@ -1651,7 +1651,7 @@ Set as destination Select city or street first Search for street in neighborhood cities - Optimized order of intermediate waypoints en-route to the destination. + Optimized order of intermediate destinations en-route to the destination. Sort door-to-door OSM change file was generated %1$s Could not back up OSM changes @@ -1714,7 +1714,7 @@ Contour lines Audio/Video data Are you sure you want to stop the navigation? - Are you sure you want to clear your destination (and intermediate waypoints)? + Are you sure you want to clear your destination (and intermediate destinations)? Calculate precise routes without glitches. Still distance-limited and slow. Precise routing (alpha) Show @@ -1792,18 +1792,18 @@ No route Remove destination Destination %1$s - Intermediate waypoint %1$s - Add as last intermediate waypoint - Add as first intermediate waypoint - Add as last intermediate waypoint - Add as first intermediate waypoint + Intermediate destination %1$s + Add as last intermediate destination + Add as first intermediate destination + Add as last intermediate destination + Add as first intermediate destination Replace the destination You have already set a destination: Destinations - Intermediate waypoint %1$s is too far from the nearest road. - Intermediate waypoint reached - Add as intermediate waypoint - Intermediate waypoint + Intermediate destination %1$s is too far from the nearest road. + Intermediate destination reached + Add as intermediate destination + Intermediate destination Intermediate time Ending point too far from nearest road. Add Tag