This is an automated email from the git hooks/post-receive script. monica pushed a commit to branch master in repository gpsprune.
commit 3c17518ec42973c39976cd6f8093a50d9890c5cb Author: Mònica Ramírez Arceda <[email protected]> Date: Thu Oct 30 11:57:23 2014 +0100 Imported Upstream version 17.1 --- build.sh | 2 +- tim/prune/App.java | 2 +- tim/prune/GpsPrune.java | 4 +- tim/prune/data/Coordinate.java | 2 +- tim/prune/data/Track.java | 4 +- tim/prune/gui/images/add_photo_icon.png | Bin tim/prune/gui/images/add_textfile_icon.png | Bin tim/prune/lang/prune-texts_da.properties | 84 ---------------------- tim/prune/lang/prune-texts_es.properties | 73 +++++++++++++------ tim/prune/lang/prune-texts_fa.properties | 73 ------------------- tim/prune/lang/prune-texts_fr.properties | 26 ++++--- tim/prune/lang/prune-texts_in.properties | 111 ----------------------------- tim/prune/lang/prune-texts_it.properties | 6 +- tim/prune/lang/prune-texts_ro.properties | 8 ++- tim/prune/lang/prune-texts_sv.properties | 102 -------------------------- tim/prune/readme.txt | 15 ++-- tim/prune/threedee/TerrainHelper.java | 4 +- 17 files changed, 100 insertions(+), 416 deletions(-) diff --git a/build.sh b/build.sh index 18927e2..f909584 100644 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ # Build script using external exif library # Version number -PRUNENAME=gpsprune_17 +PRUNENAME=gpsprune_17.1 # remove compile directory rm -rf compile # remove dist directory diff --git a/tim/prune/App.java b/tim/prune/App.java index c69d73e..7be8242 100644 --- 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 e382170..2e02fa5 100644 --- a/tim/prune/GpsPrune.java +++ b/tim/prune/GpsPrune.java @@ -36,9 +36,9 @@ import tim.prune.gui.profile.ProfileChart; public class GpsPrune { /** Version number of application, used in about screen and for version check */ - public static final String VERSION_NUMBER = "17"; + public static final String VERSION_NUMBER = "17.1"; /** Build number, just used for about screen */ - public static final String BUILD_NUMBER = "320"; + public static final String BUILD_NUMBER = "320a"; /** 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 e2b67a8..e30fa4a 100644 --- 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 c56f9f5..31c9b4e 100644 --- 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/gui/images/add_photo_icon.png b/tim/prune/gui/images/add_photo_icon.png old mode 100644 new mode 100755 diff --git a/tim/prune/gui/images/add_textfile_icon.png b/tim/prune/gui/images/add_textfile_icon.png old mode 100644 new mode 100755 diff --git a/tim/prune/lang/prune-texts_da.properties b/tim/prune/lang/prune-texts_da.properties deleted file mode 100644 index 8bcf9ca..0000000 --- a/tim/prune/lang/prune-texts_da.properties +++ /dev/null @@ -1,84 +0,0 @@ -# Text entries for the GpsPrune application -# Danish translations - -# Menu entries -menu.file=Fil -menu.file.addphotos=Tilf\u00f8j billeder -menu.file.recentfiles=Seneste filer -menu.file.save=Gem som tekst -menu.file.exit=Afslut -menu.track.undo=Fortryd -menu.track.clearundo=Nulstil fortrydelsesliste -menu.track.deletemarked=Slet markerede punkter -function.rearrangewaypoints=Omorganis\u00e9r waypoints -dialog.rearrange.tonearest=Hvert waypoint til n\u00e6rmeste nabo -menu.range=Omr\u00e5de -menu.range.all=V\u00e6lg alle -menu.range.none=Ingen valgt -menu.range.start=V\u00e6lg omr\u00e5des startpunkt -menu.range.end=V\u00e6lg omr\u00e5des slutpunkt -menu.range.average=Dan gennemsnit af valgte omr\u00e5de -menu.range.reverse=Dan omvendt r\u00e6kkef\u00f8lge -menu.range.mergetracksegments=Sammensmelt sporsegmenter -menu.range.cutandmove=Afsk\u00e6r og flyt valgte omr\u00e5de -menu.point=Punkt -menu.point.editpoint=Redig\u00e8r punkt -menu.point.deletepoint=Fjern punkt -menu.photo=Foto -menu.photo.saveexif=Gem Exif-data -menu.audio=Lyd -menu.view=Udseende -menu.view.showsidebars=Vis sidepanel -menu.view.browser=Kort i browser -menu.settings=Indstillinger -menu.settings.onlinemode=Hent kort fra Internettet -menu.settings.autosave=Gem indstillinger automatisk ved aflutning -menu.help=Hj\u00e6lp -# Popup menu for map -menu.map.zoomin=Zoom ind -menu.map.zoomout=Zoom ud -menu.map.newpoint=Skab nyt punkt -menu.map.drawpoints=Skab serie af punkter -menu.map.connect=Saml punkter p\u00e5 linie -menu.map.autopan=Autocentrering -menu.map.showmap=Vis kort -menu.map.showscalebar=Vis m\u00e5lestok - -# Alt keys for menus -altkey.menu.file=F -altkey.menu.track=S -altkey.menu.range=O -altkey.menu.point=P -altkey.menu.view=U -altkey.menu.photo=T -altkey.menu.audio=L -altkey.menu.settings=I -altkey.menu.help=H - -# Functions -function.open=\u00c5bn fil -function.importwithgpsbabel=Import\u00e9r fil med GPSBabel -function.loadfromgps=Hent data fra GPS -function.sendtogps=Overf\u00f8r data til GPS -function.exportkml=Eksport\u00e9r KML -function.exportgpx=Eksport\u00e9r GPX -function.exportpov=Eksport\u00e9r POV -function.exportsvg=Eksport\u00e9r SVG -function.editwaypointname=Ret waypoint-navn -function.compress=Komprim\u00e9r spor -function.deleterange=Fjern det valgte omr\u00e5de -function.croptrack=Afgr\u00e6ns spor -function.interpolate=Interpol\u00e9r -function.addtimeoffset=Tilf\u00f8j offset p\u00e5 tiden -function.addaltitudeoffset=Tilf\u00f8j offset p\u00e5 h\u00f8jde -function.convertnamestotimes=Ret waypoint-navne til tidspunkter -function.deletefieldvalues=Fjern feltv\u00e6rdier -function.findwaypoint=Find waypoint -function.pastecoordinates=Indf\u00f8j nye koordinater -function.charts=Kort -function.show3d=3-D view -function.distances=Afstande -function.fullrangedetails=Vis alle detaljer -function.setmapbg=V\u00e6lg kort som baggrund -function.setpaths=V\u00e6lg sti til programmer -function.getgpsies=Se liste af GPS-spor diff --git a/tim/prune/lang/prune-texts_es.properties b/tim/prune/lang/prune-texts_es.properties index 63901b2..a51088c 100644 --- 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 @@ -199,8 +203,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 +252,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 @@ -501,8 +514,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 +537,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 +579,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 +622,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 +641,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 +660,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 +672,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 +721,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 +739,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 +773,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 +821,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_fa.properties b/tim/prune/lang/prune-texts_fa.properties deleted file mode 100644 index a70545b..0000000 --- a/tim/prune/lang/prune-texts_fa.properties +++ /dev/null @@ -1,73 +0,0 @@ -# Text entries for the Prune application -# Persian (Farsi) entries as extra - -# Menu entries -menu.file=\u067e\u0648\u0634\u0647 -menu.file.addphotos=\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0639\u06a9\u0633 -menu.file.save=\u0630\u062e\u064a\u0631\u0647 -menu.file.exit=\u062e\u0631\u0648\u062c -menu.track=\u0645\u0633\u064a\u0631 -menu.track.undo=\u0628\u0627\u0637\u0644 \u06a9\u0631\u062f\u0646 \u06a9\u0627\u0631 \u0642\u0628\u0644\u064a -menu.track.clearundo=\u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u0644\u064a\u0633\u062a \u06a9\u0627\u0631\u0647\u0627\u06cc \u0627\u0646\u062c\u0627\u0645 \u0634\u062f\u0647 -menu.track.deletemarked=\u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u0646\u0642\u0627\u0637 \u0627\u0646\u062a\u062e\u0627\u0628 \u0634\u062f\u0647 -function.rearrangewaypoints=\u0628\u0627\u0632 \u0686\u064a\u0646\u06cc \u0646\u0642\u0627\u0637 \u0645\u0633\u064a\u0631 -dialog.rearrange.tostart=\u0647\u0645\u0647 \u0646\u0642\u0627\u0637 \u0628\u0647 \u0627\u0628\u062a\u062f\u0627\u06cc \u0645\u0633\u064a\u0631 -dialog.rearrange.toend=\u0647\u0645\u0647 \u0646\u0642\u0627\u0637 \u0628\u0647 \u0627\u0646\u062a\u0647\u0627\u06cc \u0645\u0633\u064a\u0631 -dialog.rearrange.tonearest=\u0647\u0631 \u064a\u06a9 \u0628\u0647 \u0646\u0632\u062f\u064a\u06a9 \u0646\u0642\u0637\u0647 \u0645\u0633\u064a\u0631 -menu.range=\u0686\u064a\u0646\u0634 -menu.range.all=\u0627\u0646\u062a\u062e\u0627\u0628 \u0647\u0645\u0647 \u0646\u0642\u0627\u0637 -menu.range.none=\u0627\u0646\u062a\u062e\u0627\u0628 \u0647\u064a\u0686 \u064a\u06a9 \u0627\u0632 \u0646\u0642\u0627\u0637 -menu.range.start=\u062a\u0646\u0638\u064a\u0645 \u0634\u0631\u0648\u0639 \u0686\u064a\u0646\u0634 -menu.range.end=\u062a\u0646\u0638\u064a\u0645 \u0627\u0646\u062a\u0647\u0627\u06cc \u0686\u064a\u0646\u0634 -function.deleterange=\u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u0686\u064a\u0646\u0634 -function.interpolate=\u062f\u0631\u0648\u0646\u064a\u0627\u0628\u06cc -menu.range.average=\u0645\u06cc\u0627\u0646\u06af\u064a\u0646 \u0627\u0646\u062a\u062e\u0627\u0628 \u0634\u062f\u0647 \u0647\u0627 -menu.range.reverse=\u0686\u064a\u0646\u0634 \u0645\u0639\u06a9\u0648\u0633 -menu.range.mergetracksegments=\u0627\u062a\u0635\u0627\u0644 \u0642\u0633\u0645\u062a \u0647\u0627\u06cc \u0645\u0633\u064a\u0631 -menu.range.cutandmove=\u062c\u062f\u0627 \u06a9\u0631\u062f\u0646 \u0642\u0633\u0645\u062a \u0627\u0646\u062a\u062e\u0627\u0628 \u0634\u062f\u0647 -menu.point=\u0646\u0642\u0637\u0647 -menu.point.editpoint=\u062a\u0646\u0638\u064a\u0645\u0627\u062a \u0646\u0642\u0637\u0647 -menu.point.deletepoint=\u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u0646\u0642\u0637\u0647 -menu.photo=\u0639\u06a9\u0633 -menu.photo.saveexif=\u0630\u062e\u064a\u0631\u0647 \u062f\u0631 \u0641\u0627\u064a\u0644 \u0636\u0645\u064a\u0645\u0647 \u0639\u06a9\u0633 -function.connecttopoint=\u0627\u062a\u0635\u0627\u0644 \u0628\u0647 \u0646\u0642\u0637\u0647 -function.disconnectfrompoint=\u0642\u0637\u0639 \u0627\u062a\u0635\u0627\u0644 \u0627\u0632 \u0646\u0642\u0637\u0647 -function.removephoto=\u0628\u0631\u062f\u0627\u0634\u062a\u0646 \u0639\u06a9\u0633 -menu.view=\u062f\u064a\u062f -menu.view.browser=\u0646\u0642\u0634\u0647 \u062f\u0631\u062c\u0633\u062a\u062c\u0648\u06af\u0631 -menu.view.browser.google=Google Maps -menu.view.browser.openstreetmap=OpenStreetMap -menu.view.browser.mapquest=MapQuest -menu.view.browser.yahoo=Yahoo Maps -menu.view.browser.bing=Bing Maps -menu.settings=\u062a\u0646\u0638\u06cc\u0645\u0627\u062a -menu.settings.onlinemode=\u062f\u0627\u0646\u0644\u0648\u062f \u0646\u0642\u0634\u0647 \u0627\u0632 \u0627\u064a\u0646\u062a\u0631\u0646\u062a -menu.help=\u0631\u0627\u0647\u0646\u0645\u0627 -# Popup menu for map -menu.map.zoomin=\u0628\u0632\u0631\u06af \u0646\u0645\u0627\u064a\u06cc -menu.map.zoomout=\u06a9\u0648\u0686\u06a9 \u0646\u0645\u0627\u064a\u06cc -menu.map.zoomfull=\u0646\u0645\u0627\u064a\u0634 \u062f\u0631 \u0627\u0646\u062f\u0627\u0632\u0647 \u06a9\u0627\u0645\u0644 -menu.map.newpoint=\u0627\u064a\u062c\u0627\u062f \u0646\u0642\u0637\u0647 \u062c\u062f\u064a\u062f -menu.map.connect=\u0627\u062a\u0635\u0627\u0644 \u0646\u0642\u0627\u0637 \u0645\u0633\u064a\u0631 -menu.map.autopan=\u0646\u0645\u0627\u064a\u0634 \u062f\u0627\u0626\u0645 \u0646\u0642\u0637\u0647 -menu.map.showmap=\u0646\u0645\u0627\u064a\u0634 \u0646\u0642\u0637\u0647 -menu.map.showscalebar=\u0646\u0645\u0627\u064a\u0634 \u062a\u0646\u0638\u064a\u0645\u0627\u062a \u0645\u0642\u064a\u0627\u0633 - -# Alt keys for menus -altkey.menu.file=\u067e -altkey.menu.track=\u0645 -altkey.menu.range=\u0686 -altkey.menu.point=\u0646 -altkey.menu.view=\u062f -altkey.menu.photo=\u0639 -altkey.menu.settings=\u062a -altkey.menu.help=\u0631 - -# Ctrl shortcuts for menu items -shortcut.menu.file.open=\u0628 -shortcut.menu.file.load=\u062f -shortcut.menu.file.save=\u0630 -shortcut.menu.track.undo=\u0638 -shortcut.menu.edit.compress=\u062a -shortcut.menu.range.all=\u0686 -shortcut.menu.help.help=\u0631 diff --git a/tim/prune/lang/prune-texts_fr.properties b/tim/prune/lang/prune-texts_fr.properties index 0e25497..04a0d12 100644 --- 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 > @@ -392,6 +396,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 @@ -546,7 +551,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 +706,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 +760,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_in.properties b/tim/prune/lang/prune-texts_in.properties deleted file mode 100644 index c0b4246..0000000 --- a/tim/prune/lang/prune-texts_in.properties +++ /dev/null @@ -1,111 +0,0 @@ -# Text entries for the Prune application -# Indonesian entries as extra - -# Menu entries -menu.file=Berkas -menu.file.addphotos=Muat foto -menu.file.save=Simpan -menu.file.exit=Keluar -menu.track=Track -menu.track.undo=Batal -menu.point.editpoint=Perbaiki titik -menu.point.deletepoint=Hapus titik -function.deleterange=Hapus jarak -menu.range=Jangkauan -menu.point=Titik -menu.range.all=Pilih semua -menu.range.none=Tidak memilih -menu.photo=Foto -menu.photo.saveexif=Simpan ke Exif -function.connecttopoint=Hubungkan ke titik -function.disconnectfrompoint=Putuskan dari titik -function.removephoto=Menghapus foto -menu.view=Lihat -menu.settings=Pengaturan -menu.view.browser=Peta di browser -menu.help=Bantuan -# Popup menu for map -menu.map.zoomin=Perbesar -menu.map.zoomout=Perkecil -menu.map.newpoint=Buat titik baru -menu.map.connect=Hubungkan titik jalur -menu.map.showmap=Tampilkan peta - -# Alt keys for menus -altkey.menu.file=B -altkey.menu.track=T -altkey.menu.range=J -altkey.menu.point=K -altkey.menu.view=L -altkey.menu.photo=F -altkey.menu.settings=G -altkey.menu.help=N - -# Ctrl shortcuts for menu items -shortcut.menu.file.open=B -shortcut.menu.file.load=M -shortcut.menu.file.save=S -shortcut.menu.track.undo=Z -shortcut.menu.edit.compress=P -shortcut.menu.range.all=- -shortcut.menu.help.help=- - -# Functions -function.open=Buka -function.loadfromgps=Muat data dari GPS -function.sendtogps=Kirim data ke GPS -function.exportkml=Ekspor KML -function.exportgpx=Ekspor GPX -function.exportpov=Ekspor POV -function.editwaypointname=Perbaiki Nama waypoint -function.compress=Padatkan jalur -function.findwaypoint=Menemukan waypoint -function.charts=Grafik -function.show3d=Lihat tiga-D -function.distances=Jarak -function.correlatephotos=Korelasikan foto -function.help=Bantuan -function.about=Tentang Prune -function.saveconfig=Simpan pengaturan - -# Dialogs -dialog.load.table.datatype=Jenis -dialog.load.table.description=Keterangan -dialog.pointnameedit.name=Nama -dialog.distances.column.from=Awal -dialog.distances.column.to=Akhir -dialog.about.languages=Bahasa -dialog.about.yes=Ya -dialog.about.no=Tidak - -# Buttons -button.back=Sebelumnya -button.next=Lanjut -button.close=Tutup -button.yes=Ya -button.no=Tidak -button.select=Pilih -button.guessfields=Deteksi otomatis - -# File types -filetype.txt=Berkas teks -filetype.jpeg=Berkas JPG -filetype.kmlkmz=Berkas KML, KMZ -filetype.kml=Berkas KML -filetype.kmz=Berkas KMZ -filetype.gpx=Berkas GPX -filetype.pov=Berkas POV -filetype.svg=Berkas SVG - -# Display components -display.nodata=Tidak ada data -details.trackdetails=Rincian track -details.notrack=Tidak ada track -details.pointdetails=Rincian titik -details.nopointselection=Tidak ada titik -details.norangeselection=Tidak ada jangkauan -details.rangedetails=Rincian jangkauan -details.lists.photos=Foto -details.photodetails=Rincian foto -details.nophoto=Tidak ada foto -details.photo.loading=Membuka diff --git a/tim/prune/lang/prune-texts_it.properties b/tim/prune/lang/prune-texts_it.properties index c437011..ea66483 100644 --- a/tim/prune/lang/prune-texts_it.properties +++ b/tim/prune/lang/prune-texts_it.properties @@ -519,9 +519,12 @@ dialog.colourchooser.title=Scegli colore dialog.colourchooser.red=Rosso dialog.colourchooser.green=Verde dialog.colourchooser.blue=Blu +dialog.colourer.intro=E' 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 @@ -789,6 +792,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_ro.properties b/tim/prune/lang/prune-texts_ro.properties index e734fb7..e311430 100644 --- 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/lang/prune-texts_sv.properties b/tim/prune/lang/prune-texts_sv.properties deleted file mode 100644 index ecde4b7..0000000 --- a/tim/prune/lang/prune-texts_sv.properties +++ /dev/null @@ -1,102 +0,0 @@ -# Text entries for the GpsPrune application -# Swedish entries - -# Menu entries -menu.file=Arkiv -menu.file.addphotos=L\u00e4gg till foto -menu.file.recentfiles=Senaste filer -menu.file.save=Spara som text -menu.file.exit=Avsluta -menu.track=Sp\u00e5r -menu.track.undo=\u00c5ngra -menu.track.clearundo=Rensa \u00e5ngra-historik -menu.track.markrectangle=Markera punkter i rektangel -menu.track.deletemarked=Radera markerade punkter -function.rearrangewaypoints=Ordna waypoints -dialog.rearrange.tostart=Alla till b\u00f6rjan av fil -dialog.rearrange.toend=Alla till slut av fil -dialog.rearrange.tonearest=Varje till n\u00e4rmaste sp\u00e5rpunkt -menu.range=Intervall -menu.range.all=V\u00e4lj alla -menu.range.none=V\u00e4lj ingen -menu.range.start=S\u00e4tt till b\u00f6rjan av intervall -menu.range.end=S\u00e4tt till slutet av intervall -menu.range.average=Medelv\u00e4rdesval -menu.range.reverse=V\u00e4nd intervall -menu.range.mergetracksegments=Sl\u00e5 ihop sp\u00e5rsegment -menu.range.cutandmove=Klipp och flytta urval -menu.point=Punkt -menu.point.editpoint=Redigera punkt -menu.point.deletepoint=Radera punkt -menu.photo=Foto -menu.photo.saveexif=Spara till Exif -menu.audio=Ljud -menu.view=Visa -menu.view.showsidebars=Visa sidopaneler -menu.view.browser=Karta i webbl\u00e4sare -menu.view.browser.google=Google Maps -menu.view.browser.openstreetmap=Openstreetmap -menu.view.browser.mapquest=Mapquest -menu.view.browser.yahoo=Yahoo maps -menu.view.browser.bing=Bing maps -menu.settings=Inst\u00e4llningar -menu.settings.onlinemode=H\u00e4mta kartor fr\u00e5n Internet -menu.settings.autosave=Autospara inst\u00e4llningar vid avslut -menu.help=Hj\u00e4lp -# Popup menu for map -menu.map.zoomin=Zooma ut -menu.map.zoomout=Zooma in -menu.map.zoomfull=Zooma till passning -menu.map.newpoint=Skapa ny punkt -menu.map.drawpoints=Skapa en serie punkter -menu.map.connect=F\u00f6rbind sp\u00e5rpunkter -menu.map.autopan=Panorera automatiskt -menu.map.showmap=Visa karta -menu.map.showscalebar=Visa skala -menu.map.editmode=Redigeringsl\u00e4ge - -# Alt keys for menus -altkey.menu.file=A -altkey.menu.track=S -altkey.menu.range=I -altkey.menu.point=P -altkey.menu.view=V -altkey.menu.photo=F -altkey.menu.audio=L -altkey.menu.settings=I -altkey.menu.help=H - -# Ctrl shortcuts for menu items -shortcut.menu.file.open=O -shortcut.menu.file.load=L -shortcut.menu.file.save=S -shortcut.menu.track.undo=Z -shortcut.menu.range.all=A -shortcut.menu.help.help=H - -# Functions -function.open=\u00d6ppna fil -function.importwithgpsbabel=Importera fil med GPSBabel -function.loadfromgps=Ladda fr\u00e5n GPS -function.sendtogps=Skicka till GPS -function.exportkml=Exportera KML -function.exportgpx=Exportera GPX -function.exportpov=Exportera POV -function.exportsvg=Exportera SVG -function.exportimage=Exportera bildfil -function.editwaypointname=Redigera namn p\u00e5 waypoint -function.compress=Komprimera sp\u00e5r -function.deleterange=Radera intervall -function.croptrack=Besk\u00e4r sp\u00e5r till intervall -function.interpolate=Interpolera punkter -function.addtimeoffset=Infoga tidsoffset -function.addaltitudeoffset=Infoga h\u00f6jdoffset -function.convertnamestotimes=Omvandla waypointnamn till tidpunkter -function.findwaypoint=S\u00f6k waypoint -function.pastecoordinates=Infoga koordinater -function.charts=Diagram -function.show3d=3D-vy -function.distances=Avst\u00e5nd -function.estimatetime=Uppskatta tid - -openweathermap.lang=se diff --git a/tim/prune/readme.txt b/tim/prune/readme.txt index 7b1c9c6..3cf81c7 100644 --- a/tim/prune/readme.txt +++ b/tim/prune/readme.txt @@ -1,5 +1,5 @@ -GpsPrune version 17 -=================== +GpsPrune version 17.1 +===================== GpsPrune is an application for viewing, editing and managing coordinate data from GPS systems, including format conversion, charting and photo correlation. @@ -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.1.jar If the jar file is saved in a different directory, you will need to include the path. Depending on your system settings, you may be able to click or double-click on the jar file @@ -25,9 +25,16 @@ in a file manager window to execute it. A shortcut, menu item, alias, desktop i or other link can of course be made should you wish. To specify a language other than the default, use an additional parameter, eg: - java -jar gpsprune_17.jar --lang=DE + java -jar gpsprune_17.1.jar --lang=DE +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 =================== The following features were added since version 16: diff --git a/tim/prune/threedee/TerrainHelper.java b/tim/prune/threedee/TerrainHelper.java index 0be2216..16e63ed 100644 --- 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)); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gpsprune.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
