Version 19, May 2018

[GpsPrune.git] / tim / prune / lang / prune-texts_zh.properties

diff --git a/tim/prune/lang/prune-texts_zh.properties b/tim/prune/lang/prune-texts_zh.properties
index 6068744d6f902cc5d8cb29c63142c3cb9120effd..d1c128265f32101d256b10fec298d6fc3d989d00 100644 (file)
--- a/tim/prune/lang/prune-texts_zh.properties
+++ b/tim/prune/lang/prune-texts_zh.properties
@@ -7,15 +7,12 @@ menu.file.addphotos=\u6dfb\u52a0\u7167\u7247
 menu.file.recentfiles=\u6700\u8fd1\u6253\u5f00\u8fc7\u6587\u4ef6
 menu.file.save=\u4fdd\u5b58
 menu.file.exit=\u9000\u51fa
+menu.online=\u8054\u7f51
 menu.track=\u8f68\u8ff9
 menu.track.undo=\u64a4\u9500
 menu.track.clearundo=\u6e05\u9664\u64a4\u9500\u6e05\u5355
 menu.track.markrectangle=\u6807\u8bb0\u9009\u53d6\u533a\u57df\u5185\u7684\u70b9
-menu.track.deletemarked=\u5220\u9664\u5df2\u6807\u8bb0\u8f68\u8ff9\u70b9
-menu.track.rearrange=\u91cd\u65b0\u6392\u5217\u822a\u70b9
-menu.track.rearrange.start=\u81f3\u8d77\u59cb\u4f4d\u7f6e
-menu.track.rearrange.end=\u81f3\u672b\u4f4d\u7f6e
-menu.track.rearrange.nearest=\u81f3\u6700\u8fd1\u8f68\u8ff9\u70b9
+function.deletemarked=\u5220\u9664\u5df2\u6807\u8bb0\u8f68\u8ff9\u70b9
 menu.range=\u822a\u6bb5
 menu.range.all=\u5168\u9009
 menu.range.none=\u64a4\u9500\u9009\u62e9
@@ -57,6 +54,7 @@ menu.map.editmode=\u7f16\u8f91\u6a21\u5f0f
 
 # Alt keys for menus
 altkey.menu.file=F
+altkey.menu.online=N
 altkey.menu.track=T
 altkey.menu.range=R
 altkey.menu.point=P
@@ -83,34 +81,40 @@ function.sendtogps=\u53d1\u9001\u81f3GPS
 function.exportkml=\u8f93\u51faKML\u6587\u4ef6
 function.exportgpx=\u8f93\u51faGPX\u6587\u4ef6
 function.exportpov=\u8f93\u51faPOV\u6587\u4ef6
-function.exportsvg=\u8f93\u51faSVG\u6587\u4ef6
+function.exportimage=\u8f93\u51fa\u56fe\u50cf
 function.editwaypointname=\u7f16\u8f91\u822a\u70b9\u540d
 function.compress=\u538b\u7f29\u8f68\u8ff9(\u6807\u8bb0\u8981\u5220\u9664\u822a\u70b9)
 function.deleterange=\u5220\u9664\u8f68\u8ff9\u70b9\u6bb5
 function.croptrack=\u4fee\u526a\u8f68\u8ff9
 function.interpolate=\u91cd\u53e0\u8f68\u8ff9\u70b9
+function.deletebydate=\u6839\u636e\u65e5\u671f\u5220\u9664\u8f68\u8ff9\u70b9
 function.addtimeoffset=\u52a0\u5165\u65f6\u95f4\u5dee
 function.addaltitudeoffset=\u52a0\u5165\u9ad8\u5ea6\u504f\u79fb
+function.rearrangewaypoints=\u91cd\u65b0\u6392\u5217\u822a\u70b9
 function.convertnamestotimes=\u822a\u70b9\u540d\u79f0\u8f6c\u4e3a\u65f6\u95f4
-function.deletefieldvalues=\u5220\u9664\u533a\u57df\u6570\u503c
+function.deletefieldvalues=\u5220\u9664\u5b57\u6bb5\u503c
 function.findwaypoint=\u67e5\u627e\u822a\u70b9
 function.pastecoordinates=\u8f93\u5165\u65b0\u5750\u6807
 function.charts=\u56fe\u8868
 function.show3d=3D\u89c6\u56fe
 function.distances=\u8ddd\u79bb
 function.fullrangedetails=\u5168\u822a\u6bb5\u8be6\u7ec6\u4fe1\u606f
+function.estimatetime=\u4f30\u8ba1\u65f6\u95f4
+function.learnestimationparams=\u4f7f\u7528\u5f53\u524d\u8f68\u8ff9\u53c2\u6570\u4f30\u8ba1\u65f6\u95f4
 function.setmapbg=\u80cc\u666f\u5730\u56fe
-function.setkmzimagesize=\u8bbe\u7f6eKMZ\u56fe\u50cf\u5c3a\u5bf8
 function.setpaths=\u8bbe\u7f6e\u7a0b\u5e8f\u8def\u5f84
+function.selectsegment=\u9009\u4e2d\u5f53\u524d\u8f68\u8ff9\u6bb5
+function.splitsegments=\u5206\u5272\u8f68\u8ff9
+function.sewsegments=\u63a5\u5408\u8f68\u8ff9\u7247\u6bb5
 function.getgpsies=\u83b7\u53d6Gpsies\u8f68\u8ff9
 function.uploadgpsies=\u4e0a\u4f20\u8f68\u8ff9\u5230Gpsies
 function.lookupsrtm=\u4eceSRTM\u83b7\u5f97\u9ad8\u5ea6\u4fe1\u606f
+function.downloadsrtm=\u4e0b\u8f7dSRTM\u6570\u636e
 function.getwikipedia=\u7ef4\u57fa\u767e\u79d1\u6709\u5173\u672c\u5730\u6587\u7ae0
 function.searchwikipedianames=\u6309\u540d\u5b57\u4ece\u7ef4\u57fa\u767e\u79d1\u67e5\u627e
 function.downloadosm=\u4e0b\u8f7d\u6b64\u5730OSM\u6570\u636e
 function.duplicatepoint=\u590d\u5236\u70b9
 function.setcolours=\u8bbe\u7f6e\u989c\u8272
-function.setlinewidth=\u8bbe\u7f6e\u7ebf\u4f53\u5bbd\u5ea6
 function.setlanguage=\u8bbe\u7f6e\u8bed\u8a00
 function.connecttopoint=\u94fe\u63a5\u5230\u5f53\u524d\u70b9
 function.disconnectfrompoint=\u64a4\u9500\u94fe\u63a5
@@ -133,6 +137,8 @@ function.checkversion=\u68c0\u67e5\u66f4\u65b0
 function.saveconfig=\u4fdd\u5b58\u8bbe\u7f6e
 function.diskcache=\u4fdd\u5b58\u5730\u56fe
 function.managetilecache=\u7ba1\u7406\u5730\u56fe\u533a\u57df\u6570\u636e\u7f13\u5b58
+function.getweatherforecast=\u83b7\u53d6\u5929\u6c14\u9884\u62a5
+function.setaltitudetolerance=\u8bbe\u7f6e\u9ad8\u5ea6\u516c\u5dee
 
 # Dialogs
 dialog.exit.confirm.title=\u9000\u51fa
@@ -146,10 +152,10 @@ dialog.deletephoto.deletepoint=\u5220\u9664\u94fe\u63a5\u5230\u7167\u7247\u7684\
 dialog.deleteaudio.deletepoint=\u5220\u9664\u94fe\u63a5\u5230\u97f3\u9891\u7684\u8f68\u8ff9\u70b9\uff1f
 dialog.openoptions.title=\u6253\u5f00\u9009\u9879
 dialog.openoptions.filesnippet=\u63d0\u53d6\u6587\u4ef6\u7247\u6bb5
-dialog.load.table.field=\u6570\u636e\u6bb5
+dialog.load.table.field=\u5b57\u6bb5
 dialog.load.table.datatype=\u6570\u636e\u7c7b\u578b
 dialog.load.table.description=\u63cf\u8ff0
-dialog.delimiter.label=\u6570\u636e\u6bb5\u5206\u9694\u7b26
+dialog.delimiter.label=\u5b57\u6bb5\u5206\u9694\u7b26
 dialog.delimiter.comma=\u9017\u53f7
 dialog.delimiter.tab=Tab
 dialog.delimiter.space=\u7a7a\u683c
@@ -159,6 +165,10 @@ dialog.openoptions.deliminfo.records=\u6761\u8bb0\u5f55\uff0c
 dialog.openoptions.deliminfo.fields=\u6570\u636e\u6bb5
 dialog.openoptions.deliminfo.norecords=\u65e0\u7eaa\u5f55
 dialog.openoptions.altitudeunits=\u9ad8\u5ea6\u5355\u4f4d
+dialog.openoptions.speedunits=\u901f\u5ea6\u5355\u4f4d
+dialog.openoptions.vertspeedunits=\u5782\u76f4\u901f\u5ea6\u5355\u4f4d
+dialog.openoptions.vspeed.positiveup=\u4e0a\u5347\u4e3a\u6b63
+dialog.openoptions.vspeed.positivedown=\u4e0b\u964d\u4e3a\u6b63
 dialog.open.contentsdoubled=\u6587\u4ef6\u542b\u6709\u4e24\u5957\u70b9\u4fe1\u606f\uff0c\u4e00\u5957\u822a\u70b9\u4fe1\u606f\u548c\u4e00\u5957\u8f68\u8ff9\u70b9\u4fe1\u606f
 dialog.selecttracks.intro=\u9009\u62e9\u8981\u5bfc\u5165\u7684\u8f68\u8ff9
 dialog.selecttracks.noname=\u672a\u547d\u540d
@@ -176,6 +186,30 @@ dialog.gpsload.save=\u4fdd\u5b58\u5230\u6587\u4ef6
 dialog.gpssend.sendwaypoints=\u53d1\u9001\u822a\u70b9
 dialog.gpssend.sendtracks=\u53d1\u9001\u8f68\u8ff9
 dialog.gpssend.trackname=\u8f68\u8ff9\u540d
+dialog.gpsbabel.filters=\u7b5b\u9009\u6761\u4ef6
+dialog.addfilter.title=\u6dfb\u52a0\u7b5b\u9009\u6761\u4ef6
+dialog.gpsbabel.filter.discard=\u820d\u5f03
+dialog.gpsbabel.filter.simplify=\u7b80\u5316
+dialog.gpsbabel.filter.distance=\u8ddd\u79bb
+dialog.gpsbabel.filter.interpolate=\u63d2\u503c
+dialog.gpsbabel.filter.discard.intro=\u820d\u5f03\u8f68\u8ff9\u70b9\u5f53
+dialog.gpsbabel.filter.discard.hdop=Hdop >
+dialog.gpsbabel.filter.discard.vdop=Vdop >
+dialog.gpsbabel.filter.discard.numsats=\u536b\u661f\u6570 <
+dialog.gpsbabel.filter.discard.nofix=\u8f68\u8ff9\u70b9\u672a\u5b9a\u4f4d
+dialog.gpsbabel.filter.discard.unknownfix=\u8f68\u8ff9\u70b9\u5b9a\u4f4d\u4e0d\u660e
+dialog.gpsbabel.filter.simplify.intro=\u5220\u9664\u6240\u6709\u8f68\u8ff9\u70b9\u76f4\u5230
+dialog.gpsbabel.filter.simplify.maxpoints=\u8f68\u8ff9\u70b9\u6570 <
+dialog.gpsbabel.filter.simplify.maxerror=\u6216\u8bef\u5dee\u8ddd\u79bb <
+dialog.gpsbabel.filter.simplify.crosstrack=\u504f\u822a
+dialog.gpsbabel.filter.simplify.length=\u957f\u5ea6\u5dee
+dialog.gpsbabel.filter.simplify.relative=\u76f8\u5bf9hdop
+dialog.gpsbabel.filter.distance.intro=\u79fb\u9664\u4e0e\u524d\u4e00\u70b9\u8ddd\u79bb\u592a\u8fd1\u7684\u8f68\u8ff9\u70b9
+dialog.gpsbabel.filter.distance.distance=\u5f53\u8ddd\u79bb <
+dialog.gpsbabel.filter.distance.time=\u4e14\u65f6\u95f4\u5dee <
+dialog.gpsbabel.filter.interpolate.intro=\u63d2\u5165\u4e2d\u95f4\u70b9
+dialog.gpsbabel.filter.interpolate.distance=\u5f53\u8ddd\u79bb >
+dialog.gpsbabel.filter.interpolate.time=\u6216\u65f6\u95f4\u5dee >
 dialog.saveoptions.title=\u4fdd\u5b58
 dialog.save.fieldstosave=\u4fdd\u5b58\u6570\u636e\u6bb5
 dialog.save.table.field=\u6570\u636e\u6bb5
@@ -192,7 +226,10 @@ dialog.exportkml.text=\u6570\u636e\u540d\u79f0
 dialog.exportkml.altitude=\u7edd\u5bf9\u9ad8\u5ea6(\u822a\u7a7a\u7528)
 dialog.exportkml.kmz=\u538b\u7f29\u6210KMZ\u6587\u4ef6
 dialog.exportkml.exportimages=\u8f93\u51fa\u7f29\u7565\u56fe\u81f3KMZ
+dialog.exportkml.imagesize=\u56fe\u50cf\u5c3a\u5bf8
 dialog.exportkml.trackcolour=\u8f68\u8ff9\u989c\u8272
+dialog.exportkml.standardkml=\u6807\u51c6KML
+dialog.exportkml.extendedkml=\u5e26\u65f6\u95f4\u6233\u8bb0\u7684\u6269\u5c55KML
 dialog.exportgpx.name=\u540d\u79f0
 dialog.exportgpx.desc=\u63cf\u8ff0
 dialog.exportgpx.includetimestamps=\u5305\u542b\u65f6\u95f4
@@ -208,11 +245,22 @@ dialog.exportpov.cameraz=\u76f8\u673aZ\u5750\u6807
 dialog.exportpov.modelstyle=\u6a21\u578b\u7c7b\u578b
 dialog.exportpov.ballsandsticks=\u7403\u6746\u6a21\u578b
 dialog.exportpov.tubesandwalls=\u7ba1\u5899\u6a21\u578b
-dialog.exportpov.warningtracksize=\u8f68\u8ff9\u542b\u6709\u592a\u591a\u822a\u70b9\uff0cJAVA3D\u53ef\u80fd\u65e0\u6cd5\u663e\u793a\u3002\n\u662f\u5426\u7ee7\u7eed\uff1f
-dialog.exportsvg.text=\u9009\u62e9\u8f93\u51faSVG\u6587\u4ef6\u7684\u53c2\u6570
-dialog.exportsvg.phi=\u65b9\u4f4d\u89d2
-dialog.exportsvg.theta=\u4ef0\u89d2
-dialog.exportsvg.gradients=\u4f7f\u7528\u6e10\u53d8\u8272
+dialog.3d.warningtracksize=\u8f68\u8ff9\u542b\u6709\u592a\u591a\u822a\u70b9\uff0cJAVA3D\u53ef\u80fd\u65e0\u6cd5\u663e\u793a\n\u662f\u5426\u7ee7\u7eed\uff1f
+dialog.3d.useterrain=\u663e\u793a\u5730\u5f62
+dialog.3d.terraingridsize=\u7f51\u683c\u5927\u5c0f
+dialog.exportpov.baseimage=\u57fa\u7840\u56fe
+dialog.exportpov.cannotmakebaseimage=\u65e0\u6cd5\u4fdd\u5b58\u57fa\u7840\u56fe
+dialog.baseimage.title=\u8bbe\u7f6e\u57fa\u7840\u56fe
+dialog.baseimage.useimage=\u4f7f\u7528\u6b64\u56fe\u50cf
+dialog.baseimage.mapsource=\u5730\u56fe\u6e90
+dialog.baseimage.zoom=\u7f29\u653e\u7ea7\u522b
+dialog.baseimage.incomplete=\u56fe\u50cf\u4e0d\u5b8c\u6574
+dialog.baseimage.tiles=\u5730\u56fe\u5757
+dialog.baseimage.size=\u56fe\u50cf\u5c3a\u5bf8
+dialog.exportimage.noimagepossible=\u8f93\u51fa\u7684\u5730\u56fe\u56fe\u50cf\u9996\u5148\u9700\u8981\u7f13\u5b58\u5728\u672c\u5730\u78c1\u76d8\u4e0a
+dialog.exportimage.drawtrack=\u7ed8\u51fa\u8f68\u8ff9
+dialog.exportimage.drawtrackpoints=\u7ed8\u51fa\u5404\u8f68\u8ff9\u70b9
+dialog.exportimage.textscalepercent=\u6587\u5b57\u7f29\u653e\u6bd4\u4f8b (%)
 dialog.pointtype.desc=\u4fdd\u5b58\u4e0b\u5217\u70b9\uff1a
 dialog.pointtype.track=\u8f68\u8ff9\u70b9
 dialog.pointtype.waypoint=\u822a\u70b9
@@ -220,9 +268,9 @@ dialog.pointtype.photo=\u7167\u7247\u70b9
 dialog.pointtype.audio=\u5e26\u58f0\u97f3\u7684\u822a\u70b9
 dialog.pointtype.selection=\u4ec5\u5df2\u9009\u62e9\u822a\u6bb5
 dialog.confirmreversetrack.title=\u786e\u8ba4\u53cd\u8f6c
-dialog.confirmreversetrack.text=\u8f68\u8ff9\u5305\u542b\u65f6\u95f4\u4fe1\u606f\uff0c\u53cd\u8f6c\u540e\u53ef\u80fd\u4e22\u5931\u3002\n\u662f\u5426\u7ee7\u7eed\uff1f
+dialog.confirmreversetrack.text=\u8f68\u8ff9\u5305\u542b\u65f6\u95f4\u4fe1\u606f\uff0c\u53cd\u8f6c\u540e\u53ef\u80fd\u4e22\u5931\n\u662f\u5426\u7ee7\u7eed\uff1f
 dialog.confirmcutandmove.title=\u786e\u8ba4\u526a\u5207\u548c\u79fb\u52a8
-dialog.confirmcutandmove.text=\u8f68\u8ff9\u5305\u542b\u65f6\u95f4\u4fe1\u606f\uff0c\u79fb\u52a8\u540e\u53ef\u80fd\u4e22\u5931\u3002\n\u662f\u5426\u7ee7\u7eed\uff1f
+dialog.confirmcutandmove.text=\u8f68\u8ff9\u5305\u542b\u65f6\u95f4\u4fe1\u606f\uff0c\u79fb\u52a8\u540e\u53ef\u80fd\u4e22\u5931\n\u662f\u5426\u7ee7\u7eed\uff1f
 dialog.interpolate.parameter.text=\u6240\u9009\u4e24\u70b9\u4e2d\u63d2\u5165\u70b9\u7684\u4e2a\u6570
 dialog.interpolate.betweenwaypoints=\u521b\u5efa\u4e2d\u7ee7\u822a\u70b9\uff1f
 dialog.undo.title=\u64a4\u9500\u64cd\u4f5c
@@ -232,12 +280,10 @@ dialog.undo.none.text=\u65e0\u64cd\u4f5c\u53ef\u64a4\u9500
 dialog.clearundo.title=\u6e05\u9664\u64a4\u9500\u64cd\u4f5c\u6e05\u5355
 dialog.clearundo.text=\u662f\u5426\u786e\u5b9e\u8981\u6e05\u9664\u64a4\u9500\u64cd\u4f5c\u6e05\u5355\uff1f\n\u64a4\u9500\u64cd\u4f5c\u4fe1\u606f\u4f1a\u4e22\u5931\uff01
 dialog.pointedit.title=\u7f16\u8f91\u8f68\u8ff9\u70b9
-dialog.pointedit.text=\u9009\u62e9\u8981\u7f16\u8f91\u7684\u533a\u57df\u5e76\u7528\u201c\u7f16\u8f91\u201d\u952e\u6539\u53d8\u6570\u503c
-dialog.pointedit.table.field=\u6570\u636e\u6bb5
+dialog.pointedit.intro=\u4f9d\u6b21\u9009\u4e2d\u5b57\u6bb5\u4ee5\u67e5\u770b\u53ca\u8c03\u6574\u6570\u503c
+dialog.pointedit.table.field=\u5b57\u6bb5
+dialog.pointedit.nofield=\u672a\u9009\u4e2d\u5b57\u6bb5
 dialog.pointedit.table.value=\u6570\u503c
-dialog.pointedit.table.changed=\u5df2\u6539\u53d8
-dialog.pointedit.changevalue.text=\u8f93\u5165\u65b0\u6570\u503c
-dialog.pointedit.changevalue.title=\u7f16\u8f91\u6570\u636e\u6bb5
 dialog.pointnameedit.name=\u822a\u70b9\u540d\u79f0
 dialog.pointnameedit.uppercase=\u4e0a\u6863\u952e
 dialog.pointnameedit.lowercase=\u4e0b\u6863\u952e
@@ -279,13 +325,33 @@ dialog.distances.toofewpoints=\u9700\u8981\u822a\u70b9\u6765\u8ba1\u7b97\u8ddd\u
 dialog.fullrangedetails.intro=\u822a\u6bb5\u8be6\u60c5
 dialog.fullrangedetails.coltotal=\u5305\u542b\u95f4\u65ad
 dialog.fullrangedetails.colsegments=\u4e0d\u5305\u542b\u95f4\u65ad
+dialog.estimatetime.details=\u8be6\u60c5
+dialog.estimatetime.gentle=\u5e73\u7f13
+dialog.estimatetime.steep=\u9661\u5ced
+dialog.estimatetime.climb=\u4e0a\u5347
+dialog.estimatetime.descent=\u4e0b\u964d
+dialog.estimatetime.parameters=\u53c2\u6570
+dialog.estimatetime.parameters.timefor=\u9700\u65f6
+dialog.estimatetime.results=\u7ed3\u679c
+dialog.estimatetime.results.estimatedtime=\u4f30\u8ba1\u65f6\u95f4
+dialog.estimatetime.results.actualtime=\u5b9e\u9645\u7528\u65f6
+dialog.estimatetime.error.nodistance=\u4f30\u8ba1\u65f6\u95f4\u9700\u8981\u8fde\u7eed\u7684\u8f68\u8ff9
+dialog.estimatetime.error.noaltitudes=\u9009\u4e2d\u90e8\u5206\u4e0d\u5305\u542b\u9ad8\u5ea6\u4fe1\u606f
+dialog.learnestimationparams.intro=\u6b64\u8f68\u8ff9\u8ba1\u7b97\u5f97\u5230\u7684\u53c2\u6570\u4e3a
+dialog.learnestimationparams.averageerror=\u5e73\u5747\u8bef\u5dee
+dialog.learnestimationparams.combine=\u8fd9\u4e9b\u53c2\u6570\u53ef\u4e0e\u5f53\u524d\u6570\u503c\u5408\u5e76
+dialog.learnestimationparams.combinedresults=\u5408\u5e76\u7ed3\u679c
+dialog.learnestimationparams.weight.100pccurrent=\u4fdd\u6301\u5f53\u524d\u6570\u503c
+dialog.learnestimationparams.weight.current=\u5f53\u524d\u503c
+dialog.learnestimationparams.weight.calculated=\u8ba1\u7b97\u503c
+dialog.learnestimationparams.weight.50pc=\u5e73\u5747\u503c
+dialog.learnestimationparams.weight.100pccalculated=\u4f7f\u7528\u65b0\u8ba1\u7b97\u503c
 dialog.setmapbg.intro=\u8bf7\u9009\u62e9\u5730\u56fe\uff0c\u6216\u6dfb\u52a0\u5730\u56fe
 dialog.addmapsource.title=\u6dfb\u52a0\u5730\u56fe
 dialog.addmapsource.sourcename=\u5730\u56fe\u6765\u6e90\u540d\u79f0
 dialog.addmapsource.layer1url=\u7b2c\u4e00\u5c42URL
 dialog.addmapsource.layer2url=\u53ef\u9009\u7b2c\u4e8c\u5c42URL
 dialog.addmapsource.maxzoom=\u6700\u5927\u7f29\u653e\u7ea7\u6570
-dialog.addmapsource.cloudstyle=\u6837\u5f0f\u53f7
 dialog.addmapsource.noname=\u672a\u547d\u540d
 dialog.gpsies.column.name=\u8f68\u8ff9\u540d\u79f0
 dialog.gpsies.column.length=\u957f\u5ea6
@@ -307,14 +373,14 @@ dialog.gpsies.activity.sailing=\u5e06\u8239
 dialog.gpsies.activity.skating=\u6ed1\u51b0
 dialog.wikipedia.column.name=\u6587\u7ae0\u9898\u76ee
 dialog.wikipedia.column.distance=\u8ddd\u79bb
+dialog.wikipedia.nonefound=\u672a\u627e\u5230\u7ef4\u57fa\u767e\u79d1\u6761\u76ee
 dialog.correlate.notimestamps=\u6570\u636e\u70b9\u4e2d\u65e0\u65f6\u95f4\u4fe1\u606f\uff0c\u7167\u7247\u65e0\u6cd5\u94fe\u63a5
-dialog.correlate.nouncorrelatedphotos=\u6240\u6709\u7167\u7247\u5df2\u94fe\u63a5\u3002\u7ee7\u7eed\uff1f
-dialog.correlate.nouncorrelatedaudios=\u6240\u6709\u97f3\u9891\u5df2\u94fe\u63a5\u3002\u7ee7\u7eed\uff1f
+dialog.correlate.nouncorrelatedphotos=\u6240\u6709\u7167\u7247\u5df2\u94fe\u63a5\uff0c\u7ee7\u7eed\uff1f
+dialog.correlate.nouncorrelatedaudios=\u6240\u6709\u97f3\u9891\u5df2\u94fe\u63a5\uff0c\u7ee7\u7eed\uff1f
 dialog.correlate.photoselect.intro=\u9009\u62e9\u5df2\u94fe\u63a5\u7167\u7247\u4f5c\u4e3a\u65f6\u95f4\u504f\u79fb
 dialog.correlate.select.photoname=\u7167\u7247\u540d
 dialog.correlate.select.timediff=\u65f6\u95f4\u5dee
 dialog.correlate.select.photolater=\u7167\u7247\u5ef6\u540e
-dialog.correlate.options.tip=\u63d0\u793a\uff1a\u624b\u52a8\u94fe\u63a5\u81f3\u5c11\u4e00\u5f20\u7167\u7247\uff0c\u53ef\u81ea\u52a8\u8ba1\u7b97\u65f6\u95f4\u504f\u79fb
 dialog.correlate.options.intro=\u9009\u62e9\u81ea\u52a8\u94fe\u63a5\u8bbe\u7f6e
 dialog.correlate.options.offsetpanel=\u65f6\u95f4\u504f\u79fb
 dialog.correlate.options.offset=\u504f\u79fb
@@ -331,7 +397,7 @@ dialog.correlate.options.timelimit=\u65f6\u95f4\u9650\u5236
 dialog.correlate.options.nodistancelimit=\u65e0\u8ddd\u79bb\u9650\u5236
 dialog.correlate.options.distancelimit=\u8ddd\u79bb\u9650\u5236
 dialog.correlate.options.correlate=\u5173\u8054
-dialog.correlate.alloutsiderange=\u65e0\u6cd5\u94fe\u63a5\uff0c\u6240\u6709\u7167\u7247\u8d85\u51fa\u8f68\u8ff9\u65f6\u95f4\u8303\u56f4\u3002\n\u8bf7\u6539\u53d8\u65f6\u95f4\u504f\u79fb\u6216\u624b\u52a8\u94fe\u63a5\u81f3\u5c11\u4e00\u5f20\u5728\u7167\u7247\u3002
+dialog.correlate.alloutsiderange=\u65e0\u6cd5\u94fe\u63a5\uff0c\u6240\u6709\u7167\u7247\u8d85\u51fa\u8f68\u8ff9\u65f6\u95f4\u8303\u56f4\n\u8bf7\u6539\u53d8\u65f6\u95f4\u504f\u79fb\u6216\u624b\u52a8\u94fe\u63a5\u81f3\u5c11\u4e00\u5f20\u5728\u7167\u7247
 dialog.correlate.filetimes=\u6587\u4ef6\u65f6\u95f4\u8868\u793a\u58f0\u97f3\u7684\uff1a
 dialog.correlate.filetimes2=\u90e8\u5206
 dialog.correlate.correltimes=\u5982\u8981\u5173\u8054\uff0c\u8bf7\u4f7f\u7528\uff1a
@@ -341,12 +407,15 @@ dialog.correlate.timestamp.end=\u7ed3\u675f
 dialog.correlate.audioselect.intro=\u9009\u62e9\u4ee5\u4e0b\u58f0\u97f3\u6587\u4ef6\u4f5c\u4e3a\u65f6\u95f4\u504f\u5dee
 dialog.correlate.select.audioname=\u58f0\u97f3\u6587\u4ef6\u540d\u5b57
 dialog.correlate.select.audiolater=\u58f0\u97f3\u5ef6\u8fdf
+dialog.rearrangewaypoints.desc=\u9009\u62e9\u76ee\u7684\u5730\u5e76\u6392\u5217\u8def\u70b9
 dialog.rearrangephotos.desc=\u9009\u62e9\u76ee\u7684\u5730\u53ca\u7167\u7247\u70b9\u6392\u5217\u987a\u5e8f
-dialog.rearrangephotos.tostart=\u79fb\u5230\u5f00\u59cb
-dialog.rearrangephotos.toend=\u79fb\u5230\u672b\u5c3e
-dialog.rearrangephotos.nosort=\u4e0d\u6392\u5e8f
-dialog.rearrangephotos.sortbyfilename=\u6309\u540d\u79f0\u6392\u5e8f
-dialog.rearrangephotos.sortbytime=\u6309\u65f6\u95f4\u6392\u5e8f
+dialog.rearrange.tostart=\u79fb\u5230\u5f00\u59cb
+dialog.rearrange.toend=\u79fb\u5230\u672b\u5c3e
+dialog.rearrange.tonearest=\u81f3\u6700\u8fd1\u8f68\u8ff9\u70b9
+dialog.rearrange.nosort=\u4e0d\u6392\u5e8f
+dialog.rearrange.sortbyfilename=\u6309\u6587\u4ef6\u540d\u6392\u5e8f
+dialog.rearrange.sortbyname=\u6309\u8def\u70b9\u540d\u6392\u5e8f
+dialog.rearrange.sortbytime=\u6309\u65f6\u95f4\u6392\u5e8f
 dialog.compress.closepoints.title=\u90bb\u8fd1\u70b9\u5220\u9664
 dialog.compress.closepoints.paramdesc=\u8303\u56f4\u7cfb\u6570
 dialog.compress.wackypoints.title=\u5f02\u5e38\u70b9\u5220\u9664
@@ -357,19 +426,18 @@ dialog.compress.duplicates.title=\u91cd\u590d\u70b9\u5220\u9664
 dialog.compress.douglaspeucker.title=Douglas-Peucker \u538b\u7f29
 dialog.compress.douglaspeucker.paramdesc=\u95f4\u8ddd\u7cfb\u6570
 dialog.compress.summarylabel=\u8981\u5220\u9664\u7684\u70b9
-dialog.compress.confirm1=\u5df2\u6807\u8bb0
-dialog.compress.confirm2=\u70b9\u3002\n\u70b9\u51fb \u8f68\u8ff9->\u5220\u9664 \u5220\u9664\u8fd9\u4e9b\u70b9
+dialog.compress.confirm=\u5df2\u6807\u8bb0 %d \u70b9\n\u70b9\u51fb \u8f68\u8ff9->\u5220\u9664 \u5220\u9664\u8fd9\u4e9b\u70b9
 dialog.compress.confirmnone=\u672a\u6807\u8bb0\u4efb\u4f55\u70b9
 dialog.deletemarked.nonefound=\u65e0\u6cd5\u5220\u9664\u6570\u636e\u70b9
 dialog.pastecoordinates.desc=\u5728\u6b64\u8f93\u5165\u6216\u7c98\u8d34\u5750\u6807\u70b9
 dialog.pastecoordinates.coords=\u5750\u6807\u70b9
 dialog.pastecoordinates.nothingfound=\u8bf7\u68c0\u67e5\u5750\u6807\u6570\u636e\u5e76\u91cd\u8bd5
-dialog.help.help=\u66f4\u591a\u4fe1\u606f\u548c\u7528\u6cd5\uff0c\u8bf7\u53c2\u8003\u7f51\u7ad9\nhttp://activityworkshop.net/software/gpsprune/
+dialog.help.help=\u66f4\u591a\u4fe1\u606f\u548c\u7528\u6cd5\uff0c\u8bf7\u53c2\u8003\u7f51\u7ad9\nhttp://gpsprune.activityworkshop.net///
 dialog.about.version=\u7248\u672c
 dialog.about.build=Build
 dialog.about.summarytext1=GpsPrune\u662f\u4e00\u4e2a\u4eceGPS\u4e2d\u5bfc\u5165\u6570\u636e\uff0c\u663e\u793a\u6570\u636e\u548c\u7f16\u8f91\u6570\u636e\u7684\u8f6f\u4ef6
-dialog.about.summarytext2=\u5b83\u7684\u53d1\u884c\u662f\u57fa\u4e8eGnu GPL\u89c4\u5219\uff0c\u662f\u514d\u8d39\u7684\uff0c\u5f00\u653e\u5f0f\u7684\uff0c\u5168\u4e16\u754c\u5171\u7528\u5e76\u6539\u5584\u589e\u5f3a\u5176\u529f\u80fd\n\u5728\u7b26\u5408"license.txt"\u6761\u4ef6\u4e0b\uff0c\u5bb9\u8bb8\u5e76\u9f13\u52b1\u590d\u5236\uff0c\u5206\u53d1\u53ca\u4fee\u6539\u3002
-dialog.about.summarytext3=\u66f4\u591a\u4fe1\u606f\u53ca\u7528\u6cd5\u6307\u5357\uff0c\u8bf7\u53c2\u8003\u7f51\u7ad9\uff1a\nhttp:activityworkshop.net/
+dialog.about.summarytext2=\u5b83\u7684\u53d1\u884c\u662f\u57fa\u4e8eGnu GPL\u89c4\u5219\uff0c\u662f\u514d\u8d39\u7684\uff0c\u5f00\u653e\u5f0f\u7684\uff0c\u5168\u4e16\u754c\u5171\u7528\u5e76\u6539\u5584\u589e\u5f3a\u5176\u529f\u80fd<br>\u5728\u7b26\u5408"license.txt"\u6761\u4ef6\u4e0b\uff0c\u5bb9\u8bb8\u5e76\u9f13\u52b1\u590d\u5236\uff0c\u5206\u53d1\u53ca\u4fee\u6539\u3002
+dialog.about.summarytext3=\u66f4\u591a\u4fe1\u606f\u53ca\u7528\u6cd5\u6307\u5357\uff0c\u8bf7\u53c2\u8003\u7f51\u7ad9\uff1a<br>http:activityworkshop.net/
 dialog.about.languages=\u652f\u6301\u8bed\u8a00
 dialog.about.translatedby=\u4e2d\u6587\u7ffb\u8bd1\uff1a\u9ed1\u8001\u9648 (Sam Chen)
 dialog.about.systeminfo=\u7cfb\u7edf\u4fe1\u606f
@@ -380,11 +448,6 @@ dialog.about.systeminfo.povray=Povray \u662f\u5426\u5b89\u88c5
 dialog.about.systeminfo.exiftool=Exiftool \u662f\u5426\u5b89\u88c5
 dialog.about.systeminfo.gpsbabel=Gpsbabel \u662f\u5426\u5b89\u88c5
 dialog.about.systeminfo.gnuplot=Gnuplot \u662f\u5426\u5b89\u88c5
-dialog.about.systeminfo.exiflib=Exif \u5e93
-dialog.about.systeminfo.exiflib.internal=\u5185\u90e8
-dialog.about.systeminfo.exiflib.internal.failed=\u5185\u90e8(\u672a\u627e\u5230)
-dialog.about.systeminfo.exiflib.external=\u5916\u90e8
-dialog.about.systeminfo.exiflib.external.failed=\u5916\u90e8(\u672a\u627e\u5230)
 dialog.about.yes=\u662f
 dialog.about.no=\u5426
 dialog.about.credits=\u81f4\u8c22
@@ -403,7 +466,7 @@ dialog.checkversion.newversion1=\u53d1\u73b0\u65b0\u7248\u672c\uff01\u6700\u65b0
 dialog.checkversion.newversion2=
 dialog.checkversion.releasedate1=\u65b0\u7248\u672c\u53d1\u884c\u4e8e
 dialog.checkversion.releasedate2=
-dialog.checkversion.download=\u4e0b\u8f7d\u6700\u65b0\u7248\u672c\uff0c\u8bf7\u767b\u9646\u7f51\u7ad9\uff1a\nhttp:activityworkshop.net/software/gpsprune/download.html
+dialog.checkversion.download=\u4e0b\u8f7d\u6700\u65b0\u7248\u672c\uff0c\u8bf7\u767b\u9646\u7f51\u7ad9\uff1a\nhttp:gpsprune.activityworkshop.net/download.html
 dialog.keys.intro=\u53ef\u7528\u4e0b\u5217\u5feb\u6377\u952e\u66ff\u4ee3\u9f20\u6807
 dialog.keys.keylist=<table><tr><td>\u7bad\u5934</td><td>\u4e0a\u4e0b\u5de6\u53f3\u79fb\u52a8\u5730\u56fe</td></tr><tr><td>Ctrl + \u5de6\u53f3\u7bad\u5934</td><td>\u9009\u53d6\u524d\uff0c\u540e\u70b9</td></tr><tr><td>Ctrl + \u4e0a\u4e0b\u7bad\u5934</td><td>\u653e\u5927\u7f29\u5c0f</td></tr><tr><td>Ctrl + PgUp, PgDown</td><td>\u9009\u62e9\u524d\u540e\u6bb5</td></tr><tr><td>Ctrl + Home, End</td><td>\u9009\u62e9\u9996\u672b\u70b9</td></tr><tr><td>Del</td><td>\u5220\u9664\u5f53\u524d\u70b9</td></tr></table>
 dialog.keys.normalmodifier=Ctrl
@@ -423,7 +486,6 @@ dialog.saveconfig.prune.mapsource=\u5df2\u9009\u62e9\u7684\u5730\u56fe\u6570\u63
 dialog.saveconfig.prune.mapsourcelist=\u5730\u56fe\u6570\u636e\u6e90
 dialog.saveconfig.prune.diskcache=\u5b58\u50a8\u8def\u5f84
 dialog.saveconfig.prune.kmzimagewidth=KMZ\u56fe\u50cf\u5bbd\u5ea6
-dialog.saveconfig.prune.kmzimageheight=KMZ\u56fe\u50cf\u9ad8\u5ea6
 dialog.saveconfig.prune.colourscheme=\u989c\u8272
 dialog.saveconfig.prune.linewidth=\u7ebf\u4f53\u5bbd\u5ea6
 dialog.saveconfig.prune.kmltrackcolour=KML\u8f68\u8ff9\u989c\u8272
@@ -446,6 +508,19 @@ dialog.colourchooser.title=\u8bf7\u9009\u62e9\u989c\u8272
 dialog.colourchooser.red=\u7ea2
 dialog.colourchooser.green=\u7eff
 dialog.colourchooser.blue=\u84dd
+dialog.colourer.intro=\u53ef\u4ee5\u8d4b\u4e88\u8f68\u8ff9\u70b9\u4e0d\u540c\u7684\u989c\u8272
+dialog.colourer.type=\u7740\u8272\u6a21\u5f0f
+dialog.colourer.type.none=\u65e0
+dialog.colourer.type.byfile=\u6309\u6587\u4ef6
+dialog.colourer.type.bysegment=\u6309\u8f68\u8ff9\u6bb5
+dialog.colourer.type.byaltitude=\u6309\u9ad8\u5ea6
+dialog.colourer.type.byspeed=\u6309\u901f\u5ea6
+dialog.colourer.type.byvertspeed=\u6309\u5782\u76f4\u901f\u5ea6
+dialog.colourer.type.bygradient=\u6309\u5761\u5ea6
+dialog.colourer.type.bydate=\u6309\u65e5\u671f
+dialog.colourer.start=\u8d77\u59cb\u989c\u8272
+dialog.colourer.end=\u7ed3\u675f\u989c\u8272
+dialog.colourer.maxcolours=\u6700\u5927\u989c\u8272\u6570\u91cf
 dialog.setlanguage.firstintro=\u4f60\u53ef\u4ee5\u9009\u62e9\u5df2\u6709\u8bed\u8a00,<p>\u6216\u9009\u62e9\u5916\u6302\u8bed\u8a00\u5305
 dialog.setlanguage.secondintro=\u8bf7\u4fdd\u5b58\u8bbe\u7f6e<p>\u5e76\u91cd\u542fGpsPrune\u4f7f\u8bbe\u7f6e\u751f\u6548
 dialog.setlanguage.language=\u8bed\u8a00
@@ -467,20 +542,45 @@ dialog.diskcache.tileset.multiple=\u6570\u76ee
 dialog.diskcache.deleteold=\u5220\u9664\u65e7\u5730\u56fe\u5757
 dialog.diskcache.maximumage=\u6700\u957f\u65f6\u95f4(\u5929)
 dialog.diskcache.deleteall=\u5220\u9664\u6240\u6709\u5730\u56fe\u5757
-dialog.diskcache.deleted1=\u5df2\u5220\u9664
-dialog.diskcache.deleted2=\u7f13\u5b58\u5185\u6587\u4ef6
-dialog.deletefieldvalues.intro=\u9009\u62e9\u5f53\u524d\u8303\u56f4\u5185\u8981\u5220\u9664\u7684\u6570\u636e
-dialog.deletefieldvalues.nofields=\u9009\u5b9a\u8303\u56f4\u5185\u6ca1\u6709\u8981\u5220\u9664\u7684\u6570\u636e
-dialog.setlinewidth.text=\u8f93\u5165\u8f68\u8ff9\u7ebf\u5bbd\u50cf\u7d20\u503c(1-4)
+dialog.diskcache.deleted=\u5df2\u5220\u9664 %d \u7f13\u5b58\u5185\u6587\u4ef6
+dialog.deletefieldvalues.intro=\u9009\u62e9\u5f53\u524d\u8303\u56f4\u5185\u8981\u5220\u9664\u7684\u5b57\u6bb5
+dialog.deletefieldvalues.nofields=\u9009\u5b9a\u8303\u56f4\u5185\u6ca1\u6709\u8981\u5220\u9664\u7684\u5b57\u6bb5
+dialog.displaysettings.linewidth=\u8f93\u5165\u8f68\u8ff9\u7ebf\u5bbd\u50cf\u7d20\u503c(1-4)
 dialog.downloadosm.desc=\u786e\u8ba4\u4eceOSM\u4e0b\u8f7d\u8be5\u5730\u533a\u539f\u59cb\u6570\u636e:
 dialog.searchwikipedianames.search=\u67e5\u627e:
+dialog.weather.location=\u5730\u70b9
+dialog.weather.update=\u5929\u6c14\u9884\u62a5\u66f4\u65b0
+dialog.weather.sunrise=\u65e5\u51fa
+dialog.weather.sunset=\u65e5\u843d
+dialog.weather.temperatureunits=\u6e29\u5ea6
+dialog.weather.currentforecast=\u5929\u6c14\u73b0\u72b6
+dialog.weather.dailyforecast=\u9010\u65e5\u9884\u62a5
+dialog.weather.3hourlyforecast=\u4e09\u5c0f\u65f6\u9884\u62a5
+dialog.weather.day.now=\u5929\u6c14\u73b0\u72b6
+dialog.weather.day.today=\u4eca\u65e5
+dialog.weather.day.tomorrow=\u660e\u65e5
+dialog.weather.day.monday=\u5468\u4e00
+dialog.weather.day.tuesday=\u5468\u4e8c
+dialog.weather.day.wednesday=\u5468\u4e09
+dialog.weather.day.thursday=\u5468\u56db
+dialog.weather.day.friday=\u5468\u4e94
+dialog.weather.day.saturday=\u5468\u516d
+dialog.weather.day.sunday=\u5468\u65e5
+dialog.weather.wind=\u98ce\u529b
+dialog.weather.temp=\u6e29\u5ea6
+dialog.weather.humidity=\u6e7f\u5ea6
+dialog.weather.creditnotice=\u5929\u6c14\u4fe1\u606f\u83b7\u53d6\u81eaopenweathermap.org\uff0c\u83b7\u53d6\u66f4\u591a\u5929\u6c14\u8be6\u60c5\u8bf7\u8bbf\u95ee\u7f51\u7ad9\u3002
+dialog.deletebydate.onlyonedate=\u6240\u6709\u8f68\u8ff9\u70b9\u90fd\u662f\u540c\u4e00\u5929\u7684
+dialog.deletebydate.intro=\u4f60\u53ef\u4ee5\u9009\u62e9\u4fdd\u7559\u6216\u5220\u9664\u67d0\u4e00\u5929\u7684\u8f68\u8ff9\u70b9
+dialog.deletebydate.nodate=\u6ca1\u6709\u65f6\u95f4\u6233
+dialog.deletebydate.column.keep=\u4fdd\u7559
+dialog.deletebydate.column.delete=\u5220\u9664
+dialog.setaltitudetolerance.text.metres=\u4e0d\u8d85\u8fc7\u6b64\u6570\u503c(\u7c73)\u7684\u9ad8\u5ea6\u53d8\u5316\u5c06\u88ab\u5ffd\u7565
+dialog.setaltitudetolerance.text.feet=
 
 # 3d window
 dialog.3d.title=GpsPrune 3D \u663e\u793a
 dialog.3d.altitudefactor=\u9ad8\u5ea6\u653e\u5927\u7cfb\u6570
-dialog.3dlines.title=GpsPrune \u7f51\u683c\u7ebf
-dialog.3dlines.empty=\u65e0\u6cd5\u663e\u793a\u7f51\u683c\u7ebf
-dialog.3dlines.intro=3D \u7f51\u683c\u7ebf
 
 # Confirm messages
 confirm.loadfile=\u6570\u636e\u5df2\u4ece\u6587\u4ef6\u5bfc\u5165
@@ -495,11 +595,12 @@ confirm.addtimeoffset=\u5df2\u52a0\u4e0a\u65f6\u95f4\u504f\u5dee
 confirm.addaltitudeoffset=\u5df2\u52a0\u4e0a\u9ad8\u5ea6\u504f\u5dee
 confirm.rearrangewaypoints=\u91cd\u65b0\u914d\u7f6e\u7684\u822a\u70b9
 confirm.rearrangephotos=\u7167\u7247\u5df2\u91cd\u6392
+confirm.splitsegments=\u8f68\u8ff9\u5df2\u5206\u5272\u4e3a %d \u6bb5
+confirm.sewsegments=%d \u8f68\u8ff9\u6bb5\u5df2\u5408\u5e76
 confirm.cutandmove=\u5df2\u79fb\u52a8\u7684\u8f68\u8ff9\u6bb5
 confirm.interpolate=\u8f68\u8ff9\u70b9\u5df2\u6dfb\u52a0
 confirm.convertnamestotimes=\u822a\u70b9\u540d\u79f0\u5df2\u8f6c\u6362
-confirm.saveexif.ok1=\u5df2\u4fdd\u5b58
-confirm.saveexif.ok2=\u7167\u7247\u6587\u4ef6
+confirm.saveexif.ok=\u5df2\u4fdd\u5b58 %d \u7167\u7247\u6587\u4ef6
 confirm.undo.single=\u5df2\u64a4\u9500\u7684\u64cd\u4f5c
 confirm.undo.multi=\u5df2\u64a4\u9500\u7684\u64cd\u4f5c
 confirm.jpegload.single=\u5df2\u52a0\u5165\u7167\u7247
@@ -513,13 +614,23 @@ confirm.correlatephotos.multi=\u7167\u7247\u5df2\u94fe\u63a5
 confirm.createpoint=\u5df2\u521b\u5efa\u70b9
 confirm.rotatephoto=\u7167\u7247\u5df2\u65cb\u8f6c
 confirm.running=\u8bf7\u7a0d\u7b49...
-confirm.lookupsrtm1=\u627e\u5230
-confirm.lookupsrtm2=\u9ad8\u5ea6\u503c
+confirm.lookupsrtm=\u627e\u5230 %d \u9ad8\u5ea6\u503c
+confirm.downloadsrtm=\u4e0b\u8f7d %d \u9ad8\u5ea6\u6587\u4ef6\u5230\u7f13\u5b58\u4e2d
+confirm.downloadsrtm.1=\u4e0b\u8f7d %d \u9ad8\u5ea6\u6587\u4ef6\u5230\u7f13\u5b58\u4e2d
+confirm.downloadsrtm.none=\u65e0\u9700\u4e0b\u8f7d\uff0c\u6587\u4ef6\u5df2\u5b58\u50a8\u5728\u7f13\u5b58\u4e2d
 confirm.deletefieldvalues=\u533a\u57df\u6570\u636e\u5df2\u5220\u9664
 confirm.audioload=\u5df2\u6dfb\u52a0\u58f0\u97f3\u6587\u4ef6
 confirm.correlateaudios.single=\u58f0\u97f3\u5df2\u5173\u8054
 confirm.correlateaudios.multi=\u58f0\u97f3\u5df2\u5173\u8054
 
+# Tips, shown just once when appropriate
+tip.title=\u63d0\u793a
+tip.useamapcache=\u542f\u7528\u78c1\u76d8\u7f13\u5b58 (\u8bbe\u7f6e -> \u4fdd\u5b58\u5730\u56fe)\n\u53ef\u4ee5\u63d0\u9ad8\u663e\u793a\u901f\u5ea6\uff0c\u51cf\u5c11\u7f51\u7edc\u6d41\u91cf
+tip.learntimeparams=\u5bf9\u8bb0\u5f55\u7684\u8f68\u8ff9\u542f\u7528 \u8f68\u8ff9 -> \u4f7f\u7528\u5f53\u524d\u8f68\u8ff9\u53c2\u6570\u4f30\u8ba1\u65f6\u95f4\n\u5c06\u4f7f\u7ed3\u679c\u66f4\u52a0\u7cbe\u786e
+tip.downloadsrtm=\u53ef\u4ee5\u70b9\u51fb \u8054\u7f51 -> \u4e0b\u8f7dSRTM\u6570\u636e\n\u5c06\u6570\u636e\u4fdd\u5b58\u5230\u78c1\u76d8\u7f13\u5b58\u4ee5\u63d0\u9ad8\u901f\u5ea6
+tip.usesrtmfor3d=\u6b64\u8f68\u8ff9\u6ca1\u6709\u9ad8\u5ea6\u4fe1\u606f\n\u53ef\u4ee5\u901a\u8fc7SRTM\u83b7\u53d6\u5927\u81f4\u9ad8\u5ea6\u4ee5\u663e\u793a3D\u89c6\u56fe
+tip.manuallycorrelateone=\u63d0\u793a\uff1a\u624b\u52a8\u94fe\u63a5\u81f3\u5c11\u4e00\u5f20\u7167\u7247\uff0c\u53ef\u81ea\u52a8\u8ba1\u7b97\u65f6\u95f4\u504f\u79fb
+
 # Buttons
 button.ok=\u786e\u5b9a
 button.back=\u8fd4\u56de
@@ -529,7 +640,6 @@ button.cancel=\u53d6\u6d88
 button.overwrite=\u8986\u76d6
 button.moveup=\u4e0a\u79fb
 button.movedown=\u4e0b\u79fb
-button.showlines=\u663e\u793a\u7ebf\u6761
 button.edit=\u7f16\u8f91
 button.exit=\u9000\u51fa
 button.close=\u5173\u95ed
@@ -538,6 +648,7 @@ button.yes=\u662f
 button.no=\u5426
 button.yestoall=\u5168\u90e8\u662f
 button.notoall=\u5168\u90e8\u5426
+button.always=\u603b\u662f
 button.select=\u9009\u62e9
 button.selectall=\u5168\u9009
 button.selectnone=\u5168\u4e0d\u9009
@@ -552,6 +663,7 @@ button.browse=\u6d4f\u89c8...
 button.addnew=\u6dfb\u52a0
 button.delete=\u5220\u9664
 button.manage=\u7ba1\u7406
+button.combine=\u5408\u5e76
 
 # File types
 filetype.txt=TXT\u6587\u4ef6
@@ -562,12 +674,14 @@ filetype.kmz=KMZ\u6587\u4ef6
 filetype.gpx=GPX\u6587\u4ef6
 filetype.pov=POV\u6587\u4ef6
 filetype.svg=SVG\u6587\u4ef6
+filetype.png=PNG\u6587\u4ef6
 filetype.audio=WAV,OGG,MP3\u6587\u4ef6
 
 # Display components
 display.nodata=\u65e0\u6570\u636e
 display.noaltitudes=\u8f68\u8ff9\u6570\u636e\u4e0d\u542b\u9ad8\u5ea6\u4fe1\u606f
 display.notimestamps=\u8f68\u8ff9\u6570\u636e\u672a\u542b\u65f6\u95f4\u4fe1\u606f
+display.novalues=\u8f68\u8ff9\u6570\u636e\u4e0d\u4fdd\u542b\u6b64\u5b57\u6bb5
 details.trackdetails=\u8f68\u8ff9\u4fe1\u606f
 details.notrack=\u65e0\u8f68\u8ff9
 details.track.points=\u8f68\u8ff9\u70b9
@@ -617,13 +731,13 @@ fieldname.longitude=\u7ecf\u5ea6
 fieldname.altitude=\u9ad8\u5ea6
 fieldname.timestamp=\u65f6\u95f4
 fieldname.time=\u65f6\u95f4
+fieldname.date=\u65e5\u671f
 fieldname.waypointname=\u540d\u79f0
 fieldname.waypointtype=\u7c7b\u578b
 fieldname.newsegment=\u6bb5
 fieldname.custom=\u7528\u6237
 fieldname.prefix=\u6570\u636e\u6bb5
 fieldname.distance=\u8ddd\u79bb
-fieldname.movingdistance=\u79fb\u52a8\u8ddd\u79bb
 fieldname.duration=\u65f6\u957f
 fieldname.speed=\u901f\u5ea6
 fieldname.verticalspeed=\u5782\u76f4\u901f\u5ea6
@@ -638,24 +752,39 @@ units.feet=\u82f1\u5c3a
 units.feet.short=\u82f1\u5c3a
 units.kilometres=\u5343\u7c73
 units.kilometres.short=\u5343\u7c73
+units.kilometresperhour=\u5343\u7c73/\u65f6
 units.kilometresperhour.short=\u5343\u7c73/\u65f6
 units.miles=\u82f1\u91cc
 units.miles.short=\u82f1\u91cc
+units.milesperhour=\u82f1\u91cc/\u65f6
 units.milesperhour.short=\u82f1\u91cc/\u65f6
 units.nauticalmiles=\u6d77\u91cc
 units.nauticalmiles.short=\u6d77\u91cc
 units.nauticalmilesperhour.short=\u6d77\u91cc/\u65f6
+units.metrespersec=\u7c73/\u79d2
 units.metrespersec.short=\u7c73/\u79d2
+units.feetpersec=\u82f1\u5c3a/\u79d2
 units.feetpersec.short=\u82f1\u5c3a/\u79d2
 units.hours=\u5c0f\u65f6
+units.minutes=\u5206
+units.seconds=\u79d2
 units.degminsec=\u5ea6-\u5206-\u79d2
 units.degmin=\u5ea6-\u5206
 units.deg=\u5ea6
 units.iso8601=ISO 8601
+units.degreescelsius=\u6444\u6c0f\u5ea6
+units.degreescelsius.short=\u00b0C
+units.degreesfahrenheit=\u534e\u6c0f\u5ea6
+units.degreesfahrenheit.short=\u00b0F
+
+# How to combine conditions, such as filters
+logic.and=\u4e0e
+logic.or=\u6216
 
 # External urls
 url.googlemaps=ditu.google.cn
 wikipedia.lang=zh
+openweathermap.lang=zh_cn
 
 # Cardinals for 3d plots
 cardinal.n=N
@@ -677,6 +806,8 @@ undo.deletemarked=\u538b\u7f29\u8f68\u8ff9
 undo.insert=\u63d2\u5165\u822a\u70b9
 undo.reverse=\u53cd\u8f6c\u6bb5
 undo.mergetracksegments=\u5408\u5e76\u6bb5
+undo.splitsegments=\u5206\u5272\u8f68\u8ff9
+undo.sewsegments=\u5408\u5e76\u8f68\u8ff9\u7247\u6bb5
 undo.addtimeoffset=\u6dfb\u52a0\u65f6\u95f4\u504f\u79fb
 undo.addaltitudeoffset=\u52a0\u5165\u9ad8\u5ea6\u504f\u79fb
 undo.rearrangewaypoints=\u91cd\u65b0\u914d\u7f6e\u822a\u70b9
@@ -698,11 +829,9 @@ error.save.nodata=\u65e0\u6570\u636e\u4fdd\u5b58
 error.save.failed=\u5411\u6587\u4ef6\u4fdd\u5b58\u6570\u636e\u5931\u8d25
 error.saveexif.filenotfound=\u627e\u4e0d\u5230\u7167\u7247\u6587\u4ef6
 error.saveexif.cannotoverwrite1=\u7167\u7247
-error.saveexif.cannotoverwrite2=\u662f\u53ea\u8bfb\u6587\u4ef6\u3002\u4fdd\u5b58\u526f\u672c\uff1f
-error.saveexif.failed1=\u65e0\u6cd5\u4fdd\u5b58
-error.saveexif.failed2=\u5f20\u7167\u7247
-error.saveexif.forced1=
-error.saveexif.forced2=\u5f20\u7167\u7247\u9700\u8981\u5f3a\u5236\u6267\u884c
+error.saveexif.cannotoverwrite2=\u662f\u53ea\u8bfb\u6587\u4ef6\uff0c\u4fdd\u5b58\u526f\u672c\uff1f
+error.saveexif.failed=\u65e0\u6cd5\u4fdd\u5b58 %d \u5f20\u7167\u7247
+error.saveexif.forced=%d \u5f20\u7167\u7247\u9700\u8981\u5f3a\u5236\u6267\u884c
 error.load.dialogtitle=\u5bfc\u5165\u6570\u636e\u9519\u8bef
 error.load.noread=\u65e0\u6cd5\u8bfb\u6587\u4ef6
 error.load.nopoints=\u6587\u4ef6\u4e2d\u65e0\u5750\u6807\u4fe1\u606f
@@ -713,7 +842,6 @@ error.jpegload.dialogtitle=\u5bfc\u5165\u7167\u7247\u9519\u8bef
 error.jpegload.nofilesfound=\u627e\u4e0d\u5230\u6587\u4ef6
 error.jpegload.nojpegsfound=\u627e\u4e0d\u5230Jpeg\u6587\u4ef6
 error.jpegload.nogpsfound=\u627e\u4e0d\u5230GPS\u4fe1\u606f
-error.jpegload.exifreadfailed=Exif\u8bfb\u53d6\u9519\u8bef\u3002\u9700\u8981\u5185\u90e8\u6216\u8005\u5916\u90e8\u5e93\u624d\u80fd\u8bfb\u53d6
 error.audioload.nofilesfound=\u672a\u627e\u5230\u58f0\u97f3\u6587\u4ef6
 error.gpsload.unknown=\u672a\u77e5\u9519\u8bef
 error.undofailed.title=\u64a4\u9500\u5931\u8d25
@@ -721,7 +849,7 @@ error.undofailed.text=\u64a4\u9500\u64cd\u4f5c\u5931\u8d25
 error.function.noop.title=\u529f\u80fd\u65e0\u6548
 error.rearrange.noop=\u91cd\u65b0\u914d\u7f6e\u822a\u70b9\u65e0\u6548
 error.function.notavailable.title=\u65e0\u6b64\u529f\u80fd
-error.function.nojava3d=\u6b64\u529f\u80fd\u9700\u8981 Java 3D\uff0c\u53ef\u4eceSun.com\u83b7\u5f97
+error.function.nojava3d=\u6b64\u529f\u80fd\u9700\u8981 Java 3D
 error.3d=3D \u663e\u793a\u9519\u8bef
 error.readme.notfound=\u627e\u4e0d\u5230\u7248\u672c\u4fe1\u606f\u6587\u4ef6
 error.osmimage.dialogtitle=\u5bfc\u5165\u5730\u56fe\u65f6\u9519\u8bef
@@ -737,4 +865,7 @@ error.playaudiofailed=\u65e0\u6cd5\u64ad\u653e\u58f0\u97f3\u6587\u4ef6
 error.cache.notthere=\u672a\u627e\u5230\u533a\u57df\u6570\u636e\u7f13\u5b58\u6587\u4ef6\u5939
 error.cache.empty=\u533a\u57df\u6570\u636e\u6587\u4ef6\u5939\u7a7a
 error.cache.cannotdelete=\u65e0\u53ef\u5220\u9664\u533a\u57df\u6570\u636e
-error.interpolate.invalidparameter=\u8f93\u5165\u70b9\u6570\u91cf\u5fc5\u987b\u57281\u52301000\u4e4b\u95f4
+error.learnestimationparams.failed=\u65e0\u6cd5\u4ece\u6b64\u8f68\u8ff9\u5f97\u5230\u53c2\u6570\n \u5c1d\u8bd5\u8f7d\u5165\u66f4\u591a\u8f68\u8ff9
+error.tracksplit.nosplit=\u6b64\u8f68\u8ff9\u65e0\u6cd5\u5206\u5272
+error.downloadsrtm.nocache=\u6587\u4ef6\u65e0\u6cd5\u4fdd\u5b58\n\u8bf7\u68c0\u67e5\u78c1\u76d8\u7f13\u5b58
+error.sewsegments.nothingdone=\u8f68\u8ff9\u7247\u6bb5\u65e0\u6cd5\u5408\u5e76\n\u8be5\u8f68\u8ff9\u73b0\u5305\u542b %d \u4e2a\u7247\u6bb5