[gpsprune] 02/07: Merge tag 'upstream/16.2'
David Paleino
dapal at debian.org
Thu Jul 3 08:57:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
dapal pushed a commit to annotated tag debian/16.2-1
in repository gpsprune.
commit 12ac958594b8d84fd0e872f08af9f6e45dbd5f21
Merge: 71d1716 279ef3c
Author: David Paleino <dapal at debian.org>
Date: Wed Jul 2 21:57:59 2014 +0200
Merge tag 'upstream/16.2'
Upstream version 16.2
Conflicts:
build.sh
tim/prune/GpsPrune.java
tim/prune/lang/prune-texts_es.properties
tim/prune/lang/prune-texts_fr.properties
tim/prune/lang/prune-texts_hu.properties
tim/prune/lang/prune-texts_pl.properties
tim/prune/load/FileCacher.java
tim/prune/readme.txt
build.sh | 2 +-
tim/prune/App.java | 31 +-
tim/prune/DataStatus.java | 34 ++
tim/prune/ExternalTools.java | 11 +
tim/prune/FunctionLibrary.java | 15 +
tim/prune/GpsPrune.java | 6 +-
tim/prune/I18nManager.java | 18 +
tim/prune/UpdateMessageBroker.java | 14 +
tim/prune/config/Config.java | 29 ++
tim/prune/copyright.txt | 2 +-
tim/prune/correlate/Correlator.java | 17 +-
tim/prune/data/DataPoint.java | 42 +-
tim/prune/data/DoubleRange.java | 12 +
tim/prune/data/PointScaler.java | 83 +++-
tim/prune/data/RangeStats.java | 23 +-
tim/prune/data/Selection.java | 46 +-
tim/prune/data/Track.java | 16 +-
tim/prune/function/AboutScreen.java | 19 +-
tim/prune/function/AddMapSourceDialog.java | 159 +------
tim/prune/function/DeleteFieldValues.java | 4 +-
tim/prune/function/Export3dFunction.java | 22 +
tim/prune/function/FieldListModel.java | 4 +-
tim/prune/function/FindWaypoint.java | 4 +-
tim/prune/function/FullRangeDetails.java | 3 +-
tim/prune/function/GetWikipediaXmlHandler.java | 4 +-
tim/prune/function/MapSourceListModel.java | 4 +-
tim/prune/function/PasteCoordinates.java | 4 +-
tim/prune/function/SelectTracksFunction.java | 4 +-
tim/prune/function/SetLanguage.java | 8 +-
tim/prune/function/SetMapBgFunction.java | 4 +-
tim/prune/function/ShowThreeDFunction.java | 127 +++++-
tim/prune/function/browser/BrowserLauncher.java | 11 +-
tim/prune/function/cache/ManageCacheFunction.java | 3 +-
.../function/compress/CompressTrackFunction.java | 28 +-
.../compress/MarkPointsInRectangleFunction.java | 35 +-
tim/prune/function/estimate/EstimateTime.java | 16 +-
.../function/estimate/EstimationParameters.java | 13 +
tim/prune/function/estimate/LearnParameters.java | 2 +-
tim/prune/function/sew/CandidateSorter.java | 29 ++
tim/prune/function/sew/SegmentEnd.java | 197 +++++++++
.../function/sew/SewTrackSegmentsFunction.java | 331 ++++++++++++++
tim/prune/function/sew/SplitPoint.java | 101 +++++
tim/prune/function/sew/SplitSegmentsFunction.java | 285 ++++++++++++
tim/prune/function/srtm/DownloadSrtmFunction.java | 222 ++++++++++
tim/prune/function/srtm/LookupSrtmFunction.java | 207 ++++++---
tim/prune/function/srtm/SrtmTile.java | 13 +-
.../weather/GetWeatherForecastFunction.java | 480 +++++++++++++++++++++
tim/prune/function/weather/IconRenderer.java | 37 ++
tim/prune/function/weather/OWMCurrentHandler.java | 92 ++++
tim/prune/function/weather/OWMForecastHandler.java | 102 +++++
tim/prune/function/weather/ResultSet.java | 83 ++++
tim/prune/function/weather/SingleForecast.java | 185 ++++++++
tim/prune/function/weather/WeatherResults.java | 166 +++++++
tim/prune/function/weather/WeatherTableModel.java | 124 ++++++
tim/prune/gui/BaseImageDefinitionPanel.java | 157 +++++++
tim/prune/gui/DecimalNumberField.java | 3 +-
tim/prune/gui/DetailsDisplay.java | 17 +-
tim/prune/gui/DisplayUtils.java | 20 +
.../GenericProgressDialog.java} | 32 +-
tim/prune/gui/MediaListModel.java | 4 +-
tim/prune/gui/MenuManager.java | 57 ++-
tim/prune/gui/ProgressDialog.java | 8 +-
tim/prune/gui/SelectorDisplay.java | 14 +-
tim/prune/gui/TerrainDefinitionPanel.java | 85 ++++
tim/prune/gui/UndoManager.java | 4 +-
tim/prune/gui/WaypointListModel.java | 4 +-
tim/prune/gui/WaypointNameMatcher.java | 4 +-
tim/prune/gui/images/weather-clear-day.png | Bin 0 -> 3088 bytes
tim/prune/gui/images/weather-clear-night.png | Bin 0 -> 3063 bytes
tim/prune/gui/images/weather-clouds-day.png | Bin 0 -> 3766 bytes
tim/prune/gui/images/weather-clouds-night.png | Bin 0 -> 3824 bytes
tim/prune/gui/images/weather-clouds.png | Bin 0 -> 2618 bytes
tim/prune/gui/images/weather-extreme.png | Bin 0 -> 1533 bytes
tim/prune/gui/images/weather-fog.png | Bin 0 -> 1521 bytes
tim/prune/gui/images/weather-hail.png | Bin 0 -> 1708 bytes
tim/prune/gui/images/weather-lightrain.png | Bin 0 -> 1731 bytes
tim/prune/gui/images/weather-rain.png | Bin 0 -> 2184 bytes
tim/prune/gui/images/weather-snow.png | Bin 0 -> 2106 bytes
tim/prune/gui/images/weather-storm.png | Bin 0 -> 2984 bytes
tim/prune/gui/map/CloudmadeMapSource.java | 61 ---
tim/prune/gui/map/DiskTileCacher.java | 13 +-
tim/prune/gui/map/MapCanvas.java | 55 ++-
tim/prune/gui/map/MapSourceLibrary.java | 2 -
tim/prune/gui/map/MapTileManager.java | 110 +++--
tim/prune/gui/map/TileConsumer.java | 10 +
tim/prune/gui/map/TileDownloader.java | 3 +
tim/prune/lang/prune-texts_af.properties | 11 +-
tim/prune/lang/prune-texts_cz.properties | 76 +++-
tim/prune/lang/prune-texts_da.properties | 84 ++++
tim/prune/lang/prune-texts_de.properties | 77 +++-
tim/prune/lang/prune-texts_de_CH.properties | 95 ++--
tim/prune/lang/prune-texts_en.properties | 75 +++-
tim/prune/lang/prune-texts_en_US.properties | 1 +
tim/prune/lang/prune-texts_es.properties | 57 ++-
tim/prune/lang/prune-texts_fa.properties | 73 ++++
tim/prune/lang/prune-texts_fr.properties | 71 ++-
tim/prune/lang/prune-texts_hu.properties | 181 ++++++--
tim/prune/lang/prune-texts_in.properties | 111 +++++
tim/prune/lang/prune-texts_it.properties | 75 +++-
tim/prune/lang/prune-texts_ja.properties | 22 +-
tim/prune/lang/prune-texts_ko.properties | 23 +-
tim/prune/lang/prune-texts_nl.properties | 75 +++-
tim/prune/lang/prune-texts_pl.properties | 49 ++-
tim/prune/lang/prune-texts_pt.properties | 215 +++++++--
tim/prune/lang/prune-texts_ro.properties | 97 ++++-
tim/prune/lang/prune-texts_ru.properties | 53 ++-
tim/prune/lang/prune-texts_sv.properties | 58 +++
tim/prune/lang/prune-texts_tr.properties | 16 +-
tim/prune/lang/prune-texts_uk.properties | 234 ++++++++++
tim/prune/lang/prune-texts_zh.properties | 90 +++-
tim/prune/load/BabelFileFormats.java | 4 +-
tim/prune/load/BabelLoadFromFile.java | 39 +-
tim/prune/load/FileCacher.java | 2 +-
tim/prune/load/MediaLoadProgressDialog.java | 93 +---
tim/prune/load/TextFileLoader.java | 18 +-
tim/prune/load/babel/DiscardFilter.java | 4 +-
tim/prune/load/babel/DistanceFilter.java | 4 +-
tim/prune/load/babel/InterpolateFilter.java | 4 +-
tim/prune/load/babel/SimplifyFilter.java | 4 +-
tim/prune/load/xml/GzipFileLoader.java | 6 +-
tim/prune/load/xml/XmlFileLoader.java | 60 ++-
tim/prune/load/xml/ZipFileLoader.java | 4 +-
tim/prune/readme.txt | 41 +-
tim/prune/save/BaseImageConfigDialog.java | 197 ++++++---
tim/prune/save/BaseImageConsumer.java | 10 +
tim/prune/save/ExifSaver.java | 9 +-
tim/prune/save/GpxExporter.java | 73 +---
tim/prune/save/GroutedImage.java | 7 -
tim/prune/save/ImageExporter.java | 139 +++---
tim/prune/save/MapGrouter.java | 69 ++-
tim/prune/save/PovExporter.java | 253 ++++++-----
tim/prune/save/SvgExporter.java | 9 +-
tim/prune/save/xml/ByteBuffer.java | 88 ++++
tim/prune/save/xml/GpxSlicer.java | 68 ++-
tim/prune/save/xml/XmlUtils.java | 72 ++++
tim/prune/threedee/ImageDefinition.java | 66 +++
tim/prune/threedee/Java3DWindow.java | 208 +++++++--
tim/prune/threedee/TerrainCache.java | 57 +++
tim/prune/threedee/TerrainDefinition.java | 68 +++
tim/prune/threedee/TerrainHelper.java | 477 ++++++++++++++++++++
tim/prune/threedee/ThreeDModel.java | 53 ++-
tim/prune/threedee/ThreeDWindow.java | 20 +
tim/prune/threedee/WindowFactory.java | 6 +-
tim/prune/tips/TipDefinition.java | 66 +++
tim/prune/tips/TipManager.java | 45 ++
tim/prune/undo/UndoAddAltitudeOffset.java | 3 +-
tim/prune/undo/UndoCutAndMove.java | 1 +
tim/prune/undo/UndoDeleteAudio.java | 4 +-
tim/prune/undo/UndoDeleteOperation.java | 38 ++
tim/prune/undo/UndoDeletePhoto.java | 4 +-
tim/prune/undo/UndoDeletePoint.java | 4 +-
tim/prune/undo/UndoDeleteRange.java | 17 +-
tim/prune/undo/UndoReorder.java | 3 +-
tim/prune/undo/UndoSewSegments.java | 44 ++
tim/prune/undo/UndoSplitSegments.java | 23 +
tim/prune/undo/UndoStack.java | 24 ++
156 files changed, 7255 insertions(+), 1368 deletions(-)
diff --cc tim/prune/lang/prune-texts_hu.properties
index 8b2b35b,58359f8..0e2f0a8
--- a/tim/prune/lang/prune-texts_hu.properties
+++ b/tim/prune/lang/prune-texts_hu.properties
@@@ -275,6 -331,27 +331,28 @@@ dialog.distances.toofewpoints=Ehhez a f
dialog.fullrangedetails.intro=Itt vannak a r\u00e9szletei a kiv\u00e1lasztott tartom\u00e1nynak
dialog.fullrangedetails.coltotal=R\u00e9sekkel egy\u00fctt
dialog.fullrangedetails.colsegments=R\u00e9sek n\u00e9lk\u00fcl
+ dialog.estimatetime.details=R\u00e9szletek
+ dialog.estimatetime.gentle=Lank\u00e1s
+ dialog.estimatetime.steep=Meredek
+ dialog.estimatetime.climb=M\u00e1sz\u00e1s
+ dialog.estimatetime.descent=Ereszked\u00e9s
+ dialog.estimatetime.parameters=Param\u00e9terek
+ dialog.estimatetime.parameters.timefor=Sz\u00fcks\u00e9ges id\u0151:
+ dialog.estimatetime.results=Eredm\u00e9nyek
+ dialog.estimatetime.results.estimatedtime=Becs\u00fclt id\u0151
+ dialog.estimatetime.results.actualtime=Aktu\u00e1lis id\u0151
+ dialog.estimatetime.error.nodistance=Az id\u0151becsl\u00e9shez \u00f6sszek\u00f6t\u00f6tt nyomvonalpontokra van sz\u00fcks\u00e9g a t\u00e1vols\u00e1g meghat\u00e1roz\u00e1s\u00e1hoz
+ dialog.estimatetime.error.noaltitudes=A kijel\u00f6l\u00e9s nem tartalmaz magass\u00e1g inform\u00e1ci\u00f3t
+ dialog.learnestimationparams.intro=A nyomvonalb\u00f3l sz\u00e1m\u00edtott param\u00e9terek
+ dialog.learnestimationparams.averageerror=\u00c1tlagos hiba
+ dialog.learnestimationparams.combine=A param\u00e9terek kombin\u00e1lhat\u00f3k a jelenlegi \u00e9rt\u00e9kekkel
+ dialog.learnestimationparams.combinedresults=Kombin\u00e1lt eredm\u00e9nyek
+ dialog.learnestimationparams.weight.100pccurrent=Jelenlegi \u00e9rt\u00e9kek megtart\u00e1sa
+ dialog.learnestimationparams.weight.current=jelenlegi
+ dialog.learnestimationparams.weight.calculated=sz\u00e1m\u00edtott
+ dialog.learnestimationparams.weight.50pc=A jelenlegi \u00e9s a sz\u00e1m\u00edtott \u00e9rt\u00e9kek \u00e1tlaga
+ dialog.learnestimationparams.weight.100pccalculated=Az \u00faj sz\u00e1m\u00edtott \u00e9rt\u00e9kek haszn\u00e1lata
++>>>>>>> upstream/16.2
dialog.setmapbg.intro=V\u00e1lassza ki az egyik t\u00e9rk\u00e9pforr\u00e1st, vagy adjon hozz\u00e1 egy \u00fajat
dialog.addmapsource.title=\u00daj t\u00e9rk\u00e9pforr\u00e1s hozz\u00e1ad\u00e1sa
dialog.addmapsource.sourcename=Forr\u00e1s neve
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gpsprune.git
More information about the Pkg-grass-devel
mailing list