From 91b72650132900084810e58144e2d7cc91150924 Mon Sep 17 00:00:00 2001 From: activityworkshop Date: Sat, 6 Feb 2021 12:09:13 +0100 Subject: [PATCH] Version 20.2, January 2021 --- src/tim/prune/GpsPrune.java | 4 +- src/tim/prune/copyright.txt | 2 +- src/tim/prune/function/AboutScreen.java | 2 +- src/tim/prune/function/AddTimeOffset.java | 2 +- src/tim/prune/function/ProjectPoint.java | 2 - .../prune/function/settings/SetLanguage.java | 4 +- src/tim/prune/gui/profile/ProfileChart.java | 7 ++- src/tim/prune/lang/prune-texts_fr.properties | 14 ++++- src/tim/prune/lang/prune-texts_sv.properties | 56 +++++++++++++++++++ src/tim/prune/readme.txt | 15 +++-- 10 files changed, 92 insertions(+), 16 deletions(-) diff --git a/src/tim/prune/GpsPrune.java b/src/tim/prune/GpsPrune.java index a7e0f49..1b6872c 100644 --- a/src/tim/prune/GpsPrune.java +++ b/src/tim/prune/GpsPrune.java @@ -38,9 +38,9 @@ import tim.prune.gui.profile.ProfileChart; public class GpsPrune { /** Version number of application, used in about screen and for version check */ - public static final String VERSION_NUMBER = "20.1"; + public static final String VERSION_NUMBER = "20.2"; /** Build number, just used for about screen */ - public static final String BUILD_NUMBER = "382"; + public static final String BUILD_NUMBER = "384"; /** Static reference to App object */ private static App APP = null; diff --git a/src/tim/prune/copyright.txt b/src/tim/prune/copyright.txt index db7f2dd..76ebed3 100644 --- a/src/tim/prune/copyright.txt +++ b/src/tim/prune/copyright.txt @@ -1,4 +1,4 @@ -The source code of GpsPrune is copyright 2006-2020 activityworkshop.net +The source code of GpsPrune is copyright 2006-2021 activityworkshop.net and is distributed under the terms of the Gnu GPL version 2. Portions of the package jpeg.drew were taken diff --git a/src/tim/prune/function/AboutScreen.java b/src/tim/prune/function/AboutScreen.java index c8044b4..6f98fcd 100644 --- a/src/tim/prune/function/AboutScreen.java +++ b/src/tim/prune/function/AboutScreen.java @@ -97,7 +97,7 @@ public class AboutScreen extends GenericFunction descBuffer.append("

").append(I18nManager.getText("dialog.about.summarytext3")).append("

"); descBuffer.append("

").append(I18nManager.getText("dialog.about.languages")).append(" : ") .append("afrikaans, \u010de\u0161tina, deutsch, english, espa\u00F1ol, fran\u00E7ais, italiano,
" + - " magyar, nederlands, polski, portugu\u00EAs, rom\u00E2n\u0103, suomi, \u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian),
" + + " magyar, nederlands, polski, portugu\u00EAs, rom\u00E2n\u0103, suomi, svenska, \u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian),
" + " \u4e2d\u6587 (chinese), \u65E5\u672C\u8A9E (japanese), \uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean), schwiizerd\u00FC\u00FCtsch

"); descBuffer.append("

").append(I18nManager.getText("dialog.about.translatedby")).append("

"); JEditorPane descPane = new JEditorPane("text/html", descBuffer.toString()); diff --git a/src/tim/prune/function/AddTimeOffset.java b/src/tim/prune/function/AddTimeOffset.java index 115bfa5..9e8306f 100644 --- a/src/tim/prune/function/AddTimeOffset.java +++ b/src/tim/prune/function/AddTimeOffset.java @@ -104,7 +104,7 @@ public class AddTimeOffset extends GenericFunction JPanel descPanel = new JPanel(); descPanel.setLayout(new GridLayout(0, 2)); descPanel.add(makeRightLabel("dialog.addtimeoffset.days")); - _dayField = new WholeNumberField(3); + _dayField = new WholeNumberField(4); descPanel.add(_dayField); descPanel.add(makeRightLabel("dialog.addtimeoffset.hours")); _hourField = new WholeNumberField(3); diff --git a/src/tim/prune/function/ProjectPoint.java b/src/tim/prune/function/ProjectPoint.java index 10c0675..ccdc509 100644 --- a/src/tim/prune/function/ProjectPoint.java +++ b/src/tim/prune/function/ProjectPoint.java @@ -202,7 +202,6 @@ public class ProjectPoint extends GenericFunction final double projectRads = Distance.convertDistanceToRadians(_distanceField.getValue(), distUnit); final double origLatRads = Math.toRadians(currPoint.getLatitude().getDouble()); final double origLonRads = Math.toRadians(currPoint.getLongitude().getDouble()); - System.out.println("Project from: " + origLatRads + ", " + origLonRads); final double bearingRads = Math.toRadians(_bearingField.getValue()); double lat2 = Math.asin(Math.sin(origLatRads) * Math.cos(projectRads) @@ -212,7 +211,6 @@ public class ProjectPoint extends GenericFunction double finalLatDeg = Math.toDegrees(lat2); double finalLonDeg = Math.toDegrees(lon2); - System.out.println("Result is: lat=" + finalLatDeg + ", lon=" + finalLonDeg); // Create point and append to track DataPoint point = new DataPoint(new Latitude(finalLatDeg, Coordinate.FORMAT_DEG), diff --git a/src/tim/prune/function/settings/SetLanguage.java b/src/tim/prune/function/settings/SetLanguage.java index d6edd8b..b64f906 100644 --- a/src/tim/prune/function/settings/SetLanguage.java +++ b/src/tim/prune/function/settings/SetLanguage.java @@ -43,12 +43,12 @@ public class SetLanguage extends GenericFunction /** Names of languages for display in dropdown (not translated) */ private static final String[] LANGUAGE_NAMES = {"afrikaans", "\u010de\u0161tina", "deutsch", "english", "american english", "espa\u00F1ol", "fran\u00E7ais", "italiano", "magyar", "nederlands", "polski", "portugu\u00EAs", "rom\u00E2n\u0103", - "suomi", "\u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian)", "\u4e2d\u6587 (chinese)", + "suomi", "svenska", "\u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian)", "\u4e2d\u6587 (chinese)", "\u65E5\u672C\u8A9E (japanese)", "\uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean)", "schwiizerd\u00FC\u00FCtsch" }; /** Associated language codes (must be in same order as names!) */ private static final String[] LANGUAGE_CODES = {"af", "cz", "de", "en", "en_us", "es", "fr", "it", "hu", - "nl", "pl", "pt", "ro", "fi", "ru", "zh", "ja", "ko", "de_ch" + "nl", "pl", "pt", "ro", "fi", "sv", "ru", "zh", "ja", "ko", "de_ch" }; diff --git a/src/tim/prune/gui/profile/ProfileChart.java b/src/tim/prune/gui/profile/ProfileChart.java index 5d18e1e..95d8004 100644 --- a/src/tim/prune/gui/profile/ProfileChart.java +++ b/src/tim/prune/gui/profile/ProfileChart.java @@ -382,6 +382,11 @@ public class ProfileChart extends GenericDisplay implements MouseListener */ private synchronized void makePopup() { + if (_track.getNumPoints() < 1) + { + _popup = null; + return; + } _popup = new JPopupMenu(); JMenuItem altItem = new JMenuItem(I18nManager.getText("fieldname.altitude")); altItem.addActionListener(new ActionListener() { @@ -527,7 +532,7 @@ public class ProfileChart extends GenericDisplay implements MouseListener } } } - else + else if (_popup != null) { // right clicks _popup.show(this, e.getX(), e.getY()); diff --git a/src/tim/prune/lang/prune-texts_fr.properties b/src/tim/prune/lang/prune-texts_fr.properties index 26981e4..4294192 100644 --- a/src/tim/prune/lang/prune-texts_fr.properties +++ b/src/tim/prune/lang/prune-texts_fr.properties @@ -37,6 +37,7 @@ menu.view.browser.openstreetmap=Openstreetmap menu.view.browser.mapquest=Mapquest menu.view.browser.yahoo=Cartes Yahoo menu.view.browser.bing=Cartes Bing +menu.view.browser.inlinemap=Carte du roller menu.settings=Pr\u00e9f\u00e9rences menu.settings.onlinemode=Charger cartes depuis internet menu.settings.autosave=Sauver automatiquement en quittant @@ -97,7 +98,9 @@ function.rearrangewaypoints=R\u00e9arranger les points de navigation function.convertnamestotimes=Convertir les noms de points de navigation en horodatages function.deletefieldvalues=Effacer les valeurs du champ function.findwaypoint=Trouver un waypoint -function.pastecoordinates=Coller les coordonn\u00e9es +function.pastecoordinates=Entrer coordonn\u00e9es d'un point +function.pastecoordinatelist=Entrer liste de coordonn\u00e9es +function.enterpluscode=Entrer code plus function.charts=Graphiques function.show3d=Montrer en 3D function.distances=Distances @@ -122,6 +125,7 @@ function.duplicatepoint=Dupliquer le point function.setcolours=Choisir les couleurs function.setdisplaysettings=Pr\u00e9f\u00e9rences d'affichage function.setlanguage=Choisir la langue +function.projectpoint=Projeter le point function.connecttopoint=Relier au point function.disconnectfrompoint=D\u00e9tacher du point function.removephoto=Retirer la photo @@ -424,7 +428,10 @@ dialog.compress.confirmnone=Pas de points marqu\u00e9s dialog.deletemarked.nonefound=Pas de donn\u00e9es \u00e0 effacer dialog.pastecoordinates.desc=Entrez ou collez les coordonn\u00e9es ici dialog.pastecoordinates.coords=Coordonn\u00e9es -dialog.pastecoordinates.nothingfound=V\u00e9rifier les coordonn\u00e9es et essayez \u00e0 nouveau +dialog.pastecoordinates.nothingfound=V\u00e9rifiez les coordonn\u00e9es et essayez \u00e0 nouveau +dialog.pluscode.desc=Entrez ou collez le code ici +dialog.pluscode.code=Code Plus +dialog.pluscode.nothingfound=V\u00e9rifiez le code et essayez \u00e0 nouveau dialog.help.help=Consultez la page\n https://gpsprune.activityworkshop.net/\npour plus de d\u00e9tails et des manuels utilisateur. dialog.about.version=Version dialog.about.build=Build @@ -561,6 +568,7 @@ dialog.autoplay.usetimestamps=Utiliser information de temps dialog.autoplay.rewind=Retour au d\u00e9but dialog.autoplay.pause=Pause dialog.autoplay.play=Jouer +dialog.projectpoint.bearing=Azimut (degr\u00e8s du nord) # 3d window dialog.3d.title=Vue 3D de GpsPrune @@ -721,6 +729,7 @@ fieldname.duration=Dur\u00e9e fieldname.speed=Vitesse fieldname.verticalspeed=Vitesse verticale fieldname.description=Description +fieldname.comment=Commentaire fieldname.mediafilename=Nom de fichier # Measurement units @@ -820,6 +829,7 @@ error.load.nopoints=Aucune coordonn\u00e9e trouv\u00e9e dans le fichier error.load.unknownxml=Format xml non-reconnu : error.load.noxmlinzip=Aucune xml fichier trouv\u00e9e dans le fichier error.load.othererror=Erreur \u00e0 la lecture du fichier : +error.load.nopointsintext=Aucune coordonn\u00e9e trouv\u00e9e error.jpegload.dialogtitle=Erreur au chargement des photos error.jpegload.nofilesfound=Aucun fichier trouv\u00e9 error.jpegload.nojpegsfound=Aucun fichier jpeg trouv\u00e9 diff --git a/src/tim/prune/lang/prune-texts_sv.properties b/src/tim/prune/lang/prune-texts_sv.properties index f7ed52e..b2a1bfe 100644 --- a/src/tim/prune/lang/prune-texts_sv.properties +++ b/src/tim/prune/lang/prune-texts_sv.properties @@ -515,11 +515,35 @@ dialog.diskcache.table.tiles=Kart-rutor ("tiles") dialog.diskcache.table.megabytes=Megabytes dialog.diskcache.tileset=Upps\u00e4ttning kart-rutor ("tiles") dialog.diskcache.tileset.multiple=multipla +dialog.diskcache.deleteold=Ta bort gamla kart-rutor ("tiles") +dialog.diskcache.maximumage=Max antal dagar gammal +dialog.diskcache.deleteall=Ta bort alla kart-rutor ("tiles") +dialog.diskcache.deleted=Ta bort %d filer fr\u00e5n cachen +dialog.deletefieldvalues.intro=V\u00e4lj f\u00e4lt att ta bort f\u00f6r det valda intervallet +dialog.deletefieldvalues.nofields=Det finns inga f\u00e4lt att ta bort f\u00f6r detta intervallet +dialog.displaysettings.linewidth=Linjetjocklek f\u00f6r sp\u00e5ren (1-4) +dialog.displaysettings.antialias=Anv\u00e4nd kantutj\u00e4mning ("antialiasing") +dialog.displaysettings.waypointicons=Waypoint-ikon +dialog.displaysettings.wpicon.ringpt=Rund mark\u00f6r +dialog.displaysettings.wpicon.plectrum=Plektrum +dialog.displaysettings.wpicon.ring=Ring +dialog.displaysettings.wpicon.pin=H\u00e4ftstift +dialog.displaysettings.size.small=Liten +dialog.displaysettings.size.medium=Mellan +dialog.displaysettings.size.large=Stor +dialog.displaysettings.windowstyle=F\u00f6nster-stil (kr\u00e4ver omstart) +dialog.displaysettings.windowstyle.nimbus=Nimbus +dialog.displaysettings.windowstyle.gtk=GTK +dialog.downloadosm.desc=Bekr\u00e4fta att OSM-r\u00e5data laddas ner f\u00f6r det specifika omr\u00e5det: +dialog.searchwikipedianames.search=S\u00f6k efter: +dialog.weather.location=Plats +dialog.weather.update=Prognos uppdaterad dialog.weather.sunrise=Soluppg\u00e5ng dialog.weather.sunset=Solnedg\u00e5ng dialog.weather.temperatureunits=Temperaturer dialog.weather.currentforecast=Nuvarande v\u00e4der dialog.weather.dailyforecast=Flerdygnsprognos +dialog.weather.3hourlyforecast=3-timmars-prognos dialog.weather.day.now=Nuvarande v\u00e4der dialog.weather.day.today=Idag dialog.weather.day.tomorrow=Imorgon @@ -533,17 +557,49 @@ dialog.weather.day.sunday=S\u00f6ndag dialog.weather.wind=Vind dialog.weather.temp=Temp dialog.weather.humidity=Fuktighet +dialog.weather.creditnotice=Denna data har tillhandah\u00e5llits av openweathermap.org. Mer detaljer finns p\u00e5 deras hemsida. +dialog.deletebydate.onlyonedate=Alla punkter \u00e4r fr\u00e5n samma datum. +dialog.deletebydate.intro=F\u00f6r varje datum i sp\u00e5ret kan du v\u00e4lja att ta bort eller beh\u00e5lla punkterna dialog.deletebydate.nodate=Ingen tidsst\u00e4mpel dialog.deletebydate.column.keep=Beh\u00e5ll dialog.deletebydate.column.delete=Ta bort +dialog.settimezone.intro=H\u00e4r kan du v\u00e4lja i vilken tidszon du vill visa punkternas tidsst\u00e4mplar dialog.settimezone.system=Anv\u00e4nd systemets tidszon dialog.settimezone.custom=Anv\u00e4nd f\u00f6ljande tidszon: +dialog.settimezone.list.toomany=F\u00f6r m\u00e5nga f\u00f6r att v\u00e4lja dialog.settimezone.selectedzone=Vald tidszon dialog.settimezone.offsetfromutc=Offset fr\u00e5n UTC +dialog.autoplay.duration=L\u00e4ngd (sekunder) dialog.autoplay.usetimestamps=Anv\u00e4nd tidsst\u00e4mplar fr\u00e5n punkter dialog.autoplay.rewind=Tillbaka till b\u00f6rjan dialog.autoplay.pause=Paus dialog.autoplay.play=Spela upp +dialog.markers.halves=Halvv\u00e4gs-punkter +dialog.markers.half.distance=Halva avst\u00e5ndet +dialog.markers.half.climb=Halva kl\u00e4ttringen +dialog.markers.half.descent=Halva nedstigningen +dialog.projectpoint.desc=Fyll i riktning och avst\u00e5nd f\u00f6r att projicera denna punkt +dialog.projectpoint.bearing=B\u00e4ring (grader fr\u00e5n N) + +# 3d window +dialog.3d.title=GpsPrune 3D-vy +dialog.3d.altitudefactor=F\u00f6rst\u00e4rkningsfaktor f\u00f6r h\u00f6jddata + +# Confirm messages +confirm.loadfile=Data inladdat fr\u00e5n filen +confirm.save.ok1=Det gick bra att spara +confirm.save.ok2=punkter till filen +confirm.deletepoint.single=datapunkt togs bort +confirm.deletepoint.multi=datapunkter togs bort +confirm.point.edit=punkt redigerad +confirm.mergetracksegments=Sp\u00e5r-segment ihopslagna +confirm.reverserange=Intervall v\u00e4ndes +confirm.addtimeoffset=Tids-offset tillagt +confirm.addaltitudeoffset=H\u00f6jdoffset tillagt +confirm.rearrangewaypoints=Waypoint:ar omarrangerade +confirm.rearrangephotos=Foton omarrangerade +confirm.splitsegments=segment delades upp i %d delar +confirm.sewsegments=segment slogs ihop p\u00e5 %d st\u00e4llen # Buttons button.ok=OK diff --git a/src/tim/prune/readme.txt b/src/tim/prune/readme.txt index 405a536..618513d 100644 --- a/src/tim/prune/readme.txt +++ b/src/tim/prune/readme.txt @@ -1,11 +1,11 @@ -GpsPrune version 20.1 +GpsPrune version 20.2 ===================== GpsPrune is an application for viewing, editing and managing coordinate data from GPS systems, including format conversion, charting, 3d visualisation, audio and photo correlation, and online resource lookup. Full details can be found at https://gpsprune.activityworkshop.net/ -GpsPrune is copyright 2006-2020 activityworkshop.net and distributed under the terms of the Gnu GPL version 2. +GpsPrune is copyright 2006-2021 activityworkshop.net and distributed under the terms of the Gnu GPL version 2. You may freely use the software, and may help others to freely use it too. For further information on your rights and how they are protected, see the included license.txt file. @@ -17,7 +17,7 @@ Running ======= To run GpsPrune from the jar file, simply call it from a command prompt or shell: - java -jar gpsprune_20.1.jar + java -jar gpsprune_20.2.jar If the jar file is saved in a different directory, you will need to include the path. Depending on your system settings, you may be able to click or double-click on the jar file @@ -25,9 +25,16 @@ in a file manager window to execute it. A shortcut, menu item, alias, desktop i or other link can of course be made should you wish. To specify a language other than the default, use an additional parameter, eg: - java -jar gpsprune_20.1.jar --lang=DE + java -jar gpsprune_20.2.jar --lang=DE +New with version 20.2 +===================== +The following fixes and additions were made since version 20.1: + - Fix for intermittent startup problems + - Addition of Swedish (erikiiofph7) + - Allow four digits for adding day offsets (fperrin) + New with version 20.1 ===================== The following fixes and additions were made since version 20: -- 2.43.0