From b5aa267c69d15d6a3d1f7685a615c53ead859fba Mon Sep 17 00:00:00 2001 From: Javier Salamanca Date: Thu, 16 Oct 2014 17:01:03 +0200 Subject: [PATCH 01/14] Solve Issue 2233: Routing instructions disappearing too early in roundabouts Keep track of the end for directions that are not spots (like roundabouts). Then use this information to keep on this directions until we reach their end. Has a strange side effect. Distance drop as we arrive to start of roundabout (like previously) and when entering roundabout grow up to roundabout distance. modified: src/net/osmand/plus/routing/RouteCalculationResult.java modified: src/net/osmand/plus/routing/RouteDirectionInfo.java --- .../plus/routing/RouteCalculationResult.java | 18 +++++++++++++++--- .../plus/routing/RouteDirectionInfo.java | 2 ++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java index a27081fa12..6631d2cd13 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java @@ -243,10 +243,14 @@ public class RouteCalculationResult { if (routeInd < list.size()) { int lind = routeInd; if(turn.isRoundAbout()) { + int roundAboutEnd = prevLocationSize - 1; // take next name for roundabout (not roundabout name) while(lind < list.size() -1 && list.get(lind).getObject().roundabout()) { + roundAboutEnd += Math.abs(list.get(lind).getEndPointIndex()-list.get(lind).getStartPointIndex()); lind++; } + // Consider roundabout end. + info.routeEndPointOffset = roundAboutEnd; } RouteSegmentResult next = list.get(lind); info.setRef(next.getObject().getRef()); @@ -689,7 +693,9 @@ public class RouteCalculationResult { public void updateCurrentRoute(int currentRoute) { this.currentRoute = currentRoute; - while (currentDirectionInfo < directions.size() - 1 && directions.get(currentDirectionInfo + 1).routePointOffset < currentRoute) { + while (currentDirectionInfo < directions.size() - 1 + && directions.get(currentDirectionInfo + 1).routePointOffset < currentRoute + && directions.get(currentDirectionInfo + 1).routeEndPointOffset < currentRoute) { currentDirectionInfo++; } while(nextIntermediate < intermediatePoints.length) { @@ -721,7 +727,7 @@ public class RouteCalculationResult { /*public */NextDirectionInfo getNextRouteDirectionInfo(NextDirectionInfo info, Location fromLoc, boolean toSpeak) { int dirInfo = currentDirectionInfo; if (dirInfo < directions.size()) { - int dist = listDistance[currentRoute]; + // Locate next direction of interest int nextInd = dirInfo + 1; if (toSpeak) { while (nextInd < directions.size()) { @@ -732,12 +738,18 @@ public class RouteCalculationResult { nextInd++; } } + int dist = listDistance[currentRoute]; if (fromLoc != null) { dist += fromLoc.distanceTo(locations.get(currentRoute)); } if (nextInd < directions.size()) { info.directionInfo = directions.get(nextInd); - dist -= listDistance[directions.get(nextInd).routePointOffset]; + if (directions.get(nextInd).routePointOffset <= currentRoute + && currentRoute <= directions.get(nextInd).routeEndPointOffset) + // We are not into a puntual direction. + dist -= listDistance[directions.get(nextInd).routeEndPointOffset]; + else + dist -= listDistance[directions.get(nextInd).routePointOffset]; } if(intermediatePoints != null && nextIntermediate < intermediatePoints.length) { info.intermediatePoint = intermediatePoints[nextIntermediate] == nextInd; diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java b/OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java index 906b36f782..9176b4be9d 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java @@ -7,6 +7,8 @@ import net.osmand.router.TurnType; public class RouteDirectionInfo { // location when you should action (turn or go ahead) public int routePointOffset; + // location where direction end. useful for roundabouts. + public int routeEndPointOffset = 0; // Type of action to take private TurnType turnType; // Description of the turn and route after From ee58eebe3cec18358d3d9dfea45e3a69a14967c4 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Tue, 21 Oct 2014 08:50:29 -0400 Subject: [PATCH 02/14] Add support for determining the actual turn to be taken based on the lanes highlighted --- .../osmand/router/RouteResultPreparation.java | 64 +++++++++++++++++-- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java index eeb4b7e3f8..900f4bea77 100644 --- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java +++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java @@ -5,6 +5,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -671,18 +672,18 @@ public class RouteResultPreparation { } } - private void attachTurnLanesData(boolean leftSide, RouteSegmentResult prevSegm, TurnType t) { + private TurnType attachTurnLanesData(boolean leftSide, RouteSegmentResult prevSegm, TurnType t) { int lanes = prevSegm.getObject().getLanes(); String turnLanes = getTurnLanesString(prevSegm); if (turnLanes == null) { - return; + return t; } String[] splitLaneOptions = turnLanes.split("\\|", -1); if (splitLaneOptions.length != lanes) { // Error in data or missing data - return; + return t; } if (t.getLanes().length != lanes) { @@ -699,7 +700,7 @@ public class RouteResultPreparation { if (options == 1) { if (outgoingLanesIndex + 1 >= t.getLanes().length) { // Likely an error in data - return; + return t; } int usability = t.getLanes()[outgoingLanesIndex] | t.getLanes()[outgoingLanesIndex + 1]; sourceLanes.add(usability); @@ -707,7 +708,7 @@ public class RouteResultPreparation { sourceLanesIndex++; } else { // Not supported - return; + return t; } } else { // Only one allowed turn; behave normally @@ -727,6 +728,8 @@ public class RouteResultPreparation { } assignTurns(splitLaneOptions, t); + t = inferTurnFromLanes(t, leftSide); + return t; } private int countOccurrences(String haystack, char needle) { @@ -782,6 +785,57 @@ public class RouteResultPreparation { } } + private TurnType inferTurnFromLanes(TurnType t, boolean leftSide) { + List possibleTurns = new ArrayList(); + for (int i = 0; i < t.getLanes().length; i++) { + if ((t.getLanes()[i] & 1) == 0) { + continue; + } + + if (possibleTurns.isEmpty()) { + // Nothing is in the list to compare to, so add the first elements + possibleTurns.add(TurnType.getPrimaryTurn(t.getLanes()[i])); + if (TurnType.getSecondaryTurn(t.getLanes()[i]) != 0) { + possibleTurns.add(TurnType.getSecondaryTurn(t.getLanes()[i])); + } + } else { + List laneTurns = new ArrayList(); + laneTurns.add(TurnType.getPrimaryTurn(t.getLanes()[i])); + if (TurnType.getSecondaryTurn(t.getLanes()[i]) != 0) { + laneTurns.add(TurnType.getSecondaryTurn(t.getLanes()[i])); + } + possibleTurns.retainAll(laneTurns); + + if (possibleTurns.isEmpty()) { + // No common turns, so can't determine anything. + return t; + } + } + } + + // Remove all turns from lanes not selected...because those aren't it + for (int i = 0; i < t.getLanes().length; i++) { + if ((t.getLanes()[i] & 1) == 0 && !possibleTurns.isEmpty()) { + List notLaneTurns = new ArrayList(); + notLaneTurns.add(TurnType.getPrimaryTurn(t.getLanes()[i])); + if (TurnType.getSecondaryTurn(t.getLanes()[i]) != 0) { + notLaneTurns.add(TurnType.getSecondaryTurn(t.getLanes()[i])); + } + possibleTurns.removeAll(notLaneTurns); + } + } + + // Checking to see that there is only one unique turn + if (new HashSet(possibleTurns).size() == 1) { + TurnType derivedTurnType = TurnType.valueOf(possibleTurns.get(0), leftSide); + derivedTurnType.setLanes(t.getLanes()); + derivedTurnType.setSkipToSpeak(t.isSkipToSpeak()); + t = derivedTurnType; + } + + return t; + } + private boolean isMotorway(RouteSegmentResult s){ String h = s.getObject().getHighway(); return "motorway".equals(h) || "motorway_link".equals(h) || From ebb4d42f291bb9a2b871852db0a70e604e1cfab8 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Wed, 22 Oct 2014 10:31:19 -0400 Subject: [PATCH 03/14] Assign new turn in attachKeepLeftInfoAndLanes() --- OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java index 900f4bea77..2580c99861 100644 --- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java +++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java @@ -642,7 +642,7 @@ public class RouteResultPreparation { if (t != null && lanes != null) { t.setLanes(lanes); - attachTurnLanesData(leftSide, prevSegm, t); + t = attachTurnLanesData(leftSide, prevSegm, t); } return t; } From 24ab8baa100b2b705e5a816cbb7db314a9bd789d Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Wed, 22 Oct 2014 11:23:13 -0400 Subject: [PATCH 04/14] Switch primary and secondary turns if the secondary turn is the actual turn --- .../src/net/osmand/router/RouteResultPreparation.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java index 2580c99861..2fd6711a36 100644 --- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java +++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java @@ -831,6 +831,15 @@ public class RouteResultPreparation { derivedTurnType.setLanes(t.getLanes()); derivedTurnType.setSkipToSpeak(t.isSkipToSpeak()); t = derivedTurnType; + + // Because only the primary turn is displayed, if the turn to be taken is currently set as the secondary turn, then that needs to be switched around. + for (int i = 0; i < t.getLanes().length; i++) { + if (TurnType.getSecondaryTurn(t.getLanes()[i]) == t.getValue()) { + int temp = TurnType.getSecondaryTurn(t.getLanes()[i]); + t.setSecondaryTurn(i, TurnType.getPrimaryTurn(t.getLanes()[i])); + t.setPrimaryTurn(i, temp); + } + } } return t; From 2e7ec761e9de96c39c918d5224ac9f6067ce9366 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sun, 26 Oct 2014 18:22:33 +0100 Subject: [PATCH 05/14] Translated using Weblate (Danish) Currently translated at 100.0% (1544 of 1544 strings) --- OsmAnd/res/values-da/strings.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 4ef84d261e..f8000d94a6 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1842,4 +1842,12 @@ Nogle af de centrale funktioner: Logget ind som %1$s Konfigurer kort I nærheden af - + Detaljer + Transport + Andre kortattributter + Resterende elementer + Statuslinjen + Højre panel + Venstre panel + Vis + From 28efd7b9c7c575f96d1d519f8a1b0a49b87d0a37 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sun, 26 Oct 2014 18:23:24 +0100 Subject: [PATCH 06/14] Translated using Weblate (Danish) Currently translated at 100.0% (1544 of 1544 strings) --- OsmAnd/res/values-da/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index f8000d94a6..7c3e067852 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -187,7 +187,7 @@ \nSolnedgang: %2$s Dag/nat information Dag-/natkort - Optegningsattributter: + Optegningsattributter Kortformat @@ -1461,7 +1461,7 @@ Nogle af de centrale funktioner: Motorcykel Båd Fly - Kortoptegning: + Kortoptegning Vælg tilgængelige brugerprofiler Programprofiler Sømærke From 399a25987ba1daabb37520dbcae20019aa7f2601 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Sun, 26 Oct 2014 19:11:15 +0100 Subject: [PATCH 07/14] Translated using Weblate (Catalan) Currently translated at 99.8% (1541 of 1544 strings) --- OsmAnd/res/values-ca/strings.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index acfc510690..18215c96e2 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -265,7 +265,7 @@ Crea un filtre pels PDI Alba: %1$s \nCapvespre: %2$s -Atributs de renderització: +Atributs de renderització Estil de renderització Minimapa de ruta Selecciona l\'acceleració de la ruta animada @@ -1324,7 +1324,7 @@ Balisa marina Seleccioneu els perfils d\'ús visibles a l\'aplicació Perfils de l\'aplicació - Renderitzat del mapa: + Renderitzat del mapa Senderisme Moto Vaixell @@ -1912,4 +1912,11 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània, Un usuari anònim no pot:\n- crear grups;\n- sincronitzar grups i dispositius amb el servidor;\n- gestionar grups i dispositius en privat. Usuari anònim S\'ha iniciat sessió com a %1$s - + Detalls + Transport + Altres atributs del mapa + Elements pendents + Barra d\'estat + Tauler dret + Tauler esquerre + From b151809abd439ff573753a8f9a8051788fc76a79 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Sun, 26 Oct 2014 19:12:49 +0100 Subject: [PATCH 08/14] Translated using Weblate (Catalan) Currently translated at 100.0% (1544 of 1544 strings) --- OsmAnd/res/values-ca/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 18215c96e2..de91d68401 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1919,4 +1919,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània, Barra d\'estat Tauler dret Tauler esquerre + Mostrar + Configureu mapa + A prop de From be2d8b0f59cab246bbcd2897bb7c012cda88bbe8 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Sun, 26 Oct 2014 19:20:52 +0100 Subject: [PATCH 09/14] Translated using Weblate (Belarusian) Currently translated at 100.0% (1544 of 1544 strings) --- OsmAnd/res/values-be/strings.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 50b3fb0768..f7b226882b 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -522,7 +522,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Узыход: %1$s \nЗаход: %2$s Узыход/заход Рэжым дзень/ноч - Налады адмалёўкі: + Налады адмалёўкі Стыль мапы @@ -1578,7 +1578,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Задайце хуткасць вымаўленьня для TTS Хуткасьць вымаўленьня Адключыць складаную маршрутызацыю - Адмалёўка мапы: + Адмалёўка мапы матацыкл Самалёт Частыя пытаньні @@ -1982,4 +1982,12 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Пачаць працу з натыўнай візуалізацыяй Настройка мапы Паблізу ад + Падрабязнасьці + Транспарт + Паказаць + Радок стану + Правая панэль + Левая панэль + Іншыя атрыбуты мапы + Астатнія элементы From 2983b6da1e5a99bee2779dc135134defcb8d335c Mon Sep 17 00:00:00 2001 From: Ernst te Brake Date: Sun, 26 Oct 2014 20:07:41 +0100 Subject: [PATCH 10/14] Translated using Weblate (Dutch) Currently translated at 100.0% (1543 of 1543 strings) --- OsmAnd/res/values-nl/strings.xml | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index e97bf0f85a..9fa8490979 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -1017,7 +1017,7 @@ Zonsopgang: %1$s \nZonsondergang: %2$s Dag/nacht info Dag/nacht kaart -Kaartweergave attributen: +Kaartweergave attributen Kaartstijl Je kan kiezen hoe de kaart gedraaid wordt door op het kompas-icoon te tikken. \n\nDe keuzes zijn: @@ -1599,7 +1599,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Motorfiets Boot Vliegtuig - Kaartweergave: + Kaartweergave Kies de profielen die in Osmand zichtbaar zijn Toepassingsprofielen boei / baken @@ -1973,12 +1973,26 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Tekstgrootte Favoriet bestaat al: de naam is veranderd in %1$s Favoriet met deze naam bestaat al - Test \"native rendering\" - Gebruik deze keer de C++ renderer in plaats van Java - Gebruik \"native renderer\" - Gebruik C++ renderer in plaats van Java + Test \"native weergave\" + Start activiteit met oorspronkelijke weergave + Gebruik oorspronkelijke weergave + Gebruik C++ weergave in plaats van Java Favoriet bewaard als %1s omdat vreemde tekens niet opgeslagen kunnen worden in een bestand. Route afdrukken Te hoge snelheid melden bij... Hoeveel de maximumsnelheid mag worden overschreden voordat een melding volgt. + Vervoer + Overige kaart attributen + Resterende onderdelen + Statusbalk + Rechter kolom + Linker kolom + Tonen + Kaart instellen + In de buurt van + Apparaat niet gevonden + OsMo service is niet beschikbaar:\n- Controleer de verbinding;\n- Controleer de instellingen;\n- Kijk op Twitter: https://twitter.com/OsMomobi + een anonieme gebruiker kan niet:\n- een groep aanmaken;\n- groepen en apparaten synchroniseren met de server;\n- groepen en apparaten beheren in een eigen omgeving. + Anonieme gebruiker + Ingelogd als %1$s From 9771e88aca04512778ad42b919ff38ce365c8207 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sun, 26 Oct 2014 22:07:03 +0100 Subject: [PATCH 11/14] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1544 of 1544 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 6eefbfb6e0..7c76b543d2 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -92,7 +92,7 @@ 日出：%1$s \n日落：%2$s 日/夜資訊 日/夜地圖 - 繪製屬性： + 繪製屬性 地圖樣式 @@ -1454,7 +1454,7 @@ 機車 船 飛航 - 地圖繪製： + 地圖繪製 在應用程式中選取現有的設定檔 應用設定檔 航線標識 @@ -1833,4 +1833,14 @@ 匿名使用者不能：\n- 建立群組；\n- 以伺服器同步群組和裝置；\n- 在個人的辦事處所管理群組和裝置。 匿名使用者 已登入於 %1$s - + 詳細資訊 + 運輸 + 其它地圖屬性 + 剩餘元件 + 狀態列 + 右面板 + 左面板 + 顯示 + 組態地圖 + 在接近度上 + From 6dae7096764351478aba100d0848c2868018ad5c Mon Sep 17 00:00:00 2001 From: ace shadow Date: Sun, 26 Oct 2014 22:26:47 +0100 Subject: [PATCH 12/14] Translated using Weblate (Slovak) Currently translated at 100.0% (1544 of 1544 strings) --- OsmAnd/res/values-sk/strings.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 061418cedb..8c70a3ee18 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1063,7 +1063,7 @@ \nZápad slnka: %2$s Info o dni/noci Denná/nočná mapa -Atribúty vykresľovania: +Atribúty vykresľovania Štýl vykresľovania OsmAnd je open source navigácia s offline aj online mapami OsmAnd je open source navigácia s offline aj online mapami @@ -1623,7 +1623,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Loď Lietadlo Profily aplikácie - Vykresľovanie mapy: + Vykresľovanie mapy Zvoľte profily použitia viditeľné v aplikácii Morská značka @@ -2009,4 +2009,14 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Prihlásený ako %1$s Služba OsMo nie je dostupná:\n- skontrolujte pripojenie;\n- skontrolujte nastavenie;\n- pozrite na náš Twitter: https://twitter.com/OsMomobi Anonymný používateľ nemôže:\n- vytvárať skupiny;\n- synchronizovať skupiny a zariadenia so serverom;\n- spravovať skupiny a zariadenia v súkromnej kancelárii. + Podrobnosti + Doprava + Iné vlastnosti mapy + Zvyšné elementy + Stavový riadok + Pravý panel + Ľavý panel + Zobraziť + Nastaviť mapu + Blízko k From 53f39964350dfbd192ed7ad04a02c0e742447314 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Sun, 26 Oct 2014 23:23:32 +0100 Subject: [PATCH 13/14] Translated using Weblate (French) Currently translated at 100.0% (1544 of 1544 strings) --- OsmAnd/res/values-fr/strings.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index baa41b22df..9101b5c775 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -1838,4 +1838,14 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Un utilisateur anonyme ne peut pas :\n- Créer des groupes;\n- Synchroniser les groupes et les périphériques avec le serveur;\n- Gérer les groupes et les périphériques dans un espace privé. Utilisateur anonyme Connecté entant que %1$s - + Détails + Transport + Autres éléments de la carte + Éléments restants + Barre d\'état + Panneau de droite + Panneau de gauche + Afficher + Configurer la carte + A proximité de + From f1444fc5de90484fef714cdd420b90750b3019b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B3=91=EA=B6=8C=20=EC=A1=B0?= Date: Sun, 26 Oct 2014 23:38:10 +0100 Subject: [PATCH 14/14] Translated using Weblate (Korean) Currently translated at 100.0% (1544 of 1544 strings) --- OsmAnd/res/values-ko/strings.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index c97d073504..ac230ae91e 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -2103,4 +2103,14 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 익명의 사용자는 아래 사항을 할 수 없습니다:\n- 그룹 생성;\n- 그룹 및 장치를 서버와 동기화;\n- 그룹 및 장치를 관리 (개인 사무실에서). 익명의 사용자 %1$s 사용자로 로그인 됨 - + 세부 정보 + 운송 + 다른 지도 속성 + 나머지 요소 + 상태 표시줄 + 오른쪽 패널 + 왼쪽된 패널 + 표시 + 지도 구성 + 근접에서 +