Commit graph

60661 commits

Author SHA1 Message Date
max-klaus
f3f323ce7c
Merge pull request #8671 from osmandapp/import_export_fixes
Import export fixes
2020-03-13 20:37:46 +03:00
Hosted Weblate
9e13986239
Merge branch 'origin/master' into Weblate. 2020-03-13 18:35:11 +01:00
WaldiS
cc78ba77c1
Translated using Weblate (Polish)
Currently translated at 99.6% (266 of 267 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/pl/
2020-03-13 18:35:06 +01:00
josep constanti
dad040e59e
Translated using Weblate (Catalan)
Currently translated at 100.0% (267 of 267 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/ca/
2020-03-13 18:35:05 +01:00
anonymous
4bf3b49bed
Translated using Weblate (Catalan)
Currently translated at 100.0% (267 of 267 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/ca/
2020-03-13 18:35:04 +01:00
Jeff Huang
dc303df323
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3795 of 3795 strings)
2020-03-13 18:35:03 +01:00
Max Sandholm
67935d1d92
Translated using Weblate (Finnish)
Currently translated at 29.5% (1123 of 3795 strings)
2020-03-13 18:35:00 +01:00
WaldiS
09ec84ce4a
Translated using Weblate (Polish)
Currently translated at 99.4% (3775 of 3795 strings)
2020-03-13 18:34:59 +01:00
Osoitz
4f112dfe97
Translated using Weblate (Catalan)
Currently translated at 75.4% (2864 of 3795 strings)
2020-03-13 18:34:55 +01:00
jan madsen
539b4ee6d8
Translated using Weblate (Danish)
Currently translated at 99.6% (3782 of 3795 strings)
2020-03-13 18:34:54 +01:00
nautilusx
22515df3bf
Translated using Weblate (German)
Currently translated at 99.9% (3794 of 3795 strings)
2020-03-13 18:34:50 +01:00
Eduardo Addad de Oliveira
94c38a78f7
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3795 of 3795 strings)
2020-03-13 18:34:46 +01:00
Jeff Huang
f2af3156f2
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3212 of 3212 strings)
2020-03-13 18:34:43 +01:00
ace shadow
32c4fe1623
Translated using Weblate (Slovak)
Currently translated at 100.0% (3212 of 3212 strings)
2020-03-13 18:34:42 +01:00
iman
944b52d476
Translated using Weblate (Persian)
Currently translated at 99.7% (3203 of 3212 strings)
2020-03-13 18:34:42 +01:00
Ldm Public
b3511249f5
Translated using Weblate (French)
Currently translated at 100.0% (3212 of 3212 strings)
2020-03-13 18:34:41 +01:00
Piotr Sokół
a1711444ca
Translated using Weblate (Polish)
Currently translated at 99.7% (3203 of 3212 strings)
2020-03-13 18:34:40 +01:00
WaldiS
75a9ed208e
Translated using Weblate (Polish)
Currently translated at 99.7% (3203 of 3212 strings)
2020-03-13 18:34:39 +01:00
Athoss
b604b5c90d
Translated using Weblate (Hungarian)
Currently translated at 94.9% (3050 of 3212 strings)
2020-03-13 18:34:38 +01:00
Pavel Kotrč
c7f0081642
Translated using Weblate (Czech)
Currently translated at 80.8% (2598 of 3212 strings)
2020-03-13 18:34:34 +01:00
anonymous
40d96e36f8
Translated using Weblate (Catalan)
Currently translated at 92.9% (2985 of 3212 strings)
2020-03-13 18:34:25 +01:00
josep constanti
77188096f7
Translated using Weblate (Catalan)
Currently translated at 92.9% (2985 of 3212 strings)
2020-03-13 18:34:25 +01:00
anonymous
bc5a394e25
Translated using Weblate (Russian)
Currently translated at 99.5% (3196 of 3212 strings)
2020-03-13 18:34:24 +01:00
solokot
63d582ac26
Translated using Weblate (Russian)
Currently translated at 99.5% (3196 of 3212 strings)
2020-03-13 18:34:23 +01:00
Verdulo
98faa065fb
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3212 of 3212 strings)
2020-03-13 18:33:47 +01:00
jan madsen
5528c9f84b
Translated using Weblate (Danish)
Currently translated at 89.1% (2864 of 3212 strings)
2020-03-13 18:33:46 +01:00
C. Rüdinger
764face6fe
Translated using Weblate (German)
Currently translated at 99.9% (3211 of 3212 strings)
2020-03-13 18:33:43 +01:00
Eduardo Addad de Oliveira
7b611af196
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3212 of 3212 strings)
2020-03-13 18:33:42 +01:00
veliymolfar
9b7a3431dc closeDrawer 2020-03-13 18:50:12 +02:00
Vitaliy
74f75f9ed7 Fix compilation 2020-03-13 18:36:11 +02:00
veliymolfar
5580a4fcda drawer over fragment fix / fix list padding on import complete screen 2020-03-13 18:33:12 +02:00
Vitaliy
6cd31957b3 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
2020-03-13 18:13:05 +02:00
Dmitry
972380f537 Add slope legend image 2020-03-13 18:01:51 +02:00
veliymolfar
f4c70db617 resolve conflicts / refactor ExportImportSettingsAdapter 2020-03-13 16:58:23 +02:00
veliymolfar
c66558654c Merge branches 'import_export_fixes' and 'master' of https://github.com/osmandapp/Osmand into import_export_fixes
 Conflicts:
	OsmAnd/res/values/strings.xml
	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
	OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java
	OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java
2020-03-13 16:32:18 +02:00
max-klaus
7af5e9714b
Merge pull request #8603 from osmandapp/prepare_importing_finish
Prepare importing finish
2020-03-13 17:25:39 +03:00
veliymolfar
63cdd079f5 itemsType sort 2020-03-13 16:24:06 +02:00
veliymolfar
b704f92d37 refactor 2020-03-13 16:19:32 +02:00
veliymolfar
1920bf7b9a resolve conflicts / refactor 2020-03-13 14:09:27 +02:00
veliymolfar
4d025d8d64 Merge branches 'master' and 'prepare_importing_finish' of https://github.com/osmandapp/Osmand into prepare_importing_finish
 Conflicts:
	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
2020-03-13 13:52:26 +02:00
veliymolfar
caaa7bb3fd refactor delay 2020-03-13 13:46:57 +02:00
veliymolfar
16b3f81ac8 duplicates delay 2020-03-13 13:11:54 +02:00
Vitaliy
27a5daf2db Add plugin dependent settings items to plugin item 2020-03-13 13:09:01 +02:00
max-klaus
79c59cab42 SettingsHelper refactoring done 2020-03-13 11:38:53 +03:00
Vitaliy
a5777b9ca2 Add PluginSettingsItem first part 2020-03-12 18:32:31 +02:00
vshcherb
fc3003ceed
Merge pull request #8664 from osmandapp/minor_fixes
Fix possible crashes with fragment manager and import dialogs
2020-03-12 14:33:13 +01:00
Vitaliy
38b765b31e Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins 2020-03-12 12:16:20 +02:00
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