X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Flang%2Fprune-texts.properties;h=d1861356e5e9e2e2f99a2ff6b733e4fc48f12ad0;hp=b9d86eb21d8669f3979fa57830c48259baa61b29;hb=ca9bdb3916f9c39adbbf95d06ac95c21dafbb4e6;hpb=63f178fd6c6b30b99a01f2a2d700963ea2dfef8b

diff --git a/tim/prune/lang/prune-texts.properties b/tim/prune/lang/prune-texts.properties
index b9d86eb..d186135 100644
--- a/tim/prune/lang/prune-texts.properties
+++ b/tim/prune/lang/prune-texts.properties
@@ -21,6 +21,7 @@ menu.edit.deleteduplicates=Delete duplicates
 menu.edit.compress=Compress track
 menu.edit.interpolate=Interpolate
 menu.edit.reverse=Reverse range
+menu.edit.mergetracksegments=Merge track segments
 menu.edit.rearrange=Rearrange waypoints
 menu.edit.rearrange.start=All to start of file
 menu.edit.rearrange.end=All to end of file
@@ -36,8 +37,12 @@ menu.photo.connect=Connect to point
 menu.photo.disconnect=Disconnect from point
 menu.photo.correlate=Correlate all photos
 menu.photo.delete=Remove photo
-menu.3d=Three-D
-menu.3d.show3d=Show in Three-D
+menu.view=View
+menu.view.show3d=Show in three-D
+menu.view.showmap=Show map
+menu.view.browser=Map in browser
+menu.view.browser.google=Google maps
+menu.view.browser.openstreetmap=Openstreetmap
 menu.help=Help
 menu.help.about=About Prune
 # Popup menu for map
@@ -57,14 +62,9 @@ dialog.deletepoint.deletephoto=Delete photo attached to this point?
 dialog.deletephoto.title=Delete Photo
 dialog.deletephoto.deletepoint=Delete point attached to this photo?
 dialog.deleteduplicates.title=Delete Duplicates
-dialog.deleteduplicates.single.text=duplicate was deleted
-dialog.deleteduplicates.multi.text=duplicates were deleted
 dialog.deleteduplicates.nonefound=No duplicates found
 dialog.compresstrack.title=Compress Track
 dialog.compresstrack.parameter.text=Parameter for compression (lower number = more compression)
-dialog.compresstrack.text=Track compressed
-dialog.compresstrack.single.text=data point was removed
-dialog.compresstrack.multi.text=data points were removed
 dialog.compresstrack.nonefound=No data points could be removed
 dialog.openoptions.title=Open options
 dialog.openoptions.filesnippet=Extract of file
@@ -77,7 +77,7 @@ dialog.delimiter.tab=Tab
 dialog.delimiter.space=Space
 dialog.delimiter.semicolon=Semicolon ;
 dialog.delimiter.other=Other
-dialog.openoptions.deliminfo.records=records, with 
+dialog.openoptions.deliminfo.records=records, with
 dialog.openoptions.deliminfo.fields=fields
 dialog.openoptions.deliminfo.norecords=No records
 dialog.openoptions.tabledesc=Extract of file
@@ -86,9 +86,6 @@ dialog.jpegload.subdirectories=Include subdirectories
 dialog.jpegload.loadjpegswithoutcoords=Include photos without coordinates
 dialog.jpegload.progress.title=Loading photos
 dialog.jpegload.progress=Please wait while the photos are searched
-dialog.jpegload.title=Loaded photos
-dialog.jpegload.photoadded=photo was added
-dialog.jpegload.photosadded=photos were added
 dialog.saveoptions.title=Save file
 dialog.save.fieldstosave=Fields to save
 dialog.save.table.field=Field
@@ -98,9 +95,6 @@ dialog.save.headerrow=Output header row
 dialog.save.coordinateunits=Coordinate units
 dialog.save.altitudeunits=Altitude units
 dialog.save.timestampformat=Timestamp format
-dialog.save.oktitle=File saved
-dialog.save.ok1=Successfully saved
-dialog.save.ok2=points to file
 dialog.save.overwrite.title=File already exists
 dialog.save.overwrite.text=This file already exists. Are you sure you want to overwrite the file?
 dialog.exportkml.title=Export KML
@@ -127,9 +121,6 @@ dialog.interpolate.title=Interpolate points
 dialog.interpolate.parameter.text=Number of points to insert between selected points
 dialog.undo.title=Undo action(s)
 dialog.undo.pretext=Please select the action(s) to undo
-dialog.confirmundo.title=Operation(s) undone
-dialog.confirmundo.single.text=operation undone.
-dialog.confirmundo.multiple.text=operations undone.
 dialog.undo.none.title=Cannot undo
 dialog.undo.none.text=No operations to undo!
 dialog.clearundo.title=Clear undo list
@@ -157,8 +148,6 @@ dialog.saveexif.photostatus.connected=Connected
 dialog.saveexif.photostatus.disconnected=Disconnected
 dialog.saveexif.photostatus.modified=Modified
 dialog.saveexif.overwrite=Overwrite files
-dialog.saveexif.ok1=Saved
-dialog.saveexif.ok2=photo files
 dialog.correlate.title=Correlate photos
 dialog.correlate.notimestamps=There are no timestamps in the data points, so there is nothing to correlate with the photos.
 dialog.correlate.nouncorrelatedphotos=There are no uncorrelated photos.\nAre you sure you want to continue?
@@ -182,8 +171,7 @@ dialog.correlate.options.nodistancelimit=No distance limit
 dialog.correlate.options.distancelimit=Distance limit
 dialog.correlate.options.correlate=Correlate
 dialog.correlate.alloutsiderange=All photos are outside the time range of the track, so none can be correlated.\nTry changing the offset or manually correlating at least one photo.
-dialog.correlate.confirmsingle.text=photo was correlated
-dialog.correlate.confirmmultiple.text=photos were correlated
+dialog.map.title=Prune map
 dialog.help.help=Please see\n http://activityworkshop.net/software/prune/\nfor more information and user guides.
 dialog.about.title=About Prune
 dialog.about.version=Version
@@ -198,6 +186,7 @@ dialog.about.systeminfo.java=Java Runtime
 dialog.about.systeminfo.java3d=Java3d installed
 dialog.about.systeminfo.povray=Povray installed
 dialog.about.systeminfo.exiftool=Exiftool installed
+dialog.about.systeminfo.gpsbabel=Gpsbabel installed
 dialog.about.yes=Yes
 dialog.about.no=No
 dialog.about.credits=Credits
@@ -209,6 +198,7 @@ dialog.about.credits.translations=Translations helped by
 dialog.about.credits.devtools=Development tools
 dialog.about.credits.othertools=Other tools
 dialog.about.credits.thanks=Thanks to
+dialog.about.readme=Readme
 
 # 3d window
 dialog.3d.title=Prune Three-d view
@@ -217,6 +207,28 @@ dialog.3dlines.title=Prune gridlines
 dialog.3dlines.empty=No gridlines to display!
 dialog.3dlines.intro=These are the gridlines for the three-d view
 
+# Confirm messages || These are displayed as confirmation in the status bar
+confirm.loadfile=Data loaded from file
+confirm.save.ok1=Successfully saved
+confirm.save.ok2=points to file
+confirm.deleteduplicates.single=duplicate was deleted
+confirm.deleteduplicates.multi=duplicates were deleted
+confirm.deletepoint.single=data point was removed
+confirm.deletepoint.multi=data points were removed
+confirm.point.edit=point edited
+confirm.mergetracksegments=track segments merged
+confirm.reverserange=Range reversed
+confirm.saveexif.ok1=Saved
+confirm.saveexif.ok2=photo files
+confirm.undo.single=operation undone
+confirm.undo.multi=operations undone
+confirm.jpegload.single=photo was added
+confirm.jpegload.multi=photos were added
+confirm.photo.connect=photo connected
+confirm.photo.disconnect=photo disconnected
+confirm.correlate.single=photo was correlated
+confirm.correlate.multi=photos were correlated
+
 # Buttons
 button.ok=OK
 button.back=Back
@@ -252,6 +264,7 @@ details.pointdetails=Point details
 details.index.selected=Index
 details.index.of=of
 details.nopointselection=No point selected
+details.speed=Speed
 details.photofile=Photo file
 details.norangeselection=No range selected
 details.rangedetails=Range details
@@ -266,6 +279,7 @@ display.range.time.secs=s
 display.range.time.mins=m
 display.range.time.hours=h
 display.range.time.days=d
+details.range.avespeed=Ave speed
 details.waypointsphotos.waypoints=Waypoints
 details.waypointsphotos.photos=Photos
 details.photodetails=Photo details
@@ -295,13 +309,18 @@ units.feet=Feet
 units.feet.short=ft
 units.kilometres=Kilometres
 units.kilometres.short=km
+units.kmh=km/h
 units.miles=Miles
 units.miles.short=mi
+units.mph=mph
 units.degminsec=Deg-min-sec
 units.degmin=Deg-min
 units.deg=Degrees
 units.iso8601=ISO 8601
 
+# External urls
+url.googlemaps=maps.google.co.uk
+
 # Cardinals for 3d plots
 cardinal.n=N
 cardinal.s=S
@@ -319,6 +338,7 @@ undo.compress=compress track
 undo.insert=insert points
 undo.deleteduplicates=delete duplicates
 undo.reverse=reverse range
+undo.mergetracksegments=merge track segments
 undo.rearrangewaypoints=rearrange waypoints
 undo.connectphoto=connect photo
 undo.disconnectphoto=disconnect photo
@@ -347,6 +367,9 @@ error.function.noop.title=Function had no effect
 error.rearrange.noop=Rearranging waypoints had no effect
 error.function.notimplemented=Sorry, this function has not yet been implemented.
 error.function.notavailable.title=Function not available
-error.function.nojava3d=This function requires the Java3d library,\navailable from Sun.com or Blackdown.org.
+error.function.nojava3d=This function requires the Java3d library,\navailable from Sun.com.
 error.3d.title=Error in 3d display
 error.3d=An error occurred with the 3d display
+error.readme.notfound=Readme file not found
+error.osmimage.dialogtitle=Error loading map images
+error.osmimage.failed=Failed to load map images. Please check internet connection.