[Git][debian-gis-team/gpsprune][master] 4 commits: New upstream version 24.2

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Sat Jun 22 18:50:18 BST 2024



Bas Couwenberg pushed to branch master at Debian GIS Project / gpsprune


Commits:
ff049dec by Bas Couwenberg at 2024-06-22T19:44:55+02:00
New upstream version 24.2
- - - - -
6959e721 by Bas Couwenberg at 2024-06-22T19:44:56+02:00
Update upstream source from tag 'upstream/24.2'

Update to upstream version '24.2'
with Debian dir 5219036825a41675f31b336a343307ad02e48377
- - - - -
a3f685d1 by Bas Couwenberg at 2024-06-22T19:45:28+02:00
New upstream release.

- - - - -
d530f079 by Bas Couwenberg at 2024-06-22T19:46:06+02:00
Set distribution to unstable.

- - - - -


16 changed files:

- build.sh
- debian/changelog
- tim/prune/GpsPrune.java
- tim/prune/data/Coordinate.java
- tim/prune/data/Track.java
- tim/prune/function/CropToSelection.java
- tim/prune/function/info/AboutScreen.java
- tim/prune/function/media/RemovePhotoFunction.java
- tim/prune/function/settings/SetLanguage.java
- tim/prune/gui/colour/ColourerSelectorPanel.java
- tim/prune/gui/colour/SegmentColourer.java
- tim/prune/gui/map/MapCanvas.java
- tim/prune/lang/prune-texts_cy.properties
- tim/prune/lang/prune-texts_no.properties
- tim/prune/lang/prune-texts_pt.properties
- tim/prune/readme.txt


Changes:

=====================================
build.sh
=====================================
@@ -1,6 +1,6 @@
 # Build script
 # Version number
-PRUNENAME=gpsprune_24.1
+PRUNENAME=gpsprune_24.2
 # remove compile directory
 rm -rf compile
 # remove dist directory


=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+gpsprune (24.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 22 Jun 2024 19:45:56 +0200
+
 gpsprune (24.1-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
tim/prune/GpsPrune.java
=====================================
@@ -41,9 +41,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 = "24.1";
+	public static final String VERSION_NUMBER = "24.2";
 	/** Build number, just used for about screen */
-	public static final String BUILD_NUMBER = "413";
+	public static final String BUILD_NUMBER = "415";
 	/** Static reference to App object */
 	private static App APP = null;
 


=====================================
tim/prune/data/Coordinate.java
=====================================
@@ -371,7 +371,7 @@ public class Coordinate
 				value = value.roundToSeconds(numDigits);
 				return "" + value.getWholeDegrees() + " "
 					+ value.getWholeMinutes() + " "
-					+ value.getWholeSeconds() + getLocalDecimalChar()
+					+ value.getWholeSeconds() + '.' // force decimal dot always, don't use local char
 					+ value.getFractionSeconds();
 
 			case JUST_CARDINAL:
@@ -386,7 +386,8 @@ public class Coordinate
 	/** @return decimal character used by local number formatter */
 	private static char getLocalDecimalChar()
 	{
-		if (_localDecimalChar == 0) {
+		if (_localDecimalChar == 0)
+		{
 			NumberFormat format = _coordFormatters.getLocalFormatter(3);
 			if (format instanceof DecimalFormat) {
 				_localDecimalChar = ((DecimalFormat) format).getDecimalFormatSymbols().getDecimalSeparator();


=====================================
tim/prune/data/Track.java
=====================================
@@ -510,6 +510,16 @@ public class Track
 		return getNextTrackPoint(inStartIndex, _numPoints, true);
 	}
 
+	/**
+	 * Get the next track point starting from the given index
+	 * @param inStartIndex index to start looking from
+	 * @param inEndIndex index to stop looking (inclusive)
+	 * @return next track point, or null if end of data reached
+	 */
+	public DataPoint getFirstTrackPointBetween(int inStartIndex, int inEndIndex) {
+		return getNextTrackPoint(inStartIndex, inEndIndex, true);
+	}
+
 	/**
 	 * Get the previous track point starting from the given index
 	 * @param inStartIndex index to start looking from


=====================================
tim/prune/function/CropToSelection.java
=====================================
@@ -1,9 +1,12 @@
 package tim.prune.function;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import tim.prune.App;
 import tim.prune.cmd.Command;
+import tim.prune.cmd.PointFlag;
+import tim.prune.data.DataPoint;
 import tim.prune.data.Track;
 
 /**
@@ -49,7 +52,13 @@ public class CropToSelection extends DeleteBitOfTrackFunction
 		ArrayList<Integer> indexesToKeep = new ArrayList<>();
 		ArrayList<Integer> indexesToDelete = new ArrayList<>();
 		int numMedia = fillLists(indexesToKeep, indexesToDelete, (i) -> i>=selStart && i<=selEnd);
-		Command command = createCommand(indexesToKeep, indexesToDelete, null, numMedia);
+		List<PointFlag> breakList = null;
+		// Add segment break to the first track point within the selected range
+		DataPoint firstPoint = track.getFirstTrackPointBetween(selStart, selEnd);
+		if (firstPoint != null) {
+			breakList = List.of(new PointFlag(firstPoint, true));
+		}
+		Command command = createCommand(indexesToKeep, indexesToDelete, breakList, numMedia);
 		if (command != null)
 		{
 			Describer undoDescriber = new Describer("undo.deletepoint", "undo.deletepoints");


=====================================
tim/prune/function/info/AboutScreen.java
=====================================
@@ -253,7 +253,7 @@ public class AboutScreen extends GenericFunction
 			+ "<p>" + I18nManager.getText("dialog.about.summarytext3") + "</p>"
 			+ "<p>" + I18nManager.getText("dialog.about.languages") + " : "
 				+ "afrikaans, catal\u00e0, \u010de\u0161tina, deutsch, english, espa\u00F1ol, fran\u00E7ais,<br>" +
-				" italiano, magyar, nederlands, polski, portugu\u00EAs, rom\u00E2n\u0103, suomi, svenska,<br>" +
+				" italiano, magyar, nederlands, norsk, polski, portugu\u00EAs, rom\u00E2n\u0103, suomi, svenska,<br>" +
 				" \u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian), \u4e2d\u6587 (chinese), \u65E5\u672C\u8A9E (japanese), \uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean),<br>" +
 				" schwiizerd\u00FC\u00FCtsch</p>"
 			+ "<p>" + I18nManager.getText("dialog.about.translatedby") + "</p>";


=====================================
tim/prune/function/media/RemovePhotoFunction.java
=====================================
@@ -41,6 +41,7 @@ public class RemovePhotoFunction extends GenericFunction
 		final Command command;
 		// Photo is selected, see if it has a point or not
 		DataPoint point = currentPhoto.getDataPoint();
+		boolean disconnected = false;
 		switch (shouldDeletePoint(currentPhoto))
 		{
 			default:
@@ -53,6 +54,7 @@ public class RemovePhotoFunction extends GenericFunction
 				command = new CompoundCommand()
 						.addCommand(deleteCommand)
 						.addCommand(new ConnectMediaCmd(point, null, point.getAudio()));
+				disconnected = true;
 				break;
 			case DELETE:
 				command = new CompoundCommand()
@@ -65,6 +67,10 @@ public class RemovePhotoFunction extends GenericFunction
 		command.setDescription(I18nManager.getText("undo.removephoto", currentPhoto.getName()));
 		command.setConfirmText(I18nManager.getText("confirm.media.removed", currentPhoto.getName()));
 		_app.execute(command);
+		// If a photo was removed but not the point, then deselect the photo
+		if (disconnected) {
+			_app.getTrackInfo().selectPhoto(-1);
+		}
 	}
 
 	/**


=====================================
tim/prune/function/settings/SetLanguage.java
=====================================
@@ -42,13 +42,13 @@ public class SetLanguage extends GenericFunction
 	/** Names of languages for display in dropdown (not translated) */
 	private static final String[] LANGUAGE_NAMES = {"afrikaans", "catal\u00e0", "\u010de\u0161tina", "deutsch",
 		"english", "american english", "espa\u00F1ol", "fran\u00E7ais", "italiano", "magyar", "nederlands",
-		"polski", "portugu\u00EAs", "rom\u00E2n\u0103", "suomi", "svenska",
+		"norsk", "polski", "portugu\u00EAs", "rom\u00E2n\u0103", "suomi", "svenska",
 		"\u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian)", "\u4e2d\u6587 (chinese)",
 		"\u65E5\u672C\u8A9E (japanese)", "\uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean)", "schwiizerd\u00FC\u00FCtsch"
 	};
 	/** Associated language codes (must be in same order as names!) */
 	private static final String[] LANGUAGE_CODES = {"af", "ca", "cz", "de", "en", "en_us", "es", "fr", "it", "hu",
-		"nl", "pl", "pt", "ro", "fi", "sv", "ru", "zh", "ja", "ko", "de_ch"
+		"nl", "no", "pl", "pt", "ro", "fi", "sv", "ru", "zh", "ja", "ko", "de_ch"
 	};
 
 
@@ -56,16 +56,14 @@ public class SetLanguage extends GenericFunction
 	 * Constructor
 	 * @param inApp app object
 	 */
-	public SetLanguage(App inApp)
-	{
+	public SetLanguage(App inApp) {
 		super(inApp);
 	}
 
 	/**
 	 * Return the name key for this function
 	 */
-	public String getNameKey()
-	{
+	public String getNameKey() {
 		return "function.setlanguage";
 	}
 
@@ -187,7 +185,8 @@ public class SetLanguage extends GenericFunction
 		int idx = -1;
 		if (inCode != null && !inCode.equals(""))
 		{
-			for (int i=0; i<LANGUAGE_CODES.length; i++) {
+			for (int i=0; i<LANGUAGE_CODES.length; i++)
+			{
 				if (LANGUAGE_CODES[i].equalsIgnoreCase(inCode)) {
 					idx = i;
 				}


=====================================
tim/prune/gui/colour/ColourerSelectorPanel.java
=====================================
@@ -159,8 +159,8 @@ public class ColourerSelectorPanel extends JPanel
 		}
 		if (startColour == null) {startColour = inDefaultColour;}
 		if (endColour   == null) {endColour = makeDefaultEndColour(inDefaultColour);}
-		if (startColour != null) {_startEndPatches[0].setBackground(startColour);}
-		if (endColour != null)   {_startEndPatches[1].setBackground(endColour);}
+		if (startColour != null) {_startEndPatches[0].setColour(startColour);}
+		if (endColour != null)   {_startEndPatches[1].setColour(endColour);}
 		onColourerTypeChanged(); // make sure gui is updated
 	}
 


=====================================
tim/prune/gui/colour/SegmentColourer.java
=====================================
@@ -42,7 +42,7 @@ public class SegmentColourer extends DiscretePointColourer
 			DataPoint p = track.getPoint(i);
 			if (p != null && !p.isWaypoint())
 			{
-				if (p.getSegmentStart()) {
+				if (p.getSegmentStart() || c < 0) {
 					c++;
 				}
 				setColour(i, c);


=====================================
tim/prune/gui/map/MapCanvas.java
=====================================
@@ -1054,15 +1054,21 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe
 	 * @param inX x coordinate of click
 	 * @param inY y coordinate of click
 	 * @param inNewSegment true to start a new segment, false to continue
-	 * @return DataPoint with given coordinates and no altitude
+	 * @return DataPoint with given coordinates and no altitude, or null if values are invalid
 	 */
 	private DataPoint createPointFromClick(int inX, int inY, boolean inNewSegment)
 	{
 		double lat = MapUtils.getLatitudeFromY(_mapPosition.getYFromPixels(inY, getHeight()));
 		double lon = MapUtils.getLongitudeFromX(_mapPosition.getXFromPixels(inX, getWidth()));
-		DataPoint point = new DataPoint(Latitude.make(lat), Longitude.make(lon));
-		point.setSegmentStart(inNewSegment);
-		return point;
+		Coordinate latitude = Latitude.make(lat);
+		Coordinate longitude = Longitude.make(lon);
+		if (latitude != null && longitude != null)
+		{
+			DataPoint point = new DataPoint(Latitude.make(lat), Longitude.make(lon));
+			point.setSegmentStart(inNewSegment);
+			return point;
+		}
+		return null;
 	}
 
 	/**
@@ -1193,7 +1199,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe
 	 */
 	private void insertPoint(DataPoint inPoint, int inInsertIndex)
 	{
-		if (inInsertIndex < -1) {
+		if (inInsertIndex < -1 || inPoint == null) {
 			return;
 		}
 		InsertPointCmd command = new InsertPointCmd(inPoint, inInsertIndex);


=====================================
tim/prune/lang/prune-texts_cy.properties
=====================================
@@ -4,6 +4,7 @@
 # Menu entries
 menu.file=Ffeil
 menu.file.addphotos=Mewnosod delwedd
+menu.file.findfile=Chwilio am ffeiliau
 menu.file.save=Cadw TXT
 menu.file.export=Allforio ffeil
 menu.file.exit=Gadael GpsPrune
@@ -59,6 +60,7 @@ function.findwaypoint=Chwilio am enw
 function.charts=Siartiau
 function.distances=Pellterau
 function.viewfulldetails=Manylion
+function.setcolours=Eiliwiau
 function.setlanguage=Ieithoedd
 function.help=Cymorth
 function.about=Ynghylych GpsPrune
@@ -67,20 +69,26 @@ function.selecttimezone=Gosod y gylchfa amser
 # Dialogs
 dialog.exit.confirm.title=Gadael GpsPrune
 dialog.deletepoint.title=Dileu'r pwynt
+dialog.load.table.field=Maes
 dialog.load.table.description=Disgrifiad
 dialog.delimiter.comma=Coma ,
 dialog.delimiter.semicolon=Hannercolon ;
+dialog.openoptions.deliminfo.fields=meysydd
 dialog.gpsload.format=Fformat
 dialog.gpsload.save=Cadw ffeil
 dialog.saveoptions.title=Cadwch y ffeil
 dialog.save.table.field=Maes
 dialog.save.table.save=Cadw
 dialog.exportgpx.name=Enw
+dialog.exportgpx.desc=Disgrifiad
 dialog.exportgpx.encoding.system=System
 dialog.exportgpx.encoding.utf8=UTF-8
 dialog.exportpov.camerax=Camera X
 dialog.exportpov.cameray=Camera Y
 dialog.exportpov.cameraz=Camera Z
+dialog.baseimage.tiles=Teils
+dialog.pointedit.table.field=Maes
+dialog.pointedit.table.value=Gwerth
 dialog.truncatecoords.preview=Rhagarddangosfa
 dialog.addtimeoffset.weeks=Wythnosau
 dialog.addtimeoffset.days=Dyddiau
@@ -121,6 +129,8 @@ dialog.weather.day.friday=Dydd Gwener
 dialog.weather.day.saturday=Dydd Sadwrn
 dialog.weather.day.sunday=Dydd Sul
 dialog.weather.temp=Tymh.
+dialog.findfile.searchtext=Testun
+dialog.findfile.resultscolumn.file=Ffeil
 dialog.editdaterange.yearmonthday=Blwyddyn/Mis/Dydd
 dialog.editdaterange.month.jan=Ionawr
 dialog.editdaterange.month.feb=Chwefror
@@ -139,6 +149,9 @@ dialog.editdaterange.month=Mis
 dialog.editdaterange.day=Dydd
 dialog.editdaterange.result=Canlyniad
 
+# Tips, shown just once when appropriate
+tip.title=Cwnsel
+
 # Buttons
 button.ok=Iawn
 button.next=Nesa
@@ -149,6 +162,7 @@ button.yes=Ie
 button.no=Na
 button.selectall=Dewis popeth
 button.preview=Rhagarddangosfa
+button.check=Gwirio
 button.delete=Dilea
 button.apply=Gosod
 button.allow=Caniat\u00e1u
@@ -172,6 +186,7 @@ details.track.points=Pwyntiau
 details.track.file=Ffeil
 details.index.selected=Mynegai
 details.index.of=o
+details.range.gradient=Graddiant
 details.lists.photos=Lluniau
 details.lists.audio=Awdio
 details.photodetails=Manylion y llun
@@ -188,6 +203,7 @@ fieldname.custom=Cyfaddas
 fieldname.prefix=Maes
 fieldname.distance=Pellter
 fieldname.speed=Cyflymder
+fieldname.gradient=Graddiant
 fieldname.description=Disgrifiad
 fieldname.comment=Sylw
 fieldname.symbol=Symbol
@@ -202,6 +218,14 @@ logic.or=neu
 url.googlemaps=maps.google.co.uk
 wikipedia.lang=cy
 openweathermap.lang=en
+webservice.peakfinder=Agor Peakfinder.org
+webservice.geohack=Agor Geohack
+
+# Cardinals for 3d plots
+cardinal.n=G
+cardinal.s=D
+cardinal.e=Dn
+cardinal.w=Gn
 
 # Undo operations
 undo.deletepoint=Dileu'r pwynt


=====================================
tim/prune/lang/prune-texts_no.properties
=====================================
@@ -12,14 +12,14 @@ menu.file.exit=Avslutt
 menu.online=P\u00e5 nett
 menu.track=Spor
 menu.track.undo=Angre
-menu.track.clearundo=Nullstill angreliste
+menu.track.clearundo=T\u00f8m angreliste
 menu.track.markrectangle=Marker punkter i rektangel
 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.average=Gjennomsnittsposisjon for utvalg
 menu.range.mergetracksegments=Sl\u00e5 sammen delintervaller
 menu.range.cutandmove=Kutt av og flytt valgt intervall
 menu.point=Punkt
@@ -29,19 +29,21 @@ menu.point.goto=G\u00e5 til
 menu.point.goto.highest=H\u00f8yeste punkt
 menu.point.goto.lowest=Laveste punkt
 menu.point.goto.fastest=Raskeste punkt
-menu.photo=Bilde
+menu.photo=Foto
 menu.photo.saveexif=Lagre Exif-data
 menu.audio=Lyd
-menu.view=Visning
-menu.view.showsidebars=Vis sidefelter
+menu.view=Vis
+menu.view.showsidebars=Vis sidepaneler
 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.bing=Bing maps
+menu.view.browser.mapillary=Mapillary
+menu.view.browser.graphhopper=GraphHopper
 menu.settings=Innstillinger
 menu.settings.onlinemode=Last kart fra Internet
-menu.settings.autosave=Lagre innstillinger automatisk ved avslutning
+menu.settings.autosave=Auto-lagre innstillinger ved avslutning
 menu.help=Hjelp
 
 # Popup menu for map
@@ -58,19 +60,21 @@ menu.map.editmode=Redigeringsmodus
 
 # Alt keys for menus
 altkey.menu.file=F
+altkey.menu.online=N
 altkey.menu.track=S
 altkey.menu.range=I
 altkey.menu.point=P
 altkey.menu.view=V
-altkey.menu.photo=B
+altkey.menu.photo=F
 altkey.menu.audio=L
-altkey.menu.settings=n
+altkey.menu.settings=T
 altkey.menu.help=H
 
 # Ctrl shortcuts for menu items
 shortcut.menu.file.open=\u00c5
+shortcut.menu.file.load=E
 shortcut.menu.file.save=L
-shortcut.menu.track.undo=g
+shortcut.menu.track.undo=G
 shortcut.menu.track.compress=K
 shortcut.menu.range.all=A
 shortcut.menu.point.edit=R
@@ -88,28 +92,47 @@ function.exportimage=Eksporter bilde
 function.editwaypointname=Endre veipunktnavn
 function.compress=Komprimer spor
 function.deletemarked=Slett markerte punkter
+function.marklifts=Merk heiser i oppoverbakke
 function.deleterange=Fjern valgt intervall
 function.croptrack=Beskj\u00e6r sporet
 function.reverserange=Reverser intervallet
 function.interpolate=Interpoler punkter
 function.deletebydate=Slett punkter etter dato
-function.addtimeoffset=Legg til tidsinkrement
-function.addaltitudeoffset=Legg til h\u00f8ideinkrement
-function.deletefieldvalues=Slett feltets verdier
+function.addtimeoffset=Legg til tidsforskyvning
+function.addaltitudeoffset=Legg til h\u00f8ydeforskyvning
+function.rearrangewaypoints=Omorganiser veipunkter
+function.dedupewaypoints=Fjern duplikate veipunkter
+function.deletefieldvalues=Slett feltverdier
 function.findwaypoint=Finn veipunkt
-function.pastecoordinates=Legg til nye koordinater
+function.pastecoordinates=Angi punktkoordinater
+function.pastecoordinatelist=Angi koordinatliste
 function.charts=Grafer
 function.show3d=3-D visning
 function.distances=Avstander
-function.viewfulldetails=Vis alle detaljer
-function.setmapbg=Velg grunnlagskart
-function.setpaths=Angi plassering av programmer
+function.viewfulldetails=Alle detaljer
+function.estimatetime=Beregn tid
+function.learnestimationparams=L\u00e6r opp tidsberegningsparametre
+function.autoplay=Spill av spor
+function.setmapbg=Velg bakgrunnskart
+function.setpaths=Velg programbaner
+function.selectsegment=Marker gjeldende segment
+function.splitsegments=Del spor i segmenter
+function.sewsegments=Sy sammen sporsegmenter
+function.createmarkerwaypoints=Opprett mark\u00f8rveipunkter
 function.lookupsrtm=Hent h\u00f8yde fra SRTM
+function.configuresrtmsources=Still inn SRTM-kilder
 function.getwikipedia=Vis Wikipedia info for omegn
 function.searchwikipedianames=S\u00f8k Wikipedia
+function.searchosmpois=Hent OSM-punkter i n\u00e6rheten
+function.searchopencachingde=S\u00f8k OpenCaching.de
 function.downloadosm=Last ned OSM data for omr\u00e5det
+function.truncatecoords=Avkort koordinater
 function.duplicatepoint=Dupliser punkt
+function.projectpoint=Projiser punkt
+function.projectcircle=Projiser sirkel rundt punkt
 function.setcolours=Velg farger
+function.setdisplaysettings=Velg visningsalternativer
+function.setwaypointdisplay=Velg veipunktalternativer
 function.setlanguage=Velg spr\u00e5k
 function.connecttopoint=Knytt til punkt
 function.disconnectfrompoint=Koble fra punkt
@@ -124,43 +147,319 @@ function.loadaudio=Legg til lydklipp
 function.removeaudio=Fjern lydklipp
 function.correlateaudios=Relater alle lydklipp
 function.playaudio=Spill lydklipp
-function.stopaudio=Avbryt lydklipp
+function.stopaudio=Stopp lydklipp
 function.help=Hjelp
 function.showkeys=Vis hurtigtaster
 function.about=Om GpsPrune
 function.checkversion=Sjekk etter nye versjoner
 function.saveconfig=Lagre innstillinger
+function.migrateconfig=Migrer innstillingsfil
 function.diskcache=Om lagring av kart
 function.managetilecache=H\u00e5ndter kart-flis-lager
+function.getweatherforecast=Hent v\u00e6rvarsel
+function.setaltitudetolerance=Still inn h\u00f8ydetoleranse
+function.selecttimezone=Still inn tidssone
 
 # Dialogs
+dialog.exit.confirm.title=Avslutt GpsPrune
+dialog.exit.unsaveddata.text=Dine data er ikke lagret. Er du sikker p\u00e5 at du vil avslutte?
+dialog.deletepoint.title=Slett punkt
+dialog.deletepoints.title=Slett punkter
+dialog.deletephoto.title=Slett foto
+dialog.load.table.field=Felt
+dialog.load.table.datatype=Datatype
+dialog.load.table.description=Beskrivelse
+dialog.delimiter.label=Feltskilletegn
+dialog.delimiter.comma=Komma ,
+dialog.delimiter.tab=Tabulator
+dialog.delimiter.space=Mellomrom
+dialog.delimiter.semicolon=Semikolon ;
+dialog.delimiter.other=Annet
+dialog.openoptions.deliminfo.fields=felt
 dialog.openoptions.altitudeunits=H\u00f8ydeenheter
 dialog.openoptions.speedunits=Hastighetsenheter
 dialog.openoptions.vertspeedunits=Vertikale hastighetsenheter
+dialog.open.contentsdoubled=Denne filen inneholder to kopier av hvert punkt.
+dialog.open.contentsdoubled.wayandtrack=Denne filen inneholder to kopier av hvert punkt,\nen gang som veipunkt og en gang som sporpunkt.
+dialog.open.includesubdirectories=Inkluder undermapper
+dialog.jpegload.loadjpegswithoutcoords=Inkluder bilder uten koordinater
+dialog.loadlinkedmedia.allowdomain=Tillate media fra '%s'?
+dialog.gpsload.nogpsbabel=Ikke noe GPSBabel-program ble funnet. Fortsette?
+dialog.gpsload.device=Enhetsnavn
+dialog.gpsload.format=Format
+dialog.gpsload.getwaypoints=Last veipunkter
+dialog.gpsload.gettracks=Last spor
+dialog.gpsload.save=Lagre til fil
+dialog.gpssend.sendwaypoints=Send veipunkter
+dialog.gpssend.sendtracks=Send spor
 dialog.gpssend.trackname=Spornavn
+dialog.gpsbabel.filters=Filtre
+dialog.addfilter.title=Legg til filter
+dialog.gpsbabel.filter.discard=Forkast
+dialog.gpsbabel.filter.simplify=Forenkle
 dialog.gpsbabel.filter.distance=Distanse
+dialog.gpsbabel.filter.interpolate=Interpolere
+dialog.gpsbabel.filter.discard.intro=Forkast punkter hvis
+dialog.gpsbabel.filter.discard.hdop=Hdop >
+dialog.gpsbabel.filter.discard.vdop=Vdop >
+dialog.gpsbabel.filter.discard.numsats=Antall satellitter <
+dialog.gpsbabel.filter.simplify.maxpoints=Antall punkter <
+dialog.gpsbabel.filter.simplify.length=lengdeforskjell
+dialog.gpsbabel.filter.simplify.relative=relativ til hdop
+dialog.gpsbabel.filter.distance.intro=Fjern punkter hvis n\u00e6r foreg\u00e5ende punkter
+dialog.gpsbabel.filter.distance.distance=Hvis distanse <
+dialog.gpsbabel.filter.distance.time=og tidsforskjell <
+dialog.gpsbabel.filter.interpolate.intro=Legg til ekstra punkter mellom sporpunkter
+dialog.gpsbabel.filter.interpolate.distance=Hvis distanse >
+dialog.gpsbabel.filter.interpolate.time=eller tidsforskjell >
 dialog.saveoptions.title=Lagre fil
+dialog.save.fieldstosave=Felter \u00e5 lagre
+dialog.save.table.field=Felt
+dialog.save.table.hasdata=Har data
 dialog.save.table.save=Lagre
 dialog.save.coordinateunits=Koordinatformat
 dialog.save.altitudeunits=H\u00f8ydeenheter
 dialog.save.timestampformat=Tidsstempelformat
+dialog.save.overwrite.title=Fil finnes allerede
+dialog.save.overwrite.text=Denne filen finnes allerede. Er du sikker p\u00e5 at du vil overskrive filen?
+dialog.exportkml.kmz=Komprimer for \u00e5 lage kmz-fil
+dialog.exportkml.exportimages=Eksporter miniatyrbilder til kmz
 dialog.exportkml.imagesize=Bildest\u00f8rrelse
 dialog.exportkml.trackcolour=Sporfarge
 dialog.exportgpx.name=Navn
 dialog.exportgpx.desc=Beskrivelse
 dialog.exportgpx.includetimestamps=Inkluder tidsstempler
+dialog.exportgpx.descriptionstocomments=Kopier beskrivelser til kommentarer
+dialog.exportgpx.encoding=Koding
+dialog.exportgpx.encoding.system=System
+dialog.exportgpx.encoding.utf8=UTF-8
+dialog.exportpov.text=Angi parametrene for POV-eksporten
+dialog.exportpov.font=Skrift
+dialog.exportpov.camerax=Kamera X
+dialog.exportpov.cameray=Kamera Y
+dialog.exportpov.cameraz=Kamera Z
+dialog.exportpov.modelstyle=Modellstil
 dialog.3d.useterrain=Vis terreng
+dialog.3d.terraingridsize=Rutenettst\u00f8rrelse
+dialog.baseimage.title=Kartbilde
+dialog.baseimage.useimage=Bruk bilde
+dialog.baseimage.mapsource=Kartkilde
+dialog.baseimage.zoom=Zoom-niv\u00e5
+dialog.baseimage.tiles=Fliser
+dialog.baseimage.size=Bildest\u00f8rrelse
+dialog.exportimage.drawtrack=Tegn spor p\u00e5 kart
+dialog.exportimage.drawtrackpoints=Tegn sporpunkter
+dialog.exportimage.textscalepercent=Tekstskaleringsfaktor (%)
+dialog.pointtype.desc=Lagre f\u00f8lgende punkttyper:
+dialog.pointtype.track=Sporpunkter
+dialog.pointtype.waypoint=Veipunkter
+dialog.pointtype.photo=Fotopunkter
+dialog.pointtype.audio=Lydpunkter
+dialog.undo.title=Angrehandling(er)
+dialog.undo.pretext=Velg handlingen(e) \u00e5 angre
+dialog.undo.none.title=Kan ikke angre
+dialog.undo.none.text=Ingen handlinger \u00e5 angre!
+dialog.clearundo.title=T\u00f8m angreliste
+dialog.clearundo.text=Er du sikker p\u00e5 at du vil t\u00f8mme angrelisten?\nAll angreinformasjon blir tapt!
+dialog.pointedit.title=Rediger punkt
+dialog.pointedit.intro=Velg hvert felt etter tur for \u00e5 vise og endre verdien
+dialog.pointedit.table.field=Felt
+dialog.pointedit.nofield=Ingen felt valgt
+dialog.pointedit.table.value=Verdi
+dialog.pointnameedit.name=Veipunktnavn
+dialog.pointnameedit.uppercase=STORE bokstaver
+dialog.pointnameedit.lowercase=sm\u00e5 bokstaver
+dialog.truncatecoords.intro=Velg koordinatformatet og antallet desimaler
+dialog.truncatecoords.numdigits=Antall desimaler
+dialog.truncatecoords.preview=Forh\u00e5ndsvisning
+dialog.addtimeoffset.add=Legg til tid
+dialog.addtimeoffset.subtract=Trekk fra tid
 dialog.addtimeoffset.weeks=Uker
 dialog.addtimeoffset.days=Dager
 dialog.addtimeoffset.hours=Timer
 dialog.addtimeoffset.minutes=Minutter
+dialog.addtimeoffset.notimestamps=Kan ikke legge til en tidsforskyvning ettersom dette markeringsomr\u00e5det ikke inneholder noen tidsstempelinformasjon
+dialog.findwaypoint.intro=Angi en del av veipunktnavnet
 dialog.findwaypoint.search=S\u00f8k
+dialog.saveexif.title=Lagre Exif
+dialog.saveexif.nothingtosave=Koordinatdata er uendret, ingenting \u00e5 lagre
+dialog.saveexif.noexiftool=Ikke noe ExifTool-program ble funnet. Fortsette?
+dialog.saveexif.table.photoname=Bildenavn
+dialog.saveexif.table.status=Status
 dialog.saveexif.table.save=Lagre
+dialog.saveexif.photostatus.modified=Endret
+dialog.saveexif.overwrite=Overskriv filer
+dialog.charts.xaxis=X-akse
+dialog.charts.yaxis=Y-akser
+dialog.charts.svgwidth=SVG-bredde
+dialog.charts.svgheight=SVG-h\u00f8yde
+dialog.charts.gnuplotnotfound=Fant ikke Gnuplot med den angitte banen
+dialog.distances.intro=Luftlinjeavstander mellom punkter
+dialog.distances.column.from=Fra punkt
+dialog.distances.column.to=Til punkt
+dialog.distances.currentpoint=Gjeldende punkt
+dialog.distances.toofewpoints=Denne funksjonen trenger veipunkter for \u00e5 kunne beregne avstandene mellom dem
+dialog.estimatetime.details=Detaljer
+dialog.estimatetime.gentle=Lett
+dialog.estimatetime.steep=Bratt
+dialog.estimatetime.climb=Oppstigning
+dialog.estimatetime.descent=Nedstigning
+dialog.estimatetime.parameters=Parametre
+dialog.estimatetime.parameters.timefor=Tid for
+dialog.estimatetime.results=Resultater
+dialog.estimatetime.results.estimatedtime=Beregnet tid
+dialog.estimatetime.results.actualtime=Faktisk tid
+dialog.learnestimationparams.averageerror=Gjennomsnittsfeil
+dialog.learnestimationparams.combine=Disse parameterne kan kombineres med de gjeldende verdiene
+dialog.learnestimationparams.combinedresults=Kombinerte resultater
+dialog.learnestimationparams.weight.100pccurrent=Behold gjeldende verdier
+dialog.learnestimationparams.weight.current=gjeldende
+dialog.learnestimationparams.weight.calculated=beregnet
+dialog.learnestimationparams.weight.50pc=Gjennomsnitt av gjeldende og beregnede verdier
+dialog.learnestimationparams.weight.100pccalculated=Bruk nye beregnede verdier
+dialog.setmapbg.intro=Velg en av kartkildene eller legg til en ny
+dialog.addmapsource.title=Legg til ny kartkilde
+dialog.addmapsource.maxzoom=Maksimum zoom-niv\u00e5
+dialog.addmapsource.noname=Navnl\u00f8s
+dialog.pointdownload.description=Beskrivelse
+dialog.pointdownload.nodescription=Ingen beskrivelse
+dialog.wikipedia.column.name=Artikkelnavn
+dialog.osmpois.column.name=Navn
+dialog.osmpois.column.type=Type
+dialog.osmpois.nonefound=Ingen punkter funnet
+dialog.correlate.select.photoname=Bildenavn
+dialog.correlate.select.timediff=Tidsforskjell
+dialog.correlate.options.offsetpanel=Tidsforskyvning
+dialog.correlate.options.offset.hours=timer,
+dialog.correlate.options.offset.minutes=minutter og
+dialog.correlate.options.offset.seconds=sekunder
+dialog.rearrangewaypoints.desc=Velg bestemmelsesstedet og sorteringsrekkef\u00f8lge for veipunktene
+dialog.rearrange.nosort=Ikke sorter
+dialog.rearrange.sortbyfilename=Sorter etter filnavn
+dialog.rearrange.sortbyname=Sorter etter navn
+dialog.rearrange.sortbytime=Sorter etter tid
+dialog.compress.duplicates.title=Duplikatfjerning
+dialog.compress.summarylabel=Punkter \u00e5 slette
+dialog.compress.confirm=%d punkter har blitt markerte.\nSlette disse markerte punktene n\u00e5?
+dialog.compress.confirmnone=ingen punkter har blitt markert
+dialog.deletemarked.nonefound=Ingen datapunkter kunne fjernes
+dialog.dedupewaypoints.nonefound=Ingen duplikatveipunkter ble funnet
+dialog.pastecoordinates.desc=Skriv inn eller lim inn koordinatene her
+dialog.pastecoordinates.coords=Koordinater
+dialog.pastecoordinates.nothingfound=Sjekk koordinatene og pr\u00f8v igjen
+dialog.pastecoordinatelist.desc=Angi koordinatene for de nye punktene med ett punkt per linje
+dialog.about.version=Versjon
+dialog.about.languages=Tilgjengelige spr\u00e5k
+dialog.about.translatedby=Norsk oversettelse av:
+dialog.about.systeminfo=System-info
+dialog.about.systeminfo.os=Operativsystem
+dialog.about.systeminfo.java=Java Runtime
+dialog.about.systeminfo.java3d=Java3d installert
+dialog.about.systeminfo.exiftool=ExifTool installert
+dialog.about.systeminfo.gpsbabel=GPSBabel installert
+dialog.about.systeminfo.gnuplot=Gnuplot installert
+dialog.about.yes=Ja
+dialog.about.no=Nei
+dialog.keys.normalmodifier=Ctrl
+dialog.paths.prune.gnuplotpath=Bane til Gnuplot
+dialog.paths.prune.gpsbabelpath=Bane til GPSBabel
+dialog.paths.prune.exiftoolpath=Bane til ExifTool
+dialog.setpaths.intro=Hvis du trenger det, kan du velge banene til de eksterne programmene:
+dialog.setpaths.found=Bane funnet?
+dialog.addaltitude.desc=H\u00f8ydeforskyvning \u00e5 legge til
+dialog.setcolours.background=Bakgrunn
+dialog.setcolours.borders=Kanter
+dialog.setcolours.lines=Linjer
+dialog.setcolours.primary=Prim\u00e6r
+dialog.setcolours.secondary=Sekund\u00e6r
+dialog.setcolours.point=Punkter
+dialog.setcolours.selection=Markering
+dialog.setcolours.text=Tekst
+dialog.colourchooser.title=Velg farge
+dialog.colourchooser.red=R\u00f8d
+dialog.colourchooser.green=Gr\u00f8nn
+dialog.colourchooser.blue=Bl\u00e5
+dialog.colourer.start=Startfarge
+dialog.colourer.end=Sluttfarge
+dialog.colourer.maxcolours=Maksimalt antall farger
+dialog.setlanguage.firstintro=Du kan enten velge ett av de inkluderte spr\u00e5kene,<p>eller velg en tekstfil \u00e5 bruke isteden.
+dialog.setlanguage.secondintro=Innstillingene dine m\u00e5 lagres og s\u00e5<p>start GpsPrune p\u00e5 nytt for \u00e5 endre spr\u00e5ket.
+dialog.setlanguage.language=Spr\u00e5k
+dialog.setlanguage.languagefile=Spr\u00e5kfil
+dialog.setlanguage.endmessage=Lagre innstillingene dine og start GpsPrune p\u00e5 nytt\nfor at spr\u00e5kendringen skal tre i kraft.
+dialog.setlanguage.endmessagewithautosave=Start GpsPrune p\u00e5 nytt for at spr\u00e5kendringen skal tre i kraft.
+dialog.diskcache.save=Lagre kartbilder p\u00e5 disk
+dialog.diskcache.dir=Hurtiglagermappe
+dialog.diskcache.createdir=Opprett mappe
+dialog.diskcache.nocreate=Hurtiglagermappe ikke opprettet
+dialog.diskcache.cannotwrite=Kartfliser kan ikke lagres i den valgte mappen
+dialog.diskcache.table.path=Bane
+dialog.diskcache.table.usedby=Brukt av
+dialog.diskcache.table.zoom=Zoom
+dialog.diskcache.table.tiles=Fliser
+dialog.diskcache.table.megabytes=Megabyte
+dialog.diskcache.deleteold=Slett gamle fliser
+dialog.diskcache.maximumage=Maksimal alder (dager)
+dialog.diskcache.deleteall=Slett alle fliser
+dialog.diskcache.deleted=Slettet %d filer fra hurtiglageret
+dialog.displaysettings.linewidth=Linjetykkelse for sporene (1-4)
+dialog.displaysettings.antialias=Bruk kantutjevning
+dialog.displaysettings.allowosscaling=Tillat OS \u00e5 skalere kart
+dialog.displaysettings.doublesizedicons=Gj\u00f8r ikoner dobbelt s\u00e5 store
+dialog.displaysettings.waypointicons=Veipunktikoner
+dialog.displaysettings.wpicon.default=Standard
+dialog.displaysettings.wpicon.plectrum=Plektrum
+dialog.displaysettings.wpicon.ring=Ring
+dialog.displaysettings.size.small=Sm\u00e5
+dialog.displaysettings.size.medium=Middels
+dialog.displaysettings.size.large=Store
+dialog.displaysettings.windowstyle.default=Standard
+dialog.displaysettings.windowstyle.nimbus=Nimbus
+dialog.displaysettings.windowstyle.gtk=GTK
+dialog.downloadosm.desc=Bekreft for \u00e5 laste ned OSM-r\u00e5data for det angitte omr\u00e5det:
+dialog.searchwikipedianames.search=S\u00f8k etter:
+dialog.weather.location=Sted
+dialog.weather.update=Varsel oppdatert
 dialog.weather.sunrise=Soloppgang
 dialog.weather.sunset=Solnedgang
 dialog.weather.temperatureunits=Temperaturer
+dialog.weather.currentforecast=Gjeldende v\u00e6r
+dialog.weather.dailyforecast=Daglig varsel
+dialog.weather.3hourlyforecast=Tretimers varsel
+dialog.weather.day.now=Gjeldende v\u00e6r
+dialog.weather.day.today=I dag
+dialog.weather.day.tomorrow=I morgen
+dialog.weather.day.monday=Mandag
+dialog.weather.day.tuesday=Tirsdag
+dialog.weather.day.wednesday=Onsdag
+dialog.weather.day.thursday=Torsdag
+dialog.weather.day.friday=Fredag
+dialog.weather.day.saturday=L\u00f8rdag
+dialog.weather.day.sunday=S\u00f8ndag
+dialog.weather.wind=Vind
+dialog.weather.temp=Temp
+dialog.weather.humidity=Fuktighet
+dialog.weather.creditnotice=Disse dataene er gjort tilgjengelige av openweathermap.org. Nettstedet deres har flere detaljer.
+dialog.deletebydate.nodate=Ingen tidsstempel
 dialog.deletebydate.column.keep=Behold
 dialog.deletebydate.column.delete=Slett
+dialog.setaltitudetolerance.text.metres=Grense (i meter) under hvilken sm\u00e5 stigninger og nedstigninger blir ignorert
+dialog.setaltitudetolerance.text.feet=Grense (i fot) under hvilken sm\u00e5 stigninger og nedstigninger blir ignorert
+dialog.settimezone.system=Bruk systemets tidssone
+dialog.settimezone.custom=Bruk f\u00f8lgende tidssone:
+dialog.settimezone.list.toomany=For mange \u00e5 velge mellom
+dialog.settimezone.selectedzone=Valgt tidssone
+dialog.settimezone.offsetfromutc=Forskjell fra UTC
+dialog.autoplay.rewind=Tilbake til begynnelsen
+dialog.autoplay.pause=Pause
+dialog.autoplay.play=Spill av
+dialog.findfile.dir=S\u00f8k mappe
+dialog.findfile.searchtext=Tekst
+dialog.findfile.resultscolumn.file=Fil
+dialog.findfile.resultscolumn.contents=Innhold
+dialog.editdaterange.yearmonthday=\u00c5r/M\u00e5ned/Dag
+dialog.editdaterange.daterange=Start- og sluttdato
+dialog.editdaterange.month.all=Helt \u00e5r
 dialog.editdaterange.month.jan=Januar
 dialog.editdaterange.month.feb=Februar
 dialog.editdaterange.month.mar=Mars
@@ -176,33 +475,115 @@ dialog.editdaterange.month.dec=Desember
 dialog.editdaterange.year=\u00c5r
 dialog.editdaterange.month=M\u00e5ned
 dialog.editdaterange.day=Dag
+dialog.editdaterange.to=til
+dialog.editdaterange.result=Resultat
+dialog.locationfilter.nofilter=Ingen filter
+dialog.locationfilter.distance=Etter distanse
+dialog.locationfilter.frompoint=fra punkt
+
+# Confirm messages
+confirm.loadfile=Data lastet fra fil
+confirm.save.ok1=Lagret
+confirm.save.ok2=punkter til filen
+confirm.deletepoint.single=datapunkt ble fjernet
+confirm.deletepoint.multi=%d datapunkter ble fjernet
+confirm.point.edit=punkt redigert
+confirm.addtimeoffset=Tidsforskyvning lagt til
+confirm.addaltitudeoffset=H\u00f8ydeforskyvning lagt til
+confirm.pointadded=punkt lagt til
+confirm.pointsadded=%d punkter lagt til
+confirm.saveexif.ok=Lagret %d foto-filer
+confirm.jpegload.single=1 foto ble lagt til
+confirm.media.removed=%s ble fjernet
+confirm.createpoint=punkt opprettet
+confirm.rotatephoto=foto rotert
+confirm.lookupsrtm=Fant %d h\u00f8ydeverdier
+confirm.deletefieldvalues=Feltverdier slettet
+confirm.audiosloaded.single=1 lydfil lagt til
+confirm.audiosloaded=%d lydfiler lagt til
 
 # Buttons
 button.ok=OK
 button.back=Tilbake
 button.next=Neste
+button.finish=Fullf\u00f8r
 button.cancel=Avbryt
+button.overwrite=Overskriv
+button.moveup=Flytt opp
+button.movedown=Flytt ned
 button.edit=Rediger
+button.exit=Avslutt
 button.close=Lukk
 button.continue=Fortsett
 button.yes=Ja
 button.no=Nei
+button.always=Alltid
+button.select=Velg
+button.selectall=Velg alle
+button.selectnone=Velg ingen
+button.preview=Forh\u00e5ndsvis
+button.load=Last
+button.showwebpage=Vis nettside
+button.resettodefaults=Tilbakestill til standard
 button.browse=Bla gjennom...
+button.addnew=Legg til ny
 button.delete=Slett
 button.apply=Bruk
 button.allow=Tillat
 button.block=Blokker
 button.search=S\u00f8k
 
+# File types
+filetype.txt=TXT-filer
+filetype.jpeg=JPG-filer
+filetype.kmlkmz=KML-, KMZ-filer
+filetype.kml=KML-filer
+filetype.kmz=KMZ-filer
+filetype.gpx=GPX-filer
+filetype.pov=POV-filer
+filetype.svg=SVG-filer
+filetype.png=PNG-filer
+filetype.audio=MP3-, OGG-, WAV-filer
+
 # Display components
+display.nodata=Ingen data lastet
+display.noaltitudes=Spordata inkluder ikke h\u00f8yde
+display.notimestamps=Spordata inkluder ikke tidsstempler
+display.novalues=Spordata inkluder ikke verdier for dette feltet
 details.trackdetails=Spordetaljer
+details.notrack=Ingen spor lastet
 details.track.points=Punkter
 details.track.file=Fil
+details.track.numfiles=Antall filer
+details.pointdetails=Punktdetaljer
+details.index.selected=Indeks
+details.index.of=av
+details.range.to=til
+details.altitude.to=til
+details.range.climb=Oppstigning
+details.range.descent=Nedstigning
+details.coordformat=Koordinatformat
 details.distanceunits=Distanseenheter
 display.range.time.secs=s
 display.range.time.mins=m
 display.range.time.hours=t
 display.range.time.days=d
+details.range.avespeed=Gj. hastighet
+details.range.maxspeed=Maks. hastighet
+details.range.numsegments=Antall segmenter
+details.range.pace=Tempo
+details.lists.waypoints=Veipunkter
+details.lists.photos=Foto
+details.lists.audio=Lyd
+details.photodetails=Fotodetaljer
+details.photo.loading=Laster
+details.photo.bearing=Retning
+details.media.fullpath=Full bane
+details.audiodetails=Lyddetaljer
+details.noaudio=Ingen lydklipp valgt
+details.audio.file=Lydfil
+details.audio.playing=spiller...
+map.overzoom=Ingen kart tilgjengelige p\u00e5 dette zoom-niv\u00e5et
 
 # Field names
 fieldname.latitude=Breddegrad
@@ -214,13 +595,21 @@ fieldname.time=Tid
 fieldname.date=Dato
 fieldname.waypointname=Navn
 fieldname.waypointtype=Type
+fieldname.newsegment=Segment
+fieldname.custom=Tilpasset
+fieldname.prefix=Felt
 fieldname.distance=Distanse
 fieldname.duration=Varighet
 fieldname.speed=Hastighet
 fieldname.verticalspeed=Vertikal hastighet
 fieldname.description=Beskrivelse
+fieldname.comment=Kommentar
+fieldname.symbol=Symbol
+fieldname.photo=Foto
+fieldname.audio=Lyd
 
 # Measurement units
+units.default=Standard
 units.metres=Meter
 units.metres.short=m
 units.feet=Fot
@@ -229,21 +618,74 @@ units.kilometres=Kilometer
 units.kilometres.short=km
 units.kilometresperhour=km i timen
 units.kilometresperhour.short=km/t
+units.nauticalmiles=Nautiske mil
+units.nauticalmiles.short=N.m.
+units.nauticalmilesperhour.short=kn
 units.metrespersec=meter per sekund
 units.metrespersec.short=m/s
+units.feetpersec=fot per sekund
+units.feetpersec.short=ft/s
 units.hours=timer
 units.minutes=minutter
 units.seconds=sekunder
 units.degminsec=Grad-min-sek
 units.degmin=Grad-min
 units.deg=Grader
+units.iso8601=ISO 8601
+units.degreescelsius=Celsius
+units.degreescelsius.short=\u00b0C
+units.degreesfahrenheit=Fahrenheit
+units.degreesfahrenheit.short=\u00b0F
 
 # How to combine conditions, such as filters
 logic.and=og
 logic.or=eller
 
+# External urls and services
+wikipedia.lang=no
+openweathermap.lang=no
+
 # Cardinals for 3d plots
 cardinal.n=N
 cardinal.s=S
 cardinal.e=\u00d8
 cardinal.w=V
+
+# Undo operations
+undo.loadfile=Last fil %s
+undo.loadpoints=Last %d punkter
+undo.editpoint=Rediger punkt
+undo.editpoint.withname=Rediger punkt '%s'
+undo.deletepoint=Slett punkt
+undo.deletepoint.withname=Slett punkt '%s'
+undo.deletepoints=Slett %d punkter
+undo.createpoint=Opprett punkt
+undo.applytimestamps=Bruk tidsstempler
+
+# Error messages
+error.save.dialogtitle=Feil ved lagring av data
+error.save.nodata=Ingen data \u00e5 lagre
+error.save.failed=Kunne ikke lagre dataene til fil
+error.load.dialogtitle=Feil ved lasting av data
+error.load.noread=Kan ikke lese fil
+error.load.nopoints=Ingen koordinatinformasjon funnet i filen
+error.load.unknownxml=Ikke gjenkjent xml-format:
+error.load.noxmlinzip=Ingen xml-fil funnet i zip-filen
+error.load.othererror=Feil ved lesing av fil:
+error.load.nopointsintext=Ingen koordinatinformasjon funnet
+error.jpegload.dialogtitle=Feil ved lasting av bilder
+error.jpegload.nofilesfound=Ingen filer funnet
+error.jpegload.nojpegsfound=Ingen jpeg-filer funnet
+error.jpegload.nogpsfound=Ingen GPS-informasjon funnet
+error.audioload.nofilesfound=Ingen lydklipp funnet
+error.gpsload.unknown=Ukjent feil
+error.undofailed.title=Angre mislyktes
+error.language.wrongfile=Den valgte filen ser ikke ut til \u00e5 v\u00e6re en spr\u00e5kfil for GpsPrune
+error.lookupsrtm.nonefound=Ingen h\u00f8ydeverdier tilgjengelige for disse punktene
+error.cache.notthere=Flishurtiglager-mappen ble ikke funnet
+error.cache.empty=Flishurtiglager-mappen er tom
+error.cache.cannotdelete=Ingen fliser kunne slettes
+error.tracksplit.nosplit=Sporet kunne ikke deles
+error.findfile.nofilesfound=Ingen filer ble funnet i denne mappen.
+error.migrateconfig.couldnotcreatedirectory=Kunne ikke opprette mappen %s.\nInnstillinger kunne ikke migreres.
+error.migrateconfig.couldnotdeletefile=Kunne ikke slette filen %s.\nSlett denne filen manuelt.


=====================================
tim/prune/lang/prune-texts_pt.properties
=====================================
@@ -4,7 +4,7 @@
 # Menu entries
 menu.file=Arquivo
 menu.file.addphotos=Adicionar fotos
-menu.file.findfile=Procurar archivos de faixas
+menu.file.findfile=Procurar arquivos de faixas
 menu.file.recentfiles=Arquivos recentes
 menu.file.save=Salvar
 menu.file.export=Exportar rota
@@ -602,9 +602,12 @@ dialog.configuresrtm.userid=Nome de utilizador em NASA Earthdata
 dialog.configuresrtm.password=Palavra-passe em NASA Earthdata
 dialog.findfile.dir=Diret\u00f3rio no qual pesquisar
 dialog.findfile.searchtext=Texto
-dialog.findfile.resultscolumn.file=Archivo
+dialog.findfile.daterange=Intervalo de datas
+dialog.findfile.locationfilter=Filtro de localiza\u00e7\u00e3o
+dialog.findfile.resultscolumn.file=Arquivo
 dialog.findfile.resultscolumn.contents=Conte\u00fados
-dialog.findfile.filepath.none=Nenhum ficheiro est\u00e1 selecionado
+dialog.findfile.filepath.none=Nenhum arquivo est\u00e1 selecionado
+dialog.findfile.filepath.single=Arquivo selecionado: %s
 dialog.editdaterange.yearmonthday=Ano/m\u00eas/dia
 dialog.editdaterange.daterange=Data de in\u00edcio e de fim
 dialog.editdaterange.month.all=O ano inteiro


=====================================
tim/prune/readme.txt
=====================================
@@ -1,4 +1,4 @@
-GpsPrune version 24.1
+GpsPrune version 24.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_24.1.jar
+   java -jar gpsprune_24.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,19 @@ 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_24.1.jar --lang=DE
+   java -jar gpsprune_24.2.jar --lang=DE
 
 
+New with version 24.2
+=====================
+The following fixes were made since version 24.1:
+  - Added Norwegian language to language selection dialog
+  - Bugfix: Segment flag when cropping track to selected range
+  - Bugfix: Fractional seconds values being lost in call to Exiftool depending on system's decimal point
+  - Bugfix: Photo selection when deleting photo but not deleting the attached point
+  - Bugfix: Tooltip for colour patches
+  - Bugfix: Don't create points with null Coordinates
+
 New with version 24.1
 =====================
 The following fixes were made since version 24:



View it on GitLab: https://salsa.debian.org/debian-gis-team/gpsprune/-/compare/6ecaf33b7a3a264148ee4b0c0f2464c5fde8c31f...d530f0794dcdf322b00230225cb0cdaf8f744d48

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/gpsprune/-/compare/6ecaf33b7a3a264148ee4b0c0f2464c5fde8c31f...d530f0794dcdf322b00230225cb0cdaf8f744d48
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240622/332ca3e5/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list