Commit graph

3205 commits

Author SHA1 Message Date
Hardy
1bb86776d7
Merge pull request #9106 from osmandapp/screen_control
string improvements - not final yet, have not checked the context
2020-05-29 17:16:38 +02:00
Vitaliy
b6dfa3ffaf Merge branch 'r3.7'
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-05-29 15:37:31 +03:00
Vitaliy
af13433571 Fix turn screen on prefs 2020-05-29 15:36:14 +03:00
Hardy
d94a07a0d9
string improvements - not final yet, have not checked the context 2020-05-28 19:56:07 +02:00
max-klaus
1fa17a1fee Merge branch 'master' of github.com:osmandapp/Osmand 2020-05-28 20:39:03 +03:00
max-klaus
c85f72a106 Merge branch 'r3.7' 2020-05-28 20:37:54 +03:00
sonora
f5bfeb3fb3 string improvements 2020-05-28 19:35:49 +02:00
max-klaus
0fe100e609
Merge pull request #9086 from osmandapp/map_source_dialog_7658
Map source dialog 7658
2020-05-28 17:53:14 +03:00
Vitaliy
b37d968368 Add wake time dialog 2020-05-28 15:55:51 +03:00
Hardy
aef68a7e21
shorten string 2020-05-27 22:00:22 +02:00
sonora
46bb0fcb71 fix accuracy explanation string 2020-05-27 21:12:08 +02:00
veliymolfar
6be3458ad3 Merge remote-tracking branch 'origin/master' into map_source_dialog_7658
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-05-27 09:59:47 +03:00
Vitaliy
45e63e2a0d Merge branch 'r3.7' into screen_control
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-05-26 19:32:20 +03:00
Vitaliy
f46e57f30b Add systemScreenTimeout dialog and two turn screen on prefs 2020-05-26 19:06:31 +03:00
Vitaliy
80f9bbdc5f Move turn screen on prefs to new screen 2020-05-26 17:40:08 +03:00
veliymolfar
d254de8598 add/edit map source dialog redesign 2020-05-26 17:06:14 +03:00
Victor Shcherb
4b0ff54a77 Merge branch 'r3.7' 2020-05-26 15:16:26 +02:00
Vitaliy
b202b7ac6d Added Always setting (from 28a958535a69e1f2a8131582b54db807cd63ab95) 2020-05-26 11:25:34 +03:00
Vitaliy
26805c4ae8 Fix possible IndexOutOfBoundsException 2020-05-25 16:01:55 +03:00
Victor Shcherb
bdbf07e356 Merge branch 'r3.7' 2020-05-24 17:30:55 +02:00
Victor Shcherb
d587bee309 Fix search & terrain action 2020-05-24 17:30:43 +02:00
sonora
87f95b230f string improvements 2020-05-24 10:42:08 +02:00
Robin Townsend
f6c14e659b fix some awkward strings 2020-05-23 11:46:13 -04:00
max-klaus
e39ef0d528
Merge pull request #9030 from osmandapp/custom_poi_category_fix
Custom poi category fix
2020-05-21 17:45:59 +03:00
veliymolfar
8ba8881cc4 replace search_poi_types_descr 2020-05-20 18:36:40 +03:00
Vitaliy
1dc4813d3c Check xml file before import 2020-05-19 21:36:58 +03:00
Dmitry
000f5494a1 Revert string changes 2020-05-19 16:42:40 +03:00
Allan Nordhøy
254f416092
New strings reworked 2020-05-19 07:58:42 +00:00
MadWasp79
f82fd5bf4a add detailed basemap 2020-05-18 18:31:43 +03:00
Dmitry
a639575ed8 Fix string 2020-05-14 14:44:45 +03:00
Dmitry
081eb58f26 Fix string 2020-05-14 13:01:09 +03:00
max-klaus
6008440911
Merge branch 'master' into Fix_8750 2020-05-13 18:42:41 +03:00
sonora
75b8b0de3a Use pause/resume isntead of start/stop GPX logging 2020-05-13 14:40:01 +02:00
veliymolfar
4e236a7d0c refactor string id 2020-05-08 18:40:44 +03:00
Nick Johnston
a0eee9fa09 Typo fixes and improvements for English strings
Minor fixes. The "C" in "Capacity" used a similar-looking Cyrillic
character instead of a Latin "C".
2020-05-07 20:19:46 +00:00
Nazar-Kutz
6539a35a20 Fix #8750 2020-05-07 13:57:07 +03:00
max-klaus
e8fbc6847b
Merge pull request #8860 from osmandapp/configure_menu_items_fix
Configure menu items fix
2020-05-06 15:30:30 +03:00
Dmitry
be3dc077f8 Merge branch 'master' of https://github.com/osmandapp/Osmand 2020-05-06 15:03:06 +03:00
Dmitry
a716b949ad Undo changes for string 2020-05-06 15:02:52 +03:00
veliymolfar
b96c227ec7 Merge remote-tracking branch 'origin/master' into configure_menu_items_fix
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
#	OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
2020-05-06 15:01:54 +03:00
veliymolfar
ee0d9677af possibility to change dialog cancel button title 2020-05-06 13:35:57 +03:00
veliymolfar
3d7a6341cc change reset dialog message 2020-05-06 13:17:45 +03:00
veliymolfar
df79d568fd fix string add/edit 2020-05-06 12:52:10 +03:00
veliymolfar
edbb876830 reset configure map item if hidden 2020-05-05 15:50:33 +03:00
veliymolfar
b140ac4392 Merge remote-tracking branch 'origin/master' into configure_menu_items_fix
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/OsmandSettings.java
2020-05-05 13:22:18 +03:00
Nazar-Kutz
9bd626178e Fix #8600 2020-05-05 13:17:46 +03:00
Vitaliy
e91308ad05 Fix string resource 2020-05-05 12:55:19 +03:00
Dmitry
3977d75a36 Added release notes for 3.7 2020-05-05 11:56:48 +03:00
veliymolfar
9066a33335 Merge remote-tracking branch 'origin/master' into configure_menu_items_fix
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-05-04 10:09:54 +03:00
vshcherb
ecb8cf787e
Update strings.xml 2020-05-01 17:31:51 +02:00