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 |
|
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 |
|
max-klaus
|
79c59cab42
|
SettingsHelper refactoring done
|
2020-03-13 11:38:53 +03: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 |
|
max-klaus
|
6cdc6a8fb8
|
Revert "remove duplicate string"
This reverts commit 94594b81c2.
|
2020-03-11 21:47:16 +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
|
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 |
|
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
|
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 |
|
Nazar-Kutz
|
60ee95d93c
|
Merge 'r3.6' to 'master'
|
2020-03-10 12:03:41 +02: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 |
|
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 |
|
Iváns
|
a6b2a6a689
|
Translated using Weblate (Galician)
Currently translated at 100.0% (3211 of 3211 strings)
|
2020-03-08 11:29:22 +01:00 |
|
ace shadow
|
d3994b6cc4
|
Translated using Weblate (Slovak)
Currently translated at 99.8% (3205 of 3211 strings)
|
2020-03-06 18:39:15 +01:00 |
|
WaldiS
|
1fd5847ceb
|
Translated using Weblate (Polish)
Currently translated at 99.6% (3199 of 3211 strings)
|
2020-03-06 18:39:14 +01:00 |
|
Hosted Weblate
|
5c90640bc6
|
Merge branch 'origin/master' into Weblate.
|
2020-03-06 17:34:43 +01:00 |
|
Jeff Huang
|
b282874a02
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3785 of 3785 strings)
|
2020-03-06 17:34:34 +01:00 |
|
Franco
|
ffe0804a23
|
Translated using Weblate (Spanish (Argentina))
Currently translated at 99.9% (3784 of 3785 strings)
|
2020-03-06 17:34:30 +01:00 |
|
Ajeje Brazorf
|
80b7535f0c
|
Translated using Weblate (Sardinian)
Currently translated at 99.4% (3764 of 3785 strings)
|
2020-03-06 17:34:27 +01:00 |
|
Babos Gábor
|
09ba813117
|
Translated using Weblate (Hungarian)
Currently translated at 99.7% (3775 of 3785 strings)
|
2020-03-06 17:34:23 +01:00 |
|
Sveinn í Felli
|
98b3440ea6
|
Translated using Weblate (Icelandic)
Currently translated at 99.7% (3776 of 3785 strings)
|
2020-03-06 17:34:19 +01:00 |
|
josep constanti
|
7190133bdf
|
Translated using Weblate (Catalan)
Currently translated at 75.6% (2864 of 3785 strings)
|
2020-03-06 17:34:15 +01:00 |
|
Tymofij Lytvynenko
|
0ab4bffce3
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3785 of 3785 strings)
|
2020-03-06 17:34:13 +01:00 |
|
Verdulo
|
249746a448
|
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3785 of 3785 strings)
|
2020-03-06 17:34:09 +01:00 |
|
Ettore Atalan
|
f3b3860ed1
|
Translated using Weblate (German)
Currently translated at 99.8% (3781 of 3785 strings)
|
2020-03-06 17:34:05 +01:00 |
|
Eduardo Addad de Oliveira
|
43b1d858b7
|
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3785 of 3785 strings)
|
2020-03-06 17:34:02 +01:00 |
|
Boyuan Yang
|
97dd109a09
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 63.2% (2028 of 3207 strings)
|
2020-03-06 17:33:58 +01:00 |
|
Jeff Huang
|
422bc68b2a
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3207 of 3207 strings)
|
2020-03-06 17:33:56 +01:00 |
|
Franco
|
d39968b8b2
|
Translated using Weblate (Spanish (Argentina))
Currently translated at 99.9% (3206 of 3207 strings)
|
2020-03-06 17:33:55 +01:00 |
|
iman
|
df72418d17
|
Translated using Weblate (Persian)
Currently translated at 99.7% (3198 of 3207 strings)
|
2020-03-06 17:33:54 +01:00 |
|
nasr pen
|
d6762b18c1
|
Translated using Weblate (Arabic)
Currently translated at 100.0% (3207 of 3207 strings)
|
2020-03-06 17:33:48 +01:00 |
|
Ahmad Alfrhood
|
bdfa603047
|
Translated using Weblate (Arabic)
Currently translated at 100.0% (3207 of 3207 strings)
|
2020-03-06 17:33:41 +01:00 |
|
Yaron Shahrabani
|
6c9d193178
|
Translated using Weblate (Hebrew)
Currently translated at 94.6% (3036 of 3207 strings)
|
2020-03-06 17:33:38 +01:00 |
|
Sveinn í Felli
|
0b6038494d
|
Translated using Weblate (Icelandic)
Currently translated at 100.0% (3207 of 3207 strings)
|
2020-03-06 17:33:34 +01:00 |
|
josep constanti
|
23bdb6937c
|
Translated using Weblate (Catalan)
Currently translated at 91.1% (2924 of 3207 strings)
|
2020-03-06 17:33:33 +01:00 |
|
Xuacu Saturio
|
72a7e94cd4
|
Translated using Weblate (Asturian)
Currently translated at 39.6% (1270 of 3207 strings)
|
2020-03-06 17:33:28 +01:00 |
|
Dmitry
|
1efaaf983e
|
Add image for Terrain Empty State
|
2020-03-06 17:41:32 +02:00 |
|
Yaron Shahrabani
|
aaa917693d
|
Typo fix
prexif -> prefix
|
2020-03-06 16:50:08 +02:00 |
|
Dmitry
|
56c02046f3
|
Add vector drawable resources for new customize screens
|
2020-03-06 15:29:14 +02:00 |
|
Vitaliy
|
eaba5bdcfd
|
Fix #8612
|
2020-03-06 12:27:58 +02:00 |
|
Vitaliy
|
29705de5d8
|
Update material components library
|
2020-03-05 19:59:08 +02:00 |
|
Vitaliy
|
f6eb20acab
|
Merge remote-tracking branch 'origin/android_x_migration' into android_x_migration
|
2020-03-05 19:47:43 +02:00 |
|
Vitaliy
|
febe5e3361
|
Fix possible crash and migrate file provider name in manifests
|
2020-03-05 19:30:07 +02:00 |
|
Vitaliy
|
2c7430e567
|
Remove unnecessary call to listener and fix possible crash
|
2020-03-05 18:06:10 +02:00 |
|
Vitaliy
|
2e89b0f3ab
|
Fix progress dialog in export screen
|
2020-03-05 17:39:36 +02:00 |
|
Vitaliy
|
19e58c33a5
|
Clear export listener after pause
|
2020-03-05 14:48:21 +02:00 |
|