Commit graph

60714 commits

Author SHA1 Message Date
Vitaliy
63e2ba3493 Fix several possible crashes with fragment manager and import dialogs 2020-03-12 12:15:45 +02:00
xmd5a
6f8d043612 Add phrases 2020-03-12 10:51:06 +03:00
max-klaus
4e7687371c Remove duplicate string 2020-03-11 21:49:40 +03:00
max-klaus
6cdc6a8fb8 Revert "remove duplicate string"
This reverts commit 94594b81c2.
2020-03-11 21:47:16 +03:00
max-klaus
2bbb8b212d Truncate route date 2020-03-11 21:37:46 +03:00
veliymolfar
94594b81c2 remove duplicate string 2020-03-11 18:13:53 +02:00
Hosted Weblate
c8366236b3
Merge branch 'origin/master' into Weblate. 2020-03-11 16:33:34 +01:00
Olexandr Nesterenko
42d6e6c91c
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (267 of 267 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/uk/
2020-03-11 16:33:25 +01:00
Olexandr Nesterenko
707c5d4d33
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3785 of 3785 strings)
2020-03-11 16:33:24 +01:00
jan madsen
8f486c9569
Translated using Weblate (Danish)
Currently translated at 99.6% (3772 of 3785 strings)
2020-03-11 16:33:23 +01:00
Pavel Kotrč
9f6db22272
Translated using Weblate (Czech)
Currently translated at 80.8% (2597 of 3211 strings)
2020-03-11 16:33:19 +01:00
Tymofij Lytvynenko
29c3d61d50
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-11 16:33:16 +01:00
Olexandr Nesterenko
a1610602f5
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3211 of 3211 strings)
2020-03-11 16:33:16 +01:00
veliymolfar
a375f5a6da resolve conflict 2020-03-11 16:15:47 +02:00
veliymolfar
b5659fe8b2 Merge branches 'master' and 'prepare_importing_finish' of https://github.com/osmandapp/Osmand into prepare_importing_finish
 Conflicts:
	OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java
2020-03-11 16:12:47 +02:00
veliymolfar
c89450c694 remove AdditionalDataWrapper 2020-03-11 16:08:57 +02:00
veliymolfar
adb9464de5 refactor / three state importTask 2020-03-11 13:29:28 +02:00
max-klaus
3ba8f07384
Merge pull request #8628 from osmandapp/FixRTL2
Fix "Back button (arrow)"
2020-03-11 14:23:26 +03:00
Nazar-Kutz
0b7d4fbcbf Small fixes p.2 2020-03-11 13:21:15 +02:00
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
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
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
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