From 2ba3a2cd35daecf4874abe67e4657d96e66dab49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 16 Jan 2020 19:28:13 +0100 Subject: [PATCH 01/21] Conflicts fixed and updated --- OsmAnd/res/values/strings.xml | 283 +++++++++++++++++----------------- 1 file changed, 142 insertions(+), 141 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 89b6bd1019..dfd6491a87 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -13,72 +13,72 @@ --> %1$s %2$s %1$s: %2$s - By clicking %1$s, you will lose all your changes. - All profile settings will be reset to the state after installation. - Reset all profile settings to default? + By clicking %1$s you lose all your changes. + All profile settings will return to installation defaults. + Reset all profile settings? Select navigation icon Select map icon - After you tap Apply, deleted profiles will be lost completely. + Tapping \"Apply\", deleted profiles will be lost for good. Master profile - Select color + Select colour Thick - For deserts and other sparsely populated areas. Displays more detail on a viewing scale. + For deserts and other sparsely populated areas. More details. Downloading %s - You can’t delete default OsmAnd profiles, but you can disable them in previous screen, or move them to the bottom. + You can’t delete default OsmAnd profiles, but you can go back and remove them, or move them to the bottom. Edit profiles - Navigation type affects the rules for route calculations. + \'Navigation type\' affects rules for route calculations. %1$s • %2$s %1$s, %2$s Personal - Add new profile \'%1$s\'? + Add the new profile \'%1$s\'? Include heading - Save heading to each trackpoint while recording. + Save heading to each trackpoint while tracking. Profile appearance - Choose icon, color and name - Edit profiles list + Choose icon, colour and name + Edit profile list Selected profile Node networks Show node network cycle routes Join segments Download map dialog Dialogs and notifications - Control popups, dialogs and notifications that OsmAnd show during usage. + Control popups, dialogs and notifications. Suggested maps Those maps are required to use with plugin Added profiles - Plugin adds new profile to OsmAnd + Profiles added by plugin Turn off New plugin added Clear %1$s? Revert Track saved - File name is empty - Used to estimate arrival time for unknown type of roads and to limit speed for all roads (could change the route) + Filename empty + Estimates arrival time for unknown road types, and to limit speed for all roads (can re-oute) White - Swap %1$s and %2$s + Swap %1$s ⇄ %2$s Starting point Export profile OsmAnd profile: %1$s Profile \'%1$s\' already exists. Overwrite? Could not export profile. Profile import - To import a profile, select its file on the device and open it with OsmAnd. + Import a profile by opening the file in OsmAnd. %1$s import error: %2$s - %1$s successfully imported. - Cannot start text-to-speech engine + %1$s imported. + Cannot start text-to-speech engine. OSM Edits - A toggle to show or hide contour lines on the map. + Button showing or hiding contour lines on the map. Show contour lines Hide contour lines Show/hide contour lines - A toggle to show or hide hillshade on the map. + Button showing or hiding hillshade on the map. Show hillshade Hide hillshade Show/hide hillshade - You can apply this change to all profiles or only to the currently selected one. + You can apply this change to all or only the selected profile. Shared - Prefer unpaved roads - Prefer unpaved roads. + Prefer unpaved routes + Prefer unpaved routes. • Updated app and profile settings: Settings are now arranged by type. Each profile can be customized separately.\n\n • New map download dialog suggesting a map to download while browsing\n\n @@ -94,8 +94,8 @@ Used %1$s MB Used %1$s kB Contour lines and hillshade - Prefer unpaved roads - Prefer unpaved roads. + Prefer unpaved routes + Prefer unpaved routes. Update all maps Are you sure you want to update all (%1$d) maps? Track storage folder @@ -123,8 +123,8 @@ Paste path to the folder with OsmAnd data Change OsmAnd data folder? Move to the new destination - Internal storage, hidden from user and other apps, exclusively accessible to OsmAnd - Change data storage folder + Internal storage for OsmAnd, (hidden from users and other apps). + Change storage folder Terrain park Sleigh Sled @@ -163,7 +163,7 @@ Apply to all profiles Start-up message Analytics - Show map on the lock screen during navigation. + Map on lock screen during navigation. Settings for routing in the selected profile \"%1$s\". Wake time Units & formats @@ -173,7 +173,7 @@ Installed plugins Configure navigation App theme, units, region - Alerts are shown in the bottom left during navigation. + Alerts shown bottom left during navigation. Language and output Reset to default Create, import, edit profiles @@ -187,7 +187,7 @@ Other Weight, height, speed Vehicle parameters - Voice announcements only happen during navigation. + Voice announcements only occur during navigation. Navigation instructions and announcements Voice prompts Screen alerts @@ -249,16 +249,16 @@ Number of changes UFO - • App profiles: Create a custom profile for your own needs, with a custom icon and color\n\n - • Now customize any profile\'s default and min/max speeds\n\n - • Added a widget for the current coordinates\n\n - • Added options to show the compass and a radius ruler on the map\n\n - • Fix background track logging\n\n - • Improved background map downloads\n\n - • Returned \'Turn screen on\' option\n\n - • Fixed Wikipedia language selection\n\n - • Fixed compass button behavior during navigation\n\n - • Other bugfixes\n\n + • App profiles: Create a custom profile for your own needs, with a custom icon and color\n\n + • Now customize any profile\'s default and min/max speeds\n\n + • Added a widget for the current coordinates\n\n + • Added options to show the compass and a radius ruler on the map\n\n + • Fix background track logging\n\n + • Improved background map downloads\n\n + • Returned \'Turn screen on\' option\n\n + • Fixed Wikipedia language selection\n\n + • Fixed compass button behavior during navigation\n\n + • Other bugfixes\n\n Horizontal precision: %1$s, vertical: %2$s Horizontal precision: %s @@ -270,6 +270,7 @@ Default speed Change default speed settings Set min/max speed + Used to calculate the expected arrival time New profile Crash Last OsmAnd run crashed. Please help us improve OsmAnd by sharing the error message. @@ -329,7 +330,7 @@ Car, truck, motorcycle Mountain bike, moped, horse Walking, hiking, running - All PT types + All personal transport types Ship, rowing, sailing Airplane, gliding Geocoding @@ -356,7 +357,6 @@ Calculate route on foot Transport type Send log - No trams Avoids trams No buses @@ -370,10 +370,10 @@ No ferries Avoids ferries Degrees Milliradians @@ -441,14 +441,14 @@ Grade 4 Grade 5 Enable public transport for OsmAnd Live changes. OsmAnd Live public transport @@ -462,7 +462,7 @@ Show more Displayed tracks Show/hide GPX tracks - A toggle to show or hide selected GPX tracks on the map. + Button showing or hiding selected GPX tracks on the map. Hide GPX Tracks Show GPX Tracks Please set the destination first @@ -574,7 +574,6 @@ Show images You have canceled your OsmAnd Live subscription Renew subscription to continue using all the features: - Based on the articles you bookmarked, the following maps are recommended for you to download: Maps you need OsmAnd team @@ -792,7 +791,7 @@ A-Z Added Order by: - Select how to indicate distance and direction to map markers on the map screen: + Select how to indicate distance and direction to map markers on the map: Map orientation threshold Select speed of switching orientation from \'Movement direction\' to \'Compass directon\' below. All map markers moved to history @@ -812,7 +811,7 @@ Distance indication Sort by No animations - Disables animations in the app. + Turns off map animations. Keep showing on map Exit without saving? Line @@ -832,10 +831,10 @@ Browse the map and add points Measure distance Pause/resume navigation - Tap this button to pause or resume the navigation. + Button to pause or resume navigation. Show \'Navigation finished\' dialog Start/stop navigation - Tap this button to start or end the navigation. + Button to start or end navigation. Store recorded tracks in monthly folders Store recorded tracks in sub-folders per recording month (like 2018-01). Reset @@ -878,7 +877,7 @@ Toggle OSM Notes Show OSM Notes Hide OSM Notes - A toggle to show or hide OSM Notes on the map. + Button showing or hiding OSM Notes on the map. Sorted by distance Search in Favorites Download the \'Hillshade Overlay\' map to show vertical shading. @@ -907,16 +906,16 @@ Select city Postcode search Auto zoom map on/off - A toggle to turn on/off auto map zoom according to your speed. - Enable auto zoom map - Disable auto zoom map + Button turning on or off auto zoom according to your speed. + Turn on auto zooming + Turn off auto zooming Set destination Replace destination Add first intermediate - A button to make the screen center the route destination, any previously selected destination becomes the last intermediate destination. + Button centering in on route destination, making previously selected destination becomes the last intermediate destination. A button to make the screen center the point of departure and calculate route to the destination or open a dialog to select destination if the destination marker is not on the map. - Tapping this action button makes the screen center the new route destination, replacing the previously selected destination (if any). - A button to make the screen center the first intermediate destination. + Button centering in on new route destination, replacing previously selected destination (if any). + Button centering in on first intermediate destination. No overlay No underlay Error @@ -1093,6 +1092,7 @@ Subscription enables hourly, daily, weekly updates, and unlimited downloads for all maps globally. Get it Get for %1$s + Get for %1$s month Get unlimited map downloads, adding weekly, daily, or even hourly updates. Unlimited map downloads, updates, and Wikipedia plugin. Miles/meters @@ -1195,7 +1195,6 @@ No waypoints found Anonymous users cannot:\n- Create groups;\n- Sync groups and devices with the server;\n- Manage groups and devices in a personal dashboard on the website. Report - The app is now allowed to write to external storage, but needs to be started again to do so. Cancel download? Thank you for using OsmAnd. Download regional data for offline use via \'Settings\' → \'Manage map files\' to view maps, locate addresses, look up POIs, find public transport and more. - The basemap needed to provide basic functionality is in the download queue. + The basemap (in the download queue) provides basic functionality. Online and cached tile maps Standard maps (vector) Download and manage offline map files stored on your device. @@ -2847,13 +2847,14 @@ Overlay map Choose the overlay map Map already installed, \'Settings\' will be updated. - Choose (tile) maps to install or update. + Choose maps to install or update. Unable to perform operation without a connection to the Internet. Install more… Use raster maps for anything beyond this level. Minimum vector zoom level Online OSM map classification with images. Could not perform offline search. + Could not parse geo intent \'%s\'. Search by geo location System App display language (used after OsmAnd is restarted). @@ -2951,7 +2952,7 @@ Show POI phone type to filter High resolution display - Do not stretch (and blur) map tiles on high density displays. + Do not stretch (and blur) maps on high density displays. Search public transport Transport results (no destination): Transport results ({0} to destination): @@ -3077,11 +3078,11 @@ Offline search Online search Max. online zoom - Do not browse online map tiles for zoom levels beyond this. + Do not browse online maps for zoom levels beyond this. Total distance %1$s, traveling time %2$d h %3$d min. Online or offline navigation service. Navigation service - The data storage folder on the memory card is not accessible! + The data folder on the memory card is not accessible! Download {0} - {1} ? Offline data for {0} already exists ({1}). Update it ({2})? Address @@ -3122,7 +3123,7 @@ Finished Use the Internet to calculate a route. Use online navigation - Specify OpenStreetMap.org (OSM) settings needed for OSM submissions. + Specify OpenStreetMap.org login details to upload edits. Specify language, download/reload data. Data Additional settings @@ -3142,13 +3143,13 @@ Map View 3D Show the last used POI overlay. Show POI overlay - Choose source of online or cached map tiles + Choose source of online or cached maps Tile map source Map source Use the Internet Show your position Show GPS coordinates on the map - Download missing map tiles + Download missing map parts Navigation app Search Search @@ -3164,7 +3165,7 @@ Walking Center Bottom - Input latitude & longitude in the selected format (D - degrees, M - minutes, S - seconds) + Input latitude and longitude in the selected format (D - degrees, M - minutes, S - seconds) Latitude Longitude DDD.DDDDD @@ -3331,7 +3332,7 @@ Number of contributors Number of edits Report for - File name contains illegal character + Filename contains illegal character Quick action Action %d Screen %d @@ -3356,16 +3357,16 @@ Are you sure you want to delete the action \"%s\"? Show Favorites dialog Name preset - A button to add a map marker at the screen center location. - A button to add a GPX waypoint in the middle of the screen. - A button to add an audio note in the middle of the screen. - A button to add a video note in the middle of the screen. - A button to add a photo note in the middle of the screen. - A button to add an OSM note in the middle of the screen. - A button to add a POI in the middle of the screen. - A toggle to disable or enable voice guidance during navigation. - A button to add a parking location in the middle of the screen. - A toggle to switch between day and night modes for OsmAnd. + Button adding a map marker in the middle of the screen. + Button adding a GPX waypoint in the middle of the screen. + Button adding an audio note in the middle of the screen. + Button adding a video note in the middle of the screen. + Button adding a photo note in the middle of the screen. + Button adding an OSM note in the middle of the screen. + Button adding a POI in the middle of the screen. + Button turning on or off voice guidance during navigation. + Button adding a parking location in the middle of the screen. + Button switching between \'Day\' and \'Night\' modes for OsmAnd. Day mode Night mode Switch day/night mode @@ -3374,8 +3375,8 @@ Place Quick action renamed to %1$s to avoid duplication. Quick action name duplicate - A toggle to show or hide the Favorite points on the map. - A toggle to show or hide POIs on the map. + Button showing or hideing Favorite points on the map. + Button showing or hiding POIs on the map. Show/hide Favorites Show Favorites Hide Favorites @@ -3393,7 +3394,7 @@ Choose an optional category. POI list Add one or more POI categories to display on the map. - A button to page through the list below. + Button paging through the list below. Add a map style Fill out all parameters Map styles @@ -3478,7 +3479,7 @@ Prefered difficulty Prefer routes of this difficulty, although routing over harder or easier pistes is still possible if shorter. Off-piste - Freeride and offpiste are unofficial routes and passages. Typically ungroomed, unmaintained by the officials and not checked in the evening. Enter at your own risk. + \'Freeride\' and \'Off-piste\' are unofficial routes and passages. Typically ungroomed, unmainted by the officials and not checked in the evening. Enter at your own risk. From 1f6a6bbebbf9b6b28c1ebca4e851c843e340036c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 16 Jan 2020 19:57:15 +0100 Subject: [PATCH 02/21] Removed duplicated string --- OsmAnd/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index dfd6491a87..1020ab6db6 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -270,7 +270,6 @@ Default speed Change default speed settings Set min/max speed - Used to calculate the expected arrival time New profile Crash Last OsmAnd run crashed. Please help us improve OsmAnd by sharing the error message. From bd924b17000a758ae9f14b10b25d662ba271f7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 16 Jan 2020 19:59:06 +0100 Subject: [PATCH 03/21] Clarified string --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 1020ab6db6..3d7e2869d3 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -53,7 +53,7 @@ Revert Track saved Filename empty - Estimates arrival time for unknown road types, and to limit speed for all roads (can re-oute) + Estimates arrival time for unknown road types, and limits speed for all roads (can re-oute) White Swap %1$s ⇄ %2$s Starting point From ec41441db0c1071359bb387d059753b63c8ac86b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 16 Jan 2020 20:01:23 +0100 Subject: [PATCH 04/21] Removed duplicated string --- OsmAnd/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 3d7e2869d3..16fd5c5d82 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -1091,7 +1091,6 @@ Subscription enables hourly, daily, weekly updates, and unlimited downloads for all maps globally. Get it Get for %1$s - Get for %1$s month Get unlimited map downloads, adding weekly, daily, or even hourly updates. Unlimited map downloads, updates, and Wikipedia plugin. Miles/meters From cfbc82e41ff57e2661e2b75efef546113a856bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 16 Jan 2020 20:02:20 +0100 Subject: [PATCH 05/21] Spelling: Unmaintained --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 16fd5c5d82..1b34517af5 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -3477,7 +3477,7 @@ Prefered difficulty Prefer routes of this difficulty, although routing over harder or easier pistes is still possible if shorter. Off-piste - \'Freeride\' and \'Off-piste\' are unofficial routes and passages. Typically ungroomed, unmainted by the officials and not checked in the evening. Enter at your own risk. + \'Freeride\' and \'Off-piste\' are unofficial routes and passages. Typically ungroomed, unmaintained by the officials and not checked in the evening. Enter at your own risk. From 356dc482fcf1539beddf7b59df456505e28912d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 16 Jan 2020 20:03:33 +0100 Subject: [PATCH 06/21] Spelling: hiding. Markup fixed --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 1b34517af5..93ee9036eb 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -3373,7 +3373,7 @@ Place Quick action renamed to %1$s to avoid duplication. Quick action name duplicate - Button showing or hideing Favorite points on the map. + Button showing or hiding \'Favorite\' points on the map. Button showing or hiding POIs on the map. Show/hide Favorites Show Favorites From f9ce29620487adf2b5f4cdf33b341b5a5316b0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 16 Jan 2020 20:05:17 +0100 Subject: [PATCH 07/21] Direct action change for filename change --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 93ee9036eb..b9cd95a123 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -3330,7 +3330,7 @@ Number of contributors Number of edits Report for - Filename contains illegal character + Remove all illegal characters from the filename Quick action Action %d Screen %d From d324c53e01b5edd9502c0c357cf40c4b90a7d3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 16 Jan 2020 20:06:58 +0100 Subject: [PATCH 08/21] Storage folder innaccesible, -data --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index b9cd95a123..7ea2938185 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -3080,7 +3080,7 @@ Total distance %1$s, traveling time %2$d h %3$d min. Online or offline navigation service. Navigation service - The data folder on the memory card is not accessible! + The storage folder on the memory card is inaccessible! Download {0} - {1} ? Offline data for {0} already exists ({1}). Update it ({2})? Address From 6635ed9ce75c8375da1f4fd475d9814297d5f6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 16 Jan 2020 20:14:59 +0100 Subject: [PATCH 09/21] Unused GPS wake-up string removed --- OsmAnd/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 7ea2938185..33d7b8bf8f 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2497,7 +2497,6 @@ Transparent widgets Run\n app in background Stop\n running in background - GPS wake-up interval: %s Continuous Tap the lock icon to unlock Street name From b62bdf7be01bd99d74db1240c90800bf31383411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 18 Jan 2020 22:04:29 +0100 Subject: [PATCH 10/21] Sentence ending in dot --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 963a44b420..9993e5d5c5 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2609,7 +2609,7 @@ Left-hand traffic For countries where people drive on the left side of the road. Tap any existing item to see more details, long-tap to deactivate or delete. Current data on device (%1$s free): - Point of departure not yet determined + Point of departure not yet determined. Position not yet known Set transparency (0 - transparent, 255 - opaque) From 9d613f1463dd6f7eadedb5046ec9c620f5c7563d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 18 Jan 2020 22:05:06 +0100 Subject: [PATCH 11/21] Sentence ending in dot --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 9993e5d5c5..5e24d998c5 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2610,7 +2610,7 @@ For countries where people drive on the left side of the road. Tap any existing item to see more details, long-tap to deactivate or delete. Current data on device (%1$s free): Point of departure not yet determined. - Position not yet known + Position not yet known. Set transparency (0 - transparent, 255 - opaque) Cancel download? From 77315b07f9cda9bc03079cca72bddba19210b7de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 18 Jan 2020 22:06:19 +0100 Subject: [PATCH 12/21] - by the officials --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 5e24d998c5..793e46bd9e 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -3501,7 +3501,7 @@ Prefered difficulty Prefer routes of this difficulty, although routing over harder or easier pistes is still possible if shorter. Off-piste - \'Freeride\' and \'Off-piste\' are unofficial routes and passages. Typically ungroomed, unmaintained by the officials and not checked in the evening. Enter at your own risk. + \'Freeride\' and \'Off-piste\' are unofficial routes and passages. Typically ungroomed, unmaintained and not checked in the evening. Enter at your own risk. From ec90b882d526efa6096d4e7a66ab3e1c7ab7629f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 18 Jan 2020 22:09:27 +0100 Subject: [PATCH 13/21] Spelling: Preferred --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 793e46bd9e..83cd458780 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -3498,7 +3498,7 @@ Routes groomed for freestyle or skating only without classic tracks. Allow classic only routes Routes groomed for classic style only without skating trails. This includes routes groomed by a smaller snowmobile with looser piste and tracks made manually by skiers. - Prefered difficulty + Preferred difficulty Prefer routes of this difficulty, although routing over harder or easier pistes is still possible if shorter. Off-piste \'Freeride\' and \'Off-piste\' are unofficial routes and passages. Typically ungroomed, unmaintained and not checked in the evening. Enter at your own risk. From 50209a6ceb8f93e0aacc43eb2747f252e081ba05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 18 Jan 2020 22:12:52 +0100 Subject: [PATCH 14/21] Spelling: -for OsmAnd. --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 83cd458780..5ce0b67811 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -3388,7 +3388,7 @@ Button adding a POI in the middle of the screen. Button turning on or off voice guidance during navigation. Button adding a parking location in the middle of the screen. - Button switching between \'Day\' and \'Night\' modes for OsmAnd. + Button switching between \'Day\' and \'Night\' mode. Day mode Night mode Switch day/night mode From 5e2d0f9d3434a996cf4471007f3b1afad171b30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 18 Jan 2020 22:29:15 +0100 Subject: [PATCH 15/21] Spelling: from the filename first --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 5ce0b67811..bccd2b0484 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -3354,7 +3354,7 @@ Number of contributors Number of edits Report for - Remove all illegal characters from the filename + Remove all illegal characters from the filename first Quick action Action %d Screen %d From c17c6d84ef4bad4421b4bfa569665d885eff1e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 18 Jan 2020 23:28:34 +0100 Subject: [PATCH 16/21] New strings reworked, OSM, OSM notes --- OsmAnd/res/values/strings.xml | 102 +++++++++++++++++----------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index bccd2b0484..00dedbc378 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,8 +11,8 @@ Thx - Hardy --> - \'%1$s\' file doesn\'t contain routing rules, please choose another file. - Not supported file type. You need to select a file with %1$s extension. + No routing rules in \'%1$s\'. Please choose another file. + Select a supported file with %1$s extension instead. Import from file Import routing file Import profile @@ -20,36 +20,36 @@ Picture size, audio and video quality Login, password, offline editing Choose icon, color and name - Allow you to share current location using trip recording. + Allows sharing current location using trip recording. Online tracking Logging accuracy - You can find all your recorded tracks in Menu — My place — Tracks or in OsmAd folder using file manager. - You can find all your notes in Menu — My places — Notes + All your recorded tracks are to be found in Menu → My place → Tracks, or in the OsmAd folder. + All your OSM notes are to be found in Menu → My places → OSM edits. Video notes Photo notes Route recalculation Announce Username and password - This plugin settings are global, and apply to all profiles. - OpenStreetMap Editing - You can view all your unuploaded edits or osm bugs in Menu — My places — OSM Edits. Uploaded points don’t show in OsmAnd. + These settings apply to all profiles. + OSM editing + View all your unuploaded edits or OSM bugs in Menu → My places — OSM edits. Uploaded points don’t show in OsmAnd. OSM - You will see the icon only while navigation or while moving. - Map icon appears only on the map, and changing while navigation to navigation icon. + Icon only shown while navigating or moving. + Map icon only shown on the map. %1$s %2$s %1$s: %2$s By clicking %1$s you lose all your changes. All profile settings will return to installation defaults. Reset all profile settings? - Select navigation icon - Select map icon - Tapping \"Apply\", deleted profiles will be lost for good. + Navigation icon + Map icon + Tapping \"Apply\", deletes all profiles permanently. Master profile - Select colour + Select color Thick - For deserts and other sparsely populated areas. More details. + For deserts and other sparsely populated areas. More detailed. Downloading %s - You can’t delete default OsmAnd profiles, but you can go back and remove them, or move them to the bottom. + OsmAnd profiles can be moved to the bottom, but not deleted. Go back to remove them. Edit profiles \'Navigation type\' affects rules for route calculations. %1$s • %2$s @@ -59,7 +59,7 @@ Include heading Save heading to each trackpoint while tracking. Profile appearance - Choose icon, colour and name + Icon, color and name Edit profile list Selected profile Node networks @@ -80,18 +80,18 @@ Filename empty Estimates arrival time for unknown road types, and limits speed for all roads (can re-oute) White - Swap %1$s ⇄ %2$s + %1$s ⇄ %2$s Starting point Export profile OsmAnd profile: %1$s - Profile \'%1$s\' already exists. Overwrite? + \'%1$s\' already exists. Overwrite? Could not export profile. - Profile import - Import a profile by opening the file in OsmAnd. + Import profile + Add a profile by opening the file in OsmAnd. %1$s import error: %2$s %1$s imported. Cannot start text-to-speech engine. - OSM Edits + OSM edits Button showing or hiding contour lines on the map. Show contour lines Hide contour lines @@ -107,7 +107,7 @@ • Updated app and profile settings: Settings are now arranged by type. Each profile can be customized separately.\n\n • New map download dialog suggesting a map to download while browsing\n\n - • Night theme fixes\n\n + • Night mode fixes\n\n • Fixed several routing issues around the world\n\n • Updated basemap with more detailed road network\n\n • Fixed flooded areas around the world\n\n @@ -531,7 +531,7 @@ Renews annually %1$.2f %2$s Payment interval: - Donations help fund OpenStreetMap cartography. + Donations help fund OSM cartography. Delete map marker \'%s\'? Edit map marker Third-party app @@ -689,13 +689,13 @@ Show closed notes Show/hide OSM notes on the map. GPX - suitable for export to JOSM or other OSM editors. - OSC - suitable for export to OpenStreetMap. + OSC - suitable for export to OSM. GPX file OSC file Select filetype - Select the export type: OSM notes, POIs, or both. + Export as OSM notes, POIs, or both. All data - OSM Notes + OSM notes Opens tomorrow at POI labels Without name @@ -725,16 +725,16 @@ Actions Marker Create or modify OSM objects - Create or modify OSM POIs, open or comment OSM Notes, and contribute recorded GPX files. + Create or modify OSM POIs, open or comment OSM notes, and contribute recorded GPX files. Deleted Edited Added Marker %s activated. Tap a marker on the map to move it to the top of the active markers without opening the context menu. \'One tap\' active - Take notes! + Make notes! Add audio, video or photo note to every point on the map, using widget or context menu. - Notes by date + OSM notes by date By date By type Looking for tracks with waypoints @@ -898,10 +898,10 @@ Increase search radius Nothing found Change the search or increase its radius. - Toggle OSM Notes - Show OSM Notes - Hide OSM Notes - Button showing or hiding OSM Notes on the map. + Show or hude OSM notes + Show OSM notes + Hide OSM notes + Button showing or hiding OSM notes on the map. Sorted by distance Search in Favorites Download the \'Hillshade Overlay\' map to show vertical shading. @@ -1033,7 +1033,7 @@ \u2022 Transport menu: all available routes are now at the top\n\n \u2022 Wikipedia: added the button to open the original article, updated the appearance of articles\n\n \u2022 Route: added possibility to swap start and end points in one tap\n\n - \u2022 Notes: added sorting by type and date\n\n + \u2022 OSM notes: Added sorting by type and date\n\n \u2022 OSM edits: Show an icon and a name of the POI category, display completed actions\n\n \u2022 New quick coordinate input screen for quick markers creation\n\n \u2022 Detection of stop signs now considers driving direction\n\n @@ -1053,7 +1053,7 @@ Hide water Use motorways Allows motorways. - Upload your OSM Note anonymously or by using your OpenStreetMap.org profile. + Upload your OSM note anonymously or by using your OSM.org profile. Nearby Wikipedia articles City or region Take %1$d exit and go @@ -1111,8 +1111,8 @@ New filter Please enter a name for the new filter, this will be added to your \'Categories\' tab. Subscription charged per month. Cancel it on Google Play at any time. - Donation to OpenStreetMap community - Part of your donation is sent to the OSM users who submit changes to OpenStreetMap. The cost of the subscription remains the same. + Donation to the OSM community + Part of your donation is sent to the OSM cartographers. The subscription cost remains the same. Subscription enables hourly, daily, weekly updates, and unlimited downloads for all maps globally. Get it Get for %1$s @@ -1236,7 +1236,7 @@ Top bar Full report Recalculate route - OpenStreetMap username and password + OSM username and password Donations Number of recipients Edits %1$s, rank %2$s, total edits %3$s @@ -1710,7 +1710,7 @@ Accessibility Makes the device\'s accessibility features directly available in OsmAnd. It facilitates e.g. adjusting the speech rate for text-to-speech voices, configuring D-pad navigation, using a trackball for zoom control, or text-to-speech feedback, for example to auto announce your position. OSM editing - Make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM Notes, and contributing recorded GPX files in OsmAnd by supplying your username and password. OSM is a libre, community driven, global public domain mapping project https://openstreetmap.org. + Make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM notes, and contributing recorded GPX files in OsmAnd by supplying your username and password. OSM.org is a libre, community driven, global public domain mapping project. Settings for development and debugging features, like routing simulation, rendering performance, or voice announcements. OsmAnd development Renaming failed. @@ -1719,7 +1719,7 @@ Share note Location:\n Lat %1$s\n Lon %2$s Watch - Notes + OSM notes Online map Roads only Ski slopes @@ -2316,7 +2316,7 @@ OsmAnd (OSM Automated Navigation Directions)\n\n - OsmAnd is an open source software navigation app with access to a wide variety of global OpenStreetMap (OSM) data. All map data (vector or tile maps) can be stored on the phone memory card for offline usage. Offline and online routing functionality is also offered, including turn-by-turn voice guidance.\n\n + OsmAnd is an open source software navigation app with access to a wide variety of global OSM data. All map data (vector or tile maps) can be stored on the phone memory card for offline usage. Offline and online routing functionality is also offered, including turn-by-turn voice guidance.\n\n Some of the core features:\n - Complete offline functionality (store downloaded vector or tile maps in the device storage)\n @@ -2338,7 +2338,7 @@ OsmAnd is actively being developed and our project and its continued progress relies on financial contributions for development and testing of new functionality. Please consider buying OsmAnd+, or funding specific new features or making a general donation on https://osmand.net. - OsmAnd (OSM Automated Navigation Directions) is a map and navigation app with access to the free, worldwide, and high-quality OpenStreetMap (OSM) data.\n\n + OsmAnd (OSM Automated Navigation Directions) is a map and navigation app with access to the free, worldwide, and high-quality OSM data.\n\n Enjoy voice and optical navigator, viewing POIs (points of interest), creating and managing GPX tracks, using contour lines visualization and altitude info (through plugin), a choice between driving, cycling, pedestrian modes, OSM editing and much more. @@ -2412,7 +2412,7 @@ OsmAnd+ (OSM Automated Navigation Directions)\n\n - OsmAnd+ is an open source software navigation app with access to a wide variety of global OpenStreetMap (OSM) data. All map data (vector or tile maps) can be stored on the phone memory card for offline use. Offline and online routing functionality is also offered, including turn-by-turn voice guidance.\n\n + OsmAnd+ is an open source software navigation app with access to a wide variety of global OSM data. All map data (vector or tile maps) can be stored on the phone memory card for offline use. Offline and online routing functionality is also offered, including turn-by-turn voice guidance.\n\n OsmAnd+ is the paid app version, by buying it you support the project, fund the development of new features, and receive the latest updates.\n\n @@ -2431,7 +2431,7 @@ - Lane guidance, speed limit display, recorded and text-to-speech voices\n - OsmAnd+ (OSM Automated Navigation Directions) is a map and navigation app with access to the free, worldwide, and high-quality OpenStreetMap (OSM) data.\n + OsmAnd+ (OSM Automated Navigation Directions) is a map and navigation app with access to the free, worldwide, and high-quality OSM data.\n Enjoy voice and optical navigation, viewing POIs (points of interest), creating and managing GPX tracks, using contour lines visualization and altitude info, a choice between driving, cycling, pedestrian modes, OSM editing and much more.\n\n OsmAnd+ is the paid app version. By buying it, you support the project, fund the development of new features, and receive the latest updates.\n\n @@ -2702,13 +2702,13 @@ Always use offline editing. POI changes inside app do not affect downloaded map files, changes are saved as a file on your device instead. Uploading… - {0} POI/Notes were uploaded + {0} POI/notes were uploaded Upload all Upload edit to OSM Delete edit Asynchronous OSM editing: - OSM POIs/Notes saved on device - Show and manage OSM POIs/Notes noted in database on device. + OSM- POIs/-notes saved on device + Show and manage OSM- POIs/-notes in your device database. Specify the online tracking interval. Online tracking interval Specify the web address with parameter syntax: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}. @@ -2748,7 +2748,7 @@ Set up display and common settings for the app. Global app settings Your OSM username - Needed for openstreetmap.org submissions. + Needed for OSM.org submissions. Your OSM password Background mode OsmAnd runs in the background with the screen off. @@ -3010,7 +3010,7 @@ Thanks to Yandex for traffic info. Yandex traffic Route - OSM Notes (online) + OSM notes (online) POI overlay… Map source… Map layers @@ -3145,7 +3145,7 @@ Finished Use the Internet to calculate a route. Use online navigation - Specify OpenStreetMap.org login details to upload edits. + Specify OSM.org login details to upload edits. Specify language, download/reload data. Data Additional settings From aa35312486118f2fd931738d5e2ea19e4c0c5cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 18 Jan 2020 23:59:16 +0100 Subject: [PATCH 17/21] Spelling: degrees-minutes-seconds (DMS) --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 00dedbc378..7e5269b1df 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -3187,7 +3187,7 @@ Walking Center Bottom - Input latitude and longitude in the selected format (D - degrees, M - minutes, S - seconds) + Input latitude and longitude as degrees-minutes-seconds (DMS) Latitude Longitude DDD.DDDDD From 55873bd6aa119c78ec801d7253a80524c09c8c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sun, 19 Jan 2020 00:24:51 +0100 Subject: [PATCH 18/21] Spelling: Route through unpaved, shaded hills --- OsmAnd/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 7e5269b1df..b8ad2a604b 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -96,14 +96,14 @@ Show contour lines Hide contour lines Show/hide contour lines - Button showing or hiding hillshade on the map. + Button showing or hiding shading of hills on the map. Show hillshade Hide hillshade Show/hide hillshade You can apply this change to all or only the selected profile. Shared Prefer unpaved routes - Prefer unpaved routes. + Route through terrain without pavement. • Updated app and profile settings: Settings are now arranged by type. Each profile can be customized separately.\n\n • New map download dialog suggesting a map to download while browsing\n\n From 9a4af7b73baa8a869fb41d048f1bd84bfe767bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 20 Jan 2020 03:45:24 +0100 Subject: [PATCH 19/21] Spelling: OsmAnd, show up, \', . --- OsmAnd/res/values/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index b8ad2a604b..89ed9f8cff 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -12,7 +12,7 @@ --> No routing rules in \'%1$s\'. Please choose another file. - Select a supported file with %1$s extension instead. + Select a supported %1$s extension file instead. Import from file Import routing file Import profile @@ -23,8 +23,8 @@ Allows sharing current location using trip recording. Online tracking Logging accuracy - All your recorded tracks are to be found in Menu → My place → Tracks, or in the OsmAd folder. - All your OSM notes are to be found in Menu → My places → OSM edits. + All your recorded tracks are in \'Menu\' → \'My place\' → \'Tracks\', or the OsmAnd folder. + All your OSM notes are in \'Menu\' → \'My places\' → \'OSM edits\'. Video notes Photo notes Route recalculation @@ -32,7 +32,7 @@ Username and password These settings apply to all profiles. OSM editing - View all your unuploaded edits or OSM bugs in Menu → My places — OSM edits. Uploaded points don’t show in OsmAnd. + View all your unuploaded edits or OSM bugs in \'Menu\' → \'My places\' — \'OSM edits\'. Uploaded points don\'t show up in OsmAnd. OSM Icon only shown while navigating or moving. Map icon only shown on the map. @@ -69,7 +69,7 @@ Dialogs and notifications Control popups, dialogs and notifications. Suggested maps - Those maps are required to use with plugin + Those maps are required to use with plugin. Added profiles Profiles added by plugin Turn off From 933b3d5c5726696cc12253c161dd2ff588b57f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Mon, 20 Jan 2020 19:43:24 +0100 Subject: [PATCH 20/21] Spelling: Reverted to "Swap %1$s and %2$s" --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 89ed9f8cff..8fbe691591 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -80,7 +80,7 @@ Filename empty Estimates arrival time for unknown road types, and limits speed for all roads (can re-oute) White - %1$s ⇄ %2$s + Swap %1$s and %2$s Starting point Export profile OsmAnd profile: %1$s From e64052bcd1b9e36b12176fd4a965dda87c983bb3 Mon Sep 17 00:00:00 2001 From: vshcherb Date: Tue, 21 Jan 2020 19:34:01 +0100 Subject: [PATCH 21/21] Update strings.xml --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 8fbe691591..aaf9aefa59 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -354,7 +354,7 @@ Car, truck, motorcycle Mountain bike, moped, horse Walking, hiking, running - All personal transport types + Public transport types Ship, rowing, sailing Airplane, gliding Geocoding