From 98a4a361caef4bb44b1aa4a343128e8cee3c8e42 Mon Sep 17 00:00:00 2001 From: Michael Knight Date: Wed, 28 Mar 2018 16:54:32 +0200 Subject: [PATCH 1/3] Update phrases.xml better translations --- OsmAnd/res/values-de/phrases.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index dfd51eb265..5e7299bed6 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -1457,8 +1457,8 @@ Kabinen-, Gondel-, Sesselkapazität Kapazität pro Stunde durchschnittliche Fahrzeit, Minuten - Blase - Keine Blase + mit Überdachung + Ohne Überdachung ja keine Heizung Erlaubt @@ -1972,7 +1972,7 @@ DVD Kerzen Spielzeug - Eiscream + Eiskrem SIM Karten Niederlassung @@ -2002,7 +2002,7 @@ Kohle Kupfer Diamant - Dimensionsstein + Werkstein Kies Gips Eisenerz @@ -2042,7 +2042,7 @@ Unterstand-Typ: Zelt Unterstand-Typ: verlassen - Prasat + Tempelturm Baryt Strangmoor @@ -2198,16 +2198,16 @@ Trog Tierbeförderung - Beförderungstype: Hund - Beförderungstype: Katze - Beförderungstype: Hund, Katze - Beförderungstype: Pferd + Beförderungstyp: Hund + Beförderungstyp: Katze + Beförderungstyp: Hund, Katze + Beförderungstyp: Pferd Honiggeschäft technisches Denkmal - Camping Büro + Camping-Büro Modellflugplatz Fremdenführerbüro Mittlerorganisation @@ -2295,7 +2295,7 @@ Benachteiligte Drogenabhängige Kranke - Kinder; Jugendliche + Kinder und Jugendliche Philharmonie Marionette @@ -2670,7 +2670,7 @@ Gästerichtlinien: ja Gästerichtlinien: nein - Schutztitel + Schutzgebietstyp Sanitäre Entsorgungsstation Westliche From c7c465947a88c1092c059166f16eb1d394c37f2b Mon Sep 17 00:00:00 2001 From: Michael Knight Date: Mon, 2 Apr 2018 13:11:03 +0200 Subject: [PATCH 2/3] Update phrases.xml --- OsmAnd/res/values-de/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 5e7299bed6..188aae16c1 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -1972,7 +1972,7 @@ DVD Kerzen Spielzeug - Eiskrem + Speiseeis SIM Karten Niederlassung From e14d7518ba763adf135d2969f4899c48534af439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 27 Apr 2018 03:34:20 +0200 Subject: [PATCH 3/3] Language rework --- OsmAnd/res/values/strings.xml | 194 +++++++++++++++++----------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 952a918b21..9954c4ac10 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -10,7 +10,7 @@ PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> Popular destinations - Paid application + Paid app Paid plugin We prepared updates and fixes in the Wikivoyage data, update the file to see them. Download this Wikivoyage travel guides file to view articles about places around the world without an internet connection. @@ -24,10 +24,10 @@ Welcome, to the open beta! Travel Guide Browse the Wikivoyage guides to the most interesting places on the planet inside OsmAnd without an internet connection. - Map updates: every month - Map updates: every day, every hour - In-App purchase - One time payment + Map updates: Every month + Map updates: Every hour + In-app purchase + One-time payment Once purchased, it will be permanently available to you. Buy - %1$s Subscribe - %1$s @@ -40,34 +40,34 @@ Unlock all OsmAnd features Choose plan - To read Travel articles offline, you need to purchase one of the following items. + Purchase one of the following to read travel articles offline: Choose suitable item: Don\'t Do - Only with WiFi + Only on Wi-Fi Download Pictures - We can download & show images in the articles and store them on device, so you will access them while offline. - You can always change the setting in Explore > Options. - Only WiFi + Images from articles can be downloaded for offline use.\n + You can always change the setting in \'Explore\' → \'Options\'. + Only on Wi-Fi Select travel book Travel book - This page is only available online. Do you wish to open it in a web browser? + Page only available online. Open in web browser? Images cache Delete search history Download images Travel maps Wikivoyage Article removed - Search: Country, City, Province + Search: Country, city, province Read Saved articles Explore Contents Result - Use two digits longitude + Use double digit longitude Travel Waypoints removed from map markers - Nothing found within the radius: + Could not find anything: You can add all of the track\'s waypoints, or select separate categories. Total Clear all intermediate points @@ -88,18 +88,18 @@ S N Optional point name - Routes near in - NEAR - Enter the file name. + Nearby routes in + Near + Enter the filename. Map import error Map imported Make this the start point Current - Adds the last stop along the route - Adds the first stop on the route - Move destination up, and create destination + Adds intermediate stop + Adds initial stop + Move destination up, and create it Show closed notes - Show/Hide OSM Notes on the map. + Show/Hide OSM notes on the map. GPX - suitable for export to JOSM or other OSM editors. OSC - suitable for export to OpenStreetMap. GPX file @@ -108,7 +108,7 @@ Select the export type: OSM notes, POI, or both. All data OSM Notes - Will open tomorrow at + Opens tomorrow at POI labels Without name What\'s here: @@ -120,9 +120,9 @@ All points of the group Open from Open till - Will close at - Will open at - Will open at + Closes at + Opens at + Opens at Additional actions GPX file with coordinates and data of the selected notes. GPX file with coordinates and data of all notes. @@ -162,10 +162,10 @@ Markers marked as passed will appear on this screen. Two One - Display guide lines from your position to the active marker locations. - Display one or two arrows indicating the direction to the active markers. + Show directional line from your position to the active marker locations. + Show one or two arrows indicating the direction to the active markers. Choose how to display the distance to active markers. - Choose the number of direction indicators to display. + Choose the number of active markers to display. Number of decimal digits Right Left @@ -176,11 +176,11 @@ Next field Rename marker A tap on the map toggles the control buttons and widgets. - Full screen mode + Fullscreen mode Mark passed - can be imported as Favorites, or as track file. + can be imported as favorite, or track file. Import as GPX file - Import as Favorites + Import as favorite Import file Wrong input Enter new name @@ -196,14 +196,14 @@ Exception occurred: The note was not modified Modify note Modify OSM note - Add copy of start point as destination. + Add copy of starting point as destination. Make round trip Markers Coordinate format Use system keyboard Choose coordinate input format. You can always change it by tapping \'Options\'. - Fast coordinates input + Quick coordinate input Avoid ice roads, fords Avoid ice roads and fords. Use position @@ -218,7 +218,7 @@ Save as track Move to history The group will be gone the next time you start the app. - Show guide lines + Show directional lines Show arrows on the map Show passed Hide passed @@ -268,7 +268,7 @@ Measure distance Pause/resume navigation Tap this button to pause or resume the navigation. - Show Navigation finished dialog + Show \'Navigation finished\' dialog Start/stop navigation Tap this button to start or end the navigation. Store recorded tracks in monthly folders @@ -304,7 +304,7 @@ Online street-level photos for everyone. Discover places, collaborate, capture the world. Mapillary Street-level photos for everyone. Discover places, collaborate, capture the world. - Your destination is located in an area with private access. Do you want to allow access to the private roads for this trip? + Your destination is located in an area with private access. Trespass private roads for this trip? Restart search Increase search radius Nothing found @@ -312,7 +312,7 @@ Toggle OSM Notes Show OSM Notes Hide OSM Notes - Tapping this action button will show or hide OSM Notes on the map. + Tapping this action button shows or hides OSM notes on the map. Sorted by distance Search favorites Download the \'Hillshade Overlay\' map to hillshade this region. @@ -341,21 +341,21 @@ Select city Select postcode Auto zoom map on/off - Tapping this action button will turn on/off auto zoom map according to your speed. + Tapping this action button turns on/off auto zoom map according to your speed. Enable auto zoom map Disable auto zoom map Add destination Replace destination Add first intermediate - Tapping this action button will make the screen center the route destination, any previously selected destination will become the last intermediate destination. - Tapping this action button will make the screen center the new route destination, replacing the previously selected destination (if any). - Tapping this action button will make the screen center the first intermediate destination. + 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 destination. No overlay No underlay Error Subscribe to our mailing list about app discounts and get 3 more map downloads! - Sea depth contour lines and nautical point maps. - Thank you for purchasing nautical depth contours + Sea depth contour lines and seamarks. + Thank you for purchasing \'Nautical depth contours\' Nautical depth contours Worldwide Wikivoyage articles @@ -370,7 +370,7 @@ Right-hand driving Automatic Don\'t send anonymous app usage statistics - OsmAnd collects information about which parts of the app you open. Your location is never sent, nor is anything you enter into the app or details of areas you view, search, or download. + OsmAnd collects info about which parts of the app you open. Your location is never sent, nor is anything you enter into the app or details of areas you view, search, or download. Don\'t show messages at startup Don\'t show app discounts & special local event messages. Parking options @@ -434,7 +434,7 @@ \u2022 Other improvements and bug fixes\n\n - \u2022 Completely reworked map markers with guide lines and route planning\n\n + \u2022 Completely reworked map markers with directional lines and route planning\n\n \u2022 Measure distance tool offering snap to road feature and saving points as track\n\n \u2022 OsmAnd Live: Bug fixes, fresh data on the server every 30 minutes, updates implemented into the navigation\n\n @@ -522,15 +522,15 @@ Save filter Delete filter New filter - Please enter a name for the new filter, this will be added to your Categories tab. - Subscription fee will be charged each month. You can cancel your subscription on Google Play at any time. + 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 will be sent to OSM users who submit changes to OpenStreetMap. The cost of the subscription remains the same. + Part of your donation is sent to the OSM users who submit changes to OpenStreetMap. The cost of the subscription remains the same. 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, and map updates more than once a month: weekly, daily, or hourly. + Get unlimited map downloads, and map updates more than once a month: Weekly, daily, or hourly. Unlimited map downloads, updates, and Wikipedia plugin. Miles/meters Skip downloading maps @@ -550,7 +550,7 @@ Find my position Do not check for new versions or OsmAnd related discounts. Do not show new versions - Do you want to update all maps now? + Update all maps now? Clear all tiles Fuel-efficient way Use fuel-efficient way (usually shorter). @@ -562,7 +562,7 @@ Coordinates search Advanced coordinate search Back to search - Do you want to remove the selected items from \'History\'? + Remove selected items from \'History\'? Show %1$s on the map \u2022 New very powerful free text search\n\n @@ -696,13 +696,13 @@ Second map marker Toolbar Widgets - Do you want to add all points to map markers? + Add all points as map markers? Add to map markers Select map markers Reverse order Activate the map markers feature. - Do you want to remove all active markers? - Do you want to clear the map marker history? + Remove all active markers? + Clear map marker history? Active markers Map markers Map marker @@ -852,7 +852,7 @@ Navigation Run in background GPS wake-up interval - Favorite information + Favorite info Stop simulating your position. Simulate your position using a calculated route or a recorded GPX track. Looking up address @@ -930,9 +930,9 @@ Sorbian (Upper) Kabyle Berber - You have old incompatible Wikipedia data. Do you want to archive it? - Do you want to download additional Wikipedia data (%1$s MB) ? - Location service not enabled. Do you want to turn it on? + You have old incompatible Wikipedia data. Archive it? + Download additional Wikipedia data (%1$s MB) ? + Location service not enabled. Turn it on? Prevent standalone logging Will pause GPX logging when the app is killed (via recent apps). (OsmAnd background indication disappears from the Android notification bar.) Import to OsmAnd @@ -946,7 +946,7 @@ Color by OSMC hiking symbol Log Off House numbers - Do you want OsmAnd to also copy its data files to the new destination? + Copy its data files to the new destination? Maps could not be created in specified directory Copying files failed External storage @@ -979,7 +979,7 @@ Mark to delete You are going to delete %1$d notes. Are you sure? You are going to upload %1$d change(s) to OSM. Are you sure? - Do you want to clear the history? + Clear history? Specify wait time to remain on the route planning screen. Start turn-by-turn navigation after… Go @@ -1067,10 +1067,10 @@ Favorites Address Add - Add to \'My Favorites\' + Add to \'Favorites\' My Position My Places - My Favorites + Favorites My Tracks Currently recording track Audio @@ -1169,7 +1169,7 @@ American road atlas No v1.9 routing rules Do not use routing rules introduced in v1.9. - Do you want to download offline maps? + Download offline maps? You have downloaded %1$s maps Download new map Manage @@ -1238,7 +1238,7 @@ Nearby Favorites Nearby POI Traffic warnings - OsmAnd background service is still running. Do you want to stop it, too? + OsmAnd background service still running. Stop it, too? Stop GPS background mode? Stop Always ask @@ -1431,12 +1431,12 @@ Europe - Great Britain Offline calculation of OsmAnd route segment Calculate OsmAnd route for first and last route segment - Do you want to use the shown track for navigation? + Use shown track for navigation? Add as subsequent destination Select GPX… Select Destination Route preferences - Route information + Route info Prefer motorways Prefer motorways. Avoid toll roads @@ -1455,7 +1455,7 @@ Specify vehicle weight to be permitted on routes. Height limit Specify vehicle height to be permitted on routes. - Since Android version 4.4 (KitKat) you cannot download and update maps to the previous storage folder (%s). Do you want to change to the permitted storage location and copy all OsmAnd files there? + Since Android version 4.4 (KitKat) you cannot download and update maps to the old storage folder (%s). Copy all OsmAnd files to new storage location? \n Note 1: Your old files will remain untouched (but can be deleted manually). \n Note 2: In the new storage location it will not be possible to share files between OsmAnd and OsmAnd+. Copying file (%s) to the new destination… @@ -1575,7 +1575,7 @@ Dismiss route Stop navigation Clear destination - Wi-Fi is currently not connected. Do you want to use the current connection to the Internet for downloading? + Not connected to Wi-Fi. Use current connection to the Internet to download? Street name House number Web site @@ -1632,7 +1632,7 @@ Audio/video is being recorded. To stop it tap the AV widget. An audio from the specified recording is being played.\n%1$s Open external player - Do you want to delete this recording? + Delete this recording? unavailable Take an audio note Take a video note @@ -1708,7 +1708,7 @@ For tourists Fuel Show alerts… - Configure traffic warnings (speed limits, forced stops, speed bumps, tunnels), speed camera warnings, and lane information. + Configure traffic warnings (speed limits, forced stops, speed bumps, tunnels), speed camera warnings, and lane info. Use the compass when no heading is detected otherwise. Use compass Avoid motorways @@ -1774,7 +1774,7 @@ Skiing\n - OsmAnd ski maps plugin enables you to see ski tracks with level of complexity and some additional information, like location of lifts and other facilities. + OsmAnd ski maps plugin enables you to see ski tracks with level of complexity and some additional info, like location of lifts and other facilities. Cycling\n @@ -1865,7 +1865,7 @@ Use OSM and Wikipedia Data\n - • High-quality information from the best collaborative projects of the world\n + • High-quality info from the best collaborative projects of the world\n • OSM data available per country or region\n • Wikipedia POIs, great for sightseeing\n • Unlimited free downloads, directly from the app\n @@ -1973,7 +1973,7 @@ Warning A notification to pick up your car has been added to your calendar. It will remain there until you will delete it manually. Set parking time limit - Do you want to delete the parking location marker? + Delete the parking location marker? Delete a parking marker Choose the type of parking Time-limited @@ -2013,7 +2013,7 @@ Address search Coordinates Public transport search - Favorites search + A way to search for favorites OsmAnd offline navigation is temporarily not available. Left-hand driving Select for countries with left-hand traffic. @@ -2021,7 +2021,7 @@ Starting point is not yet determined Position not yet known Modify transparency (0 - transparent, 255 - opaque) - Do you want to cancel downloading the file? + Cancel file 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. Basemap is selected for download so that the app functions. Online and cached tile maps @@ -2145,7 +2145,7 @@ Voice prompts (TTS-synthesized, prefer) Wikipedia (offline) User defined - File containing previously exported favorites already exists. Do you want to replace it? + File containing previously exported favorites already exists. Replace it? Profile Specific Settings Navigation Specify options for navigation. @@ -2252,9 +2252,9 @@ Unpacking new data… An online navigation service is selected but you are not connected to the Internet. Unsupported language - The selected language is not supported by the installed Android TTS (text-to-speech) engine. Do you want to look for another TTS engine in the market? Otherwise the preset TTS language will be used. + The selected language is not supported by the installed Android TTS (text-to-speech) engine. Look for another TTS engine in the market? Otherwise the preset TTS language will be used. Missing data - Do you want to go to the market to download the selected language? + Go to the market to download selected language? Reverse GPX direction Use current destination Pass along entire track @@ -2346,7 +2346,7 @@ All offline data in the old installed app will be supported by the new one, but favorite points must be exported from the old app and then imported in the new one. Build {0} was installed ({1}). Downloading build… - Do you want to install OsmAnd - {0} of {1} {2} MB ? + Install OsmAnd - {0} of {1} {2} MB ? Retrieving the list of OsmAnd builds failed Loading OsmAnd builds… Select an OsmAnd build to install @@ -2413,7 +2413,7 @@ No offline data for regions found on memory card. Download regions from the Internet. Type to find a POI Any - Thanks to Yandex for traffic information. + Thanks to Yandex for traffic info. Yandex traffic Route OSM Notes (online) @@ -2512,7 +2512,7 @@ Navigation service The data storage folder on the memory card is not accessible! Download {0} - {1} ? - Offline data for {0} already exists ({1}). Do you want to update it ({2})? + Offline data for {0} already exists ({1}). Update it ({2})? Address Downloading list of available regions… The list of regions was not retrieved from https://osmand.net. @@ -2738,7 +2738,7 @@ Feedback Contact Map legend - The name contains too many capital letters. Do you want to continue? + The name contains too many capital letters. Continue? Do you really want to save POI without type? Modify OSM change Use dashboard @@ -2746,7 +2746,7 @@ Dashboard or menu control A choice is offered to primarily control the app via the flexible dashboard or a static menu. Your choice can always be changed in the dashboard settings. Update - Only download over WiFi + Only download on Wi-Fi Live update Update now OsmAnd lacks permission to use the memory card @@ -2788,22 +2788,22 @@ Are you sure you want to delete the action \"%s\"? Show favorites dialog Name preset - Tapping this action button will add a map marker at the screen center location. + Tapping this action button adds a map marker at the screen center location. Tapping this action button will add a GPX waypoint in the middle of the screen. - Tapping this action button will add an audio note in the middle of the screen. - Tapping this action button will add a video note in the middle of the screen. - Tapping this action button will add a photo note in the middle of the screen. - Tapping this action button will add an OSM note in the middle of the screen. - Tapping this action button will add a POI in the middle of the screen. - Tapping this action button will disable or enable voice guidance during navigation. - Tapping this action button will add a parking location in the middle of the screen. + Tapping this action button adds an audio note in the middle of the screen. + Tapping this action button adds a video note in the middle of the screen. + Tapping this action button adds a photo note in the middle of the screen. + Tapping this action button adds an OSM note in the middle of the screen. + Tapping this action button adds a POI in the middle of the screen. + Tapping this action button disables or enables voice guidance during navigation. + Tapping this action button adds a parking location in the middle of the screen. Show an interim dialog " is saved to " Place Specified quick action name already in use, changed to %1$s to avoid duplication. Quick action name duplicate - Tapping this action button will show or hide the favorite points on the map. - Tapping this action button will show or hide POIs on the map. + Tapping this action button shows or hides the favorite points on the map. + Tapping this action button shows or hides POIs on the map. Show/hide favorites Show Favorites Hide Favorites @@ -2814,14 +2814,14 @@ Create items Configure map Navigation - Leave blank to automatically use the address or place name. - This message will be auto-completed in the comment field. + Leave blank to use the address or place name automatically. + This message is included in the comment field. Message Select the category to save the favorite in. Select an optional category. POI list You can add one or more POI categories to display on the map. - Tapping this action button will page through the list below. + Tapping this action button pages through the list below. Add a map style Parameters should not be empty Map styles @@ -2838,7 +2838,7 @@ Add map source The map source has been changed to \"%s\". Change button position - Long-tap and drag the button to change its position on the screen. + Long-taping and dragggin the button changes its position on the screen. Action name You need to be connected to the Internet to view photos from Mapillary. Retry