[gpsprune] 01/10: Imported Upstream version 18.2

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Thu Dec 17 02:26:38 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gpsprune.

commit 91e31757c57ce3977bce1cc55bbbb3cd5e0add3c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 17 01:55:35 2015 +0100

    Imported Upstream version 18.2
---
 build.sh                                          |   2 +-
 tim/prune/GpsPrune.java                           |   4 +-
 tim/prune/function/AboutScreen.java               |   6 +-
 tim/prune/function/search/wikimedia_galleries.txt |   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_fa.properties          |  73 -----------
 tim/prune/lang/prune-texts_in.properties          | 111 -----------------
 tim/prune/lang/prune-texts_it.properties          |   7 ++
 tim/prune/lang/prune-texts_nl.properties          |  23 ++--
 tim/prune/lang/prune-texts_no.properties          | 142 ----------------------
 tim/prune/lang/prune-texts_pl.properties          |   9 ++
 tim/prune/lang/prune-texts_sv.properties          | 102 ----------------
 tim/prune/readme.txt                              |  12 +-
 tim/prune/save/GpxExporter.java                   |   4 +-
 tim/prune/save/KmlExporter.java                   |   4 +-
 tim/prune/save/xml/XmlUtils.java                  |  26 +++-
 18 files changed, 71 insertions(+), 542 deletions(-)

diff --git a/build.sh b/build.sh
index dc93bd6..4c02845 100644
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 # Build script using external exif library
 # Version number
-PRUNENAME=gpsprune_18.1
+PRUNENAME=gpsprune_18.2
 # remove compile directory
 rm -rf compile
 # remove dist directory
diff --git a/tim/prune/GpsPrune.java b/tim/prune/GpsPrune.java
index 303453a..3a112b5 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 = "18.1";
+	public static final String VERSION_NUMBER = "18.2";
 	/** Build number, just used for about screen */
-	public static final String BUILD_NUMBER = "336";
+	public static final String BUILD_NUMBER = "336a";
 	/** Static reference to App object */
 	private static App APP = null;
 
diff --git a/tim/prune/function/AboutScreen.java b/tim/prune/function/AboutScreen.java
index c3a9f5b..4c104a0 100644
--- a/tim/prune/function/AboutScreen.java
+++ b/tim/prune/function/AboutScreen.java
@@ -97,9 +97,9 @@ public class AboutScreen extends GenericFunction
 		descBuffer.append("<p>").append(I18nManager.getText("dialog.about.summarytext2")).append("</p>");
 		descBuffer.append("<p>").append(I18nManager.getText("dialog.about.summarytext3")).append("</p>");
 		descBuffer.append("<p>").append(I18nManager.getText("dialog.about.languages")).append(" : ")
-			.append("\u010de\u0161tina, deutsch, english, espa\u00F1ol, fran\u00E7ais, italiano, magyar,<br>" +
-				" nederlands, polski, portugu\u00EAs, rom\u00E2n\u0103, \u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian), \u4e2d\u6587 (chinese),<br>" +
-				" \u65E5\u672C\u8A9E (japanese), \uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean), schwiizerd\u00FC\u00FCtsch, t\u00FCrk\u00E7e, afrikaans, ukrainian</p>");
+			.append("afrikaans, \u010de\u0161tina, deutsch, english, espa\u00F1ol, fran\u00E7ais, italiano,<br>" +
+				" magyar,nederlands, polski, portugu\u00EAs, rom\u00E2n\u0103, \u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian), \u4e2d\u6587 (chinese),<br>" +
+				" \u65E5\u672C\u8A9E (japanese), \uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean), schwiizerd\u00FC\u00FCtsch, t\u00FCrk\u00E7e, ukrainian</p>");
 		descBuffer.append("<p>").append(I18nManager.getText("dialog.about.translatedby")).append("</p>");
 		JEditorPane descPane = new JEditorPane("text/html", descBuffer.toString());
 		descPane.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
diff --git a/tim/prune/function/search/wikimedia_galleries.txt b/tim/prune/function/search/wikimedia_galleries.txt
index f8514f5..9bb446f 100644
--- a/tim/prune/function/search/wikimedia_galleries.txt
+++ b/tim/prune/function/search/wikimedia_galleries.txt
@@ -67,7 +67,7 @@ Boccadasse	Boccadasse è un antico borgo marinaro situato nel levante di Genova.
 Boettcherstrasse		53 04 30 N	8 48 21 E
 Boiro		42 38 13.16 N	8 52 12.31 W
 Boke	Boke is a small village in the German district Paderborn; it belongs to the city of Delbrück.	51 43 48 N	8 33 43.56 E
-Bolongaropalast	The Bolongaro Palace ist a baroque building in Frankfurt-Höchst.	50 06 04 N	8 33 08 E
+Bolongaropalast	The Bolongaro Palace is a baroque building in Frankfurt-Höchst.	50 06 04 N	8 33 08 E
 Borne des Trois Puissances	Dreiländerstein	47 30 10.58 N	7 07 48.76 E
 Borovsk	Эта страница на русском: Боровск	55 12 27.19 N	36 29 05.05 E
 Bosco delle Querce	The Regional Natural Park Bosco delle Querce (Oaks' Wood), built after the Seveso Disaster on the "A" zone.	45 38 55 N	9 09 10 E
@@ -149,7 +149,7 @@ Château de Couiza		42 56 42.68 N	2 15 14.11 E
 Chiesa di Sant'Antonio in Caggiano	Church of Saint Anthony in Caggiano.	40 34 04.13 N	15 29 39.47 E
 Chioggia	Chioggia is a town in Veneto in Italy.	45 13 04.23 N	12 16 36.76 E
 Chroniques de Jérusalem	Jerusalem Mount of Olives Santa Marta Passionists church.	31 46 15.83 N	35 15 08.48 E
-Church of Adelboden	The gothic village church Adelboden was built in the 15th century	46 29 34.1 N	7 33 32.4 E
+Church of Adelboden	The gothic village church of Adelboden was built in the 15th century	46 29 34.1 N	7 33 32.4 E
 Church of Saints Apostles Peter and Paul in Vilnius		54 41 38.82 N	25 18 22.69 E
 Church of St. Johns in Vilnius	Organ	54 40 57.5 N	25 17 19.22 E
 Church of São Vítor (Braga)	Igreja de São Victor em Braga	41 33 09.95 N	8 24 47.49 W
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 e1d29ae..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
-function.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_fa.properties b/tim/prune/lang/prune-texts_fa.properties
deleted file mode 100644
index a7637b2..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
-function.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_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 69a9c83..f8fe203 100644
--- a/tim/prune/lang/prune-texts_it.properties
+++ b/tim/prune/lang/prune-texts_it.properties
@@ -103,6 +103,7 @@ function.distances=Mostra distanze
 function.fullrangedetails=Mostra dettagli
 function.estimatetime=Stima durata
 function.learnestimationparams=Apprendi parametri di stima
+function.autoplay=Riproduci traccia
 function.setmapbg=Configura sfondo mappa
 function.setpaths=Configura percorsi programmi
 function.selectsegment=Seleziona segmento corrente
@@ -380,6 +381,7 @@ dialog.gpsies.activity.motorbiking=Motocicletta
 dialog.gpsies.activity.snowshoe=Trekking sulla neve
 dialog.gpsies.activity.sailing=Navigazione
 dialog.gpsies.activity.skating=Pattinaggio
+dialog.mapillary.nonefound=Nessuna foto trovata
 dialog.wikipedia.column.name=Titolo articolo
 dialog.wikipedia.column.distance=Distanza
 dialog.wikipedia.nonefound=Nessuna punti trovata
@@ -591,6 +593,11 @@ 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)
+dialog.autoplay.duration=Durata (sec)
+dialog.autoplay.usetimestamps=Usa dati temporali
+dialog.autoplay.rewind=Riavvolga
+dialog.autoplay.pause=Pausa
+dialog.autoplay.play=Riproduci
 
 # 3d window
 dialog.3d.title=Visione GpsPrune in 3D
diff --git a/tim/prune/lang/prune-texts_nl.properties b/tim/prune/lang/prune-texts_nl.properties
index 428913f..a9d4bc3 100644
--- a/tim/prune/lang/prune-texts_nl.properties
+++ b/tim/prune/lang/prune-texts_nl.properties
@@ -38,7 +38,7 @@ menu.view.browser.yahoo=Yahoo maps
 menu.view.browser.bing=Bing maps
 menu.settings=Instellingen
 menu.settings.onlinemode=Kaarten van internet ophalen
-menu.settings.antialias=Anti-kartelvorming
+menu.settings.antialias=Gebruik anti-aliasering
 menu.settings.autosave=Automatisch opslaan bij afsluiten
 menu.help=Help
 # Popup menu for map
@@ -86,7 +86,7 @@ function.exportsvg=Export SVG
 function.exportimage=Bestand exporteren
 function.editwaypointname=Hernoem waypoint
 function.compress=Route comprimeren
-function.marklifts=Makeer skiliften 
+function.marklifts=Markeer opgaande liften
 function.deleterange=Verwijder reeks
 function.croptrack=Route bijknippen
 function.interpolate=Interpoleer punten
@@ -104,7 +104,7 @@ function.distances=Afstanden
 function.fullrangedetails=Reeks details
 function.estimatetime=Geschatte tijd
 function.learnestimationparams=Parameters voor geschatte tijd
-function.autoplay=Route afspelen
+function.autoplay=Route automatisch afspelen
 function.setmapbg=Instellen kaart achtergrond
 function.setpaths=Instellen programmapaden
 function.selectsegment=Selecteer huidige segment
@@ -116,8 +116,8 @@ function.lookupsrtm=Hoogtes van SRTM ophalen
 function.downloadsrtm=Downloaden SRTM tegels
 function.getwikipedia=Wikipedia artikelen uit de buurt ophalen
 function.searchwikipedianames=Wikipedia zoeken op naam
-function.searchopencachingde=OpenCaching.de zoeken
-function.mapillary=Mapillary.com zoeken
+function.searchopencachingde=Doorzoek OpenCaching.de
+function.mapillary=Zoek naar foto's op Mapillary
 function.downloadosm=Downloaden OSM data voor gebied
 function.duplicatepoint=Dupliceer punt
 function.setcolours=Instellen kleuren
@@ -596,12 +596,11 @@ dialog.deletebydate.column.keep=Behouden
 dialog.deletebydate.column.delete=Verwijderen
 dialog.setaltitudetolerance.text.metres=Grens (in meters) waaronder kleine klimmen en afdalingen worden genegeerd
 dialog.setaltitudetolerance.text.feet=Grens (in feet) waaronder kleine klimmen en afdalingen worden genegeerd
-dialog.autoplay.duration=Duur (sec)
-dialog.autoplay.usetimestamps=Gebruik tijdinformatie
-dialog.autoplay.rewind=Terugspoelen
-dialog.autoplay.pause=Pauzeren
+dialog.autoplay.duration=Duur (sec.)
+dialog.autoplay.usetimestamps=Gebruik tijdinfo van punt
+dialog.autoplay.rewind=Terug naar begin
+dialog.autoplay.pause=Pauze
 dialog.autoplay.play=Afspelen
-
 # 3d window
 dialog.3d.title=GpsPrune in 3D
 dialog.3d.altitudefactor=Hoogte overdrijvingsfactor
@@ -811,8 +810,8 @@ url.googlemaps=maps.google.nl
 wikipedia.lang=nl
 openweathermap.lang=nl
 webservice.peakfinder=Open Peakfinder.org
-webservice.geohack=Open Geohack webpagina
-webservice.panoramio=Open Panoramio map
+webservice.geohack=Open Geohack pagina
+webservice.panoramio=Open Panoramio kaart
 webservice.opencachingcom=Open Opencaching.com
 webservice.opencachingcom.lang=nl
 
diff --git a/tim/prune/lang/prune-texts_no.properties b/tim/prune/lang/prune-texts_no.properties
deleted file mode 100644
index 2ad0780..0000000
--- a/tim/prune/lang/prune-texts_no.properties
+++ /dev/null
@@ -1,142 +0,0 @@
-# Text entries for the GpsPrune application
-# Norwegian entries
-
-# Menu entries
-menu.file=Fil
-menu.file.addphotos=Legg til bilder
-menu.file.recentfiles=Nyeste filer
-menu.file.save=Lagre som tekst
-menu.file.exit=Avslutt
-menu.online=
-menu.track=
-menu.track.undo=Angre
-menu.track.clearundo=Nullstill angreliste
-menu.track.markrectangle=Marker punkter i rektangel
-function.deletemarked=Slett markerte punkter
-menu.range=Intervall
-menu.range.all=Velg alle
-menu.range.none=Velg ingen
-menu.range.start=Velg intervallets startpunkt
-menu.range.end=Velg intervallets slutpunkt
-menu.range.average=Nytt punkt midt i intervallet
-menu.range.reverse=Reverser intervallet
-menu.range.mergetracksegments=Sl\u00e5 sammen delintervaller
-menu.range.cutandmove=Kutt av og flytt valgt intervall
-menu.point=Punkt
-menu.point.editpoint=Rediger punkt
-menu.point.deletepoint=Slett punkt
-menu.photo=Bilde
-menu.photo.saveexif=Lagre Exif-data
-menu.audio=Lyd
-menu.view=Visning
-menu.view.showsidebars=Vis sidefelter
-menu.view.browser=Vis kart i nettleser
-menu.view.browser.google=Google kart
-menu.view.browser.openstreetmap=Openstreetmap
-menu.view.browser.mapquest=Mapquest
-menu.view.browser.yahoo=Yahoo maps
-menu.view.browser.bing=Bing maps
-menu.settings=Innstillinger
-menu.settings.onlinemode=Last kart fra Internet
-menu.settings.autosave=Lagre innstillinger automatisk ved avslutning
-menu.help=Hjelp
-# Popup menu for map
-menu.map.zoomin=Zoom inn
-menu.map.zoomout=Zoom ut
-menu.map.zoomfull=Zoom til hele sporet
-menu.map.newpoint=Lag nytt punkt
-menu.map.drawpoints=Lag en serie punkter
-menu.map.connect=Knyt sporpunkter til linje
-menu.map.autopan=Autosentrering
-menu.map.showmap=Vis kart
-menu.map.showscalebar=Vis m\u00e5lestokk
-menu.map.editmode=Redigeringsmodus
-
-# Alt keys for menus
-altkey.menu.file=F
-altkey.menu.online=
-altkey.menu.track=S
-altkey.menu.range=I
-altkey.menu.point=P
-altkey.menu.view=V
-altkey.menu.photo=B
-altkey.menu.audio=L
-altkey.menu.settings=n
-altkey.menu.help=H
-
-# Ctrl shortcuts for menu items
-shortcut.menu.file.open=\u00c5
-shortcut.menu.file.load=
-shortcut.menu.file.save=L
-shortcut.menu.track.undo=g
-shortcut.menu.edit.compress=K
-shortcut.menu.range.all=A
-shortcut.menu.help.help=H
-
-# Functions
-function.open=\u00c5pne fil
-function.importwithgpsbabel=Importer fil med GPSBabel
-function.loadfromgps=Hent data fra GPS
-function.sendtogps=Overf\u00f8r data til GPS
-function.exportkml=Eksporter KML
-function.exportgpx=Eksporter GPX
-function.exportpov=Eksporter POV
-function.exportsvg=Eksporter SVG
-function.exportimage=
-function.editwaypointname=Endre waypoint-navn
-function.compress=Komprimer spor
-function.deleterange=Fjern valgt intervall
-function.croptrack=Beskj\u00e6r sporet
-function.interpolate=Interpoler punkter
-function.deletebydate=
-function.addtimeoffset=Legg til tidsinkrement
-function.addaltitudeoffset=Legg til h\u00f8ideinkrement
-function.rearrangewaypoints=
-function.convertnamestotimes=Les waypoint-navn som tidspunkter
-function.deletefieldvalues=Slett feltets verdier
-function.findwaypoint=Finn waypoint
-function.pastecoordinates=Legg til nye koordinater
-function.charts=Grafer
-function.show3d=3-D visning
-function.distances=Avstander
-function.fullrangedetails=Vis alle detaljer
-function.estimatetime=
-function.learnestimationparams=
-function.setmapbg=Velg grunnlagskart
-function.setpaths=Angi plassering av programmer
-function.selectsegment=
-function.splitsegments=
-function.sewsegments=
-function.getgpsies=Vis spor fra gpsies.com
-function.uploadgpsies=Last opp spor til gpsies.com
-function.lookupsrtm=Hent h\u00f8yde fra SRTM
-function.downloadsrtm=
-function.getwikipedia=Vis Wikipedia info for omegn
-function.searchwikipedianames=S\u00f8k Wikipedia
-function.searchopencachingde=
-function.downloadosm=Last ned OSM data for omr\u00e5det
-function.duplicatepoint=Dupliser punkt
-function.setcolours=Velg farger
-function.setlinewidth=Velg linjebredde
-function.setlanguage=Velg spr\u00e5k
-function.connecttopoint=Knytt til punkt
-function.disconnectfrompoint=Koble fra punkt
-function.removephoto=Fjern foto
-function.correlatephotos=Relater alle bilder
-function.rearrangephotos=Omarranger bilder
-function.rotatephotoleft=Roter bilde mot venstre
-function.rotatephotoright=Roter bilde mot h\u00f8yre
-function.photopopup=Vis bilde popup
-function.ignoreexifthumb=Ignorer exif miniatyrbilder
-function.loadaudio=Legg til lydklipp
-function.removeaudio=Fjern lydklipp
-function.correlateaudios=Relater alle lydklipp
-function.playaudio=Spill lydklipp
-function.stopaudio=Avbryt lydklipp
-function.help=Hjelp
-function.showkeys=Vis hurtigtaster
-function.about=Om GpsPrune
-function.checkversion=Sjekk etter nye versjoner
-function.saveconfig=Lagre innstillinger
-function.diskcache=Om lagring av kart
-function.managetilecache=H\u00e5ndter kart-flis-lager
diff --git a/tim/prune/lang/prune-texts_pl.properties b/tim/prune/lang/prune-texts_pl.properties
index a2302fe..a3d0662 100644
--- a/tim/prune/lang/prune-texts_pl.properties
+++ b/tim/prune/lang/prune-texts_pl.properties
@@ -113,6 +113,8 @@ function.lookupsrtm=Pobierz wysoko\u015bci z SRTM
 function.downloadsrtm=Zapisz dane z SRTM
 function.getwikipedia=Szukaj w Wikipedii o okolicy
 function.searchwikipedianames=Szukaj nazwy w Wikipedii
+function.searchopencachingde=Szukaj w OpenCaching.de
+function.mapillary=Szukaj zdj\u0119cia w Mapillary
 function.downloadosm=Za\u0142aduj dane obszaru z OSM
 function.duplicatepoint=Duplikuj plik
 function.setcolours=Ustaw kolory
@@ -380,6 +382,7 @@ dialog.gpsies.activity.skating=Wrotki/rolki
 dialog.wikipedia.column.name=Tytu\u0142 artyku\u0142u
 dialog.wikipedia.column.distance=Odleg\u0142o\u015b\u0107
 dialog.wikipedia.nonefound=Brak wpis\u00f3w w wikipedii
+dialog.wikipedia.gallery=Galeria
 dialog.correlate.notimestamps=Punkty nie maj\u0105 znacznik\u00f3w czasu, nie mo\u017cna ich powi\u0105za\u0107 ze zdj\u0119ciami.
 dialog.correlate.nouncorrelatedphotos=Nie ma nie powi\u0105zanych zdj\u0119\u0107.\nCzy na pewno chcesz kontynuowa\u0107?
 dialog.correlate.nouncorrelatedaudios=Nie ma nie powi\u0105zanych plik\u00f3w audio.\nCzy na pewno chcesz kontynuowa\u0107?
@@ -589,6 +592,8 @@ dialog.deletebydate.column.delete=Usu\u0144
 dialog.setaltitudetolerance.text.metres=Limit (w metrach) poni\u017cej kt\u00f3rego, ma\u0142e spadki wzniosy b\u0119d\u0105 ignorowane
 dialog.setaltitudetolerance.text.feet=Limit (w stopach) poni\u017cej kt\u00f3rego, ma\u0142e spadki wzniosy b\u0119d\u0105 ignorowane
 dialog.autoplay.duration=Czas trwania (sek)
+dialog.autoplay.pause=Pauza
+dialog.autoplay.play=Graj
 
 # 3d window
 dialog.3d.title=GpsPrune widok tr\u00f3jwymiarowy
@@ -798,6 +803,10 @@ logic.or=lub
 url.googlemaps=maps.google.pl
 wikipedia.lang=pl
 openweathermap.lang=pl
+webservice.peakfinder=Otw\u00f3rz w Peakfinder.org
+webservice.geohack=Otw\u00f3rz w Geohack
+webservice.panoramio=Otw\u00f3rz w Panoramio.com
+webservice.opencachingcom=Otw\u00f3rz w Opencaching.com
 webservice.opencachingcom.lang=pl
 
 # Cardinals for 3d plots
diff --git a/tim/prune/lang/prune-texts_sv.properties b/tim/prune/lang/prune-texts_sv.properties
deleted file mode 100644
index 59a84af..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
-function.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 8fe5393..d9ff49f 100644
--- a/tim/prune/readme.txt
+++ b/tim/prune/readme.txt
@@ -1,4 +1,4 @@
-GpsPrune version 18.1
+GpsPrune version 18.2
 =====================
 
 GpsPrune is an application for viewing, editing and managing coordinate data from GPS systems,
@@ -17,7 +17,7 @@ Running
 =======
 
 To run GpsPrune from the jar file, simply call it from a command prompt or shell:
-   java -jar gpsprune_18.1.jar
+   java -jar gpsprune_18.2.jar
 
 If the jar file is saved in a different directory, you will need to include the path.
 Depending on your system settings, you may be able to click or double-click on the jar file
@@ -25,9 +25,15 @@ 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_18.1.jar --lang=DE
+   java -jar gpsprune_18.2.jar --lang=DE
 
 
+New with version 18.2
+=====================
+The following fixes and additions were made since version 18.1:
+  - Fix for saving point names containing ampersands in gpx, kml, kmz formats (thanks, Joe!)
+  - Minor translation updates to nl, it, pl
+
 New with version 18.1
 =====================
 The following fixes and additions were made since version 18:
diff --git a/tim/prune/save/GpxExporter.java b/tim/prune/save/GpxExporter.java
index 584d9ba..ff2c98f 100644
--- a/tim/prune/save/GpxExporter.java
+++ b/tim/prune/save/GpxExporter.java
@@ -538,7 +538,7 @@ public class GpxExporter extends GenericFunction implements Runnable
 		source = replaceGpxTags(source, "<time>", "</time>", inPoint.getTimestamp().getText(Timestamp.Format.ISO8601));
 		if (inPoint.isWaypoint())
 		{
-			source = replaceGpxTags(source, "<name>", "</name>", inPoint.getWaypointName());
+			source = replaceGpxTags(source, "<name>", "</name>", XmlUtils.fixCdata(inPoint.getWaypointName()));
 			if (source != null)
 			{
 				source = source.replaceAll("<description>", "<desc>").replaceAll("</description>", "</desc>");
@@ -694,7 +694,7 @@ public class GpxExporter extends GenericFunction implements Runnable
 		}
 		// write waypoint name after elevation and time
 		inWriter.write("\t\t<name>");
-		inWriter.write(inPoint.getWaypointName().trim());
+		inWriter.write(XmlUtils.fixCdata(inPoint.getWaypointName().trim()));
 		inWriter.write("</name>\n");
 		// description, if any
 		String desc = XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION));
diff --git a/tim/prune/save/KmlExporter.java b/tim/prune/save/KmlExporter.java
index 50386cc..1de5fad 100644
--- a/tim/prune/save/KmlExporter.java
+++ b/tim/prune/save/KmlExporter.java
@@ -562,7 +562,7 @@ public class KmlExporter extends GenericFunction implements Runnable
 				numSaved += writeStandardTrack(inWriter, absoluteAltitudes, selStart, selEnd);
 			}
 		}
-		inWriter.write("</Folder>\n</kml>");
+		inWriter.write("</Folder>\n</kml>\n");
 		return numSaved;
 	}
 
@@ -799,7 +799,7 @@ public class KmlExporter extends GenericFunction implements Runnable
 	throws IOException
 	{
 		inWriter.write("\t<Placemark>\n\t\t<name>");
-		inWriter.write(inName);
+		inWriter.write(XmlUtils.fixCdata(inName));
 		inWriter.write("</name>\n");
 		if (inDesc != null)
 		{
diff --git a/tim/prune/save/xml/XmlUtils.java b/tim/prune/save/xml/XmlUtils.java
index dc8284c..3943d07 100644
--- a/tim/prune/save/xml/XmlUtils.java
+++ b/tim/prune/save/xml/XmlUtils.java
@@ -25,8 +25,8 @@ public abstract class XmlUtils
 	 */
 	public static String fixCdata(String inString)
 	{
-		if (inString == null) return "";
-		if (inString.indexOf('<') < 0 && inString.indexOf('>') < 0) {
+		if (inString == null || inString.isEmpty()) return "";
+		if (!hasIllegalCharacter(inString)) {
 			return inString;
 		}
 		String result = inString;
@@ -37,12 +37,32 @@ public abstract class XmlUtils
 		// Remove all instances of end block
 		result = result.replaceAll(CDATA_END, "");
 		// Now check whether cdata block is required
-		if (result.indexOf('<') < 0 && result.indexOf('>') < 0) {
+		if (!XmlUtils.hasIllegalCharacter(result)) {
 			return result;
 		}
 		return CDATA_START + result + CDATA_END;
 	}
 
+	/**
+	 * Checks the input string for the three illegal characters,
+	 * but only looping through the string once instead of three times
+	 * @param inValue string to check
+	 * @return true if at least one of the illegal characters is found
+	 */
+	public static boolean hasIllegalCharacter(String inValue)
+	{
+		if (inValue == null) return false;
+		final int numChars = inValue.length();
+		for (int i=0; i<numChars; i++)
+		{
+			final char c = inValue.charAt(i);
+			if (c == '<' || c == '>' || c == '&')
+			{
+				return true;
+			}
+		}
+		return false;
+	}
 
 	/**
 	 * @return true if system uses UTF-8 by default

-- 
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