Commit graph

61472 commits

Author SHA1 Message Date
Nazar-Kutz
eb2a343d65 Small fixes 2020-03-11 13:02:29 +02:00
Nazar-Kutz
6a0d25beba Refactor -> use different resources instead of rotate image 2020-03-11 12:45:11 +02:00
Nazar-Kutz
e3599ec39e Fix "Back button (arrow)" 2020-03-11 12:29:05 +02:00
Nazar-Kutz
e2b0ace021 Merge branch 'r3.6'
# Conflicts:
#	OsmAnd/build.gradle
#	OsmAnd/res/layout/fragment_import.xml
#	OsmAnd/res/layout/fragment_import_duplicates.xml
#	OsmAnd/res/layout/list_menu_item_native.xml
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/UiUtilities.java
#	OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java
#	OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
#	OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
#	OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersHistoryAdapter.java
#	OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
#	OsmAnd/src/net/osmand/plus/widgets/OsmandTextFieldBoxes.java
2020-03-11 12:08:04 +02:00
max-klaus
9ecef2d88e
Merge pull request #8660 from osmandapp/revert-8657-MergeVersionBranchToMaster
Revert "Merge 'r3.6' to 'master' (Fix conflicts)"
2020-03-11 11:28:58 +03:00
max-klaus
9931e88073
Revert "Merge 'r3.6' to 'master' (Fix conflicts)" 2020-03-11 11:28:43 +03:00
Dima-1
dc002a9292 Fix round button 2020-03-10 23:50:23 +02:00
Dima-1
fb8bbe0fd1 Add parsing poi_categories.json 2020-03-10 19:19:26 +02:00
Vitaliy
c884105147 Hide plugin map styles for disabled plugins 2020-03-10 17:34:02 +02:00
xmd5a
cfeef5e8c8 Add phrases 2020-03-10 14:51:05 +03:00
veliymolfar
e5d399b12f Merge branches 'master' and 'prepare_importing_finish' of https://github.com/osmandapp/Osmand into prepare_importing_finish
 Conflicts:
	OsmAnd/res/values/strings.xml
	OsmAnd/src/net/osmand/plus/SettingsHelper.java
2020-03-10 13:48:29 +02:00
vshcherb
6e76bf317d
Merge pull request #8657 from osmandapp/MergeVersionBranchToMaster
Merge 'r3.6' to 'master' (Fix conflicts)
2020-03-10 12:34:03 +01:00
Vitaliy
109101ae97 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins 2020-03-10 12:09:30 +02:00
Nazar-Kutz
60ee95d93c Merge 'r3.6' to 'master' 2020-03-10 12:03:41 +02:00
max-klaus
d69553bdd8 Optimize xml output 2020-03-10 11:29:10 +03:00
veliymolfar
ec42c163b7 Merge remote-tracking branch 'origin/master' into slope_hillshade_ui 2020-03-10 10:18:36 +02:00
Hosted Weblate
2ef2c741c6
Merge branch 'origin/master' into Weblate. 2020-03-10 07:34:34 +01:00
Marc Van Impe
eb37ea6bcd
Translated using Weblate (Dutch)
Currently translated at 82.5% (3123 of 3785 strings)
2020-03-10 07:34:31 +01:00
Gontzal Manuel Pujana Onaindia
6e08bddeee
Translated using Weblate (Basque)
Currently translated at 100.0% (3785 of 3785 strings)
2020-03-10 07:33:47 +01:00
Adolfo Jayme Barrientos
b54191e390
Translated using Weblate (Spanish (American))
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-10 07:33:42 +01:00
Branko Kokanovic
c3cfa3d7ca
Translated using Weblate (Serbian)
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-10 07:33:42 +01:00
Marc Van Impe
dce77e9911
Translated using Weblate (Dutch)
Currently translated at 97.7% (3140 of 3211 strings)
2020-03-10 07:33:40 +01:00
Suyono
a33cad6737
Translated using Weblate (Indonesian)
Currently translated at 16.8% (541 of 3211 strings)
2020-03-10 07:33:33 +01:00
Ahmad Alfrhood
0f444464a0
Translated using Weblate (Arabic)
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-10 07:33:24 +01:00
Hans Superwurst
77d80fef1a
Translated using Weblate (Armenian)
Currently translated at 70.4% (2263 of 3211 strings)
2020-03-10 07:33:21 +01:00
josep constanti
258f058d83
Translated using Weblate (Catalan)
Currently translated at 92.6% (2975 of 3211 strings)
2020-03-10 07:33:21 +01:00
Adolfo Jayme Barrientos
b6aa3312fc
Translated using Weblate (Asturian)
Currently translated at 39.5% (1271 of 3211 strings)
2020-03-10 07:33:11 +01:00
Tymofij Lytvynenko
a4f1ecfea5
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-10 07:33:10 +01:00
Gontzal Manuel Pujana Onaindia
f13f538b8d
Translated using Weblate (Basque)
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-10 07:32:57 +01:00
Ettore Atalan
ef737ab3e8
Translated using Weblate (German)
Currently translated at 99.9% (3210 of 3211 strings)
2020-03-10 07:32:55 +01:00
Oliver
bb223d915a
Translated using Weblate (German)
Currently translated at 99.9% (3210 of 3211 strings)
2020-03-10 07:32:54 +01:00
Victor Shcherb
13c1fec075 Fix issue #8649 2020-03-09 17:08:31 +01:00
Franco
e53c72dc7f
Translated using Weblate (Spanish (American))
Currently translated at 100.0% (3785 of 3785 strings)
2020-03-08 11:30:28 +01:00
Franco
7e0098c77e
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3785 of 3785 strings)
2020-03-08 11:30:22 +01:00
ace shadow
150472c4ff
Translated using Weblate (Slovak)
Currently translated at 93.2% (3530 of 3785 strings)
2020-03-08 11:30:22 +01:00
Marc Van Impe
d6987ed4fd
Translated using Weblate (Dutch)
Currently translated at 77.9% (2952 of 3785 strings)
2020-03-08 11:30:20 +01:00
Iváns
bcaa3bb011
Translated using Weblate (Galician)
Currently translated at 100.0% (3785 of 3785 strings)
2020-03-08 11:30:18 +01:00
Franco
dc62d986d4
Translated using Weblate (Spanish (American))
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-08 11:30:08 +01:00
Jeff Huang
e1181ad873
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-08 11:30:05 +01:00
Franco
7071d71b87
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-08 11:30:04 +01:00
Ajeje Brazorf
eac59b747e
Translated using Weblate (Sardinian)
Currently translated at 99.3% (3189 of 3211 strings)
2020-03-08 11:30:02 +01:00
ace shadow
2369ee33d4
Translated using Weblate (Slovak)
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-08 11:29:59 +01:00
iman
7ca3dbef47
Translated using Weblate (Persian)
Currently translated at 99.7% (3202 of 3211 strings)
2020-03-08 11:29:58 +01:00
Ldm Public
eaad2a65ec
Translated using Weblate (French)
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-08 11:29:56 +01:00
Marc Van Impe
3475b872c8
Translated using Weblate (Dutch)
Currently translated at 95.2% (3060 of 3211 strings)
2020-03-08 11:29:54 +01:00
Mirco Zorzo
a9a6ebc6d5
Translated using Weblate (Italian)
Currently translated at 90.4% (2905 of 3211 strings)
2020-03-08 11:29:32 +01:00
Yaron Shahrabani
5d6b3467d5
Translated using Weblate (Hebrew)
Currently translated at 94.7% (3044 of 3211 strings)
2020-03-08 11:29:30 +01:00
Tymofij Lytvynenko
af13f39913
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-08 11:29:27 +01:00
Verdulo
d961da19c2
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-08 11:29:25 +01:00
Eduardo Addad de Oliveira
6c5faf775c
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-08 11:29:23 +01:00