Commit graph

44108 commits

Author SHA1 Message Date
Priit Jõerüüt
12027a4429
Translated using Weblate (Estonian)
Currently translated at 98.3% (3586 of 3645 strings)
2021-01-20 22:24:13 +01:00
Eduardo Addad de Oliveira
baa66b8d4b
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3645 of 3645 strings)
2021-01-20 22:24:13 +01:00
Franco
7e4eba8aff
Translated using Weblate (Spanish (Argentina))
Currently translated at 99.8% (3641 of 3645 strings)
2021-01-20 22:24:10 +01:00
Priit Jõerüüt
2ca9e6df88
Translated using Weblate (Estonian)
Currently translated at 100.0% (3881 of 3881 strings)
2021-01-20 22:24:07 +01:00
ace shadow
fbe684924e
Translated using Weblate (Slovak)
Currently translated at 95.4% (3704 of 3881 strings)
2021-01-20 22:24:06 +01:00
Pavel Kotrč
29d060c64b
Translated using Weblate (Czech)
Currently translated at 100.0% (3645 of 3645 strings)
2021-01-20 22:24:06 +01:00
Ahmad Alfrhood
cc93512dfc
Translated using Weblate (Arabic)
Currently translated at 100.0% (3645 of 3645 strings)
2021-01-20 22:24:02 +01:00
Yaron Shahrabani
964b89701e
Translated using Weblate (Hebrew)
Currently translated at 99.5% (3627 of 3645 strings)
2021-01-20 22:23:59 +01:00
ace shadow
9745c23b42
Translated using Weblate (Slovak)
Currently translated at 100.0% (3645 of 3645 strings)
2021-01-20 22:23:58 +01:00
Ihor Hordiichuk
033935943c
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3645 of 3645 strings)
2021-01-20 22:23:55 +01:00
Oğuz Ersen
8feeb2081d
Translated using Weblate (Turkish)
Currently translated at 100.0% (3645 of 3645 strings)
2021-01-20 22:23:52 +01:00
Oliver
74b41fce88
Translated using Weblate (German)
Currently translated at 99.8% (3638 of 3645 strings)
2021-01-20 22:23:49 +01:00
Ldm Public
3c2a941098
Translated using Weblate (French)
Currently translated at 99.6% (3634 of 3645 strings)
2021-01-20 22:23:46 +01:00
Babos Gábor
d7466a2a3a
Translated using Weblate (Hungarian)
Currently translated at 99.9% (3642 of 3645 strings)
2021-01-20 22:23:40 +01:00
androiddevkotlin
3a2b54bbcc Hide/show divider fix 2021-01-20 22:58:21 +02:00
androiddevkotlin
84deb83900 Always ask color text 2021-01-20 22:36:53 +02:00
androiddevkotlin
a4cc3f83c8 Track tab - GPX Context menu
Change UI for statistic block (Distance, Timespan etc). The text should be on the left and icon on the right, the icon is 16dp (currently is used big 24dp icons)

Options edit, delete, split interval
2021-01-20 22:19:27 +02:00
androiddevkotlin
a1aeb9953b Fix rtl, icon, color tick, visible container 2021-01-20 21:40:54 +02:00
Skalii
5d6101f23a set overview as default tab;
add layout for overview fragment;
add layouts for action items;
add OverviewCard.
2021-01-20 17:22:44 +02:00
max-klaus
01569a6f52 Build gradle refactoring 2021-01-19 15:26:27 +03:00
Dmitry
a8d92d7fa0 Added 16dp arrow icons 2021-01-19 12:27:31 +02:00
androiddevkotlin
1c8c45dbad Fix UI 2 part Trip recording 2021-01-19 12:16:39 +02:00
Hosted Weblate
182fd48f3b
Merge branch 'origin/master' into Weblate. 2021-01-19 01:37:01 +01:00
Franco
e2f19990c5
Translated using Weblate (Spanish (American))
Currently translated at 99.0% (3594 of 3629 strings)
2021-01-19 01:36:56 +01:00
androiddevkotlin
50c56e2051 Fix UI 1 part Trip recording 2021-01-18 18:28:45 +02:00
nazar-kutz
f26a547103 merge ui and backend fixes p.2 2021-01-18 11:35:12 +02:00
nazar-kutz
1e946c6d51 Merge branch 'master' into OnlineRoutingBackend
# Conflicts:
#	OsmAnd/res/values/strings.xml
2021-01-18 11:33:51 +02:00
Hosted Weblate
045d132c5d
Merge branch 'origin/master' into Weblate. 2021-01-18 01:19:02 +01:00
Jeff Huang
3a1874d76e
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-18 01:19:02 +01:00
Verdulo
cd5eda6f90
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-18 01:19:01 +01:00
Franco
832f3d5741
Translated using Weblate (Spanish (American))
Currently translated at 99.3% (3594 of 3618 strings)
2021-01-18 01:19:00 +01:00
Eduardo Addad de Oliveira
c1d492b401
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-18 01:18:59 +01:00
Franco
8787c7f97e
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-18 01:18:59 +01:00
Allan Nordhøy
2325ed9de7
Translated using Weblate (Norwegian Bokmål)
Currently translated at 58.6% (2122 of 3618 strings)
2021-01-18 01:18:57 +01:00
Pavel Kotrč
3c87421b12
Translated using Weblate (Czech)
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-18 01:18:55 +01:00
Ahmad Alfrhood
67d5cec572
Translated using Weblate (Arabic)
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-18 01:18:54 +01:00
ace shadow
a3f5098ddf
Translated using Weblate (Slovak)
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-18 01:18:54 +01:00
Temuri Doghonadze
68b7e1ec50
Translated using Weblate (Georgian)
Currently translated at 76.1% (2754 of 3618 strings)
2021-01-18 01:18:53 +01:00
J. Lavoie
c5ab6f4a17
Translated using Weblate (Italian)
Currently translated at 88.1% (3190 of 3618 strings)
2021-01-18 01:18:51 +01:00
Igor Polyakov
78391a68bb
Translated using Weblate (Russian)
Currently translated at 99.0% (3582 of 3618 strings)
2021-01-18 01:18:51 +01:00
Oliver
d8f6354b79
Translated using Weblate (German)
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-18 01:18:50 +01:00
ssantos
fa39419fcf
Translated using Weblate (Portuguese)
Currently translated at 99.3% (3593 of 3618 strings)
2021-01-18 01:18:49 +01:00
Logan Rosen
0adf2a20aa
Translated using Weblate (Spanish (American))
Currently translated at 99.3% (3594 of 3618 strings)
2021-01-18 01:18:43 +01:00
nazar-kutz
cb1f203cc1 Implement Online routing backend (fixes after code review) 2021-01-18 01:09:45 +02:00
nazar-kutz
febc0822e6 Merge branch 'master' into OnlineRoutingBackend
# Conflicts:
#	OsmAnd/res/values/strings.xml
2021-01-18 00:43:44 +02:00
Vitaliy
d0df11ed90 Small fixes in TripRecordingBottomSheet 2021-01-18 10:24:37 +02:00
androiddevkotlin
7e3d3b9e79 init 2021-01-18 09:22:21 +02:00
Vitaliy
56d869389f Minor fixes 2021-01-17 01:25:22 +02:00
Vitaliy
f18ff499a4 Merge branch 'master' into announcement_time_update_ui
# Conflicts:
#	OsmAnd/res/values/strings.xml
2021-01-16 19:13:45 +02:00
Jukefox
50aa51890d
Translated using Weblate (Finnish)
Currently translated at 64.2% (2323 of 3618 strings)
2021-01-15 21:40:11 +01:00
Yaron Shahrabani
bde1f99ac6
Translated using Weblate (Hebrew)
Currently translated at 99.9% (3617 of 3618 strings)
2021-01-15 21:39:57 +01:00
Ihor Hordiichuk
e28dc59f04
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-15 21:39:56 +01:00
Babos Gábor
3d20e5be2c
Translated using Weblate (Hungarian)
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-15 21:39:55 +01:00
Oğuz Ersen
e40870b915
Translated using Weblate (Turkish)
Currently translated at 100.0% (3618 of 3618 strings)
2021-01-15 21:39:54 +01:00
Jurijus
8aa68a9ad2
Translated using Weblate (Lithuanian)
Currently translated at 59.5% (2156 of 3618 strings)
2021-01-15 21:39:53 +01:00
nazar-kutz
8395078329 Implement Online routing backend p.2 2021-01-15 17:45:29 +02:00
Hosted Weblate
cdaf54c138
Merge branch 'origin/master' into Weblate. 2021-01-15 05:48:14 +01:00
Pieter Vander Vennet
680c3a78a5
Translated using Weblate (Dutch)
Currently translated at 95.3% (3444 of 3613 strings)
2021-01-15 05:48:11 +01:00
Pavel Kotrč
35e2ab7a95
Translated using Weblate (Czech)
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-15 05:48:08 +01:00
Softmap
f646397490
Translated using Weblate (Arabic)
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-15 05:48:08 +01:00
WaldiS
a42a312aa1
Translated using Weblate (Polish)
Currently translated at 99.3% (3591 of 3613 strings)
2021-01-15 05:48:05 +01:00
ace shadow
126724f8f4
Translated using Weblate (Slovak)
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-15 05:48:04 +01:00
Temuri Doghonadze
bee5d324c1
Translated using Weblate (Georgian)
Currently translated at 75.9% (2744 of 3613 strings)
2021-01-15 05:48:01 +01:00
solokot
b07a0c38bd
Translated using Weblate (Russian)
Currently translated at 99.1% (3582 of 3613 strings)
2021-01-15 05:47:19 +01:00
Vitaliy
fcf97559db Delete string resources without default value second part 2021-01-14 18:43:55 +02:00
Vitaliy
788543c66b Remove string resources without default value 2021-01-14 18:35:11 +02:00
Vitaliy
250a19c8be Fix multiple substitutions specified 2021-01-14 17:20:36 +02:00
cepprice
7a279eae76 Remove unneeded code 2021-01-14 19:06:03 +05:00
cepprice
3d925646f8 Update UI of announcement time 2021-01-14 19:04:07 +05:00
Vitaliy
c4707e415b Gpx options initial commit 2021-01-14 10:31:04 +02:00
Dmitry
37972b1be5 Added new icons: name field, overflow menu with background 2021-01-13 16:42:53 +02:00
Victor Shcherb
46aeac9f2e Merge branch 'master' of github.com:osmandapp/Osmand 2021-01-13 14:30:20 +01:00
Victor Shcherb
1fc3e90d9d Update articles 2021-01-13 14:30:13 +01:00
Pieter Vander Vennet
d4ea5f62cc
Translated using Weblate (Dutch)
Currently translated at 94.4% (3412 of 3613 strings)
2021-01-12 21:24:59 +01:00
Jeff Huang
ae23549e8d
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-12 21:24:59 +01:00
Verdulo
9049e680c6
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-12 21:24:58 +01:00
Eduardo Addad de Oliveira
f1d71b8a4b
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-12 21:24:57 +01:00
Iváns
6bb2d4b2eb
Translated using Weblate (Galician)
Currently translated at 99.9% (3610 of 3613 strings)
2021-01-12 21:24:57 +01:00
Ajeje Brazorf
4d6dd1f27f
Translated using Weblate (Sardinian)
Currently translated at 99.8% (3606 of 3613 strings)
2021-01-12 21:24:56 +01:00
Pavel Kotrč
aa585533bb
Translated using Weblate (Czech)
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-12 21:24:53 +01:00
Yaron Shahrabani
d29c9608ef
Translated using Weblate (Hebrew)
Currently translated at 99.9% (3612 of 3613 strings)
2021-01-12 21:24:52 +01:00
Ihor Hordiichuk
0f64e24d24
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-12 21:24:51 +01:00
Babos Gábor
ca38fdb838
Translated using Weblate (Hungarian)
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-12 21:24:51 +01:00
Oğuz Ersen
5e842ee036
Translated using Weblate (Turkish)
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-12 21:24:50 +01:00
Oliver
5787564b17
Translated using Weblate (German)
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-12 21:24:49 +01:00
Ldm Public
1a8516932e
Translated using Weblate (French)
Currently translated at 100.0% (3613 of 3613 strings)
2021-01-12 21:24:48 +01:00
Edgar
24ceac5d10
Translated using Weblate (Dutch)
Currently translated at 94.3% (3410 of 3613 strings)
2021-01-12 21:24:44 +01:00
Pieter Vander Vennet
1720e5d24c
Translated using Weblate (Dutch)
Currently translated at 94.3% (3410 of 3613 strings)
2021-01-12 21:24:41 +01:00
Hosted Weblate
318ae3d3cf
Merge branch 'origin/master' into Weblate. 2021-01-11 20:33:17 +01:00
Franco
d326603d1d
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-11 20:33:12 +01:00
Dmitriy Prodchenko
7ac78fb9f4
Translated using Weblate (Russian)
Currently translated at 99.1% (3578 of 3609 strings)
2021-01-11 20:33:11 +01:00
vshcherb
3bf77e4ff1
Merge pull request #10551 from osmandapp/OnlineRoutingBackend
Implement Online routing backend
2021-01-11 10:39:56 +01:00
Vitaliy
f2f2d57a61 Move gpx UI polishing 2021-01-11 04:16:22 +02:00
Vitaliy
7a1517fc3d Fix #10068 2021-01-11 02:22:24 +02:00
Franco
da3473b838
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-11 01:01:34 +01:00
syl
93488e51a0
Translated using Weblate (French)
Currently translated at 100.0% (3881 of 3881 strings)
2021-01-11 01:01:34 +01:00
Pavel Kotrč
0f8211d3de
Translated using Weblate (Czech)
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-11 01:01:33 +01:00
Hakuchi
21591f3276
Translated using Weblate (German)
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-11 01:01:30 +01:00
Joaquin Gonzalez
b11a264a42
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-11 01:01:26 +01:00
nazar-kutz
259ab4d4f0 Merge branch 'master' into OnlineRoutingBackend
# Conflicts:
#	OsmAnd/src/net/osmand/plus/onlinerouting/OnlineRoutingEngine.java
#	OsmAnd/src/net/osmand/plus/onlinerouting/OnlineRoutingEngineFragment.java
#	OsmAnd/src/net/osmand/plus/onlinerouting/OnlineRoutingHelper.java
2021-01-11 00:15:55 +02:00
nazar-kutz
170deedad4 Implement Online routing backend 2021-01-10 15:04:47 +02:00
Jeff Huang
1cb0f08ca6
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-10 04:32:13 +01:00
Verdulo
29d19d087a
Translated using Weblate (Esperanto)
Currently translated at 99.9% (3608 of 3609 strings)
2021-01-10 04:32:12 +01:00
Eduardo Addad de Oliveira
2536688510
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-10 04:32:12 +01:00
Predatorix Phoenix
1f3af287a0
Translated using Weblate (German)
Currently translated at 100.0% (3881 of 3881 strings)
2021-01-10 04:32:12 +01:00
Yaron Shahrabani
73bfbfe76d
Translated using Weblate (Hebrew)
Currently translated at 99.9% (3608 of 3609 strings)
2021-01-10 04:32:11 +01:00
ace shadow
0a18e1de1f
Translated using Weblate (Slovak)
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-10 04:32:10 +01:00
Ihor Hordiichuk
83600fdadf
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-10 04:32:09 +01:00
Babos Gábor
13521bf1c6
Translated using Weblate (Hungarian)
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-10 04:32:08 +01:00
Oğuz Ersen
ac987645f0
Translated using Weblate (Turkish)
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-10 04:32:08 +01:00
Aleph Null
e96159d97a
Translated using Weblate (German)
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-10 04:32:07 +01:00
Ldm Public
1d50e188f4
Translated using Weblate (French)
Currently translated at 100.0% (3609 of 3609 strings)
2021-01-10 04:32:07 +01:00
Hosted Weblate
ce3483ab7f
Merge branch 'origin/master' into Weblate. 2021-01-08 22:51:44 +01:00
Sveinn í Felli
c9deb2e638
Translated using Weblate (Icelandic)
Currently translated at 100.0% (3881 of 3881 strings)
2021-01-08 22:51:40 +01:00
Sveinn í Felli
d4c019d6e7
Translated using Weblate (Icelandic)
Currently translated at 100.0% (3607 of 3607 strings)
2021-01-08 22:51:39 +01:00
ssantos
b94e699674
Translated using Weblate (Portuguese)
Currently translated at 99.8% (3875 of 3881 strings)
2021-01-08 22:51:36 +01:00
Eduardo Addad de Oliveira
f4cdf8cade
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3607 of 3607 strings)
2021-01-08 22:51:35 +01:00
Iváns
fed66f0534
Translated using Weblate (Galician)
Currently translated at 99.8% (3602 of 3607 strings)
2021-01-08 22:51:34 +01:00
Ihor Hordiichuk
bc9b3dbfc8
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3607 of 3607 strings)
2021-01-08 22:51:32 +01:00
nautilusx
925ed873d4
Translated using Weblate (German)
Currently translated at 100.0% (3607 of 3607 strings)
2021-01-08 22:51:32 +01:00
Dmitry
b1f29754f3 Added image for announcement time dialog 2021-01-08 13:43:46 +02:00
Vitaliy
fa4aa8fde5 Add export and import of online routing 2021-01-08 00:18:12 +02:00
Verdulo
9add5f0ef6
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3607 of 3607 strings)
2021-01-07 19:49:21 +01:00
Franco
144b1d5c58
Translated using Weblate (Spanish (Argentina))
Currently translated at 99.9% (3606 of 3607 strings)
2021-01-07 19:49:21 +01:00
WaldiS
532f08a509
Translated using Weblate (Polish)
Currently translated at 99.2% (3852 of 3881 strings)
2021-01-07 19:49:19 +01:00
Ajeje Brazorf
401aa58437
Translated using Weblate (Sardinian)
Currently translated at 99.3% (3583 of 3607 strings)
2021-01-07 19:49:16 +01:00
Gontzal Manuel Pujana Onaindia
9bf9efe4d3
Translated using Weblate (Basque)
Currently translated at 98.6% (3557 of 3607 strings)
2021-01-07 19:49:16 +01:00
WaldiS
f6f1ef0354
Translated using Weblate (Polish)
Currently translated at 99.4% (3587 of 3607 strings)
2021-01-07 19:49:14 +01:00
Yaron Shahrabani
8a7c935159
Translated using Weblate (Hebrew)
Currently translated at 99.9% (3606 of 3607 strings)
2021-01-07 19:49:12 +01:00
Babos Gábor
9f4221a125
Translated using Weblate (Hungarian)
Currently translated at 100.0% (3607 of 3607 strings)
2021-01-07 19:49:12 +01:00
Oliver
c8d0b19d50
Translated using Weblate (German)
Currently translated at 99.9% (3606 of 3607 strings)
2021-01-07 19:49:11 +01:00
Jeff Huang
2487e51a58
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3607 of 3607 strings)
2021-01-07 08:08:45 +01:00
Temuri Doghonadze
cbcee006be
Translated using Weblate (Georgian)
Currently translated at 64.9% (2344 of 3607 strings)
2021-01-07 08:08:43 +01:00
Oğuz Ersen
5afed63b53
Translated using Weblate (Turkish)
Currently translated at 100.0% (3607 of 3607 strings)
2021-01-07 08:08:42 +01:00
Ldm Public
301efb0252
Translated using Weblate (French)
Currently translated at 100.0% (3607 of 3607 strings)
2021-01-07 08:08:42 +01:00
Hosted Weblate
7c47116f5b
Merge branch 'origin/master' into Weblate. 2021-01-07 01:44:33 +01:00
Verdulo
41eefeda5d
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3606 of 3606 strings)
2021-01-07 01:44:30 +01:00
Ldm Public
f65d0a2dee
Translated using Weblate (French)
Currently translated at 99.9% (3880 of 3881 strings)
2021-01-07 01:44:28 +01:00
iman
7f4340a85a
Translated using Weblate (Persian)
Currently translated at 99.3% (3581 of 3606 strings)
2021-01-07 01:44:27 +01:00
ace shadow
01165f370a
Translated using Weblate (Slovak)
Currently translated at 100.0% (3606 of 3606 strings)
2021-01-07 01:44:23 +01:00
Temuri Doghonadze
b318a7cdaf
Translated using Weblate (Georgian)
Currently translated at 64.8% (2340 of 3606 strings)
2021-01-07 01:44:21 +01:00
Ihor Hordiichuk
05767e3b7a
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3606 of 3606 strings)
2021-01-07 01:44:20 +01:00
Oliver
c39d62d441
Translated using Weblate (German)
Currently translated at 99.9% (3603 of 3606 strings)
2021-01-07 01:44:20 +01:00
Ldm Public
f25a6bc001
Translated using Weblate (French)
Currently translated at 100.0% (3606 of 3606 strings)
2021-01-07 01:44:18 +01:00
Vitaliy
e9d0a379b8
Merge pull request #10533 from osmandapp/share_address_poi_type
Share address. Nearby POI
2021-01-06 19:44:19 +02:00
Vitaliy
6b9fe7027e
Merge pull request #10528 from osmandapp/Fix_10437
Fix #10437
2021-01-06 19:09:48 +02:00
nazar-kutz
38249b1122 Fix #10437 (2) 2021-01-06 18:58:50 +02:00
Skalii
190d33681d add amenity field to MenuBuilder;
remove excess R.string.poi_around;
code reduction;
2021-01-06 18:12:18 +02:00
Skalii
599544e7ba recovering deleted string value after merge 2021-01-06 12:00:17 +02:00
Skalii
7766d67cf7 Merge remote-tracking branch 'origin/master' into share_address_poi_type
# Conflicts:
#	OsmAnd/res/values/strings.xml
2021-01-06 11:06:39 +02:00