Dmitriy Prodchenko
66e88266e6
Fix typo
2018-05-11 18:19:12 +03:00
Dmitriy Prodchenko
4a88cea42a
Fix Show images string, add sting off_road_render_descr for Off-Road map style description
2018-05-11 16:46:26 +03:00
sonora
b42cdfdd6a
string improvement: Bookmark
2018-05-11 12:37:58 +02:00
Victor Shcherb
2479c749ff
Fix #5347 and simplify rendering name to keep it short
2018-05-11 00:14:39 +02:00
sonora
6e0cb1b05b
add touring atlas renderer description
2018-05-10 09:08:47 +02:00
Hardy
0ffe282277
Improve strings README comments
2018-05-10 08:46:11 +02:00
Hardy
1bee51bfee
Spelling
2018-05-10 07:49:21 +02:00
Allan Nordhøy
2bb77769d6
New strings reworked 2
2018-05-10 04:22:12 +02:00
Victor Shcherb
25f4707621
Merge branch 'master' of github.com:osmandapp/Osmand
...
Conflicts:
OsmAnd/res/values-ca/strings.xml
OsmAnd/res/values-el/strings.xml
OsmAnd/res/values-he/strings.xml
OsmAnd/res/values-pt-rBR/strings.xml
OsmAnd/res/values-zh-rTW/strings.xml
2018-05-09 16:02:39 +02:00
Victor Shcherb
27342c8b2f
Fix issue #5193
2018-05-09 15:59:31 +02:00
Alex Sytnyk
9f9ebe7026
Redesign "Select map style" dialog
2018-05-08 20:15:16 +03:00
Chumva
17727397a8
added WikipediaArticleWikiLinkFragment and custom xml for it
2018-05-08 11:59:10 +03:00
Hardy
f1ec563dbb
string improvement
2018-05-08 07:05:57 +00:00
Alex Sytnyk
d47a8a3ee8
Update buttons on "Maps you need" card
2018-05-07 13:23:21 +03:00
Mar'yan Rachynskyy
2116d8ed5b
Changed nm/h to kn
...
"Knots" sounds more naturally to those who use nautical miles. "Kn" is the ISO standard for the short form (ISO 80000-3).
2018-05-05 14:59:53 +03:00
Alexey Kulish
9ea83ebccd
Merge
2018-05-04 18:51:41 +03:00
Alexey Kulish
b467bd6022
Fix inapp purchase scheme
2018-05-04 18:50:26 +03:00
Dmitriy Prodchenko
769e66fd45
Fix string
2018-05-04 18:45:18 +03:00
Chumva
6dd1712cc8
added show images dialog options for wikipedia
2018-05-04 13:35:24 +03:00
Alex Sytnyk
a67b47d717
Add TravelNeededMapsCard and related stuff
2018-05-03 19:50:32 +03:00
Alexey Kulish
0db4ba623b
Merge
2018-05-03 18:34:17 +03:00
Alexey Kulish
2c3d2033e6
Fixed inapp purchases. Added cancelled subscription screen.
2018-05-03 18:30:50 +03:00
Alex Sytnyk
a50e5a6f56
Create layout for "Maps you need" card
2018-05-02 15:57:27 +03:00
sonora
eb56fd75a6
some spelling
2018-05-01 12:39:53 +02:00
Hardy
6e2ec11c45
reduce commit
2018-05-01 12:17:55 +02:00
Allan Nordhøy
d6902df052
Language rework 3
2018-04-29 09:12:07 +02:00
Alexey Kulish
f3e344f879
Added OsmLive subscription setting
2018-04-28 16:37:44 +03:00
Allan Nordhøy
e14d7518ba
Language rework
2018-04-27 03:34:20 +02:00
vshcherb
22e8d255a3
Merge pull request #5238 from comradekingu/patch-3
...
Spelling: Search for, linebreaks
2018-04-25 18:22:10 +02:00
David Schroeder
b79de3c9c7
Add map widget to show arrival time at first intermediate point
2018-04-25 09:03:58 -04:00
Chumva
24f6ed2015
Merge remote-tracking branch 'origin/WikivoyageExploreCards' into WikivoyageExploreCards
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2018-04-25 10:25:08 +03:00
Alexey Kulish
3c970632ee
Added choose plan for wikipedia and sea depth maps
2018-04-24 21:51:45 +03:00
Chumva
91115b90d4
add adapter and popular destinations
2018-04-24 19:51:06 +03:00
Alex Sytnyk
dc33d0848b
Create TravelDownloadUpdateCard
2018-04-24 19:02:10 +03:00
Alexey Kulish
911197abbd
Merge branch 'master' of https://github.com/osmandapp/Osmand
2018-04-24 18:21:15 +03:00
Alexey Kulish
78cf001d32
Fix choose plan UI. Refactored InAppHelper.
2018-04-24 18:21:05 +03:00
Chumva
688b1df38c
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into WikivoyageExploreCards
2018-04-24 12:47:35 +03:00
PaulStets
ad27072114
Refactored string resource
2018-04-24 11:46:51 +03:00
PaulStets
a5fb71871e
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into PaulsBranch
2018-04-23 14:19:16 +03:00
PaulStets
5446665d88
Wiki links menu and behavior improvements
2018-04-23 14:18:42 +03:00
Chumva
fdb8977197
removed unnecessary xml changes
2018-04-23 14:00:55 +03:00
Chumva
2bb773e61d
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into WikivoyageExploreCards
2018-04-23 12:50:10 +03:00
Alex Sytnyk
d54a39b922
Add strings for wikivoyage welcome screen
2018-04-23 11:18:50 +03:00
PaulStets
c4dc53f74d
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into PaulsBranch
2018-04-23 09:14:31 +03:00
Victor Shcherb
b319509a6a
Update string
2018-04-22 13:30:56 +02:00
PaulStets
eb484d2486
Wiki links dialog
2018-04-21 16:07:11 +03:00
Alexey Kulish
13f4452e42
Replaced free banner dialog with choose plan dialog
2018-04-21 15:17:34 +03:00
Alex Sytnyk
727283c513
Add wikivoyage welcome screen
2018-04-21 01:55:28 +03:00
Chumva
3940987dcd
add explore cards to wikivoyage
2018-04-20 19:28:21 +03:00
Alexey Kulish
1d65fd857b
Added purchase dialog UI
2018-04-19 20:43:51 +03:00
Alexey Kulish
1019d10b5b
Added show wikivoyage pictures first time dialog
2018-04-15 17:50:10 +03:00
Allan Nordhøy
811c74babe
Search for, linebreaks
2018-04-15 12:08:54 +02:00
Alexey Kulish
de0a0a4210
Added on/off/only wifi setting to wikivoyage
2018-04-15 12:42:45 +03:00
Victor Shcherb
4fbacaa1e7
Fix issues
2018-04-15 02:31:44 +02:00
PaulStets
1c44ec042f
Added abilyty to open article links internally
2018-04-14 13:05:27 +03:00
Chumva
57fd20ef9e
change settings name and fix articleImageTitle showing condition
2018-04-13 15:06:27 +03:00
Chumva
fc6aa1a404
change names and saved articles images
2018-04-13 11:29:17 +03:00
Chumva
4ea5ab16db
add options for icons cache and history
2018-04-12 17:29:42 +03:00
Victor Shcherb
0f29a38d0e
Update wikivoyage
2018-04-12 01:43:58 +02:00
Victor Shcherb
30adb0c048
Update wikivoyage - downloads
2018-04-11 17:03:21 +02:00
Alex Sytnyk
f85a67beec
Add the ability to undo deletion from saved articles list
2018-04-11 14:30:50 +03:00
Chumva
0e3894f11b
add new class for parser and refactored contents
2018-04-10 14:33:08 +03:00
Chumva
dbce9cb1fe
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into WikivoyageImprovements
2018-04-10 10:27:27 +03:00
Allan Nordhøy
805893850f
- will, in → from, has to → must
2018-04-07 22:21:54 +02:00
Chumva
e440a1301f
add contents for anchor links
2018-04-06 19:06:04 +03:00
Alex Sytnyk
8b39c43115
Update wikivoyage search card design
2018-04-06 18:15:46 +03:00
Alex Sytnyk
3dc478e041
Create wikivoyage saved articles list item
2018-04-06 16:32:32 +03:00
Hardy
cab1818dfe
Merge pull request #5205 from EmrahNebiyev/patch-11
...
Update strings.xml
2018-04-06 01:05:49 +02:00
Alex Sytnyk
c850aa3f91
Add menu file for wikivoyage bottom navigation
2018-04-05 14:48:28 +03:00
Әmrah Nәbiyev
2b148ca92f
Update strings.xml
2018-04-05 02:04:37 +03:00
Alex Sytnyk
f0374526a0
Add header to wikivoyage search list
2018-04-02 15:13:30 +03:00
Hardy
00c96bb120
fix string typo
2018-03-31 20:06:38 +02:00
vshcherb
e0cd250e63
Merge pull request #5188 from osmandapp/CoordinateInputSaveKeyboard
...
Coordinate input save keyboard
2018-03-30 18:14:45 +02:00
Chumva
fe2273f154
add two digit option
2018-03-30 19:06:05 +03:00
sonora
8ad13b3d3e
string improvements
2018-03-29 20:36:24 +02:00
Alexander Sytnyk
58b1c20219
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into wikivoyage
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2018-03-28 12:42:50 +03:00
Chumva
edb2400e9d
added removeMarkersGroup if group was added
2018-03-27 12:08:13 +03:00
Alexander Sytnyk
b8f50b78d8
Create simple test UI for search
2018-03-26 19:02:24 +03:00
Hardy
cc125a3b7d
quick review, may need more work
2018-03-24 13:26:59 -07:00
Allan Nordhøy
554e433ca4
Language rework
2018-03-24 11:54:19 +01:00
Chumva
66ba51edf3
added radius to UI
2018-03-22 16:51:08 +02:00
Alexander Sytnyk
a58359b442
Add menu for selecting waypoint categories for import to markers
2018-03-15 14:52:31 +02:00
alex
daf17c361d
Add "clear all intermediate points" item into waypoints dialog options
2018-03-08 13:16:02 +02:00
Victor Shcherb
f8eee5e56c
Delete unused strings #4997
2018-03-08 10:15:36 +01:00
Victor Shcherb
fa186835c7
Delete osmo code
2018-03-08 09:57:53 +01:00
Alexander Sytnyk
a4ee7f4c18
Hide gpx on map after disabling map markers group
2018-03-07 17:04:43 +02:00
xmd5a
3adbfe7f02
Add string
2018-03-01 15:46:52 +03:00
alex
ab1614b90e
Fix map markers sorting
2018-02-23 16:11:06 +02:00
Alexander Sytnyk
776f5a713a
Add a warning about invalid input in Coordinate Input
2018-02-22 18:10:03 +02:00
Alexander Sytnyk
9c2ac18147
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_coordinate_input
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2018-02-20 10:32:32 +02:00
Alexander Sytnyk
e952717c56
Merge pull request #5032 from osmandapp/NearbyRoutesTransportContextMenu
...
Nearby routes transport context menu
2018-02-20 10:21:53 +02:00
Chumva
72e45f2e55
changed style of text
2018-02-16 18:52:27 +02:00
Chumva
3146aeabe1
added two methods for getting routes and refactored strings with osmandFormattedDistance
2018-02-16 14:25:09 +02:00
Chumva
c339303e49
Refactored code
2018-02-16 13:22:54 +02:00
Chumva
6463239b69
Added nearby routes inside Transport Context Menu
2018-02-15 19:12:52 +02:00
Alexander Sytnyk
06f3ae09c6
Add CorrdinateInputFormats
2018-02-15 14:50:39 +02:00
Alexander Sytnyk
4a800136cf
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_coordinate_input
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2018-02-14 18:43:01 +02:00
Chumva
98f7460d3c
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into MeasureDistanceImprovements
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2018-02-14 12:48:54 +02:00
Alexander Sytnyk
bfa4d1d497
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_coordinate_input
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2018-02-14 11:01:10 +02:00
Alexander Sytnyk
ff8734d505
Add the ability to import obf files
2018-02-13 19:52:45 +02:00
Chumva
ff4544f7f3
Made improvements in Measure Distance
2018-02-13 11:46:34 +02:00
Alexander Sytnyk
4d69a5c014
Create new input area layout for coordinate input
2018-02-12 19:19:25 +02:00
Alexander Sytnyk
fb487b5c10
Add "Make as Start Point" item to add waypoints menu
2018-02-05 14:14:24 +02:00
Alexander Sytnyk
d2ae44bed6
Redesign "add waypoint" menu; remove some legacy code
2018-02-02 19:14:45 +02:00
Alexander Sytnyk
55306a9761
Merge pull request #4975 from osmandapp/osm_notes_options
...
Fix #4740
2018-02-01 18:28:44 +02:00
Alexander Sytnyk
8e104ba6f0
Merge pull request #4973 from osmandapp/PaulsBranch
...
Pauls branch
2018-02-01 16:16:14 +02:00
PaulStets
3117c351d7
Added the tunnel warnings
2018-02-01 15:25:42 +02:00
Alexander Sytnyk
93e94c2400
Add items to osm notes menu; add functionality for show/hide closed notes and notes in general
2018-02-01 15:25:35 +02:00
Alexander Sytnyk
7f41c6a542
Fix strings; disable rows without needed data
2018-01-31 13:41:41 +02:00
Alexander Sytnyk
627f379655
Merge pull request #4971 from osmandapp/osm_edits_export
...
Osm edits export
2018-01-31 11:44:43 +02:00
Dmitriy Prodchenko
25dc8e1908
Fix
2018-01-31 11:20:22 +02:00
Alexander Sytnyk
4202179205
Add menu for choosing export file type
2018-01-30 18:47:21 +02:00
Alexander Sytnyk
b02ee229ea
Add export options menu
2018-01-30 17:45:07 +02:00
Dmitriy Prodchenko
e785ef232a
Resolve merge conflict in strings
2018-01-30 14:24:49 +02:00
Dmitriy Prodchenko
2035908991
Resolve merge conflict in strings
2018-01-30 12:29:37 +02:00
Alexey
0b2d81813a
Merge pull request #4956 from osmandapp/PaulsBranch
...
Added ability to share point name (#4777 )
2018-01-27 14:50:00 +03:00
PaulStets
937ee090fc
Fixed string resource for clipboard toast
2018-01-27 13:48:53 +02:00
PaulStets
3f2dfee22d
Extracted string resource for clipboard toast
2018-01-27 13:46:23 +02:00
PaulStets
fa1bd1b938
Added ability to share point name ( #4777 )
2018-01-27 13:35:37 +02:00
sonora
76a0778599
Update 2.9 release notes with stuff I worked on last fall
2018-01-27 09:56:01 +01:00
Dmitriy Prodchenko
81b2fcee4d
Merge branch 'master' of https://github.com/osmandapp/Osmand
2018-01-25 19:14:49 +02:00
Alexey Kulish
fc704a7005
Fix opening hours parser (added || handling)
2018-01-25 18:53:38 +03:00
Dmitriy Prodchenko
726cbe1730
Add lines for Release notes 2.0
2018-01-24 18:34:15 +02:00
Dmitriy Prodchenko
ef8fa4e127
Add Release notes 2.9
2018-01-24 16:40:10 +02:00
xmd5a
164b675152
Add string
2018-01-24 17:01:38 +03:00
PaulStets
3eb7dd5165
Made some map styles translatable
2018-01-23 17:51:39 +02:00
PaulStets
4cab748d25
Fixed #4853
2018-01-23 13:18:12 +02:00
sonora
db05fbac56
Add Lao language string
2018-01-14 08:50:05 +01:00
sonora
0a86573b4d
string correction
2018-01-13 20:40:01 +01:00
PavelRatushnyi
c45e8b0162
Fix NPE in osm point category
2018-01-12 17:52:28 +02:00
GaspardPO
3b5faf8df3
Correct grammar / spelling according to #4902 .
...
Correct also the french translation for "till".
2018-01-07 13:47:54 +01:00
Hardy
2cd8a496c7
string improvements
2017-12-23 10:07:23 +01:00
PavelRatushnyi
1fd0a2c6fc
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into context_menu
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2017-12-22 15:39:19 +02:00
PaulStets
272bbd8206
Added total sum to reports
2017-12-21 16:22:53 +02:00
PaulStets
04b00ab916
Merge branch 'master' of github.com:osmandapp/Osmand into PaulsBranch
2017-12-21 10:15:35 +02:00
Alexander Sytnyk
37e68dc582
Import all notes to the gpx if selected only locations item and import selected notes otherwise
2017-12-20 19:16:09 +02:00
PavelRatushny
c66eef9fb6
Change multi selection menu
2017-12-20 12:39:51 +02:00
PaulStets
623bd4931b
Added recipients table to OsmAnd Live reports
2017-12-19 17:38:08 +02:00
PavelRatushny
bd2f898a40
Change text in parking menu controller
2017-12-18 13:23:18 +02:00
PavelRatushny
4a5cf8d005
Fix displaying time in parking controller
2017-12-15 18:57:03 +02:00
PavelRatushny
0a138db9a6
Change wikipedia in bottom view
2017-12-15 17:34:01 +02:00
PavelRatushny
79436d2759
Create read article button
2017-12-15 16:50:00 +02:00
PavelRatushny
4895902aa3
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into context_menu
2017-12-15 13:39:20 +02:00
Dmitriy Prodchenko
e5d49e1b25
Fix strings.
2017-12-12 18:10:04 +02:00
PavelRatushny
62bbf68ed4
Change string in fav bottom context menu view
2017-12-12 11:42:49 +02:00
PavelRatushny
873a2047ce
Merge
2017-12-11 14:16:28 +02:00
PavelRatushny
d9b4a213c9
Add opening day str
2017-12-08 18:32:52 +02:00
PavelRatushny
8e5a232d21
Fix time and refactor
2017-12-08 14:25:34 +02:00
alex
e760665a43
Replace "move to top bar" with "make active"; turn on distance indication after "make active" button click
2017-12-08 14:20:18 +02:00
PavelRatushny
4b491fb938
Add opened till str
2017-12-07 18:45:20 +02:00
PavelRatushny
246877cf10
Add will be closed at
2017-12-07 18:00:54 +02:00
PavelRatushny
587aaff2c6
Add opened from string
2017-12-07 17:09:04 +02:00
PavelRatushny
dc1bf40158
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into context_menu
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2017-12-07 11:35:58 +02:00
sonora
91bf90de54
fix apostrophe
2017-12-05 23:48:47 +01:00
sonora
7cd3e30270
Prepare release_3_0 notes
2017-12-05 23:28:02 +01:00
PavelRatushny
c10af7f927
Try adding options menu
2017-12-05 14:57:59 +02:00
PavelRatushny
d838cf7584
Resolve conflicts
2017-12-05 14:49:57 +02:00
PavelRatushny
71330aef6c
Replace action buttons
2017-11-28 18:15:08 +02:00
Alexander Sytnyk
b962c2bb3a
Fix "search more" view disappearance
2017-11-27 16:22:22 +02:00
sonora
7abe6ff4d6
string improvements
2017-11-25 09:17:17 +01:00
PavelRatushnyi
7db5462e9f
Revert: Fix #4734
2017-11-22 23:53:09 +02:00
PavelRatushny
9be31647fa
Fix #4734
2017-11-22 14:07:30 +02:00
PavelRatushny
9b852ca8a7
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_edits_ui
...
# Conflicts:
# OsmAnd/res/layout/list_item_header.xml
# OsmAnd/res/layout/note_list_item.xml
# OsmAnd/res/layout/update_index.xml
# OsmAnd/res/values/strings.xml
2017-11-20 17:16:32 +02:00
Alexander Sytnyk
0e2a649467
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_notes_ui
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2017-11-20 16:33:08 +02:00
Alexander Sytnyk
1856bc24c1
Add snackbar
2017-11-20 16:19:13 +02:00
Alexander Sytnyk
348847c59e
Add UI and setting for "markers - One tap active"
2017-11-20 12:41:41 +02:00
PavelRatushny
690ba5dfbb
Add empty states for osm edits
2017-11-20 12:36:28 +02:00
PavelRatushny
da3d3f25f2
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_edits_ui
2017-11-20 12:31:31 +02:00
Alexander Sytnyk
7f3b4a38ac
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_notes_ui
2017-11-20 10:52:12 +02:00
Hardy
178b0b6f30
string improvement
2017-11-19 10:49:12 +01:00
alex
03e695ee1b
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_notes_ui
2017-11-18 23:39:14 +02:00
njohnston
e4b27f64e3
Fix a typo in GPX waypoint quick action message
2017-11-18 16:34:45 +00:00
Hardy
ee674eb047
string consistency
2017-11-18 10:45:10 +01:00
Hardy
92f489a8bd
string improvement
2017-11-18 10:36:31 +01:00
Hardy
481b02d0e1
string improvement
2017-11-18 09:13:51 +01:00
Hardy
b21b108dee
spelling consistency
2017-11-18 08:37:53 +01:00
sonora
ae17ca6bac
string improvement
2017-11-17 21:15:58 +01:00
Alexander Sytnyk
8fe6486f62
Add empty state layouts
2017-11-17 18:29:24 +02:00
PavelRatushny
a2b74269be
Fix strings
2017-11-17 17:13:31 +02:00
Alexander Sytnyk
1d4dd760b9
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_notes_ui
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2017-11-17 10:50:46 +02:00
PavelRatushny
aeb2bc50d1
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into markers_groups
...
# Conflicts:
# OsmAnd/res/values/strings.xml
# OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
2017-11-17 10:13:46 +02:00
alex
7f1f8540f0
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_notes_ui
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2017-11-17 01:25:06 +02:00
Pavel Ratushnyi
03c156da28
Merge pull request #4745 from osmandapp/change_options_menu
...
Change markers options menu
2017-11-16 18:48:55 +02:00
Alexander Sytnyk
bce0fd7862
Change ui for notes list
2017-11-16 15:09:58 +02:00
PavelRatushny
ef1ab8307e
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into markers_empty_states
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2017-11-15 16:09:52 +02:00
Alexander Sytnyk
473c82e19d
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_notes_ui
2017-11-15 12:31:25 +02:00
Hardy
974d469002
string improvements
2017-11-15 08:54:46 +01:00
Alexander Sytnyk
ae15913626
Add sort menu
2017-11-14 19:06:09 +02:00
Alexander Sytnyk
2492b3aaa5
Change markers options menu
2017-11-13 19:06:44 +02:00
PavelRatushny
f4023816c6
Show text when loading tracks
2017-11-13 16:42:38 +02:00
PavelRatushny
eb8fc84402
Fix string
2017-11-13 16:11:27 +02:00
Hardy
63f4367d52
string improvement
2017-11-11 08:42:03 +01:00
Hardy
baa576d16a
string improvements
2017-11-11 08:34:06 +01:00
Alexander Sytnyk
c08d5e086d
Change images order and string
2017-11-10 18:35:01 +02:00
PavelRatushny
ee96bcb5c2
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into markers_empty_states
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2017-11-10 12:45:15 +02:00
PavelRatushny
c356d103d1
Create menu for favourites
2017-11-09 18:03:50 +02:00
alex
7ea8fac0d3
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into direction_indication
2017-11-09 17:32:28 +02:00
Hardy
00c0b2495d
spelling
2017-11-09 16:10:29 +01:00
alex
ee46bb2680
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into direction_indication
2017-11-09 15:20:12 +02:00
PavelRatushny
5a7aeaa1f5
Resolve conflicts
2017-11-09 14:39:29 +02:00
PavelRatushny
b53c1eebb7
Create selection menu
2017-11-09 14:08:43 +02:00
alex
2d1db11a49
Add the ability to select the number of widgets to display
2017-11-09 13:58:53 +02:00
sonora
01e882e70c
fix strings for POI Overlay
2017-11-09 08:25:42 +01:00
sonora
89b19a95b2
update string for #4461
2017-11-09 07:56:39 +01:00
Alexander Sytnyk
ed1e04f6af
Create DirectionIndicationDialogFragment
2017-11-08 20:11:12 +02:00
Alexey
1cdd5f5346
Merge pull request #4702 from osmandapp/coordinate_input_screen
...
Coordinate input screen
2017-11-08 16:32:10 +03:00
PavelRatushny
88f533a84f
Add empty states to markers
2017-11-08 14:22:28 +02:00
sonora
60009de4df
string cleanup
2017-11-08 02:52:46 +01:00
PavelRatushnyi
d05645d702
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into coordinate_input_screen
...
# Conflicts:
# OsmAnd/res/values/strings.xml
# OsmAnd/res/values/styles.xml
2017-11-07 22:43:44 +02:00
Alexander Sytnyk
1e64a28473
Add the ability to rename the marker from the context menu
2017-11-07 16:59:39 +02:00
sonora
123bc08758
Clarify free downloads
2017-11-03 17:55:15 +01:00
sonora
6e428323f7
punctuation (de)
2017-11-02 09:35:33 +01:00
sonora
c4ff30195c
punctuation
2017-11-02 09:04:04 +01:00
Hardy
b908a30680
string improvement
2017-11-02 00:24:54 +01:00
Hardy
21e3339114
string improvements
2017-11-01 17:58:34 +01:00
Alexander Sytnyk
e35c70b5f1
Add setting
2017-11-01 18:22:51 +02:00
Alexander Sytnyk
381ccc0315
Add subtitle button to the context menu; add "Show on Top Bar" button to the context menu of the marker
2017-10-31 12:47:45 +02:00
Alexander Sytnyk
1ab34b31d9
Change the button in the context menu of the marker
2017-10-30 19:07:34 +02:00
alex
f3ec5730d6
Add actions to buttons; change description
2017-10-27 14:45:55 +03:00
Alexander Sytnyk
be977966f8
Add new import gpx menu
2017-10-26 19:37:20 +03:00
PavelRatushny
da53d30774
Fix waypoints
...
(cherry picked from commit 135d01b
2017-10-20 17:40:32 +03:00
Alexander Sytnyk
fe137938bc
Add error message and name check
2017-10-20 15:15:10 +03:00
Alexander Sytnyk
c95348658f
Add fragment for renaming marker
2017-10-20 15:14:39 +03:00
Alexander Sytnyk
3b1e96bf75
Add new marker menu on map
2017-10-20 15:13:22 +03:00
PavelRatushnyi
6091daeaab
FIx crash in proxy setting
...
(cherry picked from commit 9050c44
2017-10-18 11:50:12 +03:00
Alexey Kulish
309e6f4bfd
Fix #4301
2017-10-15 10:17:13 +03:00
PavelRatushny
ff6ccb3726
Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch
2017-10-13 15:16:06 +03:00
Dmitriy Prodchenko
227f362e9e
Rename OSM Live.
...
Rename OSM Live to OsmAnd Live.
2017-10-13 12:43:13 +03:00
Alex
7cbbe99166
Replace toast with snackbar
2017-10-13 12:16:59 +03:00
vshcherb
81f6059dc5
Merge pull request #4565 from osmandapp/favourites_fix
...
Add default color to change color dialog
2017-10-13 10:46:56 +02:00
Alex
5a869dfaee
Add round trip finish item
2017-10-13 10:44:29 +03:00
PavelRatushny
536ad23ffb
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch
2017-10-12 16:27:48 +03:00
Dmitriy Prodchenko
e5cd2c2656
Update grammar in release notes.
2017-10-12 15:11:22 +03:00
Dmitriy Prodchenko
f4be1d9e12
Add Release notes 2.8
2017-10-12 14:53:35 +03:00
Alex
71127dc4b9
Close full screen after finishing snap to road
2017-10-11 18:12:21 +03:00
Alex
cee59feda8
Do not open plan route without active markers; add null-checks
2017-10-11 18:00:32 +03:00
PavelRatushny
25741a9f97
Add default color to change color dialog
2017-10-10 11:23:10 +03:00
Alexey
526e8ddb28
Merge branch 'master' into osm_notes_edit
2017-10-06 11:27:09 +03:00
Alexander Sytnyk
a048d1d9fd
Replace sort by menu with options menu
2017-10-05 13:45:21 +03:00
Dmitriy Prodchenko
3d735f16b1
Add new icon for Plan Route > Round Trip. Change string for markers.
2017-10-05 12:46:30 +03:00
Hardy
080ea268af
Better caption for #4524
2017-10-05 08:31:10 +02:00
PavelRatushnyi
69305c7409
Merge branch 'osm_notes_edit' of ssh://github.com/osmandapp/Osmand into osm_notes_edit
2017-10-03 16:39:57 +03:00
PavelRatushny
042c22d408
Add possibility to modify osm note
2017-10-03 12:11:18 +03:00
Alexander Sytnyk
1ba54c3ba1
Rename menu item; remove unnecessary string
2017-10-02 12:04:06 +03:00
Hardy
fd20d63f17
spelling
2017-10-01 10:27:11 +02:00
sonora
4e62a47337
string improvements
2017-10-01 09:04:59 +02:00
Alexey
263ee851a3
Merge branch 'master' into sasha_pasha_branch
2017-09-29 16:03:28 +03:00
xmd5a
f7242538de
Add string
2017-09-29 15:01:32 +03:00
Alexander Sytnyk
e871dc064d
Add displaying the count of selected markers; extract variables
2017-09-29 14:29:22 +03:00
PavelRatushny
27c204643d
Add option menu and keyboard styling
2017-09-28 19:02:56 +03:00
PavelRatushny
84bc403963
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch
2017-09-28 17:01:36 +03:00
PavelRatushny
e92ecfa26f
Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch
2017-09-28 15:36:12 +03:00
PavelRatushny
e72d419e9a
Add support for different coordinate formats
2017-09-28 15:35:36 +03:00
Alexander Sytnyk
20a99ac9c6
Replace Use My Location card with location item
2017-09-28 14:54:20 +03:00
PavelRatushnyi
48e051e859
Add coordinate format dialog
2017-09-28 12:02:43 +03:00
sonora
06f7d751f6
string improvement
2017-09-28 08:46:42 +02:00
sonora
d5f09cc053
string improvements
2017-09-28 07:06:35 +02:00
Hardy
03315c4ac0
string improvement
2017-09-27 22:22:48 +02:00
Alexey
330980dc2e
Merge pull request #4490 from osmandapp/sasha_pasha_branch
...
Sasha pasha branch
2017-09-27 12:49:25 +03:00
Alexander Sytnyk
1d67432fc6
Add use location card
2017-09-26 19:03:08 +03:00
Alexander Sytnyk
a91946f873
Add adapter and related stuff
2017-09-26 16:07:36 +03:00
Alexander Sytnyk
4dc734e4b3
Add Plan Route fragment and related stuff; fix some small bugs
2017-09-25 19:48:55 +03:00
PavelRatushny
83fd9df764
Add coordinate input screen
2017-09-25 19:20:47 +03:00
PavelRatushny
dbfd5bb288
Add save as track dialog
2017-09-25 16:54:32 +03:00
Hardy
fba19a853b
Update strings.xml
...
Try improve some strings
2017-09-23 08:50:47 +02:00
PavelRatushny
41bf5e3abf
Add swipes with snackbar in groups
2017-09-21 17:28:59 +03:00
PavelRatushny
fdd2c80244
Show snackbar when toggle switch in groups
2017-09-21 14:53:08 +03:00
Alexander Sytnyk
b5f826f886
Add settings and items to menu
2017-09-19 17:56:03 +03:00
PavelRatushny
bd8040420b
Refactor groups
2017-09-19 11:57:23 +03:00
Alexey
08e055243c
Merge branch 'master' into sasha_pasha_branch
2017-09-18 13:03:39 +03:00
sonora
06927666af
use shared_string_topbar
2017-09-17 10:05:28 +02:00
sonora
69d111910f
fix apostrophe
2017-09-16 10:00:43 +02:00
sonora
f392aec0c2
string improvements
2017-09-16 09:47:30 +02:00
sonora
2c8dc525d1
some string work
2017-09-16 09:24:37 +02:00
Alexander Sytnyk
8430f9d5fb
Add "Remove from Map Markers" item to EditFavoriteGroupDialog
2017-09-15 16:18:30 +03:00
PavelRatushny
cf2017b275
Add possibility to change order by mode
2017-09-15 15:11:21 +03:00
PavelRatushny
877ee34fbe
Resolve conflicts
2017-09-15 13:35:45 +03:00
PavelRatushny
a35774dd58
Add order by menu
2017-09-15 12:33:45 +03:00
PavelRatushny
07d56a7316
Resolve conflicts
2017-09-15 11:56:43 +03:00
PavelRatushny
5caf65e840
Add snackbar for move all to history
2017-09-14 18:32:20 +03:00
PavelRatushny
a1ccfd34da
Change snackbar strings
2017-09-14 14:50:28 +03:00
PavelRatushnyi
6f7e2cb380
Rename active
2017-09-14 10:00:51 +03:00
PavelRatushnyi
11eb486144
Add groups tab
2017-09-14 09:58:35 +03:00
PavelRatushny
14b70827f1
Styling
2017-09-13 18:16:24 +03:00
PavelRatushnyi
87be24e482
Add passed string to resources
2017-09-09 19:13:13 +03:00
PavelRatushny
a30b123b89
Add history marker menu
2017-09-08 15:59:29 +03:00
PavelRatushny
4ba50ff806
Rename setting
2017-09-07 18:51:04 +03:00
PavelRatushny
3a6d81bd52
Add sort for history
2017-09-07 18:17:08 +03:00
PavelRatushny
1097262dfe
Add show direction bottom sheet dialog
2017-09-06 18:34:57 +03:00
PavelRatushny
0396aa5300
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sensors_innacuracy
2017-09-04 16:36:00 +03:00
sonora
36b8d544ee
string improvement
2017-09-03 17:13:09 +02:00
PavelRatushny
c1365ddd11
Add setting for speed
2017-09-01 18:57:36 +03:00
Alexander Sytnyk
403d374bb0
Add marker options menu
2017-08-31 18:09:53 +03:00
sonora
aa0312c94b
fix build
2017-08-31 00:05:47 +02:00
sonora
19babbd730
string improvements
2017-08-30 23:50:55 +02:00
PavelRatushny
c7ebe9e979
Disable animation in drawer
2017-08-28 17:29:57 +03:00
PavelRatushny
fb86e28940
Add dialog for saving and exiting
2017-08-28 14:26:23 +03:00
vshcherb
60bfd28830
Merge pull request #4341 from osmandapp/sasha_pasha_branch
...
Sasha pasha branch
2017-08-26 16:07:02 +02:00
PavelRatushnyi
eaff1b8c7a
Fix alt and speed
2017-08-26 18:25:03 +03:00
sonora
680320c508
spelling improvements
2017-08-24 09:05:53 +02:00
PavelRatushny
42d2cd8ade
Show altitude and speed
2017-08-21 16:18:20 +03:00
PavelRatushny
a8cb9d4743
Add images to save as menu
2017-08-17 14:18:25 +03:00
PavelRatushny
971268480d
Add save as new track menu
2017-08-17 12:25:27 +03:00
PavelRatushny
41689efe1f
Change title in adding route points
2017-08-16 18:32:08 +03:00
PavelRatushny
eabf17ed7b
Add 3 dots menu
2017-08-16 18:14:19 +03:00
PavelRatushny
808c806d65
Adding route points by fab
2017-08-15 11:39:30 +03:00
PavelRatushny
98cff00597
Add selected point menu
2017-08-14 18:55:09 +03:00
PavelRatushny
c13baca903
Rename save
2017-08-11 18:58:06 +03:00
Alex
584143f6a2
Add options menu fragment; fix layouts
2017-08-11 13:57:37 +03:00
Alexander Sytnyk
8af25f51ce
Create bottom sheet for snap to road; do some related stuff
2017-08-10 14:00:24 +03:00
PavelRatushny
46e96a62b6
Add menu for saving as track
2017-08-10 13:02:09 +03:00
PavelRatushnyi
226162a76f
Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch
2017-08-10 00:57:44 +03:00
PavelRatushny
de9530af0d
Add move point mode
2017-08-09 18:34:34 +03:00
Alexander Sytnyk
0e25331dcb
Change resources
2017-08-09 12:12:43 +03:00
PavelRatushny
ca7c573286
Add saving to gpx segment
2017-08-08 18:59:50 +03:00
Dmitriy Prodchenko
1b20df7434
Change string.
2017-08-08 14:29:04 +03:00
annasoloviova
e65cf4adaa
Update strings.xml
2017-08-08 14:07:36 +03:00
PavelRatushny
137ce99023
Add fab for add line action
2017-08-08 13:22:14 +03:00
PavelRatushny
d0149b5c3e
Resolve conflicts
2017-08-07 18:11:16 +03:00
PavelRatushny
43a1873af2
Fix empty states
2017-08-07 18:03:40 +03:00
sonora
97ec703c8a
string consistency
2017-08-06 09:17:51 +02:00
sonora
d27749eceb
spelling
2017-08-06 09:14:07 +02:00
sonora
dc34934776
string improvements
2017-08-06 09:11:23 +02:00
Alexey
0776c02336
Merge pull request #4260 from osmandapp/fab_waypoints
...
Fab waypoints
2017-08-04 19:26:51 +03:00
Alexey
edb25fbd95
Merge pull request #4262 from osmandapp/measurement_tools
...
Measurement tools
2017-08-04 15:10:20 +03:00
Alex
10d70a522c
Change string
2017-08-04 12:29:49 +03:00
PavelRatushny
281bab324b
Fix adding waypoints and route points
2017-08-04 11:06:54 +03:00
PaulStets
8c5eb8a4c5
Update strings.xml
2017-08-03 16:19:41 +03:00
Alexander Sytnyk
3cdb63a669
Add string
2017-08-03 15:54:00 +03:00
PaulStets
b1e76a64e4
Improved menu item translation.
2017-08-03 15:48:53 +03:00
PavelRatushny
68e85bbbf3
Add empty states
2017-08-03 15:32:49 +03:00
PavelRatushny
0122d0faa1
Add route points and styling
2017-08-03 11:54:09 +03:00
Alexander Sytnyk
2a34c6a5aa
Rename menu item, move menu divider; add some code for save as gpx
2017-08-03 11:48:26 +03:00
Alexey
10a99a3b4e
Merge pull request #4256 from osmandapp/fab_waypoints
...
Fab waypoints
2017-08-02 11:55:21 +03:00
PavelRatushny
a26a44c8ef
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into fab_waypoints
...
# Conflicts:
# OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
2017-08-01 17:35:00 +03:00
Alexander Sytnyk
40c6ba307b
Add toolbar
2017-08-01 17:23:29 +03:00
PavelRatushny
560fca06ff
Modify fab in trackPointsFragment
2017-08-01 17:21:51 +03:00
Alexander Sytnyk
4c7e97d7e7
Remove unnecessary strings
2017-08-01 13:25:35 +03:00
Alexander Sytnyk
0f69f594c7
Add functionality
2017-08-01 13:15:11 +03:00
Alexander Sytnyk
a473632200
Create some classes and add some code
2017-07-28 17:39:32 +03:00
PavelRatushny
8b5de4a5ee
Add no internet view
2017-07-28 12:36:45 +03:00
vshcherb
401725ddbf
Merge pull request #4154 from osmandapp/live_monitoring_fixes
...
Live monitoring fixes
2017-07-21 10:03:31 +02:00
vshcherb
711cb09213
Update strings.xml
2017-07-21 10:03:21 +02:00
sonora
6a0aea428c
Bicycle route naming
2017-07-21 01:19:50 +02:00
PavelRatushny
578f9c82fc
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into live_monitoring_fixes
2017-07-20 18:56:16 +03:00
PavelRatushny
7fad69288b
Add settings for maximum interval to send
2017-07-20 17:16:34 +03:00
sonora
5459849521
Bicycle navigation wording
2017-07-20 07:47:45 +02:00
sonora
4c89d777a8
Bicycle navigation options: Try to be less ambiguous
2017-07-18 08:14:07 +02:00
Alexander Sytnyk
01d2489c73
Fix #4002
2017-07-17 16:16:06 +03:00
xmd5a
bbe974edb2
Merge pull request #4107 from njohnston/pink_gpx
...
Add support for showing GPX tracks in pink
2017-07-15 19:29:27 +03:00
Dmitriy Prodchenko
10cd330b58
Add strings with release notes for 2.7
2017-07-14 18:49:04 +03:00
njohnston
b74c2f6a39
Add support for showing GPX tracks in pink
...
Pink is one of the least used colours on the map, making it a good choice
for clearly showing GPX tracks. Pink was previously available in OsmAnd 2.5
but removed in 2.6.
2017-07-13 16:32:38 +00:00
Alexander Sytnyk
577c08e801
Change the radius of the circles; remove the selection of modes from configure screen
2017-07-12 14:02:45 +03:00
PavelRatushny
5651e9310c
Fix sizes
2017-07-10 16:22:45 +03:00
PavelRatushny
303be76bc5
Styling split segments
2017-07-07 10:49:36 +03:00
PavelRatushny
e9136402b0
Merge branch 'split_interval_screen' of ssh://github.com/osmandapp/Osmand into split_interval_screen
2017-07-04 11:39:27 +03:00
Hardy
179bb0ad25
string improvement
2017-07-03 20:51:58 +02:00
PavelRatushny
9afc0b6a0e
Test split segments
2017-07-03 19:10:00 +03:00
njohnston
b27641e074
Optionally store recorded GPX tracks in monthly directories
...
Managing many recorded GPX tracks is inconvenient and as they are all
displayed in a single, flat list.
With this feature, recorded GPX tracks can optionally be automatically
stored in monthly directories. For example, GPX tracks recorded in July
2017 will be stored in rec/2017-07. This makes tracks much easier to
manage.
2017-07-02 14:43:07 +00:00
Hardy
21e69e3968
string improvements
2017-07-02 15:16:40 +02:00
sonora
61d793f1c7
string improvements
2017-07-02 14:10:47 +02:00
sonora
4d2fe5f9eb
string improvements
2017-07-02 11:59:40 +02:00
Alexander Sytnyk
29b6588452
Add small fixes
2017-06-29 15:42:36 +03:00
Әmrah Nәbiyev
631f682052
Update strings.xml
2017-06-28 12:41:38 +04:00
sonora
d9f89ca91f
string improvement
2017-06-28 07:12:52 +02:00
sonora
98e68281ca
string improvement
2017-06-28 07:09:56 +02:00
sonora
7e4e02a4d0
add lang Azerbaijanian
2017-06-28 06:49:17 +02:00
sonora
cb5265b5ad
string improvement
2017-06-27 21:39:06 +02:00
Alexander Sytnyk
bc3a601f4e
Change description text; add functionality for reload button
2017-06-27 15:01:55 +03:00
Alexander Sytnyk
10fea91f14
Add "Reload" button; close keyboard on Done click
2017-06-27 11:55:19 +03:00
Alexander Sytnyk
6c03572c25
Finish UI for Mapillary Filters
2017-06-22 12:50:13 +03:00
Alexander Sytnyk
f07f9c1f7a
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into mapillary_filters
...
# Conflicts:
# OsmAnd/res/values/strings.xml
2017-06-19 10:53:30 +03:00
sonora
52f69b4020
string improvement
2017-06-18 08:05:17 +02:00
Alexander Sytnyk
e509e23c20
Set the color and size of the text; rename string "to"; fix night mode check
2017-06-16 11:50:45 +03:00
Alexander Sytnyk
4927ad0d34
Create UI for MapillaryMenu
2017-06-15 17:53:24 +03:00
Alexander Sytnyk
4e86b6e80c
Add the necessary icons; add control of the ruler mode in the popup menu in configure screen
2017-06-14 10:39:01 +03:00
xmd5a
e2d360f73e
Edit depth maps description because there are more detailed maps
2017-06-13 16:11:25 +03:00
Alexey Kulish
950b5efbde
Fix #3819
2017-05-29 19:28:57 +03:00
sonora
9e920c2742
string improvements
2017-05-25 22:39:08 +02:00
sonora
15ffd2704b
string improvements
2017-05-25 21:51:51 +02:00
sonora
6b3e857804
string improvement
2017-05-25 21:42:44 +02:00
sonora
6b865fa147
Display string for totalDistanceMoving
2017-05-25 08:34:11 +02:00
Alexey Kulish
6ba77dccd6
Added lines for mapillary layer
2017-05-17 19:39:44 +03:00
Alexey Kulish
a6b99f1e41
Fix webgl. Added photo_id to Mapillary start intent.
2017-05-08 22:01:00 +03:00
Alexey Kulish
a74c813694
Added mapillary install dialog
2017-05-08 11:12:22 +03:00
Alexey Kulish
36750a3dc8
Added empty state card
2017-05-05 18:58:10 +03:00
Dmitriy Prodchenko
6042de8daa
Add string for Mapillary description.
2017-05-04 18:51:56 +03:00
Alexey Kulish
4aecbac5ba
Added mapillary images to context menu
2017-05-02 12:09:11 +03:00
Alexey Kulish
a2297fae39
Added mapillary welcome dialog
2017-04-29 18:15:19 +03:00
Alexey Kulish
7f717db184
Fix animate my location description
2017-04-28 19:31:27 +03:00
Alexey Kulish
6a02e772c2
Added mapillary setting to configure map
2017-04-26 19:06:58 +03:00
aceman444
81cca5fc45
OSM bugs -> OSM Notes in strings.xml
...
Converts last remaining occurrences of 'OSM bugs' name. They are called Notes for some time now.
2017-04-25 23:13:22 +02:00
sonora
8b255824ac
string improvement
2017-04-21 08:58:33 +02:00
xmd5a
3ef66475e2
Improve strings
2017-04-20 18:47:03 +03:00
xmd5a
6ed66d7ccb
Fix allow_private_description strings
2017-04-16 16:57:14 +03:00
Alexey Kulish
3af3721b81
Fix #3164
2017-04-11 18:28:58 +03:00
Alexey Kulish
6a4c361f76
Fix #3189
2017-04-11 09:52:40 +03:00
Hardy
ca39eee8fa
string improvement
2017-04-09 21:27:20 +02:00
Hardy
5b65a048d0
string improvement
2017-04-09 21:22:35 +02:00
Hardy
ec4fb72ff5
string improvement
2017-04-09 18:50:32 +02:00
