Commit graph

66085 commits

Author SHA1 Message Date
Vitaliy
0c03cb36d6 Export json items to separate files 2020-10-29 03:12:23 +02:00
Vitaliy
750a7169f0 Add export and import favourites via osf file 2020-10-29 01:43:14 +02:00
Vitaliy
248bc052e8
Merge pull request #10056 from osmandapp/imp_exp_osm_note
Import export OSM changes, offline maps
2020-10-28 21:36:19 +02:00
Dima-1
240d4466a2 Merge branch 'master' into imp_exp_osm_note
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/backend/ExportSettingsType.java
#	OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java
#	OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java
2020-10-28 21:28:55 +02:00
Dima-1
890d41a56f Fix review 2020-10-28 21:11:06 +02:00
Hardy
a37c7f8964
Merge pull request #10097 from osmandapp/master
update test branch
2020-10-28 17:24:28 +01:00
vshcherb
2508b488dd
Merge pull request #10092 from osmandapp/clean_up
Clean up outdated settings screens
2020-10-28 14:37:02 +01:00
vshcherb
f5e60f33b4
Merge pull request #10075 from osmandapp/import_export_data
Import/export multiple profiles and visible global preferences
2020-10-28 14:35:51 +01:00
Dima-1
6112b20a6d Merge branch 'master' into imp_exp_osm_note
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-10-28 09:34:40 +02:00
Vitaliy
afb2bed60a Fix translation 2020-10-28 03:52:24 +02:00
Vitaliy
5557aed0a6 Rename variable in common preference 2020-10-28 03:50:21 +02:00
Vitaliy
d1d819086c Merge branch 'master' into import_export_data 2020-10-28 03:48:22 +02:00
Vitaliy
9f3d00eeb2 Fix merge conflict 2020-10-28 03:46:58 +02:00
Vitaliy
dab1a37e33 Merge branch 'master' into clean_up
# Conflicts:
#	OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
2020-10-28 03:43:09 +02:00
Vitaliy
711c5dc7a7
Merge pull request #10079 from osmandapp/JSON-to-Strings
Add favorites: Add names for icon groups to strings
2020-10-28 03:38:59 +02:00
Vitaliy
1f09ffc1bb Remove unnecessary check for outdated fragment 2020-10-28 03:32:36 +02:00
Vitaliy
cf906f3300 Remove outdated SettingsBaseActivity 2020-10-28 03:24:50 +02:00
Vitaliy
d3272953e4 Remove outdated SettingsNavigationActivity 2020-10-28 02:21:57 +02:00
Vitaliy
8ef41d9aaa Merge branch 'master' into clean_up 2020-10-28 01:50:03 +02:00
Vitaliy
207aad68d4 Remove outdated SettingsGeneralActivity 2020-10-28 01:49:15 +02:00
Hosted Weblate
4232328036
Merge branch 'origin/master' into Weblate. 2020-10-27 23:27:25 +01:00
Gilbert Lowel
0cf1a9d6bc
Translated using Weblate (Dutch)
Currently translated at 95.8% (3366 of 3512 strings)
2020-10-27 23:27:19 +01:00
ovl-1
ae6f4dd929
Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (271 of 271 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/nb_NO/
2020-10-27 23:27:14 +01:00
Jeff Huang
a91bc74e60
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3829 of 3829 strings)
2020-10-27 23:27:13 +01:00
Jeff Huang
bd4c18e49d
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3512 of 3512 strings)
2020-10-27 23:27:12 +01:00
Verdulo
211e4c52bf
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3829 of 3829 strings)
2020-10-27 23:27:12 +01:00
Priit Jõerüüt
6303f9792d
Translated using Weblate (Estonian)
Currently translated at 99.2% (3487 of 3512 strings)
2020-10-27 23:27:11 +01:00
Eduardo Addad de Oliveira
5c15e947a9
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.9% (3827 of 3829 strings)
2020-10-27 23:27:10 +01:00
Eduardo Addad de Oliveira
4da1c64df2
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.9% (3511 of 3512 strings)
2020-10-27 23:27:10 +01:00
Franco
9ef3d2658c
Translated using Weblate (Spanish (Argentina))
Currently translated at 99.9% (3511 of 3512 strings)
2020-10-27 23:27:09 +01:00
Priit Jõerüüt
de7a126676
Translated using Weblate (Estonian)
Currently translated at 100.0% (3829 of 3829 strings)
2020-10-27 23:27:09 +01:00
Babos Gábor
94aa8e9f76
Translated using Weblate (Hungarian)
Currently translated at 99.9% (3826 of 3829 strings)
2020-10-27 23:27:08 +01:00
Ajeje Brazorf
20dba69025
Translated using Weblate (Sardinian)
Currently translated at 99.6% (3816 of 3829 strings)
2020-10-27 23:27:07 +01:00
Ihor Hordiichuk
4feb818340
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3829 of 3829 strings)
2020-10-27 23:27:06 +01:00
Rpnpif
6b606c3af2
Translated using Weblate (French)
Currently translated at 99.4% (3808 of 3829 strings)
2020-10-27 23:27:06 +01:00
Oliver
458746add1
Translated using Weblate (German)
Currently translated at 99.6% (3816 of 3829 strings)
2020-10-27 23:27:06 +01:00
Pavel Kotrč
f2a7c44f8b
Translated using Weblate (Czech)
Currently translated at 100.0% (3829 of 3829 strings)
2020-10-27 23:27:05 +01:00
Iváns
347d489409
Translated using Weblate (Galician)
Currently translated at 99.9% (3509 of 3512 strings)
2020-10-27 23:27:04 +01:00
Ajeje Brazorf
7e9d7838d7
Translated using Weblate (Sardinian)
Currently translated at 99.6% (3500 of 3512 strings)
2020-10-27 23:27:03 +01:00
ovl-1
f7f757d7d8
Translated using Weblate (Norwegian Bokmål)
Currently translated at 48.2% (1695 of 3512 strings)
2020-10-27 23:26:58 +01:00
Pavel Kotrč
a1661d65f0
Translated using Weblate (Czech)
Currently translated at 79.4% (2789 of 3512 strings)
2020-10-27 23:26:56 +01:00
nasr pen
ed956b2c80
Translated using Weblate (Arabic)
Currently translated at 100.0% (3512 of 3512 strings)
2020-10-27 23:26:55 +01:00
Softmap
6d9cc30028
Translated using Weblate (Arabic)
Currently translated at 100.0% (3512 of 3512 strings)
2020-10-27 23:26:54 +01:00
Michal L
2831f168ea
Translated using Weblate (Polish)
Currently translated at 99.1% (3483 of 3512 strings)
2020-10-27 23:26:54 +01:00
Yaron Shahrabani
3261cf0c8d
Translated using Weblate (Hebrew)
Currently translated at 99.9% (3511 of 3512 strings)
2020-10-27 23:26:53 +01:00
ace shadow
c22d2c75cc
Translated using Weblate (Slovak)
Currently translated at 100.0% (3512 of 3512 strings)
2020-10-27 23:26:53 +01:00
Ole Carlsen
a610df9d01
Translated using Weblate (Danish)
Currently translated at 93.4% (3281 of 3512 strings)
2020-10-27 23:26:52 +01:00
Mirco Zorzo
f462ad8d27
Translated using Weblate (Italian)
Currently translated at 89.8% (3156 of 3512 strings)
2020-10-27 23:26:51 +01:00
Ihor Hordiichuk
2071b2c913
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3512 of 3512 strings)
2020-10-27 23:26:49 +01:00
Babos Gábor
4cd67ff738
Translated using Weblate (Hungarian)
Currently translated at 99.9% (3511 of 3512 strings)
2020-10-27 23:26:48 +01:00