Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Map25 experimental: Mapilion map, vtm 0.13, externalyzing #167

Merged
merged 410 commits into from
Apr 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
410 commits
Select commit Hold shift + click to select a range
b665f64
Starting with Mapilion
telemaxx Dec 2, 2019
aff79b1
More Work for Mapilion mAp
telemaxx Dec 3, 2019
805b096
Mapilion
telemaxx Dec 3, 2019
e08fa40
preperation for externalyzing strings
telemaxx Dec 3, 2019
203e541
adding some dozens: //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
telemaxx Dec 5, 2019
4fd3319
Hillshading from mapilion.
telemaxx Dec 7, 2019
62fa74a
Merge remote-tracking branch 'wolfgang/master' into library-updates
FJBDev Dec 8, 2019
a6dd843
Merge remote-tracking branch 'origin/library-updates' into library-up…
FJBDev Dec 8, 2019
b7276db
Merge remote-tracking branch 'origin/master' into govss
FJBDev Dec 8, 2019
e7c698f
WIP Issues in the General men values when switching from metric to
FJBDev Dec 10, 2019
14640d2
WIP Elevation gain and loss can be wrong at times
FJBDev Dec 10, 2019
f9b78c5
WIP : GOVSS algorithm
FJBDev Dec 10, 2019
08efadd
Using a java library but obtaining similar results
FJBDev Dec 10, 2019
a883662
Removing the series reducer
FJBDev Dec 10, 2019
008fcf9
Clean up
FJBDev Dec 10, 2019
a76bde9
WIP Fixing a bug where the metric radio buttons disappeared
FJBDev Dec 11, 2019
3a60616
Not much progress
FJBDev Dec 11, 2019
0c4d912
Fixed the UI for the measurement system tab
FJBDev Dec 11, 2019
117d49c
Cleanup
FJBDev Dec 11, 2019
14349f3
Reverting for less commit "noise"
FJBDev Dec 11, 2019
aeb7ad4
Conversion fix
FJBDev Dec 11, 2019
a6f3cf7
Typo
FJBDev Dec 11, 2019
83bf1df
Updated Readme
FJBDev Dec 11, 2019
549639c
Updated links to quickly find the maven repo
FJBDev Dec 11, 2019
120a002
dutch translation
wolfgang-ch Dec 16, 2019
280b3f6
Merge remote-tracking branch 'Wolfgang/master' into library-updates
FJBDev Dec 17, 2019
2741bfb
Merge remote-tracking branch 'Wolfgang/master' into elevationgain-com…
FJBDev Dec 17, 2019
b99134d
Merge remote-tracking branch 'Wolfgang/master' into govss
FJBDev Dec 17, 2019
e4611af
Merge remote-tracking branch 'origin/library-updates' into govss
FJBDev Dec 17, 2019
ed669ff
Disabling the "Edit Marker" in the slice editor view if an existing
FJBDev Dec 18, 2019
651d44d
No need to convert the tolerance DP in this case
FJBDev Dec 18, 2019
79d45cd
Updating to Eclipse 4.14 (2019-12)
FJBDev Dec 18, 2019
cd8ab6e
Displaying the + if altitude was added after computing the elevation
FJBDev Dec 22, 2019
b657d80
Displaying the + while computing the new elevation gain values.
FJBDev Dec 22, 2019
52334e5
Displaying the tolerance in the current measurement system and with the
FJBDev Dec 23, 2019
2d8f602
Merge pull request #43 from wolfgang-ch/map25-experimental
telemaxx Dec 27, 2019
d03be6e
2020 todo's
wolfgang-ch Dec 30, 2019
42b6ac1
Merge remote-tracking branch 'Wolfgang/master' into
FJBDev Dec 31, 2019
0eab868
Merge remote-tracking branch 'Wolfgang/master' into sliceseditor
FJBDev Dec 31, 2019
bee7297
French translation improvements and fixes
FJBDev Jan 1, 2020
b8a3dd0
Adding the tour type header "T"
FJBDev Jan 1, 2020
6a9c77b
Merge pull request #166 from FJBDev/eclipse414
wolfgang-ch Jan 1, 2020
6a9f6bd
Merge branch 'FJBDev'
wolfgang-ch Jan 1, 2020
dc5065b
removed old info
wolfgang-ch Jan 1, 2020
5d59e8b
dutch translation
wolfgang-ch Jan 1, 2020
9b9380e
Merge remote-tracking branch 'wolfgang/master' into elevationgain-com…
FJBDev Jan 2, 2020
9026a1d
Merge remote-tracking branch 'wolfgang/master' into sliceseditor
FJBDev Jan 2, 2020
7b12468
French translation fixes
FJBDev Jan 2, 2020
4139162
1st mapilion import
telemaxx Jan 2, 2020
a03cc94
trying to upgrade vtm to 0.12, wont work
telemaxx Jan 2, 2020
6d2fd5e
trying vtm 0.12, wont work
telemaxx Jan 2, 2020
67fc5c3
1st working version with mapiliion vector maps
telemaxx Jan 2, 2020
1224926
suddently it running after "refreh run configuratiuon"
telemaxx Jan 2, 2020
71e0b8c
solved
telemaxx Jan 2, 2020
a54186f
Merge remote-tracking branch 'Wolfgang/master' into govss
FJBDev Jan 2, 2020
30caa3a
French translation
FJBDev Jan 2, 2020
080c955
Adding the ability to retrieve the weather with 1 click from the Tour
FJBDev Jan 2, 2020
5b046ee
Misc
FJBDev Jan 2, 2020
119c76d
Merge remote-tracking branch 'origin/sliceseditor' into elevationgain…
FJBDev Jan 2, 2020
a020f29
20.X readme update
FJBDev Jan 3, 2020
f0977b1
French typo
FJBDev Jan 3, 2020
bd77e25
French typos
FJBDev Jan 3, 2020
9933c11
Map25: externalizing Strings
telemaxx Jan 3, 2020
67ce471
small fixes in messages.properties
telemaxx Jan 3, 2020
f976c22
updated p2 NL repo readme
wolfgang-ch Jan 4, 2020
58efe63
Map25 Show Attribution in Mapprovider
telemaxx Jan 4, 2020
830de61
debug output off
telemaxx Jan 4, 2020
d953a30
Merge pull request #44 from wolfgang-ch/master
telemaxx Jan 4, 2020
bfbaa26
Merge remote-tracking branch 'origin/master' into map25-experimental
telemaxx Jan 4, 2020
64e32af
Merge remote-tracking branch 'wolfgang/master' into elevationgain-com…
FJBDev Jan 5, 2020
28fad06
French translation
FJBDev Jan 5, 2020
e3bfe02
NPE fix : After deleting tag(s), if they were part of a tour tag filter
FJBDev Jan 6, 2020
af98135
French translation fixes
FJBDev Jan 6, 2020
f4b7492
TourDataEditorView: Fixed a bug where after editing a value and saving
FJBDev Jan 8, 2020
44f6c29
20.X readme update
FJBDev Jan 8, 2020
b076c92
Merge remote-tracking branch 'origin/master' into govss
FJBDev Jan 9, 2020
3b24190
3rd party library updates (#7)
FJBDev Jan 9, 2020
738b3ef
French translation
FJBDev Jan 9, 2020
7dcbd4e
Replacing the "" with UI.EMPTY_STRING
FJBDev Jan 4, 2020
97c2723
Better french translation
FJBDev Jan 9, 2020
7acee1e
Timeslices enhancement (#8)
FJBDev Jan 9, 2020
6f6fb50
Not applicable
FJBDev Jan 9, 2020
50287f9
We disable the edit time slices menu if the view is in readonly mode
FJBDev Jan 9, 2020
387e3b5
Updated 20.X readme
FJBDev Jan 10, 2020
6d9b1ee
NPE detected
wolfgang-ch Jan 11, 2020
4e46c24
2020 wishes
wolfgang-ch Jan 11, 2020
17ac462
Merge remote-tracking branch 'wolfgang/master' into
FJBDev Jan 12, 2020
97b3755
FIT: Fixed NPE when importing files with developer fields that are null
FJBDev Jan 13, 2020
6d3c869
Tour Marker-Added the following columns Elevation Gain Difference, E…
FJBDev Jan 13, 2020
dde405c
VTM 0.13
telemaxx Jan 14, 2020
e41fef5
Merge pull request #45 from wolfgang-ch/master
telemaxx Jan 14, 2020
41efa90
Merge remote-tracking branch 'origin/master' into map25-experimental
telemaxx Jan 14, 2020
b81e8b9
French accent
FJBDev Jan 15, 2020
3c0a52f
NPE fix
FJBDev Jan 15, 2020
35a312b
French translation
FJBDev Jan 15, 2020
c41e6fc
NPE fix
FJBDev Jan 15, 2020
8fdb319
Readme update
FJBDev Jan 15, 2020
9ea3dd3
French translation improvements
FJBDev Jan 15, 2020
c1568ed
Tourinfotooltip enabled/disabled for tourcompare result view (#11)
FJBDev Jan 17, 2020
53bb1ea
Readme update
FJBDev Jan 17, 2020
4ed6c85
French translation
FJBDev Jan 21, 2020
0cefbdd
Fixing possible NPEs in my new code
FJBDev Jan 21, 2020
8b39228
Fixing a bug where the elevation gain and loss numbers for markers
FJBDev Jan 21, 2020
1005fa7
French
FJBDev Jan 21, 2020
ed3e91b
French
FJBDev Jan 21, 2020
0bffc71
French
FJBDev Jan 22, 2020
d5fee73
French translation
FJBDev Jan 22, 2020
407f147
French translation
FJBDev Jan 22, 2020
caf4388
Merge branch 'govss' into elevationgain-computationfix
FJBDev Jan 22, 2020
460a09a
Revert "Merge branch 'govss' into elevationgain-computationfix"
FJBDev Jan 22, 2020
d0c4672
French translation
FJBDev Jan 27, 2020
953972d
Merge pull request #164 from FJBDev/elevationgain-computationfix
wolfgang-ch Feb 2, 2020
4943334
Consistent naming
FJBDev Feb 5, 2020
3165f52
Reverting the reformatted comments and sorting of the code
FJBDev Feb 5, 2020
a6be3a5
Reverting the external files
FJBDev Feb 5, 2020
34b7cb9
Reverted wrong formatting
FJBDev Feb 5, 2020
4a8ce9d
Fixed Inconsistent naming
FJBDev Feb 5, 2020
9c7ebbd
put the calculation of the boolean values in the upper part of the
FJBDev Feb 5, 2020
f192896
Added a mnemonic ("v" to open the time slices editor dialog)
FJBDev Feb 5, 2020
72eef60
Using the formtoolkit for the checkbox fields to use the correct
FJBDev Feb 6, 2020
027accb
replaced some dozens /* */ against /** */
telemaxx Feb 6, 2020
ccdff25
Reformatting Phototoolkit
telemaxx Feb 6, 2020
527b3d0
reformatting MarkerToolkit
telemaxx Feb 6, 2020
4cdd95b
reformatting Map25View
telemaxx Feb 6, 2020
dede152
update Copyright
telemaxx Feb 6, 2020
3ee1a8e
reformatting MapsforgeStyleParser
telemaxx Feb 6, 2020
7efcd05
reformatting PrefPageMap25OfflineMap
telemaxx Feb 6, 2020
9a89cbe
reformatting MapsforgeThemeStyle
telemaxx Feb 6, 2020
1c06427
reformatting Map25App
telemaxx Feb 6, 2020
b4998e2
reformatting TileEncoding
telemaxx Feb 6, 2020
d15fa8c
reformatting DebugMode
telemaxx Feb 6, 2020
fea3f76
reformatting MarkerMode
telemaxx Feb 6, 2020
e490eee
reformatting MarkerShape
telemaxx Feb 6, 2020
0369a0b
Improving the Edit Time Slices dialog per code review
FJBDev Feb 6, 2020
7275d69
French translation
FJBDev Feb 7, 2020
492923b
French translation improvements
FJBDev Feb 7, 2020
2a49ef3
Fixed a bug in the calendar view where the speed is always displayed in
FJBDev Feb 7, 2020
d148ff4
Readme update
FJBDev Feb 7, 2020
4665783
Merge pull request #169 from FJBDev/20-2
wolfgang-ch Feb 8, 2020
b90e805
Some cleanup:
telemaxx Feb 9, 2020
dc9dd1d
debug off
telemaxx Feb 9, 2020
8c5b5a2
Starting to rename
FJBDev Feb 9, 2020
db0f47c
cleanup onItemSingleTapUp and onItemLongPress
telemaxx Feb 10, 2020
e55782d
Renaming from Dialog_Edit_* to Dialog_EditTimeslicesValues_*
FJBDev Feb 10, 2020
9276be7
Saving the dialog buttons and values to state
FJBDev Feb 10, 2020
1f53d63
Adding the MT version number in the cheatsheet
FJBDev Feb 12, 2020
db0f43c
Merge pull request #170 from FJBDev/20-2
wolfgang-ch Feb 15, 2020
b69cdc3
resaved (caused reformatting) without content changes
wolfgang-ch Feb 15, 2020
f800641
align the wording
wolfgang-ch Feb 15, 2020
f812087
little bit more UI spacing, enable/disable value units
wolfgang-ch Feb 15, 2020
07dc115
Changed from Save -> Update, this action do not save the tour, saving…
wolfgang-ch Feb 15, 2020
1820922
removed "import javax.annotation.Generated;" which caused gradle buil…
wolfgang-ch Feb 16, 2020
76d0ef6
replaced eclipse NL 4.12 with 4.14
wolfgang-ch Feb 16, 2020
c6ac381
external version updated to fix build issues
wolfgang-ch Feb 16, 2020
6995e5f
prepare version 4.14
wolfgang-ch Feb 16, 2020
1c96dc0
MT 20.2 readme
wolfgang-ch Feb 16, 2020
73d2bd8
19.10 dutch translation
wolfgang-ch Feb 16, 2020
7b5341c
TODO Average heart rate in Marker View & mnemonic improvement for Tour
FJBDev Feb 16, 2020
0f50812
French translation
FJBDev Feb 16, 2020
29c43e5
Contextual menu mnemonics improvements
FJBDev Feb 17, 2020
3384bc0
fixed different formatter behaviour: chained methods are not wrapped …
wolfgang-ch Feb 17, 2020
6010abd
MT 20.2 readme/cheat sheet
wolfgang-ch Feb 17, 2020
9ce4b06
removed absolute layout indent, replaced selection listener with sele…
wolfgang-ch Feb 17, 2020
bb5b815
Merge remote-tracking branch 'origin/20-x'
FJBDev Feb 17, 2020
328d017
Undo
FJBDev Feb 17, 2020
2502847
French Mnemonic improvement
FJBDev Feb 17, 2020
1c199c0
Added average heart rate column in the Tour Marker View
FJBDev Feb 17, 2020
09be84c
Bugfix : Array index issue when computing elevation gain/loss
FJBDev Feb 18, 2020
65a63b3
Some dialog adjustments
wolfgang-ch Feb 19, 2020
73ffa89
Merge pull request #171 from FJBDev/master
wolfgang-ch Feb 19, 2020
1cb6b2b
readme update
wolfgang-ch Feb 19, 2020
a9e71bb
Merge pull request #46 from wolfgang-ch/master
telemaxx Feb 20, 2020
a915549
Merge remote-tracking branch 'origin/master' into map25-experimental
telemaxx Feb 20, 2020
6fe91a3
French mnemonics improvements
FJBDev Feb 20, 2020
de69801
French typo
FJBDev Feb 20, 2020
4a4a07c
French translation
FJBDev Feb 21, 2020
516fa21
Tour Marker View : Replacing pace difference by average pace
FJBDev Feb 21, 2020
3281a8c
Replacing ViewerSorter (deprecated) by ViewerComparator
FJBDev Feb 21, 2020
1ee1a92
Replacing ViewerSorter (deprecated) by ViewerComparator - Part2
FJBDev Feb 21, 2020
6cedf73
avoid java.lang.NoSuchMethodError: java.nio.FloatBuffer.clear() with
telemaxx Feb 23, 2020
ce68d71
reformatted
wolfgang-ch Feb 23, 2020
7ff3304
fixed
wolfgang-ch Feb 23, 2020
8d3fd3a
Added: FIT File Import: Option to set TourType to SportName from file
bbbbbr Feb 23, 2020
20c689d
Merge pull request #175 from telemaxx/master
wolfgang-ch Feb 24, 2020
0091e37
Merge remote-tracking branch 'origin/master' into 20-next
FJBDev Feb 24, 2020
a1630f1
Merge remote-tracking branch 'origin/20-next' into 20-next
FJBDev Feb 24, 2020
40200d0
Tour Marker View : Adding the average slope (#14)
FJBDev Feb 24, 2020
a5cf4e7
Readme update
FJBDev Feb 24, 2020
0593f86
Readme: add FIT File Tour Type from Sport Name option
bbbbbr Feb 25, 2020
0c09538
Reformatted
FJBDev Feb 25, 2020
4ea3e7f
Fixing the pace format display for 3D map view
FJBDev Feb 25, 2020
43da136
Readme update
FJBDev Feb 25, 2020
d4e88f7
Merge remote-tracking branch 'Wolfgang/master' into 20-next
FJBDev Feb 25, 2020
4d3280d
French translation
FJBDev Feb 25, 2020
24fe10f
Removing the double average sign
FJBDev Feb 25, 2020
9772de6
Mnemonics and translation
FJBDev Feb 25, 2020
d5a0567
French translation
FJBDev Feb 26, 2020
8430d4d
Reformatted
FJBDev Feb 26, 2020
4748ab6
Conconi View: Disabling the deflection scale if there is no HR and/or
FJBDev Feb 26, 2020
dab5877
Readme update
FJBDev Feb 26, 2020
6cbf00a
Merge pull request #176 from bbbbbr/feature_fitfile_import_sportname
wolfgang-ch Feb 26, 2020
b78f30c
fixed typo
wolfgang-ch Feb 26, 2020
a30ca0a
Merge remote-tracking branch 'origin/master' into map25-experimental
telemaxx Feb 29, 2020
c984765
Copyright (C) 2005, 2016, 2020
telemaxx Feb 29, 2020
b4b5bf8
readme
telemaxx Feb 29, 2020
8af0ebf
Added: FIT File Import: Option to set TourType to SportName from file
bbbbbr Feb 23, 2020
6a0735b
Readme: add FIT File Tour Type from Sport Name option
bbbbbr Feb 25, 2020
871a7ee
Added: FIT File Import: Option to set TourType to Sport Name or Profi…
bbbbbr Mar 1, 2020
aff195b
Merge branch 'Common_PullRequests_Branch' into feature_fitfile_import…
bbbbbr Mar 4, 2020
cf001e8
Merge pull request #177 from bbbbbr/feature_fitfile_import_tourtype
wolfgang-ch Mar 4, 2020
80b1728
using UI.EMPTY_STRING instead of ""
telemaxx Mar 4, 2020
5e68436
Reformatted
FJBDev Mar 4, 2020
09d0e92
Displaying the proper label for pace unit
FJBDev Mar 4, 2020
ccaa79f
FIT File Import: Updates per PR #177
bbbbbr Mar 4, 2020
be6b356
Fixed an issue where the altitude gain loss displayed in the UI would be
FJBDev Mar 5, 2020
1e59d3a
FIT File Import: Change empty string test convention, fix non-bool co…
bbbbbr Mar 5, 2020
103f7cd
French translation
FJBDev Mar 5, 2020
4eead6f
French translation
FJBDev Mar 5, 2020
668212d
Reformatted
FJBDev Mar 6, 2020
a662b18
Warning removal
FJBDev Mar 6, 2020
07fe472
reformatted
FJBDev Mar 6, 2020
8f9989d
Reformatted
FJBDev Mar 6, 2020
84ca4c4
More reformatting
FJBDev Mar 6, 2020
8b6ff23
Updating the 3D USGS layer names as they have changed in WorldWind 2.1
FJBDev Mar 6, 2020
5dba438
Readme update
FJBDev Mar 6, 2020
67e05ba
readme update
FJBDev Mar 6, 2020
fa8edbf
2020
FJBDev Mar 6, 2020
2e56780
Merge pull request #178 from bbbbbr/feature_fitfile_import_tourtype_2
wolfgang-ch Mar 7, 2020
4fde821
minor changes
wolfgang-ch Mar 7, 2020
a509e74
Merge pull request #173 from FJBDev/20-next
wolfgang-ch Mar 7, 2020
092d3ae
Merge branch 'FJBDev'
wolfgang-ch Mar 7, 2020
79c5b38
reverted formatting
wolfgang-ch Mar 7, 2020
4dff557
prepare 20.3
wolfgang-ch Mar 7, 2020
6f1d5e5
20.2 -> 20.3
wolfgang-ch Mar 7, 2020
08f36d4
replaced wrong version numer 2.0 with 2.1 in all worldwind projects a…
wolfgang-ch Mar 7, 2020
597d8df
replaced wrong version numer 2.0 with 2.1 in remaining worldwind proj…
wolfgang-ch Mar 7, 2020
441f3ab
Merge pull request #47 from wolfgang-ch/master
telemaxx Mar 7, 2020
5ab9f99
default height was tooooo small for Linux
Mar 7, 2020
2f6406e
swt.default works in win very good
wolfgang-ch Mar 7, 2020
ee61342
Merge remote-tracking branch 'origin/master' into map25-experimental
telemaxx Mar 7, 2020
231675c
MapPosition_with_MarkerPosition
telemaxx Mar 7, 2020
4301052
20.3 readme
wolfgang-ch Mar 8, 2020
d560d6a
Ensure that sleak options are set when sleak is enabled.
wolfgang-ch Mar 22, 2020
577dfb9
fixed: "ReferenceError: normal is not defined"
wolfgang-ch Apr 3, 2020
3fa5639
adjusted folder name as it is used as git repo name
wolfgang-ch Apr 9, 2020
1f7ba2f
Refactoring MapBookmakView to simplify translator work
telemaxx Apr 14, 2020
967694d
removing localisations for changed strings
telemaxx Apr 14, 2020
09f4740
Merge pull request #50 from wolfgang-ch/master
telemaxx Apr 14, 2020
ee30a66
Merge remote-tracking branch 'origin/master' into map25-experimental
telemaxx Apr 14, 2020
4941cb4
removing some "<<<<<<< HEAD"
telemaxx Apr 14, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#define AppYear "2019"
#define AppVersion "19.10.0"
#define AppYear "2020"
#define AppVersion "20.3.0"

#define AppSubVersion ""
;#define AppSubVersion "_BETA_1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.chart.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook.chart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.common.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook.common
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.device.garmin.fit.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook.device.garmin.fit
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.device.garmin.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook.device.garmin
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.device.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook.device
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.device.nmea.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook.device.nmea
2 changes: 1 addition & 1 deletion LANGUAGE-FRAGMENTS/net.tourbook.nl/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.photo.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook.photo
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.printing.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook.printing
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.statistics.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook.statistics
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.web.nl;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Fragment-Host: net.tourbook.web
4 changes: 2 additions & 2 deletions LANGUAGE-FRAGMENTS/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>mytourbook-i18</artifactId> <groupId>net.tourbook</groupId>
<version>19.10.0-SNAPSHOT</version>
<version>20.3.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<artifactId>mytourbook-app</artifactId> <groupId>net.tourbook</groupId>
<version>19.10.0-SNAPSHOT</version>
<version>20.3.0-SNAPSHOT</version>

<relativePath>../../MT/mytourbook/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion LANGUAGE-FRAGMENTS/translation-test/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="feature.net.tourbook.app.nl"
label="MyTourbook Translation Test"
version="19.10.0.qualifier">
version="20.3.0.qualifier">

<description>
Test translated texts.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.chart;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.common;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.device.garmin.fit;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.device.garmin;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.device.nmea;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.device;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.photo;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.printing;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.statistics;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook.web;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Language support
Bundle-SymbolicName: net.tourbook;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>build.eclipse.4.12.nl.repo</name>
<name>build.eclipse.4.14.nl.repo</name>
<comment></comment>
<projects>
</projects>
Expand Down
18 changes: 18 additions & 0 deletions build/build.eclipse.4.14.nl.repo/How to update this p2 repo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
###########################
Update Eclipse NL repo
###########################

- Install/update Eclipse NL jar files for all used languages in the current Eclipse IDE installation

- The Eclipse NL files can be downloaded from https://www.eclipse.org/babel/downloads.php

- MT 20.2 is using these NL files:

BabelLanguagePack-eclipse-cs_4.14.0.v20200113020001.zip
BabelLanguagePack-eclipse-de_4.14.0.v20200113020001.zip
BabelLanguagePack-eclipse-es_4.14.0.v20200113020001.zip
BabelLanguagePack-eclipse-fr_4.14.0.v20200113020001.zip
BabelLanguagePack-eclipse-it_4.14.0.v20200113020001.zip
BabelLanguagePack-eclipse-nl_4.14.0.v20200113020001.zip

- Export "feature.net.tourbook.ext.eclipse.nl" as deployable feature into this folder "build\build.eclipse.4.14.nl.repo"
2 changes: 1 addition & 1 deletion build/build.net.tourbook.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="build.net.tourbook.feature"
label="MyTourbook Product Features"
version="19.10.0.qualifier"
version="20.3.0.qualifier"
provider-name="MyTourbook">

<description>
Expand Down
2 changes: 1 addition & 1 deletion build/build.net.tourbook.product/net.tourbook.product
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<product

version ="19.10.0.qualifier"
version ="20.3.0.qualifier"

name ="MyTourbook Product"
id ="net.tourbook.product"
Expand Down
4 changes: 2 additions & 2 deletions build/build.net.tourbook.product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>mytourbook-product</artifactId> <groupId>net.tourbook</groupId>
<version>19.10.0-SNAPSHOT</version>
<version>20.3.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<parent>
<artifactId>mytourbook-build</artifactId> <groupId>net.tourbook</groupId>
<version>19.10.0-SNAPSHOT</version>
<version>20.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion build/build.net.tourbook/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {

id 'com.github.dkorotych.gradle-maven-exec' version '1.2.1'
id 'com.github.dkorotych.gradle-maven-exec' version '2.2.1'
}

// get MT version and remove quotes
Expand Down
2 changes: 1 addition & 1 deletion build/build.update-site-no-NL/category.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/feature.net.tourbook.app_19.10.0.qualifier.jar" id="feature.net.tourbook.app" version="19.10.0.qualifier">
<feature url="features/feature.net.tourbook.app_20.3.0.qualifier.jar" id="feature.net.tourbook.app" version="20.3.0.qualifier">
<category name="MyTourbook"/>
</feature>
<category-def name="MyTourbook" label="MyTourbook"/>
Expand Down
4 changes: 2 additions & 2 deletions build/build.update-site-no-NL/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>mytourbook-update-site</artifactId> <groupId>net.tourbook</groupId>
<version>19.10.0-SNAPSHOT</version>
<version>20.3.0-SNAPSHOT</version>

<packaging>eclipse-repository</packaging>

<parent>
<artifactId>mytourbook-app</artifactId> <groupId>net.tourbook</groupId>
<version>19.10.0-SNAPSHOT</version>
<version>20.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions build/build.update-site/category.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/feature.net.tourbook.app_19.10.0.qualifier.jar" id="feature.net.tourbook.app" version="19.10.0.qualifier">
<feature url="features/feature.net.tourbook.app_20.3.0.qualifier.jar" id="feature.net.tourbook.app" version="20.3.0.qualifier">
<category name="MyTourbook"/>
</feature>
<feature url="features/feature.net.tourbook.app.nl_19.10.0.qualifier.jar" id="feature.net.tourbook.app.nl" version="19.10.0.qualifier">
<feature url="features/feature.net.tourbook.app.nl_20.3.0.qualifier.jar" id="feature.net.tourbook.app.nl" version="20.3.0.qualifier">
<category name="MyTourbook"/>
</feature>
<category-def name="MyTourbook" label="MyTourbook"/>
Expand Down
4 changes: 2 additions & 2 deletions build/build.update-site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>mytourbook-update-site</artifactId> <groupId>net.tourbook</groupId>
<version>19.10.0-SNAPSHOT</version>
<version>20.3.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<parent>
<artifactId>mytourbook-app</artifactId> <groupId>net.tourbook</groupId>
<version>19.10.0-SNAPSHOT</version>
<version>20.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>mytourbook-build</artifactId> <groupId>net.tourbook</groupId>
<version>19.10.0-SNAPSHOT</version>
<version>20.3.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<artifactId>mytourbook-app</artifactId> <groupId>net.tourbook</groupId>
<version>19.10.0-SNAPSHOT</version>
<version>20.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions bundles/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ subprojects {

allprojects {

ext.gdxVersion = '1.9.9'
ext.slf4jVersion = '1.7.25'
ext.gdxVersion = '1.9.10'
ext.slf4jVersion = '1.7.28'
}
2 changes: 1 addition & 1 deletion bundles/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
2 changes: 1 addition & 1 deletion bundles/net.tourbook.branding/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: net.tourbook.branding
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Vendor: MyTourbook
Bundle-ActivationPolicy: lazy
Bundle-Name: Branding plugin
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.chart/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Chart-Engine
Bundle-SymbolicName: net.tourbook.chart;singleton:=true
Bundle-Version: 19.10.0.qualifier
Bundle-Version: 20.3.0.qualifier
Bundle-Activator: net.tourbook.chart.Activator
Bundle-Vendor: MyTourbook
Bundle-Localization: plugin
Expand Down
8 changes: 4 additions & 4 deletions bundles/net.tourbook.chart/plugin_nl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
Command_chart_next_month = Volgende maand
Command_chart_next_month_mnemonic = N
Command_chart_next_month_tooltip = Naar volgende maand scrollen
Command_chart_previous_month = Voorafgaande maand
Command_chart_previous_month = Vorige maand
Command_chart_previous_month_mnemonic = V
Command_chart_previous_month_tooltip = Naar voorafgaande maand scrollen
Command_chart_previous_month_tooltip = Naar vorige maand scrollen
Command_chart_zoom_fit_to_graph = Grafiek aan de raamgroote aanpassen
Command_chart_zoom_fit_to_graph_mnemonic = F
Command_chart_zoom_fit_to_graph_tooltip = Grafiek aan raamgrootte aanpassen
Command_chart_zoom_in = Inzoomen
Command_chart_zoom_in_mnemonic = i
Command_chart_zoom_in_tooltip = In de grafiek erin zoomen
Command_chart_zoom_in_tooltip = Inzoomen op de grafiek
Command_chart_zoom_out = Uitzoomen
Command_chart_zoom_out_mnemonic = a
Command_chart_zoom_out_tooltip = Uit de grafiek eruit zoomen
Command_chart_zoom_out_tooltip = Uitzoomen op de grafiek