From b8faec3c6e192710cb031b01f83777d5e95e002c Mon Sep 17 00:00:00 2001 From: Debeet Date: Mon, 29 Dec 2014 09:32:59 +0100 Subject: [PATCH 01/14] Small fixes to strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - change three dots (...) to ellipsis (…) - remove whitespace before ellipsis --- OsmAnd/res/values/strings.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 309e2b2730..a36d860e4a 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -169,13 +169,13 @@ Destinations Announce GPX waypoints Download missing maps %1$s (%2$d MB)? - More... + More… Browse map Car Bicycle Pedestrian Color-code buildings by type - Invite... + Invite… Do you want to leave group %1$s? Please specify id Continue Navigation @@ -240,7 +240,7 @@ Save as group of favorites Select waypoints Point labels - Loading %1$s … + Loading %1$s… Current time Waypoint \n\nPress and hold to see on map @@ -339,7 +339,7 @@ Click to view or share tracker id. Using tracker id connected devices will be able to monitor all movements of this device! To disconnect select Regenerate option. Session token: %1$s - Waiting for authorization... + Waiting for authorization… Locations sent %1$d (in buffer %2$d) Connection established: %1$s OsMo connection problem: @@ -431,10 +431,10 @@ Calculate OsmAnd route for first and last route segment Do you want to use displayed track for navigation? Add as destination point - Select GPX … + Select GPX… Select Destination - Select on map … - Favorite … + Select on map… + Favorite… Route preferences Route information Prefer motorways @@ -454,7 +454,7 @@ 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? \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... + Copying file (%s) to the new destination… Copying OsmAnd data files to the new destination (%s) Copying OsmAnd data files Calculate OsmAnd offline route From 7bfe1750f73b0000748c0bb01cda32863023f9ac Mon Sep 17 00:00:00 2001 From: Alexander Sapozhnikov Date: Mon, 29 Dec 2014 14:45:59 +0500 Subject: [PATCH 02/14] Translation mistake fixed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Barracks does not mean _бараки_, it means _казармы_. --- OsmAnd/res/values-ru/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 3fdc6112be..36ca52dacb 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -595,7 +595,7 @@ Военный аэродром Военный бункер - Бараки + Казармы Опасная зона Военное стрельбище Военно-морская база From 5972428b5b2e093de10be6d3abec9f7bf16cabde Mon Sep 17 00:00:00 2001 From: hvdwolf Date: Mon, 29 Dec 2014 10:08:33 +0100 Subject: [PATCH 03/14] Translated using Weblate (Dutch) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-nl/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index eab81516ce..5432afc36a 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -2038,9 +2038,9 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Amerikaanse wegenkaart Gebruik routeberekening v1.9 niet Gebruik routeberekening v1.9 niet - Spoorweg - Voetgangers - Waarschuw voor spoorwegovergangen - Waarschuw voor oversteekplaatsen + Spoorweg overgang + Voetgangers oversteekplaats + Toon spoorwegovergangen + Toon voetgangers oversteekplaatsen Meld oversteekplaatsen From 78f97fb5c2c4448809c98e1706403014a16015c0 Mon Sep 17 00:00:00 2001 From: Krystian Biesaga Date: Mon, 29 Dec 2014 09:42:07 +0100 Subject: [PATCH 04/14] Translated using Weblate (Polish) Currently translated at 30.3% (184 of 607 strings) --- OsmAnd/res/values-pl/phrases.xml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml index 703ac4f063..ae83426d29 100644 --- a/OsmAnd/res/values-pl/phrases.xml +++ b/OsmAnd/res/values-pl/phrases.xml @@ -71,7 +71,7 @@ Zoologiczny Art. RTV Rzeczy \"z drugiej ręki\" - Żeglarski + Armator Sportowy Papierniczy Zastawy stołowe @@ -135,13 +135,13 @@ Przystanek transportu miejskiego Przystanek autobusowy Przystanek trolejbusowy - Przystanek autobusowy (nieczynny) + Przystanek autobusowy (przestarzałe) Przystanek tramwajowy - Przystanek tramwajowy (nieczynny) + Przystanek tramwajowy (przestarzałe) Dworzec transportu miejskiego - Przystanek autobusowy (nieczynny) - Przystanek kolejowy (nieczynny) - Peron kolejowy (nieczynny) + Dworzec autobusowy (przestarzałe) + Stacja kolejowa (przestarzałe) + Peron kolejowy (przestarzałe) Metro - wejście Stacja metra Postój TAXI @@ -179,7 +179,7 @@ Pogotowie Dworzec kolejowy (nieaktualne) - Punkt zawracania + Miejsce do zawracania Zjazd z autostrady Fontanna @@ -188,4 +188,14 @@ Stocznia Oczyszczalnia ścieków Wieża ciśnień + Tama + Młyn wodny + + Podstacja + Transformator + Urząd pocztowy + Skrzynka pocztowa + Telefon + Kosz na śmieci + From 9678ca155c5c2aa2af8b140daa2dd847d2f17f78 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Mon, 29 Dec 2014 17:37:28 +0200 Subject: [PATCH 05/14] New GEO URI parser --- .../net/osmand/util/GeoPointParserUtil.java | 127 +++++++++++------- 1 file changed, 80 insertions(+), 47 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java b/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java index 9f1c6d6b50..2ba179bbe7 100644 --- a/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java +++ b/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java @@ -1,6 +1,8 @@ package net.osmand.util; import java.net.URI; +import java.net.URLDecoder; +import java.net.URLEncoder; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -82,15 +84,15 @@ public class GeoPointParserUtil { // google calendar // geo:0,0?q=760 West Genesee Street Syracuse NY 13204 - String qstr = "q=760 West Genesee Street Syracuse NY 13204"; - url = "geo:0,0?" + qstr; + String qstr = "760 West Genesee Street Syracuse NY 13204"; + url = "geo:0,0?q=" + qstr; System.out.println("url: " + url); actual = GeoPointParserUtil.parse("geo", url); - assertGeoPoint(actual, new GeoParsedPoint(qstr.replaceAll("\\s+", "+"))); + assertGeoPoint(actual, new GeoParsedPoint(qstr)); // geo:0,0?z=11&q=1600+Amphitheatre+Parkway,+CA - qstr = "q=1600+Amphitheatre+Parkway,+CA"; - url = "geo:0,0?z=11&" + qstr; + qstr = "1600 Amphitheatre Parkway, CA"; + url = "geo:0,0?z=11&q=" + URLEncoder.encode(qstr); System.out.println("url: " + url); actual = GeoPointParserUtil.parse("geo", url); assertGeoPoint(actual, new GeoParsedPoint(qstr)); @@ -450,48 +452,79 @@ public class GeoPointParserUtil { return null; } if ("geo".equals(scheme) || "osmand.geo".equals(scheme)) { - final String schemeSpecific = data.getSchemeSpecificPart(); - if (schemeSpecific == null) { - return null; - } - if (schemeSpecific.startsWith("0,0?")) { - // geo:0,0?q=34.99,-106.61(Treasure Island) - // geo:0,0?z=11&q=34.99,-106.61(Treasure Island) - String query = schemeSpecific.substring("0,0?".length()); - final String pattern = "(?:z=(\\d{1,2}))?&?q=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)[\\+]?(?:\\((.+?)\\))?"; - final Matcher matcher = Pattern.compile(pattern).matcher(query); - if (matcher.matches()) { - final String z = matcher.group(1); - final String name = matcher.group(4); - final int zoom = z != null ? Integer.parseInt(z) : GeoParsedPoint.NO_ZOOM; - final double lat = Double.parseDouble(matcher.group(2)); - final double lon = Double.parseDouble(matcher.group(3)); - return new GeoParsedPoint(lat, lon, zoom, name); - } else { - // geo:0,0?q=1600+Amphitheatre+Parkway%2C+CA - if (query.contains("z=")) - query = query.substring(query.indexOf("&") + 1); - return new GeoParsedPoint(query); - } - } else { - // geo:47.6,-122.3 - // geo:47.6,-122.3?z=11 (Treasure Island) - final String pattern = "([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)(?:(?:\\?z=(\\d{1,2}))?|(?:\\?q=.*?)?)[\\+]?(?:\\((.*?)\\))?"; - final Matcher matcher = Pattern.compile(pattern).matcher(schemeSpecific); - if (matcher.matches()) { - final double lat = Double.valueOf(matcher.group(1)); - final double lon = Double.valueOf(matcher.group(2)); - final String name = matcher.group(4); - int zoom = matcher.group(3) != null ? Integer.parseInt(matcher.group(3)) : GeoParsedPoint.NO_ZOOM; - if (zoom != GeoParsedPoint.NO_ZOOM) { - return new GeoParsedPoint(lat, lon, zoom, name); - } else { - return new GeoParsedPoint(lat, lon, name); - } - } else { - return null; - } - } + String schemeSpecific = data.getSchemeSpecificPart(); + if (schemeSpecific == null) { + return null; + } + + String name = null; + final Pattern namePattern = Pattern.compile("[\\+\\s]*\\((.*)\\)[\\+\\s]*$"); + final Matcher nameMatcher = namePattern.matcher(schemeSpecific); + if (nameMatcher.find()) { + name = URLDecoder.decode(nameMatcher.group(1)); + if (name != null) { + schemeSpecific = schemeSpecific.substring(0, nameMatcher.start()); + } + } + + String positionPart; + String queryPart = ""; + int queryStartIndex = schemeSpecific.indexOf('?'); + if (queryStartIndex == -1) { + positionPart = schemeSpecific; + } else { + positionPart = schemeSpecific.substring(0, queryStartIndex); + if (queryStartIndex < schemeSpecific.length()) + queryPart = schemeSpecific.substring(queryStartIndex + 1); + } + + final Pattern positionPattern = Pattern.compile( + "([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)"); + final Matcher positionMatcher = positionPattern.matcher(positionPart); + if (!positionMatcher.find()) { + return null; + } + double lat = Double.valueOf(positionMatcher.group(1)); + double lon = Double.valueOf(positionMatcher.group(2)); + + int zoom = GeoParsedPoint.NO_ZOOM; + String searchRequest = null; + for (String param : queryPart.split("&")) { + String paramName; + String paramValue = null; + int nameValueDelimititerIndex = param.indexOf('='); + if (nameValueDelimititerIndex == -1) { + paramName = param; + } else { + paramName = param.substring(0, nameValueDelimititerIndex); + if (nameValueDelimititerIndex < param.length()) + paramValue = param.substring(nameValueDelimititerIndex + 1); + } + + if ("z".equals(paramName) && paramValue != null) { + zoom = Integer.parseInt(paramValue); + } else if ("q".equals(paramName) && paramValue != null) { + searchRequest = URLDecoder.decode(paramValue); + } + } + + if (searchRequest != null) { + final Matcher positionInSearchRequestMatcher = + positionPattern.matcher(searchRequest); + if (lat == 0.0 && lon == 0.0 && positionInSearchRequestMatcher.find()) { + lat = Double.valueOf(positionInSearchRequestMatcher.group(1)); + lon = Double.valueOf(positionInSearchRequestMatcher.group(2)); + } + } + + if (lat == 0.0 && lon == 0.0 && searchRequest != null) { + return new GeoParsedPoint(searchRequest); + } + + if (zoom != GeoParsedPoint.NO_ZOOM) { + return new GeoParsedPoint(lat, lon, zoom, name); + } + return new GeoParsedPoint(lat, lon, name); } return null; } From b315352818cf5529d91684e83ccf96d320ee00e8 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Mon, 29 Dec 2014 16:15:37 +0100 Subject: [PATCH 06/14] Translated using Weblate (Belarusian (latin)) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-be-rBY/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml index b19960a90f..c6bf7bdd8a 100644 --- a/OsmAnd/res/values-be-rBY/strings.xml +++ b/OsmAnd/res/values-be-rBY/strings.xml @@ -140,7 +140,7 @@ Celі Ahalošvać maršrutnyja punkty GPX Spampavać mapy, što adsutnіčajuć, %1$s (%2$d MB)? - Boĺš... + Boĺš… Prahliad mapy Aŭtamabіĺ Rovar @@ -309,7 +309,7 @@ Piersanaĺny ID trekiera Nacіsnіcie, kab pahliadzieć cі padzialіcca іdentyfіkataram trekiera.          Vykarystańnie іdentyfіkatara trekiera zviazanaha z prystasavańniem dasć mahčymasć kantraliavać usie pieramiaščeńnі hetaha prystasavańnia! Dlia adkliučeńnia vybierycie opcyju pierastvareńnia. Tokien siesіі: %1$s - U čakańnі dazvolu... + U čakańnі dazvolu… "Miescaznachodžańnie adaslana %1$d (u bufiery %2$d) " "Zlučeńnie ŭstanoŭliena: %1$s " "Prabliema z padkliučeńniem OsMo: " @@ -412,7 +412,7 @@ Zadajcie vahu aŭtamabіlia dlia prakladańnia maršrutaŭ Z viersіі 4.4 Android (KitKat) vy nia možacie zahružać і abnaŭliać mapu ŭ papiarednіm katalohu zachoŭvańnia (%s). Vy chočacie źmianіć kataloh na dazvolieny і skapіjavać usie fajly OsmAnd tudy?\n Zaŭvaha 1: Vašy staryja fajly zastanucca niekranutymі (vy možacie vydalіć іch samastojna).          \n Zaŭvaha 2: U novym miescy zachoŭvańnia budzie niemahčyma adnačasova vykarystoŭvać fajly ŭ OsmAnd і OsmAnd+. - Kapіravańnie fajla (%s) u novaje miesca... + Kapіravańnie fajla (%s) u novaje miesca… Kapіjavańnie dadzienych OsmAnd u novaje miesca (%s) Kapіjavańnie dadzienych OsmAnd Raźlіčyć pazasiecіŭny maršrut OsmAnd From e42cade89d895ed7d405ffcfba1af40e4ef258a2 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Mon, 29 Dec 2014 13:34:08 +0100 Subject: [PATCH 07/14] Translated using Weblate (Catalan) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ca/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 81933f4919..d02c177aaf 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1348,7 +1348,7 @@ \n Nota 1: Els vostres arxius obsolets quedaran intactes (els podeu esborrar manualment). \n Nota 2: En el nou lloc d\'emmagatzemament no serà possible compartir arxius entre l\'OsmAnd i l\'OsmAnd+." Voleu que l\'OsmAnd també copiï els seus arxius de dades a la nova destinació? Indiqueu «No» i l\'OsmAnd crearà i utilitzarà una carpeta nova. - S\'està copiant el fitxer (%s) a la nova destinació... + S\'està copiant el fitxer (%s) a la nova destinació… S\'estan copiant els fitxers de dades de l\'OsmAnd a la nova destinació (%s) S\'estan copiant fitxers de dades de l\'OsmAnd Calcula una ruta fora de línia amb l\'OsmAnd @@ -1402,10 +1402,10 @@ \n\t* Entrada ràpida en la recerca d\'adreça \n\t* Errors corregits de càlcul de rutes i visualització - Selecciona una traça GPX … + Selecciona una traça GPX… Selecciona un destí - Selecciona al mapa … - Preferida … + Selecciona al mapa… + Preferida… Preferències de ruta Informació de ruta Canvis a la 1.3: From 4f0374234e76a3b4ab4d62c01031cf7988ac93d7 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Mon, 29 Dec 2014 12:58:38 +0100 Subject: [PATCH 08/14] Translated using Weblate (French) Currently translated at 99.9% (1594 of 1595 strings) --- OsmAnd/res/values-fr/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index ed8fc85f0d..18a464cbe3 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -1467,7 +1467,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Depuis Android 4.4 (KitKat), vous ne pouvez plus télécharger et mettre à jour les cartes dans le dossier (%s) utilisé jusqu\'à présent. Voulez-vous utiliser le nouveau dossier et y copier l\'ensemble des fichiers OsmAnd ? \n Note 1 : Les anciens fichiers seront conservés (mais vous pouvez les supprimer manuellement)\n Note 2 : En raison de ce nouveau dossier de stockage, il ne sera plus possible de partager des fichiers entre OsmAnd et OsmAnd+. Souhaitez-vous qu\'OsmAnd copie aussi ses données vers la nouvelle destination ? (choisissez \'Non\' pour qu\'OsmAnd crée et utilise un nouveau dossier vierge) - Copie des fichiers (%s) vers la nouvelle destination... + Copie du fichier (%s) vers le nouvel emplacement… Copie des fichiers de données OsmAnd vers la nouvelle destination (%s) Copie des fichiers de données OsmAnd Calcul de la route OsmAnd hors-ligne @@ -1488,7 +1488,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Spécifier la limite de poids devant être autorisée sur les routes Sélectionner GPX… Sélectionnez la destination - Sélectionnez sur la carte… + Sélectionner sur la carte… Favori… Préférences d\'itinéraire Informations sur l\'itinéraire @@ -1696,7 +1696,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Trace en cours d\'enregistrement Point de passage Heure actuelle - Chargement de %1$s … + Chargement de %1$s… Enregistrer comme groupe de favoris Sélectionnez les points de passage Libellés de point @@ -1784,7 +1784,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Voiture Vélo Piéton - Plus... + Plus… Télécharger les cartes manquantes %1$s (%2$d Mo) ? Tous Points de passage From 0f82ecf3714f425624ab7e2d163227b7c050c1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Mon, 29 Dec 2014 13:02:13 +0100 Subject: [PATCH 09/14] Translated using Weblate (Korean) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ko/strings.xml | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index e8afde2d9e..226f9f4a41 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -127,7 +127,7 @@ 각 프로필마다 맵뷰어 와 라우팅 설정을 기억합니다. 여기에 기본 프로필을 설정합니다. - 운행 (라우팅) + 운행 라우팅을 위한 옵션을 설정합니다 일반 설정 지도 관리 @@ -215,7 +215,7 @@ 파일 이름을 바꿀 수 없습니다. 같은 이름을 가진 파일이 이미 존재합니다. - GPX 운행 경로 + GPX 경로 이름으로 검색한 POI에 해당하는 몇몇 카테고리를 찾았습니다 : 검색한 POI에 대한 로컬 데이터가 존재하지 않습니다. 이름으로 검색 @@ -338,7 +338,7 @@ 음성 안내 출력 음성 안내를 재생할 채널을 선택합니다 (시스템 의존) 음성 호출 오디오 - 알림 오디오 + 오디오 알림 미디어/음악 오디오 OsmAnd 앱이 계층 지도 %1$s 를 다운로드할 수 없으니, 재설치 하세요. 오버레이 맵 투명도를 수정합니다 @@ -756,9 +756,9 @@ 현재 트랙을 SD 카드에 저장합니다 현재 트랙을 GPX 파일로 저장 운행하는 동안 트랙 레코딩을 저장하는 로깅 간격을 선택합니다 - 운행하는 로깅 간격 + 운행중 로깅 간격 운행하는 동안 트랙을 GPX파일로 저장합니다 - 운행하는 동안 트랙을 GPX파일로 저장 + 운행하는 동안 트랙을 GPX파일로 기록 맵 업데이트 타일 재로드 목적지 @@ -792,7 +792,7 @@ 설정 지도에 GPS 좌표 표시 누락된 맵 타일을 다운로드하기 위해 인터넷을 사용합니다 - 운행 (라우팅) 앱 + 운행 앱 종료 지도 @@ -943,7 +943,7 @@ 첫번째와 마지막 경로 구간 계산 운행을 위해 맵뷰어에 표시된 경로를 사용하시겠습니까? 목적지로 추가 - GPX파일 선택… + GPX 선택… 목적지 선택 지도에서 선택… 즐겨찾기… @@ -966,8 +966,8 @@ \n저장 위치를 변경하고 모든 파일을 그곳에 복사하는 것을 허락하겠습니까? \n Note : 이전 파일은 그대로 유지됩니다. (그러나 수동으로 삭제할 수 있습니다)\n Note : 새로운 저장소는 OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다. OsmAnd에 새 목적지로 데이터 파일을 복사하겠습니까? OsmAnd가 새 폴더를 만들고 사용하려면 \'아니오\'를 선택하세요. - 새 목적지로 파일(%s)을 복사중... - 새로운 목적지에 OsmAnd 데이터 파일을 복사중 (%s) + 새 도착지에 파일(%s)을 복사중… + 새로운 도착지에 OsmAnd 데이터 파일을 복사중 (%s) OsmAnd 데이터 파일을 복사중 OsmAnd 오프라인 경로 계산하기 트럭 @@ -1043,7 +1043,7 @@ 슬로베니아어 웨일스어 경로 환경설정 - 라우팅 환경설정 + 운행 환경설정 자동차용 라우팅의 복잡한 출발지/도착지 2단계 라우팅 사용불가 앱에서 볼 수있는 사용자 프로필를 선택합니다 나머지 요소 : @@ -1187,8 +1187,8 @@ 외부 플레이어 열기 이 기록을 삭제하시겠습니까 ? 사용 불가능 - 오디오 노트 기록하기 - 비디오 노트 기록하기 + 오디오 녹음 + 비디오 녹화 레코딩 레이어 레코딩을 재생할 수 없습니다 레코딩 삭제 @@ -1805,7 +1805,7 @@ 개인 트래커 ID 트래커 ID를 보거나 공유하려면 클릭하십시오. 트래커 ID 연결된 장치를 사용하면 이 장치의 모든 움직임을 모니터 할 수 있습니다! 선택 재생성 옵션을 분리합니다. 세션 토큰 : %1$s - 허가를 기다리는 중... + 허가를 기다리는 중… 위치 전송 %1$d (in buffer %2$d) 설정된 연결 : %1$s "1.8의 변경 사항 : @@ -1981,7 +1981,7 @@ OSMC 흔적에 따라 경로 렌더링 유형별 색상 코드 건물 - 초대... + 초대… 그룹 %1$s를 떠나시겠습니까? Id를 지정 하십시오 일찍 @@ -1996,17 +1996,17 @@ 자동차 자전거 보행자 - 기타... + 더 보기… 누락된 지도 %1$s (%2$d MB) 를 다운로드 할까요? 지도 화면에 하나의 버튼 터치로 경로를 저장 합니다. 로컬 GPX 파일 또는 웹 서비스를 사용하여 온라인에 여행을 기록하기 위해 설정을 보여줍니다. - 여행 기록 + 트랙 기록 h 경과시간 거리 여행 모두 경유지 - 목적지 + 도착지 교통 경고 가까운 즐겨찾기 알리기 가까운 POI 알리기 From 205d413821b02a67b12cf3a78ef699e702eb9a1b Mon Sep 17 00:00:00 2001 From: Jur Kis Date: Mon, 29 Dec 2014 13:20:00 +0100 Subject: [PATCH 10/14] Translated using Weblate (Lithuanian) Currently translated at 99.9% (1594 of 1595 strings) --- OsmAnd/res/values-lt/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index 7c2891e84a..98b6dbb75e 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -580,7 +580,7 @@ Įdiegimui pasirinkite vieną iš OsmAnd versijų Specialūs veiksmai tobulinamai versijai GPS statuso programa neįdiegta. Ieškoti Parduotuvėje? - Balso nurodymai neprieinami. Eikite į Nustatymus→Bendra→Balso pranešiai, išsirinkite arba parsisiųskite pageidaujamą kalbos paketą . + Balso nurodymai neprieinami. Eikite į Nustatymus→Bendra→Balso pranešimai, pasirinkite arba parsisiųskite pageidaujamą kalbos paketą . Balso nurodymai nepasirinkti Diena Naktis @@ -1472,7 +1472,7 @@ \n Pastaba: Seni failai išliks kur buvę (galima bus ištrinti rankiniu būdu). \n Pastaba: dalintis tais pačiais failais tarp OsmAnd ir OsmAnd+ nebus galima. Ar norite, kad OsmAnd perkeltų duomenis ir į naują saugyklą? Pasirinkite \"Ne\", jei norite, kad OsmAnd tik sukurtų ir naudotų naują folderį. - Kopijuojami failai (%/s) į naują saugojimo vietą... + Kopijuojami failai (%/s) į naują saugojimo vietą… OsmAnd failai kopijuojami į naują vietą (%/s) Kopijuojami OsmAnd failai Įtraukti kaip kelionės tikslą @@ -1586,7 +1586,7 @@ Paspauskite peržiūrėti ar bendrinti sekiklio ID. Naudodami sekiklio ID prijungti prietaisai galės stebėti visą šio įrenginio judėjimą! Norėdami atjungti pasirinkite Regeneravimo nustatymą. Sesijos žymė: %1$s - Laukiama autorizavimo... + Laukiama autorizavimo… Buvimo vieta išsiųsta %1$d (talpykloje %2$d) Prisijungta sėkmingai: %1$s "Pakeitimai 1.8 versijoje: * Apskaičiouti maršrutą tarp GPX failo taškų * Pakeistas šalių sąrašo išdėstymas žemėlapių parsiuntimui (palaikoma vietovardžių paieška) * Palaiko GPX/KML importavimą (konvertuoja KML į GPX) * GPX maršrutai perkelti į \'Mano duomenys\' * GPX maršrutus galima padalinti į kelias dalis pagal atstumą ir patikrinti altitudės skirtumus ir greitį * Automatiškai pradėti navigaciją su uždelsimu " @@ -1754,7 +1754,7 @@ Užkrauti kelius pagal SAC skalę Užkrauti kelius pagal OSMC pėdsakus - Pakvietimas... + Pakvietimas… Ar norite atsijungti nuo grupės %1$s? Prašome nurodyti id Anksti From 16e5da5407fecfc809e26f3ef78c68a3ae594b65 Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Mon, 29 Dec 2014 14:28:20 +0100 Subject: [PATCH 11/14] Translated using Weblate (Russian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ru/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 5e2148c9e0..a468c9558f 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1549,7 +1549,7 @@ Устройства Управление OsMo Подключиться к устройству - Ожидание авторизации... + Ожидание авторизации… Соединение установлено: %1$s часов назад минут назад @@ -1716,7 +1716,7 @@ Упрощенный китайский Традиционный китайский Маршруты метро - Пригласить... + Пригласить… Вы хотите выйти из группы %1$s? Пожалуйста, укажите ID Продолжить навигацию @@ -1740,7 +1740,7 @@ Велосипед Пешеход Скачать недостающие карты %1$s (%2$d MB)? - Более... + Более… Все Путевые точки Пункты назначения From 35349bb7bc6f3ae9e6bfdf1ba880f4f4bba3895a Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Mon, 29 Dec 2014 15:25:41 +0100 Subject: [PATCH 12/14] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index d0292b47b0..df2b63cdee 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1443,7 +1443,7 @@ 路線偏好 卡車 您想要將 OsmAnd 資料複製到新的目的地嗎？選擇否，OsmAnd 只建立和使用新的資料夾。 - 複製檔案 (%s) 到新的目的地... + 複製檔案 (%s) 到新的目的地… 複製 OsmAnd 資料檔到新的目的地 (%s) 複製 OsmAnd 資料檔案 OsmAnd 預估離線路線 @@ -1566,7 +1566,7 @@ 個人追蹤 ID 點擊查看或分享追蹤 ID。          使用追蹤 ID 連線的裝置將能夠監控該裝置的所有動作！ 要斷開選擇恢復選項。 連線階段標記：%1$s - 等候授權... + 等候授權… 發送位置 %1$d（在緩衝區 %2$d） 已建立的連線：%1$s 重新啟動 OsMo 連線階段 @@ -1738,7 +1738,7 @@ 捷運路線 繼續導航 暫停導航 - 邀請... + 邀請… 您想要離開 %1$s 群組嗎？ 請指定 ID 高山徒步比例尺 (SAC) @@ -1759,7 +1759,7 @@ 汽車 自行車 步行 - 更多... + 更多… 要下載缺少的地圖 %1$s (%2$d MB) 嗎？ 全部 中途點 From 16daa6433e5132f61953f294a7453fcc4ebd57bf Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Mon, 29 Dec 2014 15:48:28 +0100 Subject: [PATCH 13/14] Translated using Weblate (Belarusian) Currently translated at 96.0% (583 of 607 strings) --- OsmAnd/res/values-be/phrases.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml index c82e9cfbac..8ed6c0335a 100644 --- a/OsmAnd/res/values-be/phrases.xml +++ b/OsmAnd/res/values-be/phrases.xml @@ -607,4 +607,14 @@ Прыгарад Ваколіцы Док + Дарожная разьвязка + + Атракцыён + Жывёла (атракцыён) + Амэрыканскія горкі + Жолаб + Летнія сані + Скала + Сухі док + Плывучы док From 335a629bf18d4db76e3237cfdcc00bf10891322f Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Mon, 29 Dec 2014 17:41:01 +0200 Subject: [PATCH 14/14] Fix indent --- .../net/osmand/util/GeoPointParserUtil.java | 130 +++++++++--------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java b/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java index 2ba179bbe7..f991f80929 100644 --- a/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java +++ b/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java @@ -332,7 +332,7 @@ public class GeoPointParserUtil { /** * Parses geo and map intents: - * + * * @param scheme * The intent scheme * @param data @@ -452,79 +452,79 @@ public class GeoPointParserUtil { return null; } if ("geo".equals(scheme) || "osmand.geo".equals(scheme)) { - String schemeSpecific = data.getSchemeSpecificPart(); - if (schemeSpecific == null) { - return null; - } + String schemeSpecific = data.getSchemeSpecificPart(); + if (schemeSpecific == null) { + return null; + } - String name = null; - final Pattern namePattern = Pattern.compile("[\\+\\s]*\\((.*)\\)[\\+\\s]*$"); - final Matcher nameMatcher = namePattern.matcher(schemeSpecific); - if (nameMatcher.find()) { - name = URLDecoder.decode(nameMatcher.group(1)); - if (name != null) { - schemeSpecific = schemeSpecific.substring(0, nameMatcher.start()); - } - } + String name = null; + final Pattern namePattern = Pattern.compile("[\\+\\s]*\\((.*)\\)[\\+\\s]*$"); + final Matcher nameMatcher = namePattern.matcher(schemeSpecific); + if (nameMatcher.find()) { + name = URLDecoder.decode(nameMatcher.group(1)); + if (name != null) { + schemeSpecific = schemeSpecific.substring(0, nameMatcher.start()); + } + } - String positionPart; - String queryPart = ""; - int queryStartIndex = schemeSpecific.indexOf('?'); - if (queryStartIndex == -1) { - positionPart = schemeSpecific; - } else { - positionPart = schemeSpecific.substring(0, queryStartIndex); - if (queryStartIndex < schemeSpecific.length()) - queryPart = schemeSpecific.substring(queryStartIndex + 1); - } + String positionPart; + String queryPart = ""; + int queryStartIndex = schemeSpecific.indexOf('?'); + if (queryStartIndex == -1) { + positionPart = schemeSpecific; + } else { + positionPart = schemeSpecific.substring(0, queryStartIndex); + if (queryStartIndex < schemeSpecific.length()) + queryPart = schemeSpecific.substring(queryStartIndex + 1); + } - final Pattern positionPattern = Pattern.compile( - "([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)"); - final Matcher positionMatcher = positionPattern.matcher(positionPart); - if (!positionMatcher.find()) { - return null; - } - double lat = Double.valueOf(positionMatcher.group(1)); + final Pattern positionPattern = Pattern.compile( + "([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)"); + final Matcher positionMatcher = positionPattern.matcher(positionPart); + if (!positionMatcher.find()) { + return null; + } + double lat = Double.valueOf(positionMatcher.group(1)); double lon = Double.valueOf(positionMatcher.group(2)); - int zoom = GeoParsedPoint.NO_ZOOM; - String searchRequest = null; - for (String param : queryPart.split("&")) { - String paramName; - String paramValue = null; - int nameValueDelimititerIndex = param.indexOf('='); - if (nameValueDelimititerIndex == -1) { - paramName = param; - } else { - paramName = param.substring(0, nameValueDelimititerIndex); - if (nameValueDelimititerIndex < param.length()) - paramValue = param.substring(nameValueDelimititerIndex + 1); - } + int zoom = GeoParsedPoint.NO_ZOOM; + String searchRequest = null; + for (String param : queryPart.split("&")) { + String paramName; + String paramValue = null; + int nameValueDelimititerIndex = param.indexOf('='); + if (nameValueDelimititerIndex == -1) { + paramName = param; + } else { + paramName = param.substring(0, nameValueDelimititerIndex); + if (nameValueDelimititerIndex < param.length()) + paramValue = param.substring(nameValueDelimititerIndex + 1); + } - if ("z".equals(paramName) && paramValue != null) { - zoom = Integer.parseInt(paramValue); - } else if ("q".equals(paramName) && paramValue != null) { - searchRequest = URLDecoder.decode(paramValue); - } - } + if ("z".equals(paramName) && paramValue != null) { + zoom = Integer.parseInt(paramValue); + } else if ("q".equals(paramName) && paramValue != null) { + searchRequest = URLDecoder.decode(paramValue); + } + } - if (searchRequest != null) { - final Matcher positionInSearchRequestMatcher = - positionPattern.matcher(searchRequest); - if (lat == 0.0 && lon == 0.0 && positionInSearchRequestMatcher.find()) { - lat = Double.valueOf(positionInSearchRequestMatcher.group(1)); - lon = Double.valueOf(positionInSearchRequestMatcher.group(2)); - } - } + if (searchRequest != null) { + final Matcher positionInSearchRequestMatcher = + positionPattern.matcher(searchRequest); + if (lat == 0.0 && lon == 0.0 && positionInSearchRequestMatcher.find()) { + lat = Double.valueOf(positionInSearchRequestMatcher.group(1)); + lon = Double.valueOf(positionInSearchRequestMatcher.group(2)); + } + } - if (lat == 0.0 && lon == 0.0 && searchRequest != null) { - return new GeoParsedPoint(searchRequest); - } + if (lat == 0.0 && lon == 0.0 && searchRequest != null) { + return new GeoParsedPoint(searchRequest); + } - if (zoom != GeoParsedPoint.NO_ZOOM) { - return new GeoParsedPoint(lat, lon, zoom, name); - } - return new GeoParsedPoint(lat, lon, name); + if (zoom != GeoParsedPoint.NO_ZOOM) { + return new GeoParsedPoint(lat, lon, zoom, name); + } + return new GeoParsedPoint(lat, lon, name); } return null; }