Commit graph

14957 commits

Author SHA1 Message Date
Saikrishna Arcot
9ef86bbe56 Merge branch 'master' into merge-turn-lanes
Conflicts:
	OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
2014-11-23 11:27:15 -05:00
Ldm Public
5e5ed7061a Translated using Weblate (French)
Currently translated at 100.0% (1562 of 1562 strings)
2014-11-23 17:22:40 +01:00
vshcherb
087506c795 Merge pull request #968 from saiarcot895/remove-verifications
Remove one verification of lanes and turn:lanes
2014-11-23 17:16:28 +01:00
vshcherb
a187123300 Merge pull request #967 from User99gmxat/master
Update German strings
2014-11-23 17:15:26 +01:00
jan madsen
e9657b4391 Translated using Weblate (Danish)
Currently translated at 100.0% (573 of 573 strings)
2014-11-23 17:09:15 +01:00
jan madsen
6a9398c6e3 Translated using Weblate (Danish)
Currently translated at 100.0% (573 of 573 strings)
2014-11-23 17:09:12 +01:00
Weblate
6635e0cc39 Merge remote-tracking branch 'origin/master' 2014-11-23 17:07:09 +01:00
jan madsen
62f3098815 Translated using Weblate (Danish)
Currently translated at 100.0% (573 of 573 strings)
2014-11-23 17:07:04 +01:00
Victor Shcherb
ddf6d63704 Merge branch 'master' of ssh://github.com/osmandapp/Osmand 2014-11-23 17:06:51 +01:00
Victor Shcherb
171bde44c8 Fix issue not remember state of group (small issue on server left) 2014-11-23 17:05:58 +01:00
josep constanti
ac22772362 Translated using Weblate (Catalan)
Currently translated at 100.0% (1562 of 1562 strings)
2014-11-23 16:58:48 +01:00
Victor Shcherb
9c8007e097 Small refactoring 2014-11-23 16:38:51 +01:00
Weblate
c63c75ae6d Merge remote-tracking branch 'origin/master' 2014-11-23 16:29:14 +01:00
jan madsen
b58a41cfbd Translated using Weblate (Danish)
Currently translated at 100.0% (573 of 573 strings)
2014-11-23 16:29:10 +01:00
Victor Shcherb
8b79a0c2b9 Use rsa encryption 2014-11-23 16:28:58 +01:00
Weblate
fa010b0f49 Merge remote-tracking branch 'origin/master' 2014-11-23 16:22:26 +01:00
Ivan Vantu5z
5efa54264a Translated using Weblate (Russian)
Currently translated at 93.3% (535 of 573 strings)
2014-11-23 16:22:23 +01:00
jan madsen
6f3a135d81 Translated using Weblate (Danish)
Currently translated at 100.0% (573 of 573 strings)
2014-11-23 16:22:23 +01:00
Jaroslav Lichtblau
e4cfc49d42 Translated using Weblate (Czech)
Currently translated at 32.2% (185 of 573 strings)
2014-11-23 16:22:20 +01:00
Lu Ca
03470a2974 Translated using Weblate (Sardinian)
Currently translated at 100.0% (1560 of 1560 strings)
2014-11-23 16:22:18 +01:00
Ernst te Brake
e5032d1c4d Translated using Weblate (Dutch)
Currently translated at 100.0% (1560 of 1560 strings)
2014-11-23 16:22:15 +01:00
Victor Shcherb
573842f95c Merge branch 'master' of ssh://github.com/osmandapp/Osmand 2014-11-23 16:21:51 +01:00
Victor Shcherb
aa6a8e940d Fix osmo bugs: use https, encryption, cancel 2014-11-23 16:21:35 +01:00
Ernst te Brake
da35b5e4aa Translated using Weblate (Dutch)
Currently translated at 100.0% (1560 of 1560 strings)
2014-11-22 16:59:23 +01:00
Saikrishna Arcot
fcee2c6642 Log inconsistencies in lanes and turn:lanes values, and try to adjust lanes array to continue processing. 2014-11-21 11:31:18 -05:00
User99gmxat
09fec48e6b Update German strings 2014-11-21 16:14:45 +01:00
Saikrishna Arcot
72f8c1e1f4 Remove main lanes restriction 2014-11-21 07:58:15 -05:00
Saikrishna Arcot
751e569208 Refactor countLanes() so that it gets the right number of lanes by itself (similar to getTurnLanesString()) 2014-11-21 07:58:15 -05:00
Saikrishna Arcot
984dc80e58 Make a fix to ensure the directional lane is used 2014-11-21 07:51:41 -05:00
Saikrishna Arcot
e1b7f13b5c Implement merging nearby turns together.
When there are multiple turns near each other (< 60m), set the lanes
that are allowed on earlier turns such that staying on that lane will
carry you through the other turns.

For a standard left/right turn at a traffic light at two one-way roads
(dual carriageway), this means that the left and right turns are
correctly highlighted.
2014-11-21 07:51:41 -05:00
Mirco Zorzo
75db383f6b Translated using Weblate (Italian)
Currently translated at 100% (0 of 0 strings)

Created new translation.
2014-11-21 08:12:20 +01:00
sonora
89a233159a English string completions 2014-11-20 20:59:47 +01:00
Victor Shcherb
4b13460764 Fix qt rotate 2014-11-20 19:24:48 +01:00
Victor Shcherb
bb72d43ee7 Merge branch 'master' of ssh://github.com/osmandapp/Osmand 2014-11-20 19:23:55 +01:00
Victor Shcherb
a64afb2700 Fix qt zoom layer 2014-11-20 19:20:59 +01:00
Weblate
a2271c45cb Merge remote-tracking branch 'origin/master' 2014-11-20 18:11:04 +01:00
jan madsen
144ff02fca Translated using Weblate (Danish)
Currently translated at 100.0% (573 of 573 strings)
2014-11-20 18:11:00 +01:00
Victor Shcherb
c0b5229f4e Merge branch 'master' of ssh://github.com/osmandapp/Osmand 2014-11-20 18:10:47 +01:00
Victor Shcherb
f1ef2fc31c Update qt layout 2014-11-20 18:10:17 +01:00
Weblate
afd1aaabd8 Merge remote-tracking branch 'origin/master' 2014-11-20 17:00:44 +01:00
XqweX
ef4c5359c1 Translated using Weblate (Czech)
Currently translated at 28.9% (166 of 573 strings)
2014-11-20 17:00:42 +01:00
XqweX
13350163b2 Translated using Weblate (Czech)
Currently translated at 100.0% (3 of 3 strings)
2014-11-20 17:00:41 +01:00
vshcherb
6ec80b62e4 Merge pull request #965 from Bars107/master
Fixed bug with local index not showing after switching tabs
2014-11-20 17:00:37 +01:00
Denis
4f2e3acb31 Fixed bug with local index not showing after switching tabs 2014-11-20 12:38:21 +02:00
jan madsen
99515f9e9b Translated using Weblate (Danish)
Currently translated at 100.0% (573 of 573 strings)
2014-11-20 09:34:49 +01:00
Weblate
25cdd02315 Merge remote-tracking branch 'origin/master' 2014-11-20 09:06:09 +01:00
Ivan Vantu5z
34542bff46 Translated using Weblate (Russian)
Currently translated at 92.9% (525 of 565 strings)
2014-11-20 09:06:07 +01:00
jan madsen
b0adec27e5 Translated using Weblate (Danish)
Currently translated at 100.0% (565 of 565 strings)
2014-11-20 09:06:07 +01:00
Michal Čihař
a39cd15951 Translated using Weblate (Czech)
Currently translated at 29.9% (169 of 565 strings)
2014-11-20 09:06:05 +01:00
xmd5a2
13ee83761b Update phrases 2014-11-20 11:05:47 +03:00