Skip to content

Commit

Permalink
Merge pull request #167 from telemaxx/map25-experimental
Browse files Browse the repository at this point in the history
Map25 experimental: Mapilion map, vtm 0.13, externalyzing
  • Loading branch information
wolfgang-ch committed Apr 15, 2020
2 parents 6ab3978 + 4941cb4 commit 48adbe4
Show file tree
Hide file tree
Showing 422 changed files with 55,657 additions and 51,099 deletions.
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

0 comments on commit 48adbe4

Please sign in to comment.