Version 17.2, February 2015

diff --git a/tim/prune/App.java b/tim/prune/App.java
index c69d73e484463a722f68fcab2acde659e6337e73..7be82425ddc3e1628cf0d2c62343d3d50e7c3e47 100644 (file)
--- a/tim/prune/App.java
+++ b/tim/prune/App.java
@@ -566,7 +566,7 @@ public class App
                _trackInfo.selectPoint(inIndex);
                final int selStart = _trackInfo.getSelection().getStart();
                final int selEnd   = _trackInfo.getSelection().getEnd();
-               if (selStart < inIndex && selEnd > inIndex)
+               if (selStart < inIndex && selEnd >= inIndex)
                {
                        // Extend end of selection by 1
                        _trackInfo.getSelection().selectRange(selStart, selEnd+1);

diff --git a/tim/prune/GpsPrune.java b/tim/prune/GpsPrune.java
index e3821707f9b2328a38da12508fa1d99b5e10e725..e8cfad5c1e429343b689d0cb9b34ab8f2084a29e 100644 (file)
--- a/tim/prune/GpsPrune.java
+++ b/tim/prune/GpsPrune.java
@@ -29,16 +29,16 @@ import tim.prune.gui.profile.ProfileChart;
 /**
  * GpsPrune is a tool to visualize, edit, convert and prune GPS data
  * Please see the included readme.txt or http://activityworkshop.net
- * This software is copyright activityworkshop.net 2006-2014 and made available through the Gnu GPL version 2.
+ * This software is copyright activityworkshop.net 2006-2015 and made available through the Gnu GPL version 2.
  * For license details please see the included license.txt.
  * GpsPrune is the main entry point to the application, including initialisation and launch
  */
 public class GpsPrune
 {
        /** Version number of application, used in about screen and for version check */
-       public static final String VERSION_NUMBER = "17";
+       public static final String VERSION_NUMBER = "17.2";
        /** Build number, just used for about screen */
-       public static final String BUILD_NUMBER = "320";
+       public static final String BUILD_NUMBER = "320b";
        /** Static reference to App object */
        private static App APP = null;
 

diff --git a/tim/prune/data/Coordinate.java b/tim/prune/data/Coordinate.java
index e2b67a8554c996c57e93e40b9e72f6b0ceb6069e..e30fa4ac357d89a68041fa07eee2f76bf5e8ee22 100644 (file)
--- a/tim/prune/data/Coordinate.java
+++ b/tim/prune/data/Coordinate.java
@@ -437,7 +437,7 @@ public abstract class Coordinate
                double startValue = inStart.getDouble();
                double endValue = inEnd.getDouble();
                double newValue = startValue + (endValue - startValue) * inFraction;
-               Coordinate answer = inStart.makeNew(newValue, inStart._originalFormat);
+               Coordinate answer = inStart.makeNew(newValue, Coordinate.FORMAT_DECIMAL_FORCE_POINT);
                return answer;
        }
 

diff --git a/tim/prune/data/Track.java b/tim/prune/data/Track.java
index c56f9f5bcc08cba3c65096fca6299c3aafb1f103..31c9b4edeeaf3cbb04af8468e8f85b8b33932b8d 100644 (file)
--- a/tim/prune/data/Track.java
+++ b/tim/prune/data/Track.java
@@ -552,8 +552,8 @@ public class Track
                        meanAltitude = new Altitude((int) (totalAltitude / numAltitudes), altUnit);
                }
 
-               DataPoint insertedPoint = new DataPoint(new Latitude(meanLatitude, Coordinate.FORMAT_NONE),
-                       new Longitude(meanLongitude, Coordinate.FORMAT_NONE), meanAltitude);
+               DataPoint insertedPoint = new DataPoint(new Latitude(meanLatitude, Coordinate.FORMAT_DECIMAL_FORCE_POINT),
+                       new Longitude(meanLongitude, Coordinate.FORMAT_DECIMAL_FORCE_POINT), meanAltitude);
                // Make into singleton
                insertedPoint.setSegmentStart(true);
                DataPoint nextPoint = getNextTrackPoint(inEndIndex+1);

diff --git a/tim/prune/function/AboutScreen.java b/tim/prune/function/AboutScreen.java
index 5a463a3d61bff35efa3233168728cb409ea28ffc..109d07eaea188a0d58bf68a383efa2fdf3a27f00 100644 (file)
--- a/tim/prune/function/AboutScreen.java
+++ b/tim/prune/function/AboutScreen.java
@@ -200,7 +200,7 @@ public class AboutScreen extends GenericFunction
                        new JLabel(" katpatuka, R\u00E9mi, Marcus, Ali, Javier, Jeroen, prot_d, Gy\u00F6rgy,"),
                        1, 5);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel(" HooAU, Sergey, P\u00E9ter, serhijdubyk"),
+                       new JLabel(" HooAU, Sergey, P\u00E9ter, serhijdubyk, Peter"),
                        1, 6);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
                        new JLabel(I18nManager.getText("dialog.about.credits.translations") + " : "),

diff --git a/tim/prune/function/AsyncMediaLoader.java b/tim/prune/function/AsyncMediaLoader.java
index f8a505aad164aeb85af3a9ca64f48cd6c6920428..78ffc838197450079cf935f6da59cdd1186b35e4 100644 (file)
--- a/tim/prune/function/AsyncMediaLoader.java
+++ b/tim/prune/function/AsyncMediaLoader.java
@@ -8,9 +8,12 @@ import tim.prune.GenericFunction;
 import tim.prune.I18nManager;
 import tim.prune.UpdateMessageBroker;
 import tim.prune.data.AudioClip;
+import tim.prune.data.DataPoint;
+import tim.prune.data.Distance;
 import tim.prune.data.MediaObject;
 import tim.prune.data.Photo;
 import tim.prune.data.Track;
+import tim.prune.data.UnitSetLibrary;
 import tim.prune.load.MediaHelper;
 import tim.prune.load.MediaLoadProgressDialog;
 import tim.prune.undo.UndoLoadAudios;
@@ -99,14 +102,30 @@ implements Runnable, Cancellable
                                MediaObject mf = MediaHelper.createMediaObject(_zipFile, _linkArray[i], _sourceFile);
                                if (mf != null)
                                {
+                                       // Check if the media object has a point now (from exif)
+                                       DataPoint exifPoint = mf.getDataPoint();
                                        // attach media to point and set status
                                        _track.getPoint(i).attachMedia(mf);
-                                       mf.setOriginalStatus(MediaObject.Status.TAGGED);
-                                       mf.setCurrentStatus(MediaObject.Status.TAGGED);
+                                       // Check exif to see whether media was already tagged
+                                       final MediaObject.Status originalMediaStatus =
+                                               (exifPoint == null ? MediaObject.Status.NOT_CONNECTED : MediaObject.Status.TAGGED);
+                                       mf.setOriginalStatus(originalMediaStatus);
+                                       MediaObject.Status currMediaStatus = MediaObject.Status.TAGGED;
+                                       if (exifPoint != null)
+                                       {
+                                               final double distinMetres = Distance.convertRadiansToDistance(
+                                                       DataPoint.calculateRadiansBetween(exifPoint, _track.getPoint(i)),
+                                                       UnitSetLibrary.UNITS_METRES);
+                                               if (distinMetres > 10.0) {
+                                                       currMediaStatus = MediaObject.Status.CONNECTED; // still connected but changed
+                                               }
+                                       }
+                                       mf.setCurrentStatus(currMediaStatus);
                                        media[currLink] = mf;
                                        // update progress
-                                       if (!_app.isBusyLoading())
+                                       if (!_app.isBusyLoading()) {
                                                progressDialog.showProgress(currLink, numLinks);
+                                       }
                                        currLink++;
                                }
                                try {Thread.sleep(100);} catch (InterruptedException ie) {}

diff --git a/tim/prune/function/cache/TileSet.java b/tim/prune/function/cache/TileSet.java
index 3e308ba6366081a7530f6f1e77b4e74c8ffcd086..ca2b81a442fdf2b57136a1232132ef0a4b1c644b 100644 (file)
--- a/tim/prune/function/cache/TileSet.java
+++ b/tim/prune/function/cache/TileSet.java
@@ -1,7 +1,6 @@
 package tim.prune.function.cache;
 
 import java.io.File;
-import java.util.ArrayList;
 
 
 /**
@@ -16,8 +15,6 @@ public class TileSet
        private String _path = null;
        /** Comma-separated list of configs using this tileset */
        private String _usedBy = null;
-       /** List of infos for each zoom level */
-       private ArrayList<RowInfo> _zoomLevels = null;
 
 
        /**
@@ -31,7 +28,6 @@ public class TileSet
                _path = inPath;
                _usedBy = inUsedBy;
                _rowInfo = new RowInfo();
-               _zoomLevels = new ArrayList<RowInfo>();
                // Go through zoom directories and construct row info objects
                if (inDir != null && inDir.exists() && inDir.isDirectory() && inDir.canRead())
                {
@@ -41,7 +37,6 @@ public class TileSet
                                        && subdir.canRead() && isNumeric(subdir.getName()))
                                {
                                        RowInfo row = makeRowInfo(subdir);
-                                       _zoomLevels.add(row);
                                        _rowInfo.addRow(row);
                                }
                        }

diff --git a/tim/prune/gui/images/add_photo_icon.png b/tim/prune/gui/images/add_photo_icon.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/tim/prune/gui/images/add_textfile_icon.png b/tim/prune/gui/images/add_textfile_icon.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/tim/prune/lang/prune-texts_af.properties b/tim/prune/lang/prune-texts_af.properties
index 50d9c807170f6853014997044b609ce0c0f3a2f9..35ef53fbec1ac0a7f2593674ba981d57e98cf4d4 100644 (file)
--- a/tim/prune/lang/prune-texts_af.properties
+++ b/tim/prune/lang/prune-texts_af.properties
@@ -1,37 +1,37 @@
 # Text entries for the GpsPrune application
 # Afrikaans entries
 
-# Menu entries
+## Menu entries
 menu.file=L\u00eaer
 menu.file.addphotos=Voeg Fotos By
+menu.file.recentfiles=Onlangse l\u00eaers
 menu.file.save=Stoor
-menu.file.exit=Gaan Uit
-menu.track=Spoor
+menu.file.exit=Verlaat
+menu.online=Aanlyn
+menu.track=Baan
 menu.track.undo=Herroep
-menu.track.clearundo=Herroep Lys Skoonmaak
-menu.track.deletemarked=Gemerkde Punt Uitvee
-function.rearrangewaypoints=Herrangskik bakens
+menu.track.clearundo=Maak herroep lys skoon
+menu.track.markrectangle=Merk punte
+menu.track.deletemarked=Vee gemerkde punte uit
 menu.range=Reeks
-menu.range.all=Selekteer Alles
-menu.range.none=Selekteer Niks
-menu.range.start=Stel Reeks Begin
-menu.range.end=Stel Reeks Einde
-function.deleterange=Reeks Uitvee
-function.interpolate=Interpoleer punte
-menu.range.average=Gemiddelde Seleksie
-menu.range.reverse=Reeks Omkeer
-menu.range.mergetracksegments=Saamvoeg van spoor segmente
-menu.range.cutandmove=Sny en skuif seleksie
+menu.range.all=Selekteer alles
+menu.range.none=Selekteer niks
+menu.range.start=Stel reeks begin
+menu.range.end=Stel reeks einde
+menu.range.average=Gemiddelde seleksie
+menu.range.reverse=Keer reeks om
+menu.range.mergetracksegments=Voeg baan segmente saam
+menu.range.cutandmove=Knip en skuif seleksie
 menu.point=Punt
-menu.point.editpoint=Redigeer Punt
-menu.point.deletepoint=Punt Uitvee
+menu.point.editpoint=Redigeer punt
+menu.point.deletepoint=Punt uitvee
 menu.photo=Foto
 menu.photo.saveexif=Stoor na Exif
-menu.audio=Audio
-menu.view=Kyk
-menu.view.showsidebars=Wys kantstawe
+menu.audio=Klank
+menu.view=Bekyk
+menu.view.showsidebars=Wys rolstaaf
 menu.view.browser=Kaart in werf blaaier
-menu.view.browser.google=Google Kaarte
+menu.view.browser.google=Google kaarte
 menu.view.browser.openstreetmap=Openstreetmap
 menu.view.browser.mapquest=Mapquest
 menu.view.browser.yahoo=Yahoo Kaarte
@@ -40,19 +40,22 @@ menu.settings=Stellings
 menu.settings.onlinemode=Laai kaarte vanaf internet
 menu.settings.autosave=Autostoor stellings op uitgaan
 menu.help=Hulp
-# Popup menu for map
-menu.map.zoomin=Zoom in
-menu.map.zoomout=Zoom uit
-menu.map.zoomfull=Zoom na vol skaal
+
+## Popup menu for map
+menu.map.zoomin=Zoem in
+menu.map.zoomout=zoem uit
+menu.map.zoomfull=Zoem na volskaal
 menu.map.newpoint=Skep nuwe punt
 menu.map.drawpoints=Skep reeks van punte
-menu.map.connect=Connekteer baan punte
-menu.map.autopan=Automatiese Skuif van Kyk Venster
-menu.map.showmap=Wys Kaart
-menu.map.showscalebar=Wys SkalleerStaaf
+menu.map.connect=Koppel baan punte
+menu.map.autopan=Skuif kyk venster automaties
+menu.map.showmap=Wys kaart
+menu.map.showscalebar=Wys skalleerstaaf
+menu.map.editmode=Wysigingsmode
 
-# Alt keys for menus
+## Alt keys for menus
 altkey.menu.file=L
+altkey.menu.online=N
 altkey.menu.track=B
 altkey.menu.range=R
 altkey.menu.point=P
@@ -62,7 +65,7 @@ altkey.menu.audio=A
 altkey.menu.settings=S
 altkey.menu.help=H
 
-# Ctrl shortcuts for menu items
+## Ctrl shortcuts for menu items
 shortcut.menu.file.open=O
 shortcut.menu.file.load=L
 shortcut.menu.file.save=S
@@ -71,51 +74,78 @@ shortcut.menu.edit.compress=C
 shortcut.menu.range.all=A
 shortcut.menu.help.help=H
 
-# Functions
-function.open=Open L\u00eaer
-function.loadfromgps=Laai van GPS data
-function.sendtogps=Stuur van GPS data
-function.exportkml=KML Uitvoer
-function.exportgpx=GPS Uitvoer
-function.exportpov=POV Uitvoer
-function.exportsvg=SVG Uitvoer
-function.editwaypointname=Redigeer Baken Naam
-function.compress=Kompakteer spoor
+## Functions
+function.open=Open l\u00eaer
+function.importwithgpsbabel=Voer GPSBabel l\u00eaer in
+function.loadfromgps=Laai data vanaf GPS
+function.sendtogps=Stuur data na GPS
+function.exportkml=Voer uit na KML
+function.exportgpx=Voer uit na GPX
+function.exportpov=Voer uit na POV
+function.exportsvg=Voer uit na SVG
+function.exportimage=Voer uit na beeld
+function.editwaypointname=Redigeer baken naam
+function.compress=Kompakteer baan
+function.deleterange=Vee reeks uit
+function.croptrack=Kleinknip baan
+function.interpolate=Interpoleer punte
+function.deletebydate=Vee punte uit volgens datum
 function.addtimeoffset=Voeg tyd spruit by
 function.addaltitudeoffset=Voeg hoogte spruit by
-function.convertnamestotimes=Skakel baken name na tye
+function.rearrangewaypoints=Herrangskik bakens
+function.convertnamestotimes=Skakel baken name oor na tyd stempels
 function.deletefieldvalues=Verwyder veld waardes
-function.findwaypoint=Vind Baken
-function.pastecoordinates=Enter nuwe koordinate
+function.findwaypoint=Vind baken
+function.pastecoordinates=Verskaf nuwe koordinate
 function.charts=Grafieke
-function.show3d=3D Vertoon
+function.show3d=Vertoon 3D
 function.distances=Afstande
 function.fullrangedetails=Vol reeks besonderhede
-function.setmapbg=Stel Kaart agtergrond
+function.estimatetime=Skat tyd
+function.learnestimationparams=Leer tyd skatings paramters
+function.setmapbg=Stel kaart agtergrond
 function.setpaths=Stel program paaie
-function.getgpsies=Kry GPS spore
+function.selectsegment=Selekteer huidige segment
+function.splitsegments=Verdeel baan in segmente
+function.sewsegments=Naai baan segmente aanmekaar
+function.getgpsies=Kry Spsies spore
+function.uploadgpsies=Laai baan op na Gpsies
 function.lookupsrtm=Kry hoogtes vanaf SRTM
-function.duplicatepoint=Dupliseer Punt
+function.downloadsrtm=Laai SRTM te\u00ebls af
+function.getwikipedia=Kry nabye Wikipedia artikels
+function.searchwikipedianames=Soek Wikiepdia volgens naam
+function.searchopencachingde=Soek OpenCaching.de
+function.downloadosm=Laai OSM data vir area af
+function.duplicatepoint=Dupliseer punt
 function.setcolours=Stel kleure
 function.setlinewidth=Stel lyn dikte
 function.setlanguage=Stel tale
-function.connecttopoint=Las foto by huidige punt
-function.disconnectfrompoint=Ontkoppel vanaf huidige punt
+function.connecttopoint=Koppel na punt
+function.disconnectfrompoint=Ontkoppel van huidige punt
 function.removephoto=Verwyder foto
-function.correlatephotos=Korreleer Fotos
+function.correlatephotos=Korreleer fotos
 function.rearrangephotos=Herrangskik fotos
 function.rotatephotoleft=Roteer foto links
 function.rotatephotoright=Roteer foto regs
+function.photopopup=Vertoon foto
 function.ignoreexifthumb=Ignoreer Exif thumbnail
+function.loadaudio=Voeg klank insetsels by
+function.removeaudio=Verwyder klank insetsels
+function.correlateaudios=Korreleer klankgrepe
+function.playaudio=Speel klankgrepe
+function.stopaudio=Stop klankgreep terugspeel
 function.help=Hulp
-function.showkeys=Wys Kortpad sleutels
+function.showkeys=Wys kortpad sleutels
 function.about=Omtrent GpsPrune
 function.checkversion=Kyk vir nuwe weergawe
-function.saveconfig=Stoor Stellings
+function.saveconfig=Stoor stellings
 function.diskcache=Stoor kaarte na skyf
+function.managetilecache=Bestuur te\u00ebl stoor
+function.getweatherforecast=Kry weer voorspelling
+function.setaltitudetolerance=Stel hoogte tolleransie
 
-# Dialogs
-dialog.exit.confirm.title=Uitgaan uit GpsPrune
+## Dialogs
+dialog.exit.confirm.title=Gaan uit GpsPrune
 dialog.exit.confirm.text=Jou data is nie gestoor nie. Is jy seker jy wil uitgaan?
 dialog.openappend.title=Voegby tot bestaande data
 dialog.openappend.text=Voeg hierdie data by die data wat alreeds gelaai is?
@@ -123,59 +153,94 @@ dialog.deletepoint.title=Vee punt uit
 dialog.deletepoint.deletephoto=Vee aangehegde foto van die punt uit?
 dialog.deletephoto.title=Vee foto uit
 dialog.deletephoto.deletepoint=Vee punt uit wat aan hierdie foto geheg is?
-dialog.openoptions.title=Oopmaak Opsies
-dialog.openoptions.filesnippet=Ekstrak vanuit L\u00eaer
+dialog.deleteaudio.deletepoint=Vee punt uit wat aan hierdie klankgreep geheg is?
+dialog.openoptions.title=Maak opsies oop
+dialog.openoptions.filesnippet=Uittreksel vanuit L\u00eaer
 dialog.load.table.field=Veld
-dialog.load.table.datatype=Data Tipe
+dialog.load.table.datatype=Datatipe
 dialog.load.table.description=Beskrywing
-dialog.delimiter.label=Veld Skeiding Karakter
+dialog.delimiter.label=Veld skeidings karakter
 dialog.delimiter.comma=Komma ,
-dialog.delimiter.tab=Tab
+dialog.delimiter.tab=Oortjie
 dialog.delimiter.space=Spasie
-dialog.delimiter.semicolon=Komma Punt ;
+dialog.delimiter.semicolon=Kommapunt ;
 dialog.delimiter.other=Ander
 dialog.openoptions.deliminfo.records=Rekords, met
 dialog.openoptions.deliminfo.fields=velde
 dialog.openoptions.deliminfo.norecords=Geen rekords
 dialog.openoptions.altitudeunits=Hoogte eenhede
-dialog.open.contentsdoubled=Hierdie leer bevat twee kopie van elke punt,\n once eenkeer as baken en eenkeer as spoor punt
-dialog.selecttracks.intro=Selekteer die spoor of spore om te laai
-dialog.selecttracks.noname=on benaamd
+dialog.openoptions.speedunits=Spoed eenhede
+dialog.openoptions.vertspeedunits=Vertikale eenhede
+dialog.openoptions.vspeed.positiveup=Positiewe spoed opwaarts
+dialog.openoptions.vspeed.positivedown=Positiewe spoed afwaarts
+dialog.open.contentsdoubled=Hierdie leer bevat twee kopi\u00eb van elke punt,\n eenkeer as baken en eenkeer as baan punt
+dialog.selecttracks.intro=Selekteer die baan of bane om te laai
+dialog.selecttracks.noname=naamlose
 dialog.jpegload.subdirectories=Sluit sub-gidse in
 dialog.jpegload.loadjpegswithoutcoords=Sluit fotos sonder koordinate in
 dialog.jpegload.loadjpegsoutsidearea=Sluit foto buitekant huidige area in
-dialog.jpegload.progress.title=Fotos Laai
-dialog.jpegload.progress=Wag asseblief terwyl fotos gesoek word
+dialog.jpegload.progress.title=Fotos laai
+dialog.jpegload.progress=Wag asseblief terwyl na fotos gesoek word
 dialog.gpsload.nogpsbabel=Geen gpsbabel program kon gevind word. Gaanvoort?
 dialog.gpsload.device=Apparaat naam
 dialog.gpsload.format=Formaat
-dialog.gpsload.getwaypoints=Laai Bakens
-dialog.gpsload.gettracks=Laai spore
+dialog.gpsload.getwaypoints=Laai bakens
+dialog.gpsload.gettracks=Laai bane
 dialog.gpsload.save=Stoor na l\u00eaer
-dialog.gpssend.sendwaypoints=Stuur Bakens
-dialog.gpssend.sendtracks=Stuur Spore
-dialog.gpssend.trackname=Spoor name
-dialog.saveoptions.title=Stoor L\u00eaer
+dialog.gpssend.sendwaypoints=Stuur bakens
+dialog.gpssend.sendtracks=Stuur bane
+dialog.gpssend.trackname=Baan name
+dialog.gpsbabel.filters=Filters
+dialog.addfilter.title=Voeg filter by
+dialog.gpsbabel.filter.discard=Weggooi
+dialog.gpsbabel.filter.simplify=Vereenvoudig
+dialog.gpsbabel.filter.distance=Afstand
+dialog.gpsbabel.filter.interpolate=Interpoleer
+dialog.gpsbabel.filter.discard.intro=Weggooi van punte as
+dialog.gpsbabel.filter.discard.hdop=Hdop >
+dialog.gpsbabel.filter.discard.vdop=Vdop >
+dialog.gpsbabel.filter.discard.numsats=Aantal satelliete
+dialog.gpsbabel.filter.discard.nofix=Punt het geen binding
+dialog.gpsbabel.filter.discard.unknownfix=Punt het unbekende binding
+dialog.gpsbabel.filter.simplify.intro=Verwyder punte totdat
+dialog.gpsbabel.filter.simplify.maxpoints=Aantal punte
+dialog.gpsbabel.filter.simplify.maxerror=of fout afstand <
+dialog.gpsbabel.filter.simplify.crosstrack=kruis-baan
+dialog.gpsbabel.filter.simplify.length=lengte verskil
+dialog.gpsbabel.filter.simplify.relative=relatief to hdop
+dialog.gpsbabel.filter.distance.intro=Verwyder punt as naby aan vorige punt
+dialog.gpsbabel.filter.distance.distance=As afstand <
+dialog.gpsbabel.filter.distance.time=en tyd verskil <
+dialog.gpsbabel.filter.interpolate.intro=Voeg ekstra punte tussen baan punte
+dialog.gpsbabel.filter.interpolate.distance=As afstand >
+dialog.gpsbabel.filter.interpolate.time=of tyd verskil >
+dialog.saveoptions.title=Stoor l\u00eaer
 dialog.save.fieldstosave=Velde om te stoor
 dialog.save.table.field=Veld
-dialog.save.table.hasdata=Het Data
+dialog.save.table.hasdata=Het data
 dialog.save.table.save=Stoor
-dialog.save.headerrow=Hoof Afvoer Ry
-dialog.save.coordinateunits=Koordinaat eenhede
-dialog.save.altitudeunits=Hoogte Eenhede
-dialog.save.timestampformat=Tyd Stempel Formaat
-dialog.save.overwrite.title=L\u00eaer bestaan reeds
-dialog.save.overwrite.text=Hierdie L\u00eaer bestaan reeds. Is jy seker jy wil die l\u00eaer oorskryf?
+dialog.save.headerrow=Stoor opskrif ry
+dialog.save.coordinateunits=Koordinaat formaat
+dialog.save.altitudeunits=Hoogte eenhede
+dialog.save.timestampformat=Tyd stempel formaat
+dialog.save.overwrite.title=L\u00eaer bestaan alreeds
+dialog.save.overwrite.text=Hierdie l\u00eaer bestaan reeds. Is jy seker jy wil die l\u00eaer oorskryf?
 dialog.save.notypesselected=Geen punt tipes is geselekteer nie
 dialog.exportkml.text=Titel vir die data
-dialog.exportkml.altitude=Absolute hoogte (vir aviasie)
+dialog.exportkml.altitude=Absolute hoogte (vir lugvaart)
 dialog.exportkml.kmz=Kompakteer om kmz l\u00eaer te maak
 dialog.exportkml.exportimages=Voer beeld duimnaelsketse uit na kmz
-dialog.exportkml.trackcolour=Spoor kleur
+dialog.exportkml.imagesize=Beeld groote
+dialog.exportkml.trackcolour=Baan kleur
+dialog.exportkml.standardkml=Standaard KML
+dialog.exportkml.extendedkml=Uitgebreide KML met tydstempels
 dialog.exportgpx.name=Naam
 dialog.exportgpx.desc=Beskrywing
-dialog.exportgpx.includetimestamps=Tydstempel Insluit
-dialog.exportgpx.copysource=Kopieer bron xml
+dialog.exportgpx.includetimestamps=Sluit tydstempels in
+dialog.exportgpx.copysource=Kopie\u00ebr bron xml
+dialog.exportgpx.encoding=Kodering
+dialog.exportgpx.encoding.system=Stelsel
+dialog.exportgpx.encoding.utf8=UTF-8
 dialog.exportpov.text=Steutel asseblief parameters in vir POV uitvoer
 dialog.exportpov.font=Font
 dialog.exportpov.camerax=Kamera X
@@ -184,48 +249,71 @@ dialog.exportpov.cameraz=Kamera Z
 dialog.exportpov.modelstyle=Model styl
 dialog.exportpov.ballsandsticks=Balle en stokkies
 dialog.exportpov.tubesandwalls=Buise en mure
-dialog.3d.warningtracksize=Hierdie spoor het 'n groot aantal punte, wat Java3D miskien nie kan vertoon.\nIs jy seker jy wil voortgaan?
+dialog.3d.warningtracksize=Hierdie baan het 'n groot aantal punte, wat Java3D miskien nie kan vertoon.\nIs jy seker jy wil voortgaan?
+dialog.3d.useterrain=Wys terrein
+dialog.3d.terraingridsize=Rooster groote
+dialog.exportpov.baseimage=Basis beeld
+dialog.exportpov.cannotmakebaseimage=Kan nie basis beeld skryf
+dialog.baseimage.title=Kaart beeld
+dialog.baseimage.useimage=Gebruik beeld
+dialog.baseimage.mapsource=Kaar bron
+dialog.baseimage.zoom=Vergrotings vlak
+dialog.baseimage.incomplete=Beeld onvolledig
+dialog.baseimage.tiles=Te\u00ebls
+dialog.baseimage.size=Beeld groote
 dialog.exportsvg.text=Selekteer die parameters vir die SVG uitvoer
-dialog.exportsvg.phi=Azimuth hoek \u03d5
-dialog.exportsvg.theta=Opstandings angle \u03b8
+dialog.exportsvg.phi=Azimuth hoek \u03D5
+dialog.exportsvg.theta=Opstandings angle \u03B8
+dialog.exportsvg.gradients=Grbruik gradient vir skakering
+dialog.exportimage.noimagepossible=Kaart beelde moet gestoor word na skuif sodat dit gebruik kan word vir uitvoer
+dialog.exportimage.drawtrack=Teken baan op kaart
+dialog.exportimage.drawtrackpoints=Teken baan punte
+dialog.exportimage.textscalepercent=Teks skaleer faktor (%)
 dialog.pointtype.desc=Stoor die volgende punt tipes
-dialog.pointtype.track=Spoor punte
+dialog.pointtype.track=Baan punte
 dialog.pointtype.waypoint=Bakens
 dialog.pointtype.photo=Foto punte
+dialog.pointtype.audio=Klank punte
 dialog.pointtype.selection=Net seleksie
 dialog.confirmreversetrack.title=Bevestig omkering
-dialog.confirmreversetrack.text=Hierdie spoor bevat tydstempel informasie, wat uit sekwensie/order sal wees na omkering.\nIs jy seker jy wil die spoor omruil vir die seksie?
-dialog.confirmcutandmove.title=Bevestig sny en skuif
-dialog.confirmcutandmove.text=Hierdie spoor het tydstempel informasie, wat uit sekwensie/orde sal wees na skuif.\nIs jy seker jy wil die seksie skuif?
+dialog.confirmreversetrack.text=Hierdie baan bevat tydstempel informasie, wat uit sekwensie/order sal wees na omkering.\nIs jy seker jy wil die baan omruil vir die seksie?
+dialog.confirmcutandmove.title=Bevestig knip en skuif
+dialog.confirmcutandmove.text=Hierdie baan het tydstempel informasie, wat uit sekwensie/orde sal wees na skuif.\nIs jy seker jy wil die seksie skuif?
 dialog.interpolate.parameter.text=Aantal punte om bytevoeg tussen geselekteerde punte.
+dialog.interpolate.betweenwaypoints=Iterpoleer tussen bakens?
 dialog.undo.title=Herroep aksie(s)
 dialog.undo.pretext=Selekteer asb die aksie(s) om te herroep
 dialog.undo.none.title=Kan nie herroep
 dialog.undo.none.text=Geen operasies om te herroep!
-dialog.clearundo.title=Maak Herroep lys uit skoon
+dialog.clearundo.title=Maak herroep lys skoon
 dialog.clearundo.text=Is jy seker jy wil die herroep lys skoon maak?\nAlle herroep informasie sal verlore gaan!
 dialog.pointedit.title=Redigeer punt
 dialog.pointedit.intro=Selekteer elke veld om die waarde te verander
 dialog.pointedit.table.field=Veld
 dialog.pointedit.table.value=Waarde
 dialog.pointnameedit.name=Baken naam
-dialog.pointnameedit.uppercase=Hoof letter
-dialog.pointnameedit.lowercase=Klein letter
-dialog.addtimeoffset.add=Voeg tyd by
-dialog.addtimeoffset.subtract=Vat tyd weg
+dialog.pointnameedit.uppercase=Hoofletter
+dialog.pointnameedit.lowercase=Kleinletter
+dialog.pointnameedit.titlecase=Titel Kas
+dialog.addtimeoffset.add=Tel tyd by
+dialog.addtimeoffset.subtract=Trek tyd af
 dialog.addtimeoffset.days=Dae
 dialog.addtimeoffset.hours=Ure
 dialog.addtimeoffset.minutes=Minute
+dialog.addtimeoffset.notimestamps=Kan nie tyd offset by tel want die seleksie bevat nie enige tydstempel informasie nie
 dialog.findwaypoint.intro=Sleutel gedeelte van baken naam
 dialog.findwaypoint.search=Soek
 dialog.saveexif.title=Stoor Exif
+dialog.saveexif.intro=Selekter die fotos om te stoor deur gebruik te maak van merkblokkie
+dialog.saveexif.nothingtosave=Koordinaat data is onveranderd, niks om te stoor
+dialog.saveexif.noexiftool=Geen exiftool program kon gevind word. Gaan voort?
 dialog.saveexif.table.photoname=Foto naam
 dialog.saveexif.table.status=Status
 dialog.saveexif.table.save=Stoor
 dialog.saveexif.photostatus.connected=Verbind
-dialog.saveexif.photostatus.disconnected=Afgesluit
+dialog.saveexif.photostatus.disconnected=Onkoppel
 dialog.saveexif.photostatus.modified=Verander
-dialog.saveexif.overwrite=Oorskruif leers
+dialog.saveexif.overwrite=Oorskruif le\u00ears
 dialog.saveexif.force=Vorseer ten spyte van klein foute
 dialog.charts.xaxis=X as
 dialog.charts.yaxis=Y as
@@ -234,47 +322,102 @@ dialog.charts.screen=Uitset na skerm
 dialog.charts.svg=Uitset na SVG leer
 dialog.charts.svgwidth=SVG wydte
 dialog.charts.svgheight=SVG hoogte
-dialog.charts.needaltitudeortimes=die spoor moet of hoogtes of tyd informasie bevat om grafiek teskep
+dialog.charts.needaltitudeortimes=die baan moet of hoogtes of tyd informasie bevat om grafiek teskep
 dialog.charts.gnuplotnotfound=Kon nie gnuplot find op gegewe pad
 dialog.distances.intro=Reguit lyn afstande tussen punte
 dialog.distances.column.from=Vanaf punt
 dialog.distances.column.to=Na punt
-dialog.distances.currentpoint=Huidige Punt
+dialog.distances.currentpoint=Huidige punt
 dialog.distances.toofewpoints=Hierdie funksie benodig bakens om afstande tussen bakens uit tewerk
 dialog.fullrangedetails.intro=Hier is die besonderhede for die geselekteerde reeks
+dialog.fullrangedetails.coltotal=Insluitend gapings
+dialog.fullrangedetails.colsegments=Sonder gapings
+dialog.estimatetime.details=Besonderhede
+dialog.estimatetime.gentle=Delikaat
+dialog.estimatetime.steep=Styl
+dialog.estimatetime.climb=Klim
+dialog.estimatetime.descent=Val
+dialog.estimatetime.parameters=Paramters
+dialog.estimatetime.parameters.timefor=Tyd vir
+dialog.estimatetime.results=Resultate
+dialog.estimatetime.results.estimatedtime=Beraamde tyd
+dialog.estimatetime.results.actualtime=Werklike tyd
+dialog.estimatetime.error.nodistance=Die beraamings tye het gekoppelde baan punte nodig, om 'n afstand te verskaf
+dialog.estimatetime.error.noaltitudes=Die seleksie het geen hoogste informasie nie
+dialog.learnestimationparams.intro=Hierdie is die parameters wat uitgewerk is vanaf hierdie baan
+dialog.learnestimationparams.averageerror=Gemiddelde fout
+dialog.learnestimationparams.combine=Hierdie parameters kan gekombineer word met die huidige waardes
+dialog.learnestimationparams.combinedresults=Gekombineerde resulate
+dialog.learnestimationparams.weight.100pccurrent=Hou huidige waardes
+dialog.learnestimationparams.weight.current=huidig
+dialog.learnestimationparams.weight.calculated=bereken
+dialog.learnestimationparams.weight.50pc=Gemiddeld van huidige waardes en berekende waardes
+dialog.learnestimationparams.weight.100pccalculated=Gebruik nuwe berekende waardes
 dialog.setmapbg.intro=Selekteer een van die kaart bronne, of voeg nuwe een by
 dialog.addmapsource.title=Voeg nuwe kaart bron by
 dialog.addmapsource.sourcename=Naam van bron
-dialog.correlate.notimestamps=Daar is geen tyd stempels in die data punte, so daar is niks om te korreleer met die fotos
+dialog.addmapsource.layer1url=URL van eerste laag
+dialog.addmapsource.layer2url=Ooptionele URL van tweede laag
+dialog.addmapsource.maxzoom=Maksimum vergrotings vlak
+dialog.addmapsource.noname=Onbenaamd
+dialog.gpsies.column.name=Baan naam
+dialog.gpsies.column.length=Lengte
+dialog.gpsies.description=Beskrywing
+dialog.gpsies.nodescription=Geen beskrywing
+dialog.gpsies.nonefound=Geen bane gevind
+dialog.gpsies.username=Gpsies gebruikersnaam
+dialog.gpsies.password=Spsies wagwoord
+dialog.gpsies.keepprivate=Hou baan privaat
+dialog.gpsies.confirmopenpage=Maak web blad oop vir opgelaaide baan
+dialog.gpsies.activities=Aktiwiteits tipes
+dialog.gpsies.activity.trekking=Stap
+dialog.gpsies.activity.walking=Loop
+dialog.gpsies.activity.jogging=Hardloop
+dialog.gpsies.activity.biking=Fietsry
+dialog.gpsies.activity.motorbiking=Moterfietsry
+dialog.gpsies.activity.sailing=Seiljagwedvaart
+dialog.gpsies.activity.skating=Skaats
+dialog.wikipedia.column.name=Artikel naam
+dialog.wikipedia.column.distance=Afstand
+dialog.wikipedia.nonefound=Geen wikipedia insetsels gevind
+dialog.correlate.notimestamps=Daar is geen tydstempels in die data punte, so daar is niks om te korreleer met die fotos
 dialog.correlate.nouncorrelatedphotos=Daar is geen ongekorreleerde fotos.\nIs jy seker jy wil voortgaan?
+dialog.correlate.nouncorrelatedaudios=Daar is geen ongekorreleerde klankbane
 dialog.correlate.photoselect.intro=Selekteer een van die gekorreleerde fotos om te gebruik as tyd afset
 dialog.correlate.select.photoname=Foto naam
 dialog.correlate.select.timediff=Tyd verskil
 dialog.correlate.select.photolater=Foto later
-tip.title=Wenk
-tip.manuallycorrelateone=Deur een item te verbind, kan die tyd afset bereken word vir jou.
 dialog.correlate.options.intro=Seleketeer die opsies vir automatiese korrelasie
-dialog.correlate.options.offsetpanel=Tyd afset
-dialog.correlate.options.offset=Afset
+dialog.correlate.options.offsetpanel=Tyd verplasing
+dialog.correlate.options.offset=Verplasing
 dialog.correlate.options.offset.hours=ure,
 dialog.correlate.options.offset.minutes=minute en
 dialog.correlate.options.offset.seconds=sekondes
 dialog.correlate.options.photolater=Foto later as punt
 dialog.correlate.options.pointlaterphoto=Punt later as foto
+dialog.correlate.options.audiolater=Klank later as punt
+dialog.correlate.options.pointlateraudio=Punt later as klank
 dialog.correlate.options.limitspanel=Korrelasie limiete
 dialog.correlate.options.notimelimit=Geen tyd limiet
 dialog.correlate.options.timelimit=Tyd limiet
 dialog.correlate.options.nodistancelimit=Geen afstand limiet
 dialog.correlate.options.distancelimit=Afstand limiet
 dialog.correlate.options.correlate=Korreleer
-dialog.correlate.alloutsiderange=Al die fotos is buitekant die tyd reeks van die spoor, so geen kon gekorreleer word.\nProbeer om afset te stel of omself ten minste een foto te korreleer.
+dialog.correlate.alloutsiderange=Al die fotos is buitekant die tyd reeks van die baan, so geen kon gekorreleer word.\nProbeer om afset te stel of omself ten minste een foto te korreleer.
+dialog.correlate.filetimes=Le\u00ear tydstempels dui aan:
+dialog.correlate.filetimes2=van klank greep
 dialog.correlate.correltimes=Vir korrelasie gebruik:
 dialog.correlate.timestamp.beginning=Begin
 dialog.correlate.timestamp.middle=Middel
 dialog.correlate.timestamp.end=Einde
+dialog.correlate.audioselect.intro=Selekteer een van die gekorreleerde klankgrepe om te gebruik as tyd verplasing
+dialog.correlate.select.audioname=Klankgreep naam
+dialog.correlate.select.audiolater=Klank later
+dialog.rearrangewaypoints.desc=Selekteer die eindbestemming en sorteer volgorde van die bakens
+dialog.rearrangephotos.desc=Selekteer die eindbestemming en sorteer volgorde van die foto punte
 dialog.rearrange.tostart=Beweeg na begin
 dialog.rearrange.toend=Beweeg na einde
-dialog.rearrange.tonearest=Beweeg elk na naaste spoor punt
+dialog.rearrange.tonearest=Beweeg elk na naaste baan punt
 dialog.rearrange.nosort=Nie sorteer
 dialog.rearrange.sortbyfilename=Sorteer volgens leernaam
 dialog.rearrange.sortbyname=Sorteer volgens naam
@@ -283,11 +426,15 @@ dialog.compress.closepoints.title=Naby punt verwydering
 dialog.compress.closepoints.paramdesc=Span faktor
 dialog.compress.wackypoints.title=Gekkige punt verwydering
 dialog.compress.wackypoints.paramdesc=Afstands faktor
-dialog.compress.singletons.paramdesc=Afstand faktor
+dialog.compress.singletons.title=Enkeling verwydering
+dialog.compress.singletons.paramdesc=Afstands faktor
 dialog.compress.duplicates.title=Duplikaat verwydering
 dialog.compress.douglaspeucker.title=Douglas-Peuker kompressie
+dialog.compress.douglaspeucker.paramdesc=Span faktor
 dialog.compress.summarylabel=Punte om te verwyder
-dialog.deletemarked.nonefound=Geen data punt kon verwyder word
+dialog.compress.confirm=%d punte is gemerk.\nVerwyder hierdie punte nou?
+dialog.compress.confirmnone=geen punte is gemerk nie
+dialog.deletemarked.nonefound=Geen data punte kon verwyder word
 dialog.pastecoordinates.desc=Sleutel of plak die koordinate hier
 dialog.pastecoordinates.coords=Koordinate
 dialog.pastecoordinates.nothingfound=Gaan asseblief koordinate na en probeer weer
@@ -295,10 +442,13 @@ dialog.help.help=Sien asseblief\n http://gpsprune.activityworkshop.net/\n vir me
 dialog.about.version=Weergawe
 dialog.about.build=Bou
 dialog.about.summarytext1=GpsPrune is 'n program vir die laai, vertoon en wysiging van data vanaf GPS ontvangers.
+dialog.about.summarytext2=Dit is vrygestel onder die Gnu GPL gratif, oop w\u00eareldwye gebruik en verbetering.<br>Kopi\u00ebring, herverspreiding en veranderings word toegelaat en aangemoedig<br>volgens die kondisies in the aangegte <code>license.txt</code> le\u00ear.
+dialog.about.summarytext3=Sien asseblief <code style="font-weight:bold"http://activityworkshop.net/</code> vir mer inligting en wenke, insluitend<br> 'n nuwe PDF gebruikers gids wat jy kan koop.
 dialog.about.languages=Beskikbare tale
-dialog.about.translatedby=Engelse teks deur activityworkshop
+dialog.about.translatedby=Afrikaans teks deur ...?
 dialog.about.systeminfo=Stelsel informasie
 dialog.about.systeminfo.os=Beheer Stelsel
+dialog.about.systeminfo.java=Java Runtime
 dialog.about.systeminfo.java3d=Java3d geinstalleer
 dialog.about.systeminfo.povray=Povray geinstalleer
 dialog.about.systeminfo.exiftool=Exiftool geinstalleer
@@ -307,7 +457,7 @@ dialog.about.systeminfo.gnuplot=Gnuplot geinstalleer
 dialog.about.systeminfo.exiflib=Exif biblioteek
 dialog.about.systeminfo.exiflib.internal=Intern
 dialog.about.systeminfo.exiflib.internal.failed=Interne (nie gevind)
-dialog.about.systeminfo.exiflib.external=Ektern
+dialog.about.systeminfo.exiflib.external=Ekstern
 dialog.about.systeminfo.exiflib.external.failed=Ekstern (nie gevind)
 dialog.about.yes=Ja
 dialog.about.no=Nee
@@ -321,17 +471,270 @@ dialog.about.credits.devtools=Onwikkelings gereedskap
 dialog.about.credits.othertools=Ander gereedskap
 dialog.about.credits.thanks=Dankie aan
 dialog.about.readme=Leesmy
+dialog.checkversion.error=Die weergawe nommer kon nie opgespoor word nie.\nGaan asseblief die internet konneksie na.
+dialog.checkversion.uptodate=Jy gebruik die nuuste weergawe van GpsPrune
+dialog.checkversion.newversion1='n nuwe weergawe van GpsPrune is nou beskikbaar! Die nuuste weergawe is nou weergawe
+dialog.checkversion.newversion2=.
+dialog.checkversion.releasedate1=Hierdie nuwe weergawe was vrygestel op
+dialog.checkversion.releasedate2=.
+dialog.checkversion.download=Om die nuwe weergawe aftelaai, gaan na http://gpsprune.activityworkshop.net/download.html.
+dialog.keys.intro=Jy kan die volgende kortpadsleutels gebruik in plaas van om die muis te gebruik
+dialog.keys.keylist=<table><tr><td>Pylkie sleutels</td><td>Skuif kaart links regs, op, af</td></tr><tr><td>Ctrl + links, regs pylkie</td><td>Selekteer vorige of volgende punt</td></tr><tr><td>Ctrl + op, af pylkie</td><td>Vergroot in of uit</td></tr><tr><td>Ctrl + PgUp, PgDown</td><td>Selekteer vorige, volgende segment</td></tr><tr><td>Ctrl + Home, Einde</td><td>Selekteer eerste, laaste punt</td></tr><tr><td>Del</td><td>Verwyder huidige punt</td></tr></table>
+dialog.keys.normalmodifier=Ctrl
+dialog.keys.macmodifier=Command
+dialog.saveconfig.desc=Die volgende stelligns kan gestoor word na 'n konfigurasie le\u00ear
+dialog.saveconfig.prune.trackdirectory=Baan gids
+dialog.saveconfig.prune.photodirectory=foto gids
+dialog.saveconfig.prune.languagecode=Taal kode (AF)
+dialog.saveconfig.prune.languagefile=Taal le\u00ear
+dialog.saveconfig.prune.gpsdevice=GPS apparaat
+dialog.saveconfig.prune.gpsformat=GPS formaat
+dialog.saveconfig.prune.povrayfont=Pocray font
+dialog.saveconfig.prune.gnuplotpath=Pad na gnuplot
+dialog.saveconfig.prune.gpsbabelpath=Pad na gpsbabel
+dialog.saveconfig.prune.exiftoolpath=Pad na exitool
+dialog.saveconfig.prune.mapsource=Geselekteerde kaart bron
+dialog.saveconfig.prune.mapsourcelist=Kaarte bronne
+dialog.saveconfig.prune.diskcache=Kaart stoorarea
+dialog.saveconfig.prune.kmzimagewidth=KMZ beeld groote
+dialog.saveconfig.prune.colourscheme=Kleur skema
+dialog.saveconfig.prune.linewidth=Lyn dikte
+dialog.saveconfig.prune.kmltrackcolour=KML baan kleur
+dialog.saveconfig.prune.autosavesettings=Autostoor stellings
+dialog.setpaths.intro=As jy wil, kan jy die paie kies na die eksterne programme:
+dialog.setpaths.found=Pad gefind?
+dialog.addaltitude.noaltitudes=Die geselekteerde reeks bevat nie hoogtes nie
+dialog.addaltitude.desc=Hoogste verplasing
+dialog.lookupsrtm.overwritezeros=Oorskryf hoogte waardes van nul?
+dialog.setcolours.intro=Klik op 'n kleur lap om kleur te verander
+dialog.setcolours.background=Agtergrond
+dialog.setcolours.borders=Grense
+dialog.setcolours.lines=Lyne
+dialog.setcolours.primary=Primere
+dialog.setcolours.secondary=Sekondere
+dialog.setcolours.point=Punte
+dialog.setcolours.selection=Seleksie
+dialog.setcolours.text=Teks
+dialog.colourchooser.title=Kies kleur
+dialog.colourchooser.red=Rooi
+dialog.colourchooser.green=Groen
+dialog.colourchooser.blue=Blou
+dialog.colourer.intro='n punt inkleurder kan baan punte verskillende kleure gee
+dialog.colourer.type=Inkleurder tipe
+dialog.colourer.type.none=Geen
+dialog.colourer.type.byfile=Met le\u00ear
+dialog.colourer.type.bysegment=Volgens segment
+dialog.colourer.type.byaltitude=Volgens hoogte
+dialog.colourer.type.byspeed=Volgens spoed
+dialog.colourer.type.byvertspeed=Volgens vertikale spoed
+dialog.colourer.type.bygradient=Volgens gradi\u00ebnt
+dialog.colourer.type.bydate=Volgens datum
+dialog.colourer.start=Begin kleur
+dialog.colourer.end=Eind kleur
+dialog.colourer.maxcolours=Maksimum aantal kleure
+dialog.setlanguage.language=Taal
+dialog.setlanguage.languagefile=Taal le\u00ear
+dialog.diskcache.save=Stoor kaart beelde na skuif
+dialog.diskcache.dir=Datastoor gds
+dialog.diskcache.createdir=Skep gids
+dialog.diskcache.nocreate=Datastoor gids nie geskep
+dialog.diskcache.cannotwrite=Kaart teels kon nie gestoor word in die geselekteerde gids
+dialog.diskcache.table.path=Pad
+dialog.diskcache.table.usedby=Gebruik deur
+dialog.diskcache.table.zoom=Verhoog
+dialog.diskcache.table.tiles=Te\u00ebls
+dialog.diskcache.table.megabytes=Megagrepe
+dialog.diskcache.tileset=Te\u00eblstel
+dialog.diskcache.tileset.multiple=verskeie
+dialog.diskcache.deleteold=Verwyder ou te\u00ebls
+dialog.diskcache.maximumage=Maksimum ouderdom (dae)
+dialog.diskcache.deleteall=Verwyder alle te\u00ebls
+dialog.diskcache.deleted=%d leers verwyder vanuit datastoor
+dialog.deletefieldvalues.intro=Selekteer die veld om te verwyder vanuit die hudige reeks
+dialog.deletefieldvalues.nofields=Daar is geen velde om te verwyder vir hierdie reeks nie
+dialog.setlinewidth.text=Sleutel die dikte van die lyne om te teken vir die bane (1-4)
+dialog.downloadosm.desc=Bevestig die aflaai van rou OSM data vir die geslekteerde area:
+dialog.searchwikipedianames.search=Soek vir:
+dialog.weather.location=Plek
+dialog.weather.update=Voorspelling opgedateer
+dialog.weather.sunrise=Sonsopkomssdag
+dialog.weather.sunset=Sonsondergang
+dialog.weather.temperatureunits=Temperature
+dialog.weather.currentforecast=Huidige weer
+dialog.weather.dailyforecast=Daaglikse voospelling
+dialog.weather.3hourlyforecast=Drie-uurlikse voorspelling
+dialog.weather.day.now=Huidige weer
+dialog.weather.day.today=Vandag
+dialog.weather.day.tomorrow=More
+dialog.weather.day.monday=Maandag
+dialog.weather.day.tuesday=Dinsdag
+dialog.weather.day.wednesday=Woensdag
+dialog.weather.day.thursday=Donderdag
+dialog.weather.day.friday=Vrydag
+dialog.weather.day.saturday=Saturdag
+dialog.weather.day.sunday=Sondag
+dialog.weather.wind=Wind
+dialog.weather.temp=Temp
+dialog.weather.humidity=Himuditeit
+dialog.weather.creditnotice=Heirdie data is beskikbaar gestel deur openweather.org. Hulle webwerf het meer besonderhede
+dialog.deletebydate.onlyonedate=Die punte was almal opgeneem op dieselfde datum
+dialog.deletebydate.intro=Vir elke datum in tdie baan,
+dialog.deletebydate.nodate=Geen tydstempel
+dialog.deletebydate.column.keep=Hou
+dialog.deletebydate.column.delete=Verwyder
+
+## 3d window
+dialog.3d.title=Gpsprune Three-d vertoon
+dialog.3d.altitudefactor=Hoogte oordrywings faktor
+
+## Confirm messages
+confirm.loadfile=Data gelaai vanaf leer
+confirm.save.ok1=Sukselvol gestoor
+confirm.save.ok2=punte na leer
+confirm.deletepoint.single=data punt was verwyder
+confirm.deletepoint.multi=data punte was verwyder
+confirm.point.edit=punter geredigeer
+confirm.mergetracksegments=Baan segmente saamgevoeg
+confirm.reverserange=Reeks omgekeer
+confirm.addtimeoffset=Tyd verplasing bygevoeg
+confirm.addaltitudeoffset=Hoogte verplasing bygevoeg
+confirm.rearrangewaypoints=Bakens ge-herrangskik
+confirm.rearrangephotos=Fotos ge-herrangskik
+confirm.splitsegments=%d segment verdelings is gemaak
+confirm.sewsegments=%d segment las is gemaak
+confirm.cutandmove=Seleksie geskuif
+confirm.interpolate=Punte bygevoeg
+confirm.convertnamestotimes=Baken name aangepas
+confirm.saveexif.ok=%d fotos gestoor
+confirm.undo.single=operasie ongedaan
+confirm.undo.multi=operasies ongedaan
+confirm.jpegload.single=foto was bygevoeg
+confirm.jpegload.multi=fotos was bygevoeg
+confirm.media.connect=media gekoppel
+confirm.photo.disconnect=foto ontkoppel
+confirm.audio.disconnect=klank ontkoppel
+confirm.media.removed=verwyder
+confirm.correlatephotos.single=foto was gekorreleer
+confirm.correlatephotos.multi=fotos was gekorreleer
+confirm.createpoint=foto geskep
+confirm.rotatephoto=foto geroteer
+confirm.running=Besig om te loop...
+confirm.lookupsrtm=%d hoogte waardes gevind
+confirm.downloadsrtm=%d leers afgelaai na data stoor
+confirm.downloadsrtm.1=%d leer afgelaai na data stoor
+confirm.downloadsrtm.none=Geen leers afgelaai, hulle was alreeds in the data stoor
+confirm.deletefieldvalues=Veld waardes verwyder
+confirm.audioload=Klank leers bygevoeg
+confirm.correlateaudios.single=klankgreep was gekorreleer
+confirm.correlateaudios.multi=klankgrepe was gekorreleer
 
-# Field names
+## Tips, shown just once when appropriate
+tip.title=Wenk
+tip.manuallycorrelateone=Deur een item te verbind, kan die tyd afset bereken word vir jou.
+
+## Buttons
+button.ok=OK
+button.back=Terug
+button.next=Volgende
+button.finish=Eindig
+button.cancel=Kanselleer
+button.overwrite=Oorskryf
+button.moveup=Skuif op
+button.movedown=Skuif af
+button.edit=Rediggeer
+button.exit=Verlaat
+button.close=Toemaak
+button.continue=Voortgaan
+button.yes=Ja
+button.no=Nee
+button.yestoall=Ja aan almal
+button.notoall=Nee aan almal
+button.always=Altyd
+button.select=Selekteer
+button.selectall=Selekteer almal
+button.selectnone=Selekter geen
+button.preview=Voorskou
+button.load=Laai
+button.upload=Oplaai
+button.guessfields=Raai velde
+button.showwebpage=Wys webblad
+button.check=Kontroleer
+button.resettodefaults=Herstel na verstek waarde
+button.browse=Blaai...
+button.addnew=Voeg nuwe
+button.delete=Verwyder
+button.manage=Bestuur
+button.combine=Kombineer
+
+## File types
+filetype.txt=TXT leers
+filetype.jpeg=JPG leers
+filetype.kmlkmz=KML, KMZ leers
+filetype.kml=KML leers
+filetype.kmz=KMZ leers
+filetype.gpx=GPX leers
+filetype.pov=POV leers
+filetype.svg=SVG leers
+filetype.png=PNG leers
+filetype.audio=MP3, OGG, WAV leers
+
+## Display components
+display.noaltitudes=Baan data sluit geen hoogte data in
+display.notimestamps=Baan data sluit geen tydstempels in
+display.novalues=Baan data sluit geen waardes in vir hierdie veld
+details.trackdetails=Baan besonderhede
+details.notrack=Geen baan gelaai
+details.track.points=Punte
+details.track.file=Leer
+details.track.numfiles=Aantal leers
+details.pointdetails=Punt besonderhede
+details.index.selected=Indeks
+details.index.of=van
+details.nopointselection=Geen punt geselekteer
+details.photofile=Foto leer
+details.norangeselection=Geen reeks geselekteer
+details.rangedetails=Reeks besonderhede
+details.range.selected=Geselekteer
+details.range.to=na
+details.altitude.to=na
+details.range.climb=Klim
+details.range.descent=Val
+details.coordformat=Koordinaat formaat
+details.distanceunits=Afstand eenhede
+display.range.time.secs=s
+display.range.time.mins=m
+display.range.time.hours=u
+display.range.time.days=d
+details.range.avespeed=Gem spoed
+details.range.maxspeed=Maksimum spoed
+details.range.numsegments=Aantal segmente
+details.range.pace=Pas
+details.range.gradient=Gradient
+details.lists.waypoints=Bakens
+details.lists.photos=Fotos
+details.lists.audio=Klank
+details.photodetails=Foto besonderhede
+details.nophoto=Geen fotos geselekteer
+details.photo.loading=Besig om te laai
+details.media.connected=Gekoppel
+details.media.fullpath=Vol pad
+details.audiodetails=Klank besonderhede
+details.noaudio=Geen klankgreep geslekteer
+details.audio.file=Klank leer
+details.audio.playing=Besig om te speel...
+map.overzoom=Geen kaart beskikbaar by hierdie vehogings vlak
+
+## Field names
 fieldname.latitude=breedtegraad
 fieldname.longitude=lengtegraad
 fieldname.altitude=Hoogte
 fieldname.timestamp=Tyd
 fieldname.time=Tyd
+fieldname.date=Datum
 fieldname.waypointname=Naam
 fieldname.waypointtype=Tipe
 fieldname.newsegment=Segment
-fieldname.custom=Persoonlike
+fieldname.custom=Pasmaak
 fieldname.prefix=Veld
 fieldname.distance=Afstand
 fieldname.duration=Tydperk
@@ -339,7 +742,7 @@ fieldname.speed=Spoed
 fieldname.verticalspeed=Vertikale spoed
 fieldname.description=Beskrywing
 
-# Measurement units
+## Measurement units
 units.original=Oorspronklik
 units.default=Bestek
 units.metres=Meters
@@ -348,31 +751,68 @@ units.feet=Voet
 units.feet.short=ft
 units.kilometres=Kilo meters
 units.kilometres.short=km
+units.kilometresperhour=km per uur
+units.kilometresperhour.short=km/h
 units.miles=Myl
 units.miles.short=mi
+units.milesperhour=myl per uur
+units.milesperhour.short=mph
+units.nauticalmiles=See myle
+units.nauticalmiles.short=N.m.
+units.nauticalmilesperhour.short=kts
+units.metrespersec=meters per sekond
+units.metrespersec.short=m/s
+units.feetpersec=voet per sekond
+units.feetpersec.short=ft/s
 units.hours=ure
+units.minutes=minute
+units.seconds=sekonde
 units.degminsec=Deg-min-sec
 units.degmin=Deg-min
 units.deg=Grade
 units.iso8601=ISO 8601
+units.degreescelsius=Celcius
+units.degreescelsius.short=\u00b0C
+units.degreesfahrenheit=Fahrenheit
+units.degreesfahrenheit.short=\u00b0F
+
+## How to combine conditions, such as filters
+logic.and=en
+logic.or=of
+
+## External urls and services
+url.googlemaps=maps.google.co.uk
+wikipedia.lang=en
+openweathermap.lang=en
+webservice.peakfinder=Open Peakfinder.org
+webservice.geohack=Open Geohack bladsy
+webservice.panoramio=Open Panoramio kaart
+webservice.opencachingcom=Open Opencaching.com
+webservice.opencachingcom.lang=en
 
-# Cardinals for 3d plots
+## Cardinals for 3d plots
 cardinal.n=N
 cardinal.s=S
 cardinal.e=O
 cardinal.w=W
 
-# Undo operations
+## Undo operations
 undo.load=laai data
 undo.loadphotos=laai fotos
+undo.loadaudios=laai klankgrepe
 undo.editpoint=eind punt
 undo.deletepoint=verwyder punt
 undo.removephoto=verwyder foto
+undo.removeaudio=verwyder klankgreep
 undo.deleterange=verwyder reeks
+undo.croptrack=Kleinknip baan
+undo.deletemarked=verwyder punte
 undo.insert=voeg punte by
 undo.reverse=keer baan om
 undo.mergetracksegments=smelt baan segmente
-undo.addtimeoffset=voeg tyd afset
+undo.splitsegments=verdeel baan segmente
+undo.sewsegments=naai baan segmente
+undo.addtimeoffset=voeg tyd verplasing
 undo.addaltitudeoffset=voeg hoogte afset
 undo.rearrangewaypoints=herrangskik
 undo.cutandmove=beweeg seksie
@@ -385,8 +825,9 @@ undo.rotatephoto=roteer foto
 undo.convertnamestotimes=skakel name na tye
 undo.lookupsrtm=soek hoogtes vanaf SRTM
 undo.deletefieldvalues=verwyder veld waardes
+undo.correlateaudios=korreleer klankgrepe
 
-# Error messages
+## Error messages
 error.save.dialogtitle=Fout om data te stoor
 error.save.nodata=Geen data om te stoor
 error.save.failed=Stoor van data na l\u00eaer het misluk
@@ -405,9 +846,12 @@ error.jpegload.nofilesfound=Geen leers gevind
 error.jpegload.nojpegsfound=Geen jpeg leers gevind
 error.jpegload.nogpsfound=Geen GPS informasie gevind
 error.gpsload.unknown=Onbekende fout
+error.undofailed.title=Herroep fout
+error.undofailed.text=Fout met herroep operasie
 error.function.noop.title=Funksie het geen effek gehad
 error.rearrange.noop=Herrangskikking van punte het geen effek gehad
 error.function.notavailable.title=Funksie nie beskikbaar
+error.function.nojava3d=Hierdie funksie het Java3d biblioteek nodig
 error.3d='n fout het gebeur met die 3d vertoon
 error.readme.notfound=Readme leer nie gevind
 error.osmimage.dialogtitle=Fout met laai van kaart beelde
@@ -418,3 +862,11 @@ error.lookupsrtm.nonefound=Geen hoogte waardes beskikbaar vir die punte
 error.lookupsrtm.nonerequired=Al die punte het klaar hoogtes, so daar is niks meer om te soek
 error.gpsies.uploadnotok=Die gpsies server het die boodskap terug gestuur
 error.gpsies.uploadfailed=Die oplaai het misluk met die volgende fout boodskap
+error.showphoto.failed=Foto het nie gelaai nie
+error.playaudiofailed=Klankgreep het nie gespeel nie
+error.cache.notthere=Die te\u00ebl stoorarea gids kon nie opgespoor word nie
+error.cache.empty=Die te\u00ebl stoorarea gids is leeg
+error.cache.cannotdelete=Geen te\u00ebls kon verwyder word
+error.tracksplit.nosplit=Die baan kon nie verdeel word
+error.downloadsrtm.nocache=Die leers kon nie gestoor word.\nGaan asseblief die skyf stoorarea na
+error.sewsegments.nothingdone=Geen segmente kon aanmekaar genaai word.\nDaar is nou %d segmente in the baan

diff --git a/tim/prune/lang/prune-texts_es.properties b/tim/prune/lang/prune-texts_es.properties
index 63901b28ee364e15f6ee6f7c69b292241f096afd..5b920b8e6919f0ff5c9da225fa813dfbae702b1f 100644 (file)
--- a/tim/prune/lang/prune-texts_es.properties
+++ b/tim/prune/lang/prune-texts_es.properties
@@ -1,7 +1,7 @@
 # Text entries for the GpsPrune application
 # Spanish entries thanks to various contributors
 
-# Menu entries
+## Menu entries
 menu.file=Archivo
 menu.file.addphotos=Cargar fotos
 menu.file.recentfiles=Archivos recientes
@@ -13,7 +13,6 @@ menu.track.undo=Deshacer
 menu.track.clearundo=Despejar la lista de deshacer
 menu.track.markrectangle=Marcar puntos dentro de un rect\u00e1ngulo
 menu.track.deletemarked=Eliminar puntos marcados
-function.rearrangewaypoints=Reorganizar waypoints
 menu.range=Rango
 menu.range.all=Seleccionar todo
 menu.range.none=No seleccionar nada
@@ -41,7 +40,8 @@ menu.settings=Preferencias
 menu.settings.onlinemode=Cargar mapas de Internet
 menu.settings.autosave=Auto Guardar
 menu.help=Ayuda
-# Popup menu for map
+
+## Popup menu for map
 menu.map.zoomin=Ampliar zoom
 menu.map.zoomout=Reducir zoom
 menu.map.zoomfull=Mostrar todo
@@ -53,7 +53,7 @@ menu.map.showmap=Mostrar el mapa
 menu.map.showscalebar=Mostrar barra de escala
 menu.map.editmode=Editar puntos
 
-# Alt keys for menus
+## Alt keys for menus
 altkey.menu.file=A
 altkey.menu.online=O
 altkey.menu.track=T
@@ -65,7 +65,7 @@ altkey.menu.audio=D
 altkey.menu.settings=P
 altkey.menu.help=Y
 
-# Ctrl shortcuts for menu items
+## Ctrl shortcuts for menu items
 shortcut.menu.file.open=A
 shortcut.menu.file.load=C
 shortcut.menu.file.save=G
@@ -74,7 +74,7 @@ shortcut.menu.edit.compress=C
 shortcut.menu.range.all=T
 shortcut.menu.help.help=H
 
-# Functions
+## Functions
 function.open=Abrir archivo
 function.importwithgpsbabel=Importar archivo con GPSBabel
 function.loadfromgps=Cargar datos del GPS
@@ -92,6 +92,7 @@ function.interpolate=Interpolar puntos
 function.deletebydate=Eliminar puntos de acuerdo a la fecha
 function.addtimeoffset=A\u00f1adir compensar tiempo
 function.addaltitudeoffset=A\u00f1adir compensar altitud
+function.rearrangewaypoints=Reorganizar waypoints
 function.convertnamestotimes=Convertir los nombres de los "waypoints" a tiempo
 function.deletefieldvalues=Borrar valores del campo
 function.findwaypoint=Buscar waypoint
@@ -101,6 +102,7 @@ function.show3d=Mostrar en 3-D
 function.distances=Distancias
 function.fullrangedetails=Detalles adicionales de rango
 function.estimatetime=Estimar duraci\u00f3n
+function.learnestimationparams=Apprender parametros por la estimaci\u00f3n del tiempo
 function.setmapbg=Configurar fondo de mapa
 function.setpaths=Configurar rutas del programas
 function.selectsegment=Seleccionar segmento actual
@@ -112,6 +114,7 @@ function.lookupsrtm=Obtener altitudes de SRTM
 function.downloadsrtm=Descargar datos de SRTM
 function.getwikipedia=Obtener art\u00edculos de Wikipedia cercanos
 function.searchwikipedianames=Buscar en Wikipedia por nombre
+function.searchopencachingde=Buscar OpenCaching.de
 function.downloadosm=Descargar datos OSM del \u00e1rea
 function.duplicatepoint=Duplicar punto
 function.setcolours=Establecer color
@@ -139,8 +142,9 @@ function.saveconfig=Guardar preferencias
 function.diskcache=Guardar mapas en disco
 function.managetilecache=Administrar cache de mapas
 function.getweatherforecast=Obtener pron\u00f3stico del tiempo
+function.setaltitudetolerance=Establecer la tolerancia de altitud
 
-# Dialogs
+## Dialogs
 dialog.exit.confirm.title=Salir de GpsPrune
 dialog.exit.confirm.text=\u00bfLos datos han sido modificados. Desea salir de GpsPrune?
 dialog.openappend.title=\u00bfAgregar a datos existentes
@@ -167,6 +171,8 @@ dialog.openoptions.deliminfo.norecords=Ningun dato
 dialog.openoptions.altitudeunits=Unidades altitud
 dialog.openoptions.speedunits=Unidades velocidad
 dialog.openoptions.vertspeedunits=Unidades velocidad vertical
+dialog.openoptions.vspeed.positiveup=Velocidades positivos significan hacia arriba
+dialog.openoptions.vspeed.positivedown=Velocidades positivos significan hacia abajo
 dialog.open.contentsdoubled=Este archivo contiene dos copias de cada punto,\nuna como "waypoints" y otra como puntos de recorrido.
 dialog.selecttracks.intro=Seleccionar recorrido/s a cargar
 dialog.selecttracks.noname=Innominados
@@ -199,8 +205,13 @@ dialog.gpsbabel.filter.discard.unknownfix=Precisi\u00f3n desconocida
 dialog.gpsbabel.filter.simplify.intro=Desechar puntos hasta
 dialog.gpsbabel.filter.simplify.maxpoints=N\u00famero de puntos <
 dialog.gpsbabel.filter.simplify.maxerror=o desviaci\u00f3n <
+dialog.gpsbabel.filter.simplify.crosstrack=diafon\u00eda
+dialog.gpsbabel.filter.simplify.length=diferencia longitud
+dialog.gpsbabel.filter.simplify.relative=relativo hdop
+dialog.gpsbabel.filter.distance.intro=Borar puntos si estan cerca de otro punto
 dialog.gpsbabel.filter.distance.distance=Si distancia <
 dialog.gpsbabel.filter.distance.time=y differencia horaria <
+dialog.gpsbabel.filter.interpolate.intro=Agregar puntos nuevos entre puntos del track
 dialog.gpsbabel.filter.interpolate.distance=Si distancia >
 dialog.gpsbabel.filter.interpolate.time=o differencia horaria >
 dialog.saveoptions.title=Guardar archivo
@@ -243,9 +254,13 @@ dialog.exportpov.modelstyle=Estilo
 dialog.exportpov.ballsandsticks=Balas en palos
 dialog.exportpov.tubesandwalls=Tubos y paredes
 dialog.3d.warningtracksize=Este track contiene un gran n\u00famero de puntos. Puede ser que Java3D no los pueda visualizar. Est\u00e1 seguro de que desea continuar?
+dialog.3d.useterrain=Terreno
+dialog.3d.terraingridsize=Dimensi\u00f3n de la cuadr\u00edcula
+dialog.exportpov.baseimage=Imagen de mapa
+dialog.exportpov.cannotmakebaseimage=Fallo al guardar la imagen
 dialog.baseimage.title=Imagen de mapa
-dialog.baseimage.mapsource=Proveedor de mapas
 dialog.baseimage.useimage=Usar imagen
+dialog.baseimage.mapsource=Proveedor de mapas
 dialog.baseimage.zoom=Zoom
 dialog.baseimage.incomplete=Imagen incompleta
 dialog.baseimage.tiles=Recuadros
@@ -329,6 +344,8 @@ dialog.estimatetime.parameters.timefor=Duraci\u00f3n para
 dialog.estimatetime.results=Resultados
 dialog.estimatetime.results.estimatedtime=Duraci\u00f3n estimada
 dialog.estimatetime.results.actualtime=Duraci\u00f3n real
+dialog.estimatetime.error.noaltitudes=Los rangos seleccionados no contienen altitudes
+dialog.learnestimationparams.averageerror=Error medio
 dialog.learnestimationparams.combinedresults=Resultados combinados
 dialog.learnestimationparams.weight.100pccurrent=Mantener datos actuales
 dialog.learnestimationparams.weight.current=actuales
@@ -396,7 +413,8 @@ dialog.correlate.timestamp.end=Final
 dialog.correlate.audioselect.intro=Seleccione uno de estos audios correlacionados para usarlo como margen temporal.
 dialog.correlate.select.audioname=Nombre del audio
 dialog.correlate.select.audiolater=Audio m\u00e1s adelante
-dialog.rearrangephotos.desc=Seleccionar el destino y sortear el orden de los puntos de las fotos
+dialog.rearrangephotos.desc=Seleccionar el destino y orden de los puntos de las fotos
+dialog.rearrangewaypoints.desc=Seleccionar el destino y orden de los waypoints
 dialog.rearrange.tostart=Mover al comienzo
 dialog.rearrange.toend=Mover al final
 dialog.rearrange.tonearest=Mover al punto m\u00e1s pr\u00f3ximo
@@ -501,8 +519,19 @@ dialog.colourchooser.title=Elegir color
 dialog.colourchooser.red=Rojo
 dialog.colourchooser.green=Verde
 dialog.colourchooser.blue=Azul
+dialog.colourer.intro=Un tintorero puede dar distintos colores a puntos de un track
+dialog.colourer.type=Tipo del tintorero
+dialog.colourer.type.none=Ninguno
+dialog.colourer.type.byfile=Per fichero
+dialog.colourer.type.bysegment=Per segmento
+dialog.colourer.type.byaltitude=Per altitud
+dialog.colourer.type.byspeed=Per velocidad
+dialog.colourer.type.byvertspeed=Per velocidad vertical
+dialog.colourer.type.bygradient=Per escarpadura
+dialog.colourer.type.bydate=Per fecha
 dialog.colourer.start=Color de inicio
 dialog.colourer.end=Color final
+dialog.colourer.maxcolours=N\u00famero maximal de colores
 dialog.setlanguage.firstintro=Puede usted seleccionar algunos de los lenguajes incluidos,<p>o puede en lugar de esto seleccionar un archivo de texto
 dialog.setlanguage.secondintro=Usted necesita guardar sus preferencias y luego<p>reiniciar GpsPrune para cambiar el lenguaje
 dialog.setlanguage.language=Lenguaje
@@ -513,6 +542,7 @@ dialog.diskcache.save=Guardar im\u00e1genes de mapa a disco
 dialog.diskcache.dir=Directorio de mapas
 dialog.diskcache.createdir=Crear directorio
 dialog.diskcache.nocreate=No se ha creado el directorio de mapas
+dialog.diskcache.cannotwrite=Azulejos de mapa no se puede guardar en el directorio selecionado
 dialog.diskcache.table.path=Ruta
 dialog.diskcache.table.usedby=Utilizado por
 dialog.diskcache.table.zoom=Zoom
@@ -554,11 +584,12 @@ dialog.deletebydate.nodate=Sin marcas de tiempo
 dialog.deletebydate.column.keep=Mantener
 dialog.deletebydate.column.delete=Eliminar
 
-# 3d window
+## 3d window
 dialog.3d.title=GpsPrune vista 3-D
 dialog.3d.altitudefactor=Factor de exageraci\u00f3n de altura
 
-# Confirm messages
+## Confirm messages
+# These are displayed as confirmation in the status bar
 confirm.loadfile=Dato cargado de
 confirm.save.ok1=Guardado correctamente
 confirm.save.ok2=puntos al archivo
@@ -596,11 +627,11 @@ confirm.audioload=A\u00f1adidos archivos de audio
 confirm.correlateaudios.single=El audio fue correlacionado
 confirm.correlateaudios.multi=Los audios fueron correlacionados
 
-# Tips
+## Tips, shown just once when appropriate
 tip.title=Sugerencia
 tip.manuallycorrelateone=Correlacionando al menos una foto manualmente, el margen de tiempo se calcula autom\u00e1ticamente.
 
-# Buttons
+## Buttons
 button.ok=Aceptar
 button.back=Anterior
 button.next=Siguiente
@@ -615,9 +646,9 @@ button.close=Cerrar
 button.continue=Contin\u00fae
 button.yes=Si
 button.no=No
-button.always=Si, siempre
 button.yestoall=Si por todo
 button.notoall=No por todo
+button.always=Si, siempre
 button.select=Seleccionar
 button.selectall=Seleccionar todo
 button.selectnone=Seleccionar nada
@@ -634,7 +665,7 @@ button.delete=Eliminar
 button.manage=Administrar
 button.combine=Combinar
 
-# File types
+## File types
 filetype.txt=Archivos TXT
 filetype.jpeg=Archivos JPG
 filetype.kmlkmz=Archivos KML, KMZ
@@ -646,7 +677,8 @@ filetype.svg=Archivos SVG
 filetype.png=Archivos PNG
 filetype.audio=Archivos MP3, OGG, WAV
 
-# Display components
+## Display components
+# These are all for the side panels showing point/range details
 display.nodata=Ning\u00fan dato cargado
 display.noaltitudes=Los datos del track no incluyen altitudes
 display.notimestamps=Los datos de recorrido no incluyen marcas de tiempo
@@ -694,7 +726,7 @@ details.audio.file=Archivo de audio
 details.audio.playing=Reproduciendo...
 map.overzoom=No existen mapas disponibles con este nivel de enfoque
 
-# Field names
+## Field names
 fieldname.latitude=Latitud
 fieldname.longitude=Longitud
 fieldname.altitude=Altitud
@@ -712,7 +744,7 @@ fieldname.speed=Velocidad
 fieldname.verticalspeed=Velocidad vertical
 fieldname.description=Descripci\u00f3n
 
-# Measurement units
+## Measurement units
 units.original=Original
 units.default=Por defecto
 units.metres=Metros
@@ -746,22 +778,24 @@ units.degreescelsius.short=\u00b0C
 units.degreesfahrenheit=Fahrenheit
 units.degreesfahrenheit.short=\u00b0F
 
-# How to combine conditions, such as filters
+## How to combine conditions, such as filters
 logic.and=y
 logic.or=o
 
-# External urls
+## External urls and services
 url.googlemaps=maps.google.es
 wikipedia.lang=es
 openweathermap.lang=sp
+webservice.opencachingcom.lang=es
 
-# Cardinals for 3d plots
+## Cardinals for 3d plots
 cardinal.n=N
 cardinal.s=S
 cardinal.e=E
 cardinal.w=O
 
-# Undo operations
+## Undo operations
+# These will be displayed in the undo list after you've performed the operation, to tell you what you did
 undo.load=cargar datos
 undo.loadphotos=cargar fotos
 undo.loadaudios=cargar archivos de audio
@@ -792,7 +826,7 @@ undo.lookupsrtm=obtener altitudes de SRTM
 undo.deletefieldvalues=eliminar valores de campo
 undo.correlateaudios=correlacionar audios
 
-# Error messages
+## Error messages
 error.save.dialogtitle=Fallo al guardar datos
 error.save.nodata=Ning\u00fan dato guardado
 error.save.failed=Fallo al guardar datos al archivo

diff --git a/tim/prune/lang/prune-texts_fr.properties b/tim/prune/lang/prune-texts_fr.properties
index 0e25497fdcf606b39b93d235ec07dcc79de0b71c..ad05294a2b095d89f5f422890a4568ea1bdc0bb6 100644 (file)
--- a/tim/prune/lang/prune-texts_fr.properties
+++ b/tim/prune/lang/prune-texts_fr.properties
@@ -13,7 +13,7 @@ menu.track.undo=Annuler
 menu.track.clearundo=Purger la liste d'annulation
 menu.track.markrectangle=S\u00e9lectionner les points dans un rectangle
 menu.track.deletemarked=Supprimer les points marqu\u00e9s
-function.rearrangewaypoints=R\u00e9arranger les waypoints
+function.rearrangewaypoints=R\u00e9arranger les points du navigation
 menu.range=\u00c9tendue
 menu.range.all=Tout s\u00e9lectionner
 menu.range.none=Rien s\u00e9lectionner
@@ -32,11 +32,11 @@ menu.audio=Audio
 menu.view=Affichage
 menu.view.showsidebars=Montrer les barres lat\u00e9rales
 menu.view.browser=Ouvrir la carte dans le navigateur
-menu.view.browser.google=Google maps
+menu.view.browser.google=Cartes Google
 menu.view.browser.openstreetmap=Openstreetmap
 menu.view.browser.mapquest=Mapquest
-menu.view.browser.yahoo=Yahoo maps
-menu.view.browser.bing=Cartes dans Bing
+menu.view.browser.yahoo=Cartes Yahoo
+menu.view.browser.bing=Cartes Bing
 menu.settings=Pr\u00e9f\u00e9rences
 menu.settings.onlinemode=Charger cartes depuis internet
 menu.settings.autosave=Sauver automatiquement en quittant
@@ -84,14 +84,16 @@ function.exportgpx=Exporter en GPX
 function.exportpov=Exporter en POV
 function.exportsvg=Exporter en SVG
 function.exportimage=Exporter une image
-function.editwaypointname=\u00c9diter le nom du waypoint
+function.editwaypointname=\u00c9diter le nom du point
 function.compress=Compresser la trace
 function.deleterange=Supprimer l'\u00e9tendue
 function.croptrack=Recadrer l'\u00e9tendue
 function.interpolate=Interpoler les points
+function.deletebydate=Supprimer les points par date
 function.addtimeoffset=Ajouter un d\u00e9calage d'horaire
 function.addaltitudeoffset=Ajouter un d\u00e9calage d'altitude
-function.convertnamestotimes=Convertir les noms de waypoints en horodatages
+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
@@ -100,9 +102,10 @@ function.show3d=Montrer en 3D
 function.distances=Distances
 function.fullrangedetails=Montrer tous les d\u00e9tails
 function.estimatetime=Temps estim\u00e9
-function.learnestimationparams=Apprendre les param\u00e8tres pour l'estimation
+function.learnestimationparams=Apprentissage de l'estimation
 function.setmapbg=D\u00e9finir le fond de carte
 function.setpaths=D\u00e9finir les chemins des programmes
+function.selectsegment=S\u00e9lectionner le segment courant
 function.splitsegments=S\u00e9pare les segments
 function.sewsegments=R\u00e9unis les segments
 function.getgpsies=R\u00e9cup\u00e9rer les traces Gpsies
@@ -138,6 +141,7 @@ function.saveconfig=Enregistrer les pr\u00e9f\u00e9rences
 function.diskcache=Enregistrer les cartes sur le disque
 function.managetilecache=Gestion du cache des dalles de cartes
 function.getweatherforecast=Obtenir une pr\u00e9vision m\u00e9t\u00e9orologique
+function.setaltitudetolerance=Variation de d\u00e9nivel\u00e9 ignor\u00e9e
 
 # Dialogs
 dialog.exit.confirm.title=Quitter GpsPrune
@@ -189,6 +193,7 @@ dialog.gpsbabel.filters=Filtres
 dialog.addfilter.title=Ajouter un filtre
 dialog.gpsbabel.filter.discard=Jeter
 dialog.gpsbabel.filter.simplify=Simplifier
+dialog.gpsbabel.filter.distance=Distance
 dialog.gpsbabel.filter.interpolate=Interpoler
 dialog.gpsbabel.filter.discard.intro=Jeter les points si
 dialog.gpsbabel.filter.discard.hdop=Hdop >
@@ -199,7 +204,6 @@ dialog.gpsbabel.filter.discard.unknownfix=Point a une fix inconnue
 dialog.gpsbabel.filter.simplify.intro=Effacer les points jusque
 dialog.gpsbabel.filter.simplify.maxpoints=Nombre de points <
 dialog.gpsbabel.filter.simplify.maxerror=ou erreur <
-dialog.gpsbabel.filter.distance=Distance
 dialog.gpsbabel.filter.distance.distance=Si la distance <
 dialog.gpsbabel.filter.distance.time=et difference de temps <
 dialog.gpsbabel.filter.interpolate.distance=Si la distance >
@@ -256,6 +260,7 @@ dialog.exportsvg.theta=Angle d'\u00e9l\u00e9vation \u03b8
 dialog.exportsvg.gradients=Utiliser des d\u00e9grad\u00e9s pour l'ombrage
 dialog.exportimage.drawtrack=Dessiner la trace sur la carte
 dialog.exportimage.drawtrackpoints=Dessiner les points de trace
+dialog.exportimage.textscalepercent=Facteur d'echelle du texte (%)
 dialog.pointtype.desc=Sauvegarder ces types de points:
 dialog.pointtype.track=Points de la trace
 dialog.pointtype.waypoint=Waypoints
@@ -321,6 +326,7 @@ dialog.fullrangedetails.intro=Voici les d\u00e9tails pour l\u2019\u00e9tendue s\
 dialog.fullrangedetails.coltotal=Inclure les cellules vides
 dialog.fullrangedetails.colsegments=Exclure les cellules vides
 dialog.estimatetime.details=D\u00e9tails
+dialog.estimatetime.gentle=Pas escarp\u00e9
 dialog.estimatetime.steep=Escarp\u00e9
 dialog.estimatetime.climb=Mont\u00e9e
 dialog.estimatetime.descent=Descente
@@ -329,6 +335,7 @@ dialog.estimatetime.parameters.timefor=Dur\u00e9e pour
 dialog.estimatetime.results=R\u00e9sultats
 dialog.estimatetime.results.estimatedtime=Dur\u00e9e estim\u00e9e
 dialog.estimatetime.results.actualtime=Dur\u00e9e en fait
+dialog.estimatetime.error.noaltitudes=L'\u00e9tendue s\u00e9lectionn\u00e9e de contient pas d'altitudes
 dialog.learnestimationparams.averageerror=Erreur en moyenne
 dialog.learnestimationparams.combinedresults=R\u00e9sultats combin\u00e9es
 dialog.setmapbg.intro=S\u00e9lectionnez une source de cartes, ou ajoutez-en une nouvelle
@@ -392,6 +399,7 @@ dialog.correlate.timestamp.end=La fin
 dialog.correlate.audioselect.intro=Choisir un de ces fichiers audio corr\u00e9l\u00e9s comme d\u00e9calage de temps
 dialog.correlate.select.audioname=Nom du fichier audio
 dialog.correlate.select.audiolater=Audio apr\u00e8s
+dialog.rearrangewaypoints.desc=Choisissez la destination et l\u2019ordre des points du navigation
 dialog.rearrangephotos.desc=Choisissez la destination et l\u2019ordre des points des photos
 dialog.rearrange.tostart=Au d\u00e9but
 dialog.rearrange.toend=\u00e0 la fin
@@ -497,6 +505,8 @@ dialog.colourchooser.title=Choisissez la couleur
 dialog.colourchooser.red=Rouge
 dialog.colourchooser.green=Vert
 dialog.colourchooser.blue=Bleu
+dialog.colourer.type=Crit\u00e8re de coloriste
+dialog.colourer.type.none=Aucun
 dialog.setlanguage.firstintro=Vous pouvez s\u00e9lectionner l'une des langues disponibles,<p> ou bien un fichier de langue \u00e0 utiliser.
 dialog.setlanguage.secondintro=Vous devez sauvegarder vos param\u00e8tres puis<p>red\u00e9marrer GpsPrune pour changer de langue.
 dialog.setlanguage.language=Langue
@@ -546,7 +556,8 @@ dialog.weather.wind=Vent
 dialog.weather.temp=Temp
 dialog.weather.humidity=Humidit\u00e9
 dialog.weather.creditnotice=Ces donn\u00e9es sont fournies par openweathermap.org. Consultez la page pour plus de d\u00e9tails.
-dialog.deletebydate.column.keep=Conserver
+dialog.deletebydate.nodate=Sans horodatage
+dialog.deletebydate.column.keep=Garder
 dialog.deletebydate.column.delete=Supprimer
 
 # 3d window
@@ -700,6 +711,7 @@ fieldname.longitude=Longitude
 fieldname.altitude=Altitude
 fieldname.timestamp=Date et heure
 fieldname.time=Temps
+fieldname.date=Date
 fieldname.waypointname=Nom
 fieldname.waypointtype=Type
 fieldname.newsegment=Segment
@@ -753,6 +765,7 @@ logic.or=ou
 url.googlemaps=maps.google.fr
 wikipedia.lang=fr
 openweathermap.lang=fr
+webservice.opencachingcom.lang=fr
 
 # Cardinals for 3d plots
 cardinal.n=N

diff --git a/tim/prune/lang/prune-texts_hu.properties b/tim/prune/lang/prune-texts_hu.properties
index b4a9fafd692a58374e3d88d39814daa9fc5e9584..74ba9e42db12ea3a54bdfea058dda7a25ad162f7 100644 (file)
--- a/tim/prune/lang/prune-texts_hu.properties
+++ b/tim/prune/lang/prune-texts_hu.properties
@@ -1,5 +1,5 @@
 # Text entries for the GpsPrune application
-# Hungarian entries thanks to Gy\u00f6rgy Ball\u00f3 and Peter Bathory
+# Hungarian entries thanks to Gy\u00f6rgy Ball\u00f3, Peter Bathory and Peter Gervai
 
 # Menu entries
 menu.file=F\u00e1jl
@@ -13,8 +13,6 @@ menu.track.undo=Visszavon\u00e1s
 menu.track.clearundo=Visszavon\u00e1si lista t\u00f6rl\u00e9se
 menu.track.markrectangle=N\u00e9gyzeten bel\u00fcli pontok megjel\u00f6l\u00e9se
 menu.track.deletemarked=Jel\u00f6lt pontok t\u00f6rl\u00e9se
-function.rearrangewaypoints=\u00datpontok \u00fajrarendez\u00e9se
-dialog.rearrange.tonearest=Egyenk\u00e9nt a legk\u00f6zelebbi nyomponthoz
 menu.range=Tartom\u00e1ny
 menu.range.all=Mindet kijel\u00f6l
 menu.range.none=Kijel\u00f6l\u00e9s megsz\u00fcntet\u00e9se
@@ -42,6 +40,7 @@ menu.settings=Be\u00e1ll\u00edt\u00e1sok
 menu.settings.onlinemode=T\u00e9rk\u00e9pek bet\u00f6lt\u00e9se internetr\u0151l
 menu.settings.autosave=Be\u00e1ll\u00edt\u00e1sok automatikus ment\u00e9se kil\u00e9p\u00e9skor
 menu.help=S\u00fag\u00f3
+
 # Popup menu for map
 menu.map.zoomin=Nagy\u00edt\u00e1s
 menu.map.zoomout=Kicsiny\u00edt\u00e9s
@@ -90,8 +89,10 @@ function.compress=Nyomvonal t\u00f6m\u00f6r\u00edt\u00e9se
 function.deleterange=Tartom\u00e1ny t\u00f6rl\u00e9se
 function.croptrack=Nyomvonal k\u00f6rbev\u00e1g\u00e1sa
 function.interpolate=Pontok interpol\u00e1l\u00e1sa
+function.deletebydate=Pontok t\u00f6rl\u00e9se d\u00e1tum szerint
 function.addtimeoffset=Id\u0151eltol\u00e1s hozz\u00e1ad\u00e1sa
 function.addaltitudeoffset=Magass\u00e1geltol\u00e1s hozz\u00e1ad\u00e1sa
+function.rearrangewaypoints=\u00datpontok \u00fajrarendez\u00e9se
 function.convertnamestotimes=\u00datpontok neveinek konvert\u00e1l\u00e1sa id\u0151pontokk\u00e1
 function.deletefieldvalues=Mez\u0151 \u00e9rt\u00e9keinek t\u00f6rl\u00e9se
 function.findwaypoint=\u00datpont keres\u00e9se
@@ -104,6 +105,7 @@ function.estimatetime=Becs\u00fclt id\u0151
 function.learnestimationparams=Id\u0151becsl\u00e9s tanul\u00e1s\u00e1nak param\u00e9terei
 function.setmapbg=H\u00e1tt\u00e9rk\u00e9p be\u00e1ll\u00edt\u00e1sa
 function.setpaths=Program\u00fatvonalak be\u00e1ll\u00edt\u00e1sa
+function.selectsegment=Aktu\u00e1lis szakasz kiv\u00e1laszt\u00e1sa
 function.splitsegments=Nyomvonal kett\u00e9v\u00e1g\u00e1sa szakaszokk\u00e1
 function.sewsegments=Nyomvonalszakaszok \u00f6sszevon\u00e1sa
 function.getgpsies=Gpsies nyomvonalak let\u00f6lt\u00e9se
@@ -112,6 +114,7 @@ function.lookupsrtm=Magass\u00e1gok let\u00f6lt\u00e9se SRTM-r\u0151l
 function.downloadsrtm=SRTM csemp\u00e9k let\u00f6lt\u00e9se
 function.getwikipedia=K\u00f6zeli Wikip\u00e9dia sz\u00f3cikkek let\u00f6lt\u00e9se
 function.searchwikipedianames=Keres\u00e9s a Wikip\u00e9di\u00e1ban n\u00e9v szerint
+function.searchopencachingde=Keres\u00e9s az OpenCaching.de-n
 function.downloadosm=OSM adatok let\u00f6lt\u00e9se a ter\u00fcletr\u0151l
 function.duplicatepoint=Pont kett\u0151z\u00e9se
 function.setcolours=Sz\u00ednek be\u00e1ll\u00edt\u00e1sa
@@ -139,6 +142,7 @@ function.saveconfig=Be\u00e1ll\u00edt\u00e1sok ment\u00e9se
 function.diskcache=T\u00e9rk\u00e9pek ment\u00e9se lemezre
 function.managetilecache=Csempegyors\u00edt\u00f3t\u00e1r kezel\u00e9se
 function.getweatherforecast=Id\u0151j\u00e1r\u00e1s el\u0151rejelz\u00e9s
+function.setaltitudetolerance=Magass\u00e1gi t\u0171r\u00e9s be\u00e1ll\u00edt\u00e1sa
 
 # Dialogs
 dialog.exit.confirm.title=Kil\u00e9p\u00e9s a GpsPrune-b\u00f3l
@@ -377,6 +381,7 @@ dialog.gpsies.activity.sailing=Vitorl\u00e1z\u00e1s
 dialog.gpsies.activity.skating=Korcsoly\u00e1z\u00e1s
 dialog.wikipedia.column.name=Sz\u00f3cikk neve
 dialog.wikipedia.column.distance=T\u00e1vols\u00e1g
+dialog.wikipedia.nonefound=Nem tal\u00e1lhat\u00f3 Wikip\u00e9dia sz\u00f3cikk
 dialog.correlate.notimestamps=Nincsenek id\u0151b\u00e9lyegek az adatpontokon, \u00edgy nem feleltethet\u0151 meg semmi a f\u00e9nyk\u00e9pekkel.
 dialog.correlate.nouncorrelatedphotos=Nincsenek megfeleltetlen f\u00e9nyk\u00e9pek.\nBiztos benne, hogy folytatja?
 dialog.correlate.nouncorrelatedaudios=Nincsenek megfeleltetlen hangok.\nBiztos benne, hogy folytatja?
@@ -410,11 +415,14 @@ dialog.correlate.timestamp.end=V\u00e9g\u00e9t
 dialog.correlate.audioselect.intro=V\u00e1lasszon egyet ezek k\u00f6z\u00fcl a megfeleltetett f\u00e9nyk\u00e9pek k\u00f6z\u00fcl az id\u0151eltol\u00e1s haszn\u00e1lat\u00e1hoz
 dialog.correlate.select.audioname=Hang neve
 dialog.correlate.select.audiolater=Hang k\u00e9s\u0151bb
+dialog.rearrangewaypoints.desc=V\u00e1laszd ki az \u00fatpontok c\u00e9lj\u00e1t \u00e9s rendez\u00e9si sorrendj\u00e9t
 dialog.rearrangephotos.desc=V\u00e1lassza ki a f\u00e9nyk\u00e9ppontok c\u00e9lj\u00e1t \u00e9s rendez\u00e9si sorrendj\u00e9t
 dialog.rearrange.tostart=Mozgat\u00e1s a kezdet\u00e9hez
 dialog.rearrange.toend=Mozgat\u00e1s a v\u00e9g\u00e9hez
+dialog.rearrange.tonearest=Egyenk\u00e9nt a legk\u00f6zelebbi nyomponthoz
 dialog.rearrange.nosort=Ne rendezze
 dialog.rearrange.sortbyfilename=Rendez\u00e9s f\u00e1jln\u00e9v szerint
+dialog.rearrange.sortbyname=Rendez\u00e9s n\u00e9v szerint
 dialog.rearrange.sortbytime=Rendez\u00e9s id\u0151 szerint
 dialog.compress.closepoints.title=K\u00f6zeli pontok elt\u00e1vol\u00edt\u00e1sa
 dialog.compress.closepoints.paramdesc=Hat\u00f3t\u00e1vols\u00e1g
@@ -439,7 +447,7 @@ dialog.about.summarytext1=A GpsPrune egy program GPS vev\u0151kr\u0151l sz\u00e1
 dialog.about.summarytext2=Gnu GPL licenc alatt ker\u00fclt kiad\u00e1sra a szabad, ny\u00edlt, vil\u00e1gm\u00e9ret\u0171 haszn\u00e1lathoz \u00e9s fejleszt\u00e9shez.<br>M\u00e1sol\u00e1sa, terjeszt\u00e9se \u00e9s m\u00f3dos\u00edt\u00e1sa megengedett \u00e9s \u00f6szt\u00f6nz\u00f6tt<br>a mell\u00e9kelt <code>license.txt</code> f\u00e1jlban r\u00f6gz\u00edtett felt\u00e9telek szerint
 dialog.about.summarytext3=Tov\u00e1bbi inform\u00e1ci\u00f3k\u00e9rt \u00e9s kezel\u00e9si \u00fatmutat\u00f3\u00e9rt l\u00e1sd a <code style="font-weight:bold">http://activityworkshop.net/</code> webhelyet.
 dialog.about.languages=El\u00e9rhet\u0151 nyelvek
-dialog.about.translatedby=Magyar sz\u00f6veg: Ball\u00f3 Gy\u00f6rgy \u00e9s B\u00e1thory P\u00e9ter
+dialog.about.translatedby=Magyar sz\u00f6veg: Ball\u00f3 Gy\u00f6rgy, B\u00e1thory P\u00e9ter, Peter Gervai
 dialog.about.systeminfo=Rendszerinform\u00e1ci\u00f3
 dialog.about.systeminfo.os=Oper\u00e1ci\u00f3s rendszer
 dialog.about.systeminfo.java=Java futtat\u00f3k\u00f6rnyezet
@@ -513,6 +521,19 @@ dialog.colourchooser.title=Sz\u00edn kiv\u00e1laszt\u00e1sa
 dialog.colourchooser.red=Piros
 dialog.colourchooser.green=Z\u00f6ld
 dialog.colourchooser.blue=K\u00e9k
+dialog.colourer.intro=A pontsz\u00ednez\u0151 a nyomvonalpontoknak egyedi sz\u00edneket adhat
+dialog.colourer.type=A sz\u00ednez\u0151 t\u00edpusa
+dialog.colourer.type.none=Nincs
+dialog.colourer.type.byfile=F\u00e1jl szerint
+dialog.colourer.type.bysegment=Szakaszok szerint
+dialog.colourer.type.byaltitude=Magass\u00e1g szerint
+dialog.colourer.type.byspeed=Sebess\u00e9g szerint
+dialog.colourer.type.byvertspeed=F\u00fcgg\u0151leges sebess\u00e9g szerint
+dialog.colourer.type.bygradient=Emelked\u00e9s szerint
+dialog.colourer.type.bydate=D\u00e1tum szerint
+dialog.colourer.start=Kezd\u0151sz\u00edn
+dialog.colourer.end=V\u00e9gsz\u00edn
+dialog.colourer.maxcolours=Sz\u00ednek maxim\u00e1lis sz\u00e1ma
 dialog.setlanguage.firstintro=Kiv\u00e1laszthat egy be\u00e9p\u00edtett nyelvet,<p>vagy v\u00e1lasszon egy sz\u00f6vegf\u00e1jlt helyette.
 dialog.setlanguage.secondintro=Mentenie kell a be\u00e1ll\u00edt\u00e1sokat, majd<p>a nyelv v\u00e1lt\u00e1s\u00e1hoz ind\u00edtsa \u00fajra a GpsPrune-t.
 dialog.setlanguage.language=Nyelv
@@ -558,7 +579,17 @@ dialog.weather.day.thursday=Cs\u00fct\u00f6rt\u00f6k
 dialog.weather.day.friday=P\u00e9ntek
 dialog.weather.day.saturday=Szombat
 dialog.weather.day.sunday=Vas\u00e1rnap
+dialog.weather.wind=Sz\u00e9l
+dialog.weather.temp=H\u0151m.
+dialog.weather.humidity=L\u00e9gnedvess\u00e9g
 dialog.weather.creditnotice=Az adatok az openweathermap.org-r\u00f3l sz\u00e1rmaznak. N\u00e1luk tov\u00e1bbi inform\u00e1ci\u00f3t tal\u00e1lsz.
+dialog.deletebydate.onlyonedate=A pontok ugyanazon a napon ker\u00fcltek r\u00f6gz\u00edt\u00e9sre
+dialog.deletebydate.intro=A nyomvonal minden pontj\u00e1n\u00e1l eld\u00f6ntheted hogy t\u00f6rl\u00f6d vagy megtartod azt
+dialog.deletebydate.nodate=Nincsenek id\u0151b\u00e9lyegek
+dialog.deletebydate.column.keep=Megtart
+dialog.deletebydate.column.delete=T\u00f6r\u00f6l
+dialog.setaltitudetolerance.text.metres=Az a hat\u00e1r (m\u00e9terben) ami alatt a kis s\u00fcllyed\u00e9seket \u00e9s emelked\u00e9seket figyelmen k\u00edv\u00fcl hagyjuk
+dialog.setaltitudetolerance.text.feet=Az a hat\u00e1r (l\u00e1bban) ami alatt a kis s\u00fcllyed\u00e9seket \u00e9s emelked\u00e9seket figyelmen k\u00edv\u00fcl hagyjuk
 
 # 3d window
 dialog.3d.title=GpsPrune 3D n\u00e9zet
@@ -713,6 +744,7 @@ fieldname.longitude=Hossz\u00fas\u00e1g
 fieldname.altitude=Magass\u00e1g
 fieldname.timestamp=Id\u0151
 fieldname.time=Id\u0151
+fieldname.date=D\u00e1tum
 fieldname.waypointname=N\u00e9v
 fieldname.waypointtype=T\u00edpus
 fieldname.newsegment=Szakasz
@@ -762,9 +794,15 @@ units.degreesfahrenheit.short=\u00b0F
 logic.and=\u00e9s
 logic.or=vagy
 
-# External urls
+# External urls and services
 url.googlemaps=maps.google.hu
 wikipedia.lang=hu
+openweathermap.lang=en
+webservice.peakfinder=Peakfinder.org megnyit\u00e1sa
+webservice.geohack=A geohack lap nyit\u00e1sa
+webservice.panoramio=Panoramio t\u00e9rk\u00e9p nyit\u00e1sa
+webservice.opencachingcom=Opencaching.com nyit\u00e1sa
+webservice.opencachingcom.lang=en
 
 # Cardinals for 3d plots
 cardinal.n=\u00c9

diff --git a/tim/prune/lang/prune-texts_it.properties b/tim/prune/lang/prune-texts_it.properties
index c437011bfadf72d87f6198f4609a56906ea69fac..06eb02985330ad6137a2f62bc12dd20fdc812b5e 100644 (file)
--- a/tim/prune/lang/prune-texts_it.properties
+++ b/tim/prune/lang/prune-texts_it.properties
@@ -113,6 +113,7 @@ function.lookupsrtm=Ottieni quote da SRTM
 function.downloadsrtm=Scarica file da SRTM
 function.getwikipedia=Ottieni informazioni da Wikipedia
 function.searchwikipedianames=Cerca il nome in Wikipedia
+function.searchopencachingde=Cerca OpenCaching.de
 function.downloadosm=Scarica dati OSM dell'area
 function.duplicatepoint=Duplica punto corrente in coda
 function.setcolours=Scegli colori
@@ -414,7 +415,7 @@ dialog.correlate.audioselect.intro=Seleziona una di queste riprese audio correla
 dialog.correlate.select.audioname=Nome ripresa audio
 dialog.correlate.select.audiolater=Ripresa audio successiva
 dialog.rearrangephotos.desc=Seleziona la destinazione e l'ordine dei punti foto
-dialog.rearrangephotos.desc=Seleziona la destinazione e l'ordine dei waypoint
+dialog.rearrangewaypoints.desc=Seleziona la destinazione e l'ordine dei waypoint
 dialog.rearrange.tostart=Sposta all'inizio
 dialog.rearrange.toend=Sposta alla fine
 dialog.rearrange.tonearest=Sul punto pi\u00f9 vicino
@@ -519,9 +520,12 @@ dialog.colourchooser.title=Scegli colore
 dialog.colourchooser.red=Rosso
 dialog.colourchooser.green=Verde
 dialog.colourchooser.blue=Blu
+dialog.colourer.intro=\u00c8 possibile assegnare colori differenti ai punti traccia
+dialog.colourer.type=Metodo
+dialog.colourer.type.none=Nessuno
 dialog.colourer.type.byfile=Per file
 dialog.colourer.type.bysegment=Per segmento
-dialog.colourer.type.byaltitude=Per altitud
+dialog.colourer.type.byaltitude=Per altitudine
 dialog.colourer.type.byspeed=Per velocit\u00e0
 dialog.colourer.type.byvertspeed=Per velocit\u00e0 verticale
 dialog.colourer.type.bygradient=Per gradiente
@@ -578,9 +582,13 @@ dialog.weather.wind=Vento
 dialog.weather.temp=Temp
 dialog.weather.humidity=Umidit\u00e0
 dialog.weather.creditnotice=Queste informazioni sono rese disponibili da openweathermap.org. Il loro sito web contiene ulteriori dettagli.
+dialog.deletebydate.onlyonedate=I punti sono stati registrati tutti nella stessa data.
+dialog.deletebydate.intro=Per ogni data nella traccia \u00e8 possibile eliminare o conservare i punti
 dialog.deletebydate.nodate=Senza dati temporali
 dialog.deletebydate.column.keep=Tieni
 dialog.deletebydate.column.delete=Cancella
+dialog.setaltitudetolerance.text.metres=Tolleranza di altitudini (metri)
+dialog.setaltitudetolerance.text.feet=Tolleranza di altitudini (feet)
 
 # 3d window
 dialog.3d.title=Visione GpsPrune in 3D
@@ -789,6 +797,7 @@ logic.or=o
 url.googlemaps=maps.google.it
 wikipedia.lang=it
 openweathermap.lang=it
+webservice.opencachingcom.lang=it
 
 # Cardinals for 3d plots
 cardinal.n=N

diff --git a/tim/prune/lang/prune-texts_nl.properties b/tim/prune/lang/prune-texts_nl.properties
index bcfa3f1a732b4c1b556aad5d422fb3f0e8ef9814..a9431c6425bc770902a2a1b662774840bc16ae28 100644 (file)
--- a/tim/prune/lang/prune-texts_nl.properties
+++ b/tim/prune/lang/prune-texts_nl.properties
@@ -636,7 +636,7 @@ confirm.correlateaudios.multi=audiobestanden gecorreleerd
 
 # Tips, shown just once when appropriate
 tip.title=Tip
-tip.useamapcache=Door het instellen van een schijfcache (Instellingen -> Kaart opslaan op schijf<span style="color: #ff0000;">)\nkan je de afbeeldsnelheid verbeteren en het netwerkverkeer verminderen.</span>
+tip.useamapcache=Door het instellen van een schijfcache (Instellingen -> Kaart opslaan op schijf)\nkan je de afbeeldsnelheid verbeteren en het netwerkverkeer verminderen.
 tip.learntimeparams=De resultaten zullen nauwkeuriger zijn als je \nRoute -> Parameters voor geschatte tijd\ngebruikt op je opgenomen routes.
 tip.downloadsrtm=Je kan dit versnellen door hier\nOnline -> Download SRTM tegels\nde data in je kaartcache op te slaan.
 tip.usesrtmfor3d=Deze route heeft geen hoogten.\nJe kan de SRTM functies gebruiken om een geschatte hoogte\nop te halen voor het 3d beeld.
@@ -796,6 +796,7 @@ logic.or=of
 url.googlemaps=maps.google.nl
 wikipedia.lang=nl
 openweathermap.lang=nl
+webservice.opencachingcom.lang=nl
 
 # Cardinals for 3d plots
 cardinal.n=N

diff --git a/tim/prune/lang/prune-texts_pl.properties b/tim/prune/lang/prune-texts_pl.properties
index e730fb177dd6e9a857bd9efa4f390564602f1d53..acf3fe08fb4428962ccf9fc897e4ec390a3ceb42 100644 (file)
--- a/tim/prune/lang/prune-texts_pl.properties
+++ b/tim/prune/lang/prune-texts_pl.properties
@@ -606,7 +606,7 @@ confirm.addtimeoffset=Dodano przesuni\u0119cie czasowe
 confirm.addaltitudeoffset=Dodano przesuni\u0119cie wysoko\u015bci
 confirm.rearrangewaypoints=Przestawiono punkty po\u015brednie
 confirm.rearrangephotos=Zmieniono kolejno\u015b\u0107 zdj\u0119\u0107
-confirm.splitsegments=
+confirm.splitsegments=Podzielono na %d fragmenty/\u00f3w
 confirm.sewsegments=Po\u0142\u0105czono %d fragmenty/\u00f3w
 confirm.cutandmove=Przesuni\u0119to zaznaczenie
 confirm.interpolate=Dodano punkty
@@ -796,6 +796,7 @@ logic.or=lub
 url.googlemaps=maps.google.pl
 wikipedia.lang=pl
 openweathermap.lang=pl
+webservice.opencachingcom.lang=pl
 
 # Cardinals for 3d plots
 cardinal.n=N

diff --git a/tim/prune/lang/prune-texts_ro.properties b/tim/prune/lang/prune-texts_ro.properties
index e734fb73036ceb50438ec78dd60f1af99b82c2f4..e31143085e3908482bf8bc2b8eb2723b1e7044fb 100644 (file)
--- a/tim/prune/lang/prune-texts_ro.properties
+++ b/tim/prune/lang/prune-texts_ro.properties
@@ -501,4 +501,10 @@ undo.disconnect=deconecteaza
 undo.rotatephoto=roti foto
 
 # Error messages
-error.function.notavailable.title=Func\u021bie indisponibil\u0103
\ No newline at end of file
+error.saveexif.cannotoverwrite1=Fi\u0219ier
+error.jpegload.nofilesfound=Nu au fost g\u0103site fi\u0219iere
+error.jpegload.nojpegsfound=Nu au fost g\u0103site fi\u0219iere jpeg
+error.jpegload.nogpsfound=Nu a fost g\u0103sit informa\u021Bii GPS
+error.audioload.nofilesfound=Nu au fost g\u0103site fi\u0219iere audio
+error.function.notavailable.title=Func\u021bie indisponibil\u0103
+error.readme.notfound=Fi\u015Fierul "cite\u015Fte-m\u0103" nu a fost g\u0103sit

diff --git a/tim/prune/readme.txt b/tim/prune/readme.txt
index 7b1c9c68eebf2dba7df83b97aa9bc16568b67066..eae9fe373ffb32e8770d95c9d35d5961cac93b35 100644 (file)
--- a/tim/prune/readme.txt
+++ b/tim/prune/readme.txt
@@ -1,11 +1,11 @@
-GpsPrune version 17
-===================
+GpsPrune version 17.2
+=====================
 
 GpsPrune is an application for viewing, editing and managing coordinate data from GPS systems,
 including format conversion, charting and photo correlation.
 Full details can be found at http://gpsprune.activityworkshop.net/
 
-GpsPrune is copyright 2006-2014 activityworkshop.net and distributed under the terms of the Gnu GPL version 2.
+GpsPrune is copyright 2006-2015 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_17.jar
+   java -jar gpsprune_17.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,8 +25,21 @@ 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_17.jar --lang=DE
+   java -jar gpsprune_17.2.jar --lang=DE
+
 
+New with version 17.2
+=====================
+The following fixes were added since version 17.1:
+  - Speed up the cache management dialog
+  - Translation improvements
+
+New with version 17.1
+=====================
+The following fixes were added since version 17:
+  - Fix the decimal precision of coordinates calculated by interpolation and averaging
+  - Fix the selection adjustment when midpoints within the selection are dragged
+  - Minor translation improvements
 
 New with version 17
 ===================

diff --git a/tim/prune/threedee/TerrainHelper.java b/tim/prune/threedee/TerrainHelper.java
index 0be2216cdf592384e95feb5c5ac34add99453b69..16e63edbc43c57f84a320563030ee5a625ff804b 100644 (file)
--- a/tim/prune/threedee/TerrainHelper.java
+++ b/tim/prune/threedee/TerrainHelper.java
@@ -149,8 +149,8 @@ public class TerrainHelper
                                // Create a new point with the appropriate lat and long, with no altitude
                                double pX = xRange.getMinimum() + j * xStep;
                                DataPoint point = new DataPoint(
-                                       new Latitude(MapUtils.getLatitudeFromY(pY), Coordinate.FORMAT_NONE),
-                                       new Longitude(MapUtils.getLongitudeFromX(pX), Coordinate.FORMAT_NONE),
+                                       new Latitude(MapUtils.getLatitudeFromY(pY), Coordinate.FORMAT_DECIMAL_FORCE_POINT),
+                                       new Longitude(MapUtils.getLongitudeFromX(pX), Coordinate.FORMAT_DECIMAL_FORCE_POINT),
                                        null);
                                //System.out.println("Created point at " + point.getLatitude().output(Coordinate.FORMAT_DEG_MIN_SEC)
                                //      + ", " + point.getLongitude().output(Coordinate.FORMAT_DEG_MIN_SEC));