X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/83d0c91ad1f8cab94b11887e88e3d1f5810464e0..7233fcb656b321f5690667077d4c629300fd6ddd:/po/zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 33fc9936..46423ec8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Viking\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-21 23:24+0200\n"
-"PO-Revision-Date: 2008-01-12 10:03+0000\n"
-"Last-Translator: Zhang Jun <rocketman_gw@yahoo.com.cn>\n"
+"POT-Creation-Date: 2010-06-08 22:39+0200\n"
+"PO-Revision-Date: 2010-06-07 09:49+0000\n"
+"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2008-02-11 21:12+0000\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2010-09-06 20:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: Simplified Chinese\n"
 
@@ -20,30 +20,34 @@ msgstr "工作中..."
 
 #: ../src/acquire.c:141
 msgid "Error: acquisition failed."
-msgstr ""
+msgstr "错误: 接收失败。"
 
-#: ../src/acquire.c:149 ../src/vikgpslayer.c:924
+#: ../src/acquire.c:149 ../src/vikgpslayer.c:1013
 msgid "Done."
-msgstr "完成."
+msgstr "完成。"
+
+#: ../src/acquire.c:156
+msgid "No data."
+msgstr ""
 
-#: ../src/acquire.c:326 ../src/vikgpslayer.c:963
+#: ../src/acquire.c:338 ../src/vikgpslayer.c:1052
 msgid "Status: detecting gpsbabel"
-msgstr "状态 : 检测  gpsbabel"
+msgstr "状态: 检测  gpsbabel"
 
-#: ../src/background.c:55
+#: ../src/background.c:57
 #, c-format
 msgid "%d items"
-msgstr "%d 条目"
+msgstr "%d 项目"
 
-#: ../src/background.c:200
+#: ../src/background.c:224
 msgid "Job"
 msgstr "任务"
 
-#: ../src/background.c:204
+#: ../src/background.c:228
 msgid "Progress"
-msgstr "进程"
+msgstr "进度"
 
-#: ../src/background.c:215
+#: ../src/background.c:239
 msgid "Viking Background Jobs"
 msgstr "Viking 后台任务"
 
@@ -58,7 +62,7 @@ msgstr "剪贴版数据尺寸错误"
 #: ../src/clipboard.c:113
 #, c-format
 msgid ""
-"The clipboard contains sublayer data for a %s layers.You must select a layer "
+"The clipboard contains sublayer data for %s layers. You must select a layer "
 "of this type to paste the clipboard data."
 msgstr ""
 
@@ -68,165 +72,140 @@ msgid ""
 "into."
 msgstr ""
 
-#: ../src/curl_download.c:85
+#: ../src/curl_download.c:98
 #, c-format
 msgid "%s() Curl perform failed: %s"
 msgstr ""
 
-#: ../src/dialog.c:48 ../src/dialog.c:96
+#: ../src/dialog.c:49 ../src/dialog.c:97
 msgid "Go to Lat/Lon"
 msgstr ""
 
-#: ../src/dialog.c:60 ../src/dialog.c:210
+#: ../src/dialog.c:61 ../src/dialog.c:236
 msgid "Latitude:"
-msgstr "纬度 :"
+msgstr "纬度："
 
-#: ../src/dialog.c:66 ../src/dialog.c:215
+#: ../src/dialog.c:67 ../src/dialog.c:241
 msgid "Longitude:"
-msgstr "经度 :"
+msgstr "经度："
 
-#: ../src/dialog.c:109
+#: ../src/dialog.c:110
 msgid "Northing:"
 msgstr "Northing :"
 
-#: ../src/dialog.c:115
+#: ../src/dialog.c:116
 msgid "Easting:"
 msgstr "Easting :"
 
-#: ../src/dialog.c:122
+#: ../src/dialog.c:123
 msgid "Zone:"
 msgstr "Zone :"
 
-#: ../src/dialog.c:125
+#: ../src/dialog.c:126
 msgid "Letter:"
-msgstr "Lettre :"
+msgstr "信函:"
 
-#: ../src/dialog.c:172 ../src/viktrwlayer.c:1549
-msgid "Create"
-msgstr "创建"
+#: ../src/dialog.c:187
+msgid "Waypoint Properties"
+msgstr ""
 
-#: ../src/dialog.c:198
+#: ../src/dialog.c:224
 msgid "Name:"
 msgstr "名称:"
 
-#: ../src/dialog.c:220
+#: ../src/dialog.c:246
 msgid "Altitude:"
 msgstr "海拔:"
 
-#: ../src/dialog.c:225
+#: ../src/dialog.c:251
 msgid "Comment:"
 msgstr "注释:"
 
-#: ../src/dialog.c:231
+#: ../src/dialog.c:258
 msgid "Image:"
 msgstr "图片:"
 
-#: ../src/dialog.c:236
+#: ../src/dialog.c:263
 msgid "Symbol:"
 msgstr "符号:"
 
-#: ../src/dialog.c:243
+#: ../src/dialog.c:272
 msgid "(none)"
 msgstr "(无)"
 
 #. TODO: other checks (isalpha or whatever )
-#: ../src/dialog.c:298
+#: ../src/dialog.c:327
 msgid "Please enter a name for the waypoint."
 msgstr "请为该航点输入一个名字."
 
-#: ../src/dialog.c:302
+#: ../src/dialog.c:331
 #, c-format
 msgid "The waypoint \"%s\" exists, do you want to overwrite it?"
 msgstr ""
 
-#: ../src/dialog.c:374
+#: ../src/dialog.c:484 ../src/geonamessearch.c:228
+msgid "Nothing was selected"
+msgstr ""
+
+#: ../src/dialog.c:492
 msgid "Add Track"
 msgstr "添加轨迹:"
 
-#: ../src/dialog.c:382
+#: ../src/dialog.c:500
 msgid "Track Name:"
 msgstr "轨迹名称:"
 
-#: ../src/dialog.c:397
+#: ../src/dialog.c:515
 msgid "Please enter a name for the track."
 msgstr "请为该轨迹输入一个名字."
 
-#: ../src/dialog.c:401
+#: ../src/dialog.c:519
 #, c-format
 msgid "The track \"%s\" exists, do you want to overwrite it?"
 msgstr ""
 
-#: ../src/dialog.c:463
+#: ../src/dialog.c:581
 msgid "Zoom Factors..."
 msgstr "缩放参数..."
 
-#: ../src/dialog.c:477
-msgid "Zoom factor (in meters per pixel:"
-msgstr "缩放参数 (米／像素):"
+#: ../src/dialog.c:595
+msgid "Zoom factor (in meters per pixel):"
+msgstr ""
 
-#: ../src/dialog.c:478
+#: ../src/dialog.c:596
 msgid "X (easting): "
 msgstr "X (东方): "
 
-#: ../src/dialog.c:479
+#: ../src/dialog.c:597
 msgid "Y (northing): "
 msgstr "Y (北方): "
 
-#: ../src/dialog.c:484
+#: ../src/dialog.c:602
 msgid "X and Y zoom factors must be equal"
 msgstr "X和Y缩放参数必须相等"
 
-#: ../src/dialog.c:537
+#: ../src/dialog.c:655
 msgid "1 min"
 msgstr "1 分钟"
 
-#: ../src/dialog.c:538
+#: ../src/dialog.c:656
 msgid "1 hour"
 msgstr "1 小时"
 
-#: ../src/dialog.c:539
+#: ../src/dialog.c:657
 msgid "1 day"
 msgstr "1 天"
 
-#: ../src/dialog.c:540
+#: ../src/dialog.c:658
 msgid "Custom (in minutes):"
 msgstr ""
 
-#: ../src/dialog.c:580
-#, c-format
-msgid ""
-"<span font_desc='20' weight='bold'>Viking %s</span>\n"
-"\n"
-"GPS Data and Topo Analyzer, Explorer, and Manager.\n"
-"\n"
-"<small>(C) 2003-2008, Evan Battaglia</small>\n"
-"\n"
-"<small>Web site: %s</small>"
-msgstr ""
-"<span font_desc='20' weight='bold'>Viking %s</span>\n"
-"\n"
-"GPS 数据和拓扑分析、浏览、管理工具.\n"
-"\n"
-"<small>(C) 2003-2007, Evan Battaglia</small>\n"
-"\n"
-"<small>网址: %s</small>"
-
-#: ../src/dialog.c:591
-msgid "Credits"
-msgstr "荣誉"
-
-#: ../src/dialog.c:591
-msgid "License"
-msgstr "版权"
-
-#: ../src/dialog.c:591
-msgid "Close"
-msgstr "关闭"
+#: ../src/dialog.c:713
+msgid "GPS Data and Topo Analyzer, Explorer, and Manager."
+msgstr "GPS 数据和拓扑分析、浏览、管理工具."
 
-#: ../src/dialog.c:599
+#: ../src/dialog.c:714
 msgid ""
-"\n"
-"\n"
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
 "Software Foundation; either version 2 of the License, or (at your option) "
@@ -241,112 +220,89 @@ msgid ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place, Suite 330, Boston, MA 02111-1307, USA"
 msgstr ""
-"\n"
-"\n"
-"这是一个自由软件; 您可以在自由软件基金会发布的GNU GPL版权协议条款下 重新发布"
-"或者修改它; 可以是GPL2的版本，或者您也可以选择更新的版本.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA"
 
-#: ../src/dialog.c:622
+#: ../src/dialog.c:748
 msgid "Download along track"
 msgstr "沿着轨迹下载"
 
-#: ../src/dialog.c:624
+#: ../src/dialog.c:750
 msgid "Map type:"
 msgstr "地图类型:"
 
-#: ../src/dialog.c:629
+#: ../src/dialog.c:755
 msgid "Zoom level:"
 msgstr "缩放程度:"
 
-#: ../src/expedia.c:48
+#: ../src/expedia.c:51
 msgid "Expedia Street Maps"
 msgstr "Expedia 街道地图"
 
-#: ../src/expedia.c:76
+#: ../src/expedia.c:79
 msgid "Invalid expedia altitude"
 msgstr "无效的Expedia高度"
 
-#: ../src/expedia.c:107
+#: ../src/expedia.c:110
 #, c-format
 msgid ""
 "Couldn't open EXPEDIA image file (right after successful download! Please "
 "report and delete image file!): %s"
 msgstr ""
 
-#: ../src/expedia.c:120
+#: ../src/expedia.c:123
 #, c-format
 msgid ""
 "Couldn't save EXPEDIA image file (right after successful download! Please "
 "report and delete image file!): %s"
 msgstr ""
 
-#: ../src/google.c:57
-msgid "Google Maps"
-msgstr "谷歌地图"
+#: ../src/geonamessearch.c:98
+msgid "Search"
+msgstr "搜索"
 
-#: ../src/google.c:58
-msgid "Transparent Google Maps"
+#: ../src/geonamessearch.c:100
+msgid "No entries found!"
 msgstr ""
 
-#: ../src/google.c:59
-msgid "Google Satellite Images"
-msgstr "谷歌卫星影象"
-
-#: ../src/google.c:60
-msgid "Google Terrain Maps"
-msgstr "谷歌地形地图"
-
-#: ../src/google.c:132
-#, c-format
-msgid "couldn't open temp file %s"
-msgstr "不能打开临时文件 %s"
+#: ../src/geonamessearch.c:254 ../src/googlesearch.c:121
+msgid "couldn't map temp file"
+msgstr ""
 
-#. error
-#: ../src/google.c:143
-#, c-format
-msgid "Failed downloading %s"
-msgstr "下载 %s 失败"
+#: ../src/geonamessearch.c:395 ../src/vikgototool.c:250
+msgid "couldn't open temp file"
+msgstr "不能打开临时文件"
 
-#: ../src/google.c:146 ../src/googlesearch.c:126
-msgid "couldn't map temp file"
+#: ../src/globals.c:42
+msgid "Degree format:"
 msgstr ""
 
-#: ../src/google.c:153
-msgid "Failed fetching Google numbers (\"GLoadApi\" not found)"
+#: ../src/globals.c:46
+msgid "Distance units:"
 msgstr ""
 
-#: ../src/google.c:184
-msgid "Failed getting google version numbers"
+#: ../src/globals.c:50
+msgid "Speed units:"
 msgstr ""
 
-#: ../src/googlemaps.c:42
-msgid "Old Google Maps"
-msgstr "老的谷歌地图"
+#: ../src/globals.c:54
+msgid "Height units:"
+msgstr ""
 
-#: ../src/googlesearch.c:67 ../src/googlesearch.c:85
-msgid "Search"
-msgstr "搜索"
+#: ../src/globals.c:58
+msgid "Use large waypoint icons:"
+msgstr ""
 
-#: ../src/googlesearch.c:69
-msgid "I don't know that place. Do you want another search?"
+#: ../src/globals.c:62
+msgid "Default latitude:"
 msgstr ""
 
-#: ../src/googlesearch.c:87
-msgid "Enter address or place name:"
-msgstr "输入地址或者地点名称:"
+#: ../src/globals.c:65
+msgid "Default longitude:"
+msgstr ""
 
-#: ../src/googlesearch.c:215
-msgid "couldn't open temp file"
-msgstr "不能打开临时文件"
+#. Webtools
+#: ../src/google.c:36
+msgid "Google"
+msgstr ""
 
 #: ../src/datasource_gc.c:62
 msgid "Download Geocaches"
@@ -356,24 +312,24 @@ msgstr "下载 Geocaches"
 msgid "Geocaching.com Caches"
 msgstr "Geocaching.com 缓存"
 
-#: ../src/datasource_gc.c:78
+#: ../src/datasource_gc.c:79
 msgid "geocaching.com username:"
 msgstr "geocaching.com 用户名:"
 
-#: ../src/datasource_gc.c:79
+#: ../src/datasource_gc.c:80
 msgid "geocaching.com password:"
 msgstr "geocaching.com 密码:"
 
-#: ../src/datasource_gc.c:107
+#: ../src/datasource_gc.c:108
 msgid ""
 "Can't find gcget in path! Check that you have installed gcget correctly."
 msgstr ""
 
-#: ../src/datasource_gc.c:169
+#: ../src/datasource_gc.c:170
 msgid "Number geocaches:"
 msgstr ""
 
-#: ../src/datasource_gc.c:171
+#: ../src/datasource_gc.c:172
 msgid "Centered around:"
 msgstr ""
 
@@ -381,186 +337,215 @@ msgstr ""
 msgid "Google Directions"
 msgstr "Google 方位"
 
-#: ../src/datasource_google.c:74
+#: ../src/datasource_google.c:75
 msgid "From:"
 msgstr "从 :"
 
-#: ../src/datasource_google.c:76
+#: ../src/datasource_google.c:77
 msgid "To:"
 msgstr "至 :"
 
-#: ../src/datasource_gps.c:48
+#: ../src/datasource_gps.c:53
 msgid "Acquire from GPS"
 msgstr "从GPS获取"
 
-#: ../src/datasource_gps.c:49
+#: ../src/datasource_gps.c:54
 msgid "Acquired from GPS"
 msgstr "已从GPS获取的"
 
-#: ../src/datasource_gps.c:133
+#: ../src/datasource_gps.c:142
 #, c-format
 msgid "using cmdline '%s' and file '%s'\n"
 msgstr "使用命令行 '%s' 和文件 '%s'\n"
 
-#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:678
-#, fuzzy, c-format
+#: ../src/datasource_gps.c:204 ../src/vikgpslayer.c:755
+#, c-format
 msgid "Downloading %d waypoint..."
 msgid_plural "Downloading %d waypoints..."
-msgstr[0] "正在下载 %d 航点..."
-msgstr[1] "正在下载 %d 航点..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:680
-#, fuzzy, c-format
+#: ../src/datasource_gps.c:206 ../src/vikgpslayer.c:757
+#, c-format
 msgid "Downloading %d trackpoint..."
 msgid_plural "Downloading %d trackpoints..."
-msgstr[0] "正在下载 %d 轨迹点..."
-msgstr[1] "正在下载 %d 轨迹点..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/datasource_gps.c:170
+#: ../src/datasource_gps.c:224
 #, c-format
 msgid "Downloaded %d out of %d %s..."
 msgstr ""
 
-#: ../src/datasource_gps.c:172
+#: ../src/datasource_gps.c:226
 #, c-format
 msgid "Downloaded %d %s."
 msgstr ""
 
-#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:750
+#: ../src/datasource_gps.c:239 ../src/vikgpslayer.c:827
 #, c-format
 msgid "GPS Device: %s"
 msgstr "GPS设备: %s"
 
-#: ../src/datasource_gps.c:262 ../src/vikgpslayer.c:109
+#: ../src/datasource_gps.c:328 ../src/vikgpslayer.c:144
 msgid "GPS Protocol:"
 msgstr "GPS 协议:"
 
-#: ../src/datasource_gps.c:269 ../src/vikgpslayer.c:110
+#: ../src/datasource_gps.c:335 ../src/vikgpslayer.c:145
 msgid "Serial Port:"
 msgstr "串口:"
 
-#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:968
+#: ../src/datasource_gps.c:356
+msgid ""
+"Turn Off After Transfer\n"
+"(Garmin Only)"
+msgstr ""
+
+#: ../src/datasource_gps.c:377 ../src/vikgpslayer.c:1057
 msgid "GPS device: N/A"
 msgstr "GPS设备: 无"
 
-#: ../src/dem.c:53 ../src/dem.c:67
+#: ../src/dem.c:59 ../src/dem.c:73
 msgid "Invalid DEM"
 msgstr ""
 
-#: ../src/dem.c:109
+#: ../src/dem.c:115
 msgid "Invalid DEM header"
 msgstr ""
 
-#: ../src/dem.c:178 ../src/dem.c:191
+#: ../src/dem.c:184 ../src/dem.c:197
 msgid "Incorrect DEM Class B record: expected 1"
 msgstr ""
 
-#: ../src/dem.c:348
-#, fuzzy, c-format
+#: ../src/dem.c:354
+#, c-format
 msgid "Couldn't map file %s: %s"
-msgstr "不能打开临时文件 %s"
+msgstr ""
+
+#: ../src/download.c:111
+msgid "Tile age (s):"
+msgstr ""
 
-#: ../src/download.c:121
+#: ../src/download.c:206
 #, c-format
 msgid "Download error: %s"
 msgstr "下载错误: %s"
 
-#: ../src/osm-traces.c:194
+#: ../src/file.c:426 ../src/file.c:430
+#, c-format
+msgid "Draw mode '%s' no more supported"
+msgstr ""
+
+#: ../src/osm-traces.c:73
+msgid "Identifiable (public w/ timestamps)"
+msgstr ""
+
+#: ../src/osm-traces.c:74
+msgid "Trackable (private w/ timestamps)"
+msgstr ""
+
+#: ../src/osm-traces.c:75
+msgid "Public"
+msgstr "Public"
+
+#: ../src/osm-traces.c:76
+msgid "Private"
+msgstr ""
+
+#: ../src/osm-traces.c:93
+msgid "OSM username:"
+msgstr ""
+
+#: ../src/osm-traces.c:94
+msgid "OSM password:"
+msgstr ""
+
+#: ../src/osm-traces.c:229
 #, c-format
 msgid "failed to upload data: HTTP response is %ld"
 msgstr ""
 
-#: ../src/osm-traces.c:197
+#: ../src/osm-traces.c:232
 #, c-format
 msgid "curl_easy_getinfo failed: %d"
 msgstr ""
 
-#: ../src/osm-traces.c:201
+#: ../src/osm-traces.c:236
 #, c-format
 msgid "curl request failed: %s"
 msgstr ""
 
-#: ../src/osm-traces.c:229
+#: ../src/osm-traces.c:264
 #, c-format
 msgid "failed to open temporary file: %s"
 msgstr ""
 
-#: ../src/osm-traces.c:263
+#: ../src/osm-traces.c:298
 #, c-format
 msgid "failed to unlink temporary file: %s"
 msgstr ""
 
-#: ../src/osm-traces.c:275
+#: ../src/osm-traces.c:310
 msgid "OSM upload"
 msgstr ""
 
-#: ../src/osm-traces.c:295
+#: ../src/osm-traces.c:331
 msgid "Email:"
 msgstr "电子邮箱 :"
 
-#: ../src/osm-traces.c:310
-msgid "The email used as login"
-msgstr ""
-
-#: ../src/osm-traces.c:311
-msgid "Enter the email you use to login into www.openstreetmap.org."
+#: ../src/osm-traces.c:342
+msgid ""
+"The email used as login\n"
+"<small>Enter the email you use to login into www.openstreetmap.org.</small>"
 msgstr ""
 
-#: ../src/osm-traces.c:313
+#: ../src/osm-traces.c:345
 msgid "Password:"
 msgstr "密码:"
 
-#: ../src/osm-traces.c:324
-msgid "The password used to login"
-msgstr "登录用的密码"
-
-#: ../src/osm-traces.c:325
-msgid "Enter the password you use to login into www.openstreetmap.org."
-msgstr "请输入您登录www.openstreetmap.org的密码."
+#: ../src/osm-traces.c:356
+msgid ""
+"The password used to login\n"
+"<small>Enter the password you use to login into "
+"www.openstreetmap.org.</small>"
+msgstr ""
 
-#: ../src/osm-traces.c:327
+#: ../src/osm-traces.c:359
 msgid "File's name:"
 msgstr "文件名称:"
 
-#: ../src/osm-traces.c:339
-msgid "The name of the file on OSM"
-msgstr "OSM上的文件名"
-
-#: ../src/osm-traces.c:340
+#: ../src/osm-traces.c:369
 msgid ""
-"This is the name of the file created on the server. This is not the name of "
-"the local file."
+"The name of the file on OSM\n"
+"<small>This is the name of the file created on the server.This is not the "
+"name of the local file.</small>"
 msgstr ""
 
-#: ../src/osm-traces.c:343
+#: ../src/osm-traces.c:373
 msgid "Description:"
 msgstr "Description :"
 
-#: ../src/osm-traces.c:350
+#: ../src/osm-traces.c:378
 msgid "The description of the trace"
 msgstr ""
 
-#: ../src/osm-traces.c:353
+#: ../src/osm-traces.c:380
 msgid "Tags:"
 msgstr ""
 
-#: ../src/osm-traces.c:360
+#: ../src/osm-traces.c:385
 msgid "The tags associated to the trace"
 msgstr ""
 
-#: ../src/osm-traces.c:363
-msgid "Public"
-msgstr "Public"
-
-#: ../src/osm-traces.c:369
-msgid "Indicates if the trace is public or not"
-msgstr ""
-
-#: ../src/osm-traces.c:390
+#: ../src/osm-traces.c:415
 #, c-format
 msgid "Uploading %s to OSM"
 msgstr "上传 %s 到 OSM"
 
+#: ../src/mapcache.c:61
+msgid "Mapcache memory size (MB):"
+msgstr ""
+
 #: ../src/print.c:53
 msgid "None"
 msgstr "无"
@@ -603,19 +588,23 @@ msgstr ""
 msgid "Image S_ize:"
 msgstr ""
 
-#: ../src/util.c:65
+#: ../src/util.c:76
 msgid "Could not launch web browser."
 msgstr ""
 
-#: ../src/vikcoordlayer.c:43 ../src/vikdemlayer.c:102
+#: ../src/util.c:87
+msgid "Could not create new email."
+msgstr ""
+
+#: ../src/vikcoordlayer.c:46 ../src/vikdemlayer.c:121
 msgid "Color:"
 msgstr ""
 
-#: ../src/vikcoordlayer.c:44
+#: ../src/vikcoordlayer.c:47
 msgid "Minutes Width:"
 msgstr ""
 
-#: ../src/vikcoordlayer.c:45 ../src/vikdemlayer.c:105
+#: ../src/vikcoordlayer.c:48 ../src/vikdemlayer.c:125
 msgid "Line Thickness:"
 msgstr ""
 
@@ -623,83 +612,115 @@ msgstr ""
 msgid "Max number of points:"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:54
+#: ../src/datasource_bfilter.c:60
 msgid "Simplify All Tracks"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:55
+#: ../src/datasource_bfilter.c:61
 msgid "Simplified Tracks"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:87 ../src/datasource_bfilter.c:88
+#: ../src/datasource_bfilter.c:94 ../src/datasource_bfilter.c:95
 msgid "Remove Duplicate Waypoints"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:117
+#: ../src/datasource_bfilter.c:125
 msgid "Waypoints Inside This"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:118 ../src/datasource_bfilter.c:151
-msgid "Polygonzied Layer"
+#: ../src/datasource_bfilter.c:126
+msgid "Polygonized Layer"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:150
+#: ../src/datasource_bfilter.c:159
 msgid "Waypoints Outside This"
 msgstr ""
 
-#: ../src/main.c:115
+#: ../src/datasource_bfilter.c:160
+msgid "Polygonzied Layer"
+msgstr ""
+
+#: ../src/main.c:117
 msgid "Enable debug output"
 msgstr ""
 
-#: ../src/main.c:116
+#: ../src/main.c:118
 msgid "Enable verbose output"
 msgstr ""
 
-#: ../src/main.c:117
+#: ../src/main.c:119
 msgid "Show version"
 msgstr "显示版本"
 
-#: ../src/vikdemlayer.c:100
+#: ../src/osm.c:77
+msgid "OSM (view)"
+msgstr ""
+
+#: ../src/osm.c:81
+msgid "OSM (edit)"
+msgstr ""
+
+#: ../src/osm.c:85
+msgid "OSM (render)"
+msgstr ""
+
+#: ../src/uibuilder.c:148
+msgid "Take care that this password will be stored clearly in a plain file."
+msgstr ""
+
+#: ../src/vikdemlayer.c:101
+msgid "Absolute height"
+msgstr ""
+
+#: ../src/vikdemlayer.c:102
+msgid "Height gradient"
+msgstr ""
+
+#: ../src/vikdemlayer.c:119
 msgid "DEM Files:"
 msgstr "DEM 文件:"
 
-#: ../src/vikdemlayer.c:101
+#: ../src/vikdemlayer.c:120
 msgid "Download Source:"
 msgstr "下载源:"
 
-#: ../src/vikdemlayer.c:103
+#: ../src/vikdemlayer.c:122
+msgid "Type:"
+msgstr ""
+
+#: ../src/vikdemlayer.c:123
 msgid "Min Elev:"
 msgstr "最低高度:"
 
-#: ../src/vikdemlayer.c:104
+#: ../src/vikdemlayer.c:124
 msgid "Max Elev:"
 msgstr "最高高度:"
 
-#: ../src/vikdemlayer.c:116
+#: ../src/vikdemlayer.c:136
 msgid "DEM Download/Import"
 msgstr "DEM下载/导入"
 
-#: ../src/vikdemlayer.c:746
+#: ../src/vikdemlayer.c:804
 #, c-format
 msgid "No SRTM data available for %f, %f"
 msgstr "没有可以的SRTM数据给 %f, %f"
 
-#: ../src/vikdemlayer.c:985
+#: ../src/vikdemlayer.c:1042
 msgid "No download source selected. Edit layer properties."
 msgstr "没有下载源被选. 编辑图层属性."
 
-#: ../src/vikdemlayer.c:1008
+#: ../src/vikdemlayer.c:1065
 #, c-format
 msgid "Downloading DEM %s"
 msgstr "正在下载 DEM %s"
 
-#: ../src/vikfileentry.c:67
+#: ../src/vikfileentry.c:68
 msgid "Browse..."
-msgstr "浏览 ..."
+msgstr "浏览..."
 
-#: ../src/vikfileentry.c:94
+#: ../src/vikfileentry.c:96
 msgid "Choose file"
-msgstr "选择一个文件"
+msgstr "选择文件"
 
 #: ../src/vikfilelist.c:47
 msgid "Choose file(s)"
@@ -713,358 +734,446 @@ msgstr "添加 ..."
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/vikgeoreflayer.c:67
+#: ../src/vikgeoreflayer.c:68
 msgid "Georef Move Map"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:71
+#: ../src/vikgeoreflayer.c:72
 msgid "Georef Zoom Tool"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:269 ../src/vikmapslayer.c:540
+#: ../src/vikgeoreflayer.c:311 ../src/vikmapslayer.c:606
 #, c-format
 msgid "Couldn't open image file: %s"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:294
+#: ../src/vikgeoreflayer.c:341
 msgid "Unexpected end of file reading World file."
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:310 ../src/vikgeoreflayer.c:355
+#: ../src/vikgeoreflayer.c:357 ../src/vikgeoreflayer.c:402
 msgid "Choose World file"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:323
+#: ../src/vikgeoreflayer.c:370
 msgid "The World file you requested could not be opened for reading."
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:368
+#: ../src/vikgeoreflayer.c:415
 msgid "The file you requested could not be opened for writing."
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:385
+#: ../src/vikgeoreflayer.c:432 ../src/viklayer.c:463
 msgid "Layer Properties"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:401
+#: ../src/vikgeoreflayer.c:448
 msgid "World File Parameters:"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:402
+#: ../src/vikgeoreflayer.c:449
 msgid "Load From File..."
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:407
+#: ../src/vikgeoreflayer.c:454
 msgid "Corner pixel easting:"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:410
+#: ../src/vikgeoreflayer.c:456
+msgid "the UTM \"easting\" value of the upper-right corner pixel of the map"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:458
 msgid "Corner pixel northing:"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:413
+#: ../src/vikgeoreflayer.c:460
+msgid "the UTM \"northing\" value of the upper-right corner pixel of the map"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:462
 msgid "X (easting) scale (mpp): "
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:414
+#: ../src/vikgeoreflayer.c:463
 msgid "Y (northing) scale (mpp): "
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:419
+#: ../src/vikgeoreflayer.c:466
+msgid "the scale of the map in the X direction (meters per pixel)"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:468
+msgid "the scale of the map in the Y direction (meters per pixel)"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:470
 msgid "Map Image:"
 msgstr "地图图片："
 
-#: ../src/vikgeoreflayer.c:523
+#: ../src/vikgeoreflayer.c:574
 msgid "Zoom to Fit Map"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:528
+#: ../src/vikgeoreflayer.c:579
 msgid "Goto Map Center"
 msgstr "前往地图中心"
 
-#: ../src/vikgeoreflayer.c:533
+#: ../src/vikgeoreflayer.c:584
 msgid "Export to World File"
 msgstr ""
 
-#: ../src/vikgpslayer.c:113
+#: ../src/vikgoto.c:77
+msgid "No goto tool available."
+msgstr ""
+
+#: ../src/vikgoto.c:90 ../src/vikgoto.c:108
+msgid "goto"
+msgstr ""
+
+#: ../src/vikgoto.c:92
+msgid "I don't know that place. Do you want another goto?"
+msgstr ""
+
+#: ../src/vikgoto.c:110
+msgid "goto provider:"
+msgstr ""
+
+#: ../src/vikgoto.c:125
+msgid "Enter address or place name:"
+msgstr "输入地址或者地点名称:"
+
+#: ../src/vikgpslayer.c:148
 msgid "Recording tracks"
 msgstr "正在纪录轨迹"
 
-#: ../src/vikgpslayer.c:114
+#: ../src/vikgpslayer.c:149
 msgid "Jump to current position on start"
 msgstr "在开始时跳到当前位置"
 
-#: ../src/vikgpslayer.c:115
-msgid "Keep current position at center"
-msgstr "保持现有未知在中央"
+#: ../src/vikgpslayer.c:150
+msgid "Moving Map Method:"
+msgstr ""
 
-#: ../src/vikgpslayer.c:116
+#: ../src/vikgpslayer.c:151
 msgid "Gpsd Host:"
 msgstr "Gpsd 主机:"
 
-#: ../src/vikgpslayer.c:117
+#: ../src/vikgpslayer.c:152
 msgid "Gpsd Port:"
 msgstr "Gpsd 端口:"
 
-#: ../src/vikgpslayer.c:181 ../src/vikgpslayer.c:956
+#: ../src/vikgpslayer.c:153
+msgid "Gpsd Retry Interval (seconds):"
+msgstr ""
+
+#: ../src/vikgpslayer.c:217 ../src/vikgpslayer.c:1045
 msgid "GPS Download"
 msgstr "GPS 下载"
 
-#: ../src/vikgpslayer.c:181 ../src/vikgpslayer.c:956
+#: ../src/vikgpslayer.c:217 ../src/vikgpslayer.c:1045
 msgid "GPS Upload"
 msgstr "GPS 上传"
 
-#: ../src/vikgpslayer.c:183
+#: ../src/vikgpslayer.c:219
 msgid "GPS Realtime Tracking"
 msgstr "GPS实时跟踪"
 
-#: ../src/vikgpslayer.c:347
+#: ../src/vikgpslayer.c:382
 msgid "Unknown GPS Protocol"
 msgstr "未知的GPS协议"
 
-#: ../src/vikgpslayer.c:353
+#: ../src/vikgpslayer.c:401
 msgid "Unknown serial port device"
 msgstr "未知的串口设备"
 
-#: ../src/vikgpslayer.c:413
+#: ../src/vikgpslayer.c:467
 #, c-format
 msgid "%s: unknown parameter"
 msgstr "%s: 未知的参数"
 
-#: ../src/vikgpslayer.c:510
+#: ../src/vikgpslayer.c:581
 msgid "Upload to GPS"
 msgstr "上传到GPS"
 
-#: ../src/vikgpslayer.c:515
+#: ../src/vikgpslayer.c:586
 msgid "Download from GPS"
 msgstr "从GPS下载"
 
-#: ../src/vikgpslayer.c:533
+#: ../src/vikgpslayer.c:604
 msgid "Empty Upload"
 msgstr "清空上传"
 
-#: ../src/vikgpslayer.c:538
+#: ../src/vikgpslayer.c:609
 msgid "Empty Download"
 msgstr "清空下载"
 
-#: ../src/vikgpslayer.c:543
+#: ../src/vikgpslayer.c:614
 msgid "Empty All"
 msgstr "清空全部"
 
-#: ../src/vikgpslayer.c:685
-#, fuzzy, c-format
+#. 
+#. NB It's not fatal if this gives 2 for example! Hence removal of the g_assert
+#. This happens when copied GPS layer is deleted (not sure why the number_handlers would be 2)
+#. I don't think there's any side effects and certainly better than the program just aborting
+#. 
+#: ../src/vikgpslayer.c:630
+#, c-format
+msgid "Unexpected number of disconnected handlers: %d"
+msgstr ""
+
+#: ../src/vikgpslayer.c:762
+#, c-format
 msgid "Uploading %d waypoint..."
 msgid_plural "Uploading %d waypoints..."
-msgstr[0] "正在上传 %d 航点..."
-msgstr[1] "正在上传 %d 航点..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/vikgpslayer.c:687
-#, fuzzy, c-format
+#: ../src/vikgpslayer.c:764
+#, c-format
 msgid "Uploading %d trackpoint..."
 msgid_plural "Uploading %d trackpoints..."
-msgstr[0] "正在上传 %d 轨迹点..."
-msgstr[1] "正在上传 %d 轨迹点..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/vikgpslayer.c:711
+#: ../src/vikgpslayer.c:788
 #, c-format
 msgid "Downloaded %d out of %d waypoint..."
 msgid_plural "Downloaded %d out of %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:713
+#: ../src/vikgpslayer.c:790
 #, c-format
 msgid "Downloaded %d out of %d trackpoint..."
 msgid_plural "Downloaded %d out of %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:717
+#: ../src/vikgpslayer.c:794
 #, c-format
 msgid "Uploaded %d out of %d waypoint..."
 msgid_plural "Uploaded %d out of %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:719
+#: ../src/vikgpslayer.c:796
 #, c-format
 msgid "Uploaded %d out of %d trackpoint..."
 msgid_plural "Uploaded %d out of %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:726
+#: ../src/vikgpslayer.c:803
 #, c-format
 msgid "Downloaded %d waypoint"
 msgid_plural "Downloaded %d waypoints"
 msgstr[0] "下载的 %d 航点"
-msgstr[1] "下载的 %d 航点"
 
-#: ../src/vikgpslayer.c:728
+#: ../src/vikgpslayer.c:805
 #, c-format
 msgid "Downloaded %d trackpoint"
 msgid_plural "Downloaded %d trackpoints"
 msgstr[0] "下载的 %d 轨迹点"
-msgstr[1] "下载的 %d 轨迹点"
 
-#: ../src/vikgpslayer.c:732
+#: ../src/vikgpslayer.c:809
 #, c-format
 msgid "Uploaded %d waypoint"
 msgid_plural "Uploaded %d waypoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:734
+#: ../src/vikgpslayer.c:811
 #, c-format
 msgid "Uploaded %d trackpoint"
 msgid_plural "Uploaded %d trackpoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:919
+#: ../src/vikgpslayer.c:1008
 msgid "Error: couldn't find gpsbabel."
 msgstr "错误: 没有发现 gpsbabel."
 
-#: ../src/viklayerspanel.c:59
+#: ../src/viklayerspanel.c:57
 msgid "/C_ut"
 msgstr "/_u 剪切"
 
-#: ../src/viklayerspanel.c:60
+#: ../src/viklayerspanel.c:58
 msgid "/_Copy"
 msgstr "/_C 拷贝"
 
-#: ../src/viklayerspanel.c:61
+#: ../src/viklayerspanel.c:59
 msgid "/_Paste"
-msgstr "/_P 粘贴 "
+msgstr "/_P 粘贴"
 
-#: ../src/viklayerspanel.c:62
+#: ../src/viklayerspanel.c:60
 msgid "/_Delete"
 msgstr "/_D 删除"
 
-#: ../src/viklayerspanel.c:63
+#: ../src/viklayerspanel.c:61
 msgid "/New Layer"
 msgstr "/新图层"
 
-#: ../src/viklayerspanel.c:145
+#: ../src/viklayerspanel.c:150
 msgid "Top Layer"
 msgstr "顶层"
 
-#: ../src/viklayerspanel.c:443
+#: ../src/viklayerspanel.c:165
+msgid "Add new layer"
+msgstr ""
+
+#: ../src/viklayerspanel.c:172
+msgid "Remove selected layer"
+msgstr ""
+
+#: ../src/viklayerspanel.c:179
+msgid "Move selected layer up"
+msgstr ""
+
+#: ../src/viklayerspanel.c:186
+msgid "Move selected layer down"
+msgstr ""
+
+#: ../src/viklayerspanel.c:193
+msgid "Cut selected layer"
+msgstr ""
+
+#: ../src/viklayerspanel.c:200
+msgid "Copy selected layer"
+msgstr ""
+
+#: ../src/viklayerspanel.c:207
+msgid "Paste layer below selected layer"
+msgstr ""
+
+#: ../src/viklayerspanel.c:492
 msgid "Aggregate Layers have no settable properties."
 msgstr ""
 
-#: ../src/viklayerspanel.c:488
+#: ../src/viklayerspanel.c:542
 msgid "You cannot cut the Top Layer."
 msgstr "您不能剪切掉顶层"
 
-#: ../src/viklayerspanel.c:537
+#: ../src/viklayerspanel.c:597
 msgid "You cannot delete the Top Layer."
 msgstr "您不能删除顶层"
 
-#: ../src/viklayerspanel.c:621
+#: ../src/viklayerspanel.c:681
 msgid "Are you sure you wish to delete all layers?"
 msgstr "您真的确认要删除所有的图层?"
 
 #. ******* MAPZOOMS ********
-#: ../src/vikmapslayer.c:84
+#: ../src/vikmapslayer.c:90
 msgid "Use Viking Zoom Level"
 msgstr ""
 
-#: ../src/vikmapslayer.c:115
+#: ../src/vikmapslayer.c:122
 msgid "Map Type:"
 msgstr "地图类型:"
 
-#: ../src/vikmapslayer.c:116
-msgid "Maps Directory (Optional):"
-msgstr "地图目录(可选):"
+#: ../src/vikmapslayer.c:123
+msgid "Maps Directory:"
+msgstr ""
 
-#: ../src/vikmapslayer.c:117
+#: ../src/vikmapslayer.c:124
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: ../src/vikmapslayer.c:118
+#: ../src/vikmapslayer.c:125
 msgid "Autodownload maps:"
 msgstr "自动下载地图:"
 
-#: ../src/vikmapslayer.c:119
+#: ../src/vikmapslayer.c:126
 msgid "Zoom Level:"
 msgstr "缩放程度 :"
 
-#: ../src/vikmapslayer.c:125
+#: ../src/vikmapslayer.c:132
 msgid "Maps Download"
 msgstr "地图下载"
 
-#: ../src/vikmapslayer.c:131
+#: ../src/vikmapslayer.c:138
 msgid "Map"
 msgstr "地图"
 
-#: ../src/vikmapslayer.c:384
+#: ../src/vikmapslayer.c:212
+msgid "Default maplayer directory:"
+msgstr ""
+
+#: ../src/vikmapslayer.c:449
 msgid "Unknown map type"
 msgstr "未知的地图类型"
 
-#: ../src/vikmapslayer.c:394
+#: ../src/vikmapslayer.c:459
 msgid "Unknown Map Zoom"
 msgstr ""
 
-#: ../src/vikmapslayer.c:463
+#: ../src/vikmapslayer.c:528
 #, c-format
 msgid ""
 "New map cannot be displayed in the current drawmode.\n"
 "Select \"%s\" from View menu to view it."
 msgstr ""
 
-#: ../src/vikmapslayer.c:605
+#: ../src/vikmapslayer.c:670
 #, c-format
 msgid ""
 "Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out "
 "factor"
 msgstr ""
 
-#: ../src/vikmapslayer.c:920
+#: ../src/vikmapslayer.c:1043
 #, c-format
 msgid "Redownloading up to %d %s map..."
 msgid_plural "Redownloading up to %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikmapslayer.c:922
-#, fuzzy, c-format
+#: ../src/vikmapslayer.c:1045
+#, c-format
 msgid "Redownloading %d %s map..."
 msgid_plural "Redownloading %d %s maps..."
-msgstr[0] "重新下载 %d %s 地图..."
-msgstr[1] "重新下载 %d %s 地图..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/vikmapslayer.c:926 ../src/vikmapslayer.c:997
+#: ../src/vikmapslayer.c:1049 ../src/vikmapslayer.c:1120
 #, c-format
 msgid "Downloading %d %s map..."
 msgid_plural "Downloading %d %s maps..."
 msgstr[0] "正在下载 %d %s 地图..."
-msgstr[1] "正在下载 %d %s 地图..."
 
-#: ../src/vikmapslayer.c:1054
+#: ../src/vikmapslayer.c:1183
 msgid "Redownload bad map(s)"
 msgstr "重新下载损坏的地图"
 
-#: ../src/vikmapslayer.c:1058
+#: ../src/vikmapslayer.c:1187
+msgid "Redownload new map(s)"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1191
 msgid "Redownload all map(s)"
 msgstr "重新下载所有地图"
 
-#: ../src/vikmapslayer.c:1138
+#: ../src/vikmapslayer.c:1271
 #, c-format
 msgid ""
 "Wrong drawmode for this map.\n"
 "Select \"%s\" from View menu and try again."
 msgstr ""
 
-#: ../src/vikmapslayer.c:1143
+#: ../src/vikmapslayer.c:1276
 msgid "Wrong zoom level for this map."
 msgstr "此地图无此缩放程度"
 
-#: ../src/vikmapslayer.c:1168
-msgid "Download Onscreen Maps"
-msgstr "下载屏幕地图"
+#: ../src/vikmapslayer.c:1306
+msgid "Download missing Onscreen Maps"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1312
+msgid "Download new Onscreen Maps from server"
+msgstr ""
 
-#: ../src/vikmapslayer.c:1173
+#. TODO Add GTK_STOCK_REFRESH icon
+#: ../src/vikmapslayer.c:1319
 msgid "Refresh Onscreen Tiles"
 msgstr ""
 
@@ -1072,475 +1181,552 @@ msgstr ""
 msgid "Layer Name"
 msgstr "图层名字"
 
-#: ../src/viktreeview.c:609
+#: ../src/viktreeview.c:624
 #, c-format
 msgid "delete data from %s\n"
 msgstr "从 %s 删除数据\n"
 
-#: ../src/viktrwlayer.c:298
+#: ../src/viktrwlayer.c:307
 msgid "Create Waypoint"
 msgstr "创建航点"
 
-#: ../src/viktrwlayer.c:301
+#: ../src/viktrwlayer.c:310
 msgid "Create Track"
 msgstr "创建轨迹"
 
-#: ../src/viktrwlayer.c:305
+#: ../src/viktrwlayer.c:314
 msgid "Begin Track"
 msgstr "开始跟踪"
 
-#: ../src/viktrwlayer.c:308
+#: ../src/viktrwlayer.c:317
 msgid "Edit Waypoint"
 msgstr "编辑航点"
 
-#: ../src/viktrwlayer.c:313
+#: ../src/viktrwlayer.c:322
 msgid "Edit Trackpoint"
 msgstr "编辑轨迹点"
 
-#: ../src/viktrwlayer.c:318
+#: ../src/viktrwlayer.c:327
 msgid "Show Picture"
 msgstr "显示图片"
 
-#: ../src/viktrwlayer.c:321
+#: ../src/viktrwlayer.c:330
 msgid "Magic Scissors"
 msgstr "魔术剪刀"
 
 #. ***** PARAMETERS *****
-#: ../src/viktrwlayer.c:328 ../src/viktrwlayer.c:1383
-#: ../src/viktrwlayer.c:1385
+#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1401
+#: ../src/viktrwlayer.c:1403
 msgid "Waypoints"
 msgstr "航点"
 
-#: ../src/viktrwlayer.c:328 ../src/viktrwlayer.c:1373
-#: ../src/viktrwlayer.c:1375
+#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1391
+#: ../src/viktrwlayer.c:1393
 msgid "Tracks"
 msgstr "轨迹"
 
-#: ../src/viktrwlayer.c:328
+#: ../src/viktrwlayer.c:337
 msgid "Waypoint Images"
 msgstr "航点图片"
 
-#: ../src/viktrwlayer.c:331
+#: ../src/viktrwlayer.c:340
 msgid "Draw by Track"
 msgstr "以轨迹绘图"
 
-#: ../src/viktrwlayer.c:331
+#: ../src/viktrwlayer.c:340
 msgid "Draw by Velocity"
 msgstr "以速度绘图"
 
-#: ../src/viktrwlayer.c:331
+#: ../src/viktrwlayer.c:340
 msgid "All Tracks Black"
 msgstr ""
 
-#: ../src/viktrwlayer.c:332
+#: ../src/viktrwlayer.c:341
 msgid "Filled Square"
 msgstr "实心方块"
 
-#: ../src/viktrwlayer.c:332
+#: ../src/viktrwlayer.c:341
 msgid "Square"
 msgstr "正方形"
 
-#: ../src/viktrwlayer.c:332
+#: ../src/viktrwlayer.c:341
 msgid "Circle"
 msgstr "圆形"
 
-#: ../src/viktrwlayer.c:332
+#: ../src/viktrwlayer.c:341
 msgid "X"
 msgstr "X"
 
-#: ../src/viktrwlayer.c:354
+#: ../src/viktrwlayer.c:363
 msgid "Track Drawing Mode:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:355
+#: ../src/viktrwlayer.c:364
 msgid "Draw Track Lines"
 msgstr ""
 
-#: ../src/viktrwlayer.c:356
+#: ../src/viktrwlayer.c:365
 msgid "Draw Trackpoints"
 msgstr ""
 
-#: ../src/viktrwlayer.c:357
+#: ../src/viktrwlayer.c:366
 msgid "Draw Elevation"
 msgstr ""
 
-#: ../src/viktrwlayer.c:358
+#: ../src/viktrwlayer.c:367
 msgid "Draw Elevation Height %:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:360
+#: ../src/viktrwlayer.c:369
 msgid "Draw Stops"
 msgstr ""
 
-#: ../src/viktrwlayer.c:361
+#: ../src/viktrwlayer.c:370
 msgid "Min Stop Length (seconds):"
 msgstr ""
 
-#: ../src/viktrwlayer.c:363
+#: ../src/viktrwlayer.c:372
 msgid "Track Thickness:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:364
+#: ../src/viktrwlayer.c:373
 msgid "Track BG Thickness:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:365
+#: ../src/viktrwlayer.c:374
 msgid "Track Background Color"
 msgstr ""
 
-#: ../src/viktrwlayer.c:366
+#: ../src/viktrwlayer.c:375
 msgid "Min Track Velocity:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:367
+#: ../src/viktrwlayer.c:376
 msgid "Max Track Velocity:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:369
+#: ../src/viktrwlayer.c:378
 msgid "Draw Labels"
 msgstr "描绘图层"
 
-#: ../src/viktrwlayer.c:370
+#: ../src/viktrwlayer.c:379
 msgid "Waypoint Color:"
 msgstr "航点颜色"
 
-#: ../src/viktrwlayer.c:371
+#: ../src/viktrwlayer.c:380
 msgid "Waypoint Text:"
 msgstr "航点文字:"
 
-#: ../src/viktrwlayer.c:372
+#: ../src/viktrwlayer.c:381
 msgid "Background:"
 msgstr "背景:"
 
-#: ../src/viktrwlayer.c:373
+#: ../src/viktrwlayer.c:382
 msgid "Fake BG Color Translucency:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:374
+#: ../src/viktrwlayer.c:383
 msgid "Waypoint marker:"
 msgstr "航点标签"
 
-#: ../src/viktrwlayer.c:375
+#: ../src/viktrwlayer.c:384
 msgid "Waypoint size:"
 msgstr "航点大小"
 
-#: ../src/viktrwlayer.c:376
+#: ../src/viktrwlayer.c:385
 msgid "Draw Waypoint Symbols:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:378
+#: ../src/viktrwlayer.c:387
 msgid "Draw Waypoint Images"
 msgstr ""
 
-#: ../src/viktrwlayer.c:379
+#: ../src/viktrwlayer.c:388
 msgid "Image Size (pixels):"
 msgstr "图片大小 (像素):"
 
-#: ../src/viktrwlayer.c:380
+#: ../src/viktrwlayer.c:389
 msgid "Image Alpha:"
 msgstr "图片Alpha值:"
 
-#: ../src/viktrwlayer.c:381
+#: ../src/viktrwlayer.c:390
 msgid "Image Memory Cache Size:"
 msgstr "图片内存缓存尺寸:"
 
-#: ../src/viktrwlayer.c:1491
+#: ../src/viktrwlayer.c:1540
 msgid "This layer has no waypoints or trackpoints."
 msgstr ""
 
-#: ../src/viktrwlayer.c:1499
+#: ../src/viktrwlayer.c:1548
 msgid "Export Layer"
 msgstr "输出图层"
 
-#: ../src/viktrwlayer.c:1518 ../src/vikwindow.c:1411 ../src/vikwindow.c:1779
+#: ../src/viktrwlayer.c:1567 ../src/vikwindow.c:1577 ../src/vikwindow.c:2020
 #, c-format
 msgid "The file \"%s\" exists, do you wish to overwrite it?"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1528 ../src/vikwindow.c:1429
+#: ../src/viktrwlayer.c:1577 ../src/vikwindow.c:1598
 msgid "The filename you requested could not be opened for writing."
 msgstr ""
 
-#: ../src/viktrwlayer.c:1559
+#: ../src/viktrwlayer.c:1598
+msgid "Create"
+msgstr "创建"
+
+#: ../src/viktrwlayer.c:1608
 msgid "Waypoint Name:"
 msgstr "航点名称:"
 
-#: ../src/viktrwlayer.c:1579
+#: ../src/viktrwlayer.c:1628
 msgid "Waypoint not found in this layer."
 msgstr "在此图层中没有发现航点"
 
-#: ../src/viktrwlayer.c:1633
+#: ../src/viktrwlayer.c:1725
 msgid "Goto Center of Layer"
 msgstr "前往图层中心"
 
-#: ../src/viktrwlayer.c:1638
+#: ../src/viktrwlayer.c:1730
 msgid "Goto Waypoint"
 msgstr "前往航点"
 
-#: ../src/viktrwlayer.c:1644
+#: ../src/viktrwlayer.c:1736
 msgid "Export layer"
 msgstr "输出图层"
 
-#: ../src/viktrwlayer.c:1649
+#: ../src/viktrwlayer.c:1741
 msgid "Export as GPSPoint"
 msgstr "输出成GPS点"
 
-#: ../src/viktrwlayer.c:1654
+#: ../src/viktrwlayer.c:1746
 msgid "Export as GPSMapper"
 msgstr "输出成GPS地图"
 
-#: ../src/viktrwlayer.c:1659
+#: ../src/viktrwlayer.c:1751
 msgid "Export as GPX"
 msgstr "输出成GPX文件"
 
-#: ../src/viktrwlayer.c:1664 ../src/viktrwlayer.c:2572
+#: ../src/viktrwlayer.c:1756 ../src/viktrwlayer.c:2796
 msgid "New Waypoint"
 msgstr "新航点"
 
-#: ../src/viktrwlayer.c:1670 ../src/viktrwlayer.c:2538
+#: ../src/viktrwlayer.c:1763
+msgid "Add Wikipedia Waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1768
+msgid "Within layer bounds"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1773
+msgid "Within current view"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1780 ../src/viktrwlayer.c:2762
 msgid "Upload to OSM"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2135
+#: ../src/viktrwlayer.c:2291
+msgid "Failed. This track does not have timestamp"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2305
+msgid "Failed. No other track in this layer has timestamp"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2311
+msgid "Merge with..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:2311
+msgid "Select track to merge with"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2348
 msgid "Merge Threshold..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2136
+#: ../src/viktrwlayer.c:2349
 msgid "Merge when time between tracks less than:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2227
+#: ../src/viktrwlayer.c:2441
 msgid "Split Threshold..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2228
+#: ../src/viktrwlayer.c:2442
 msgid "Split when time between trackpoints exceeds:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2311
+#: ../src/viktrwlayer.c:2525
 msgid "Waypoint Already Exists"
 msgstr "航点已经存在"
 
-#: ../src/viktrwlayer.c:2352
+#: ../src/viktrwlayer.c:2566
 msgid "Track Already Exists"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2474
+#: ../src/viktrwlayer.c:2688
 msgid "Goto"
 msgstr "前往"
 
-#: ../src/viktrwlayer.c:2482
+#: ../src/viktrwlayer.c:2696
 msgid "Visit Geocache Webpage"
 msgstr "访问Geocache网页"
 
-#: ../src/viktrwlayer.c:2497
+#: ../src/viktrwlayer.c:2711
 msgid "Goto Startpoint"
 msgstr "Aller au premier point"
 
-#: ../src/viktrwlayer.c:2502
+#: ../src/viktrwlayer.c:2716
 msgid "Goto \"Center\""
 msgstr "前往“中间”"
 
-#: ../src/viktrwlayer.c:2507
+#: ../src/viktrwlayer.c:2721
 msgid "Goto Endpoint"
 msgstr "前往最后一点"
 
-#: ../src/viktrwlayer.c:2512
+#: ../src/viktrwlayer.c:2726
 msgid "Merge By Time"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2517
+#: ../src/viktrwlayer.c:2731
+msgid "Merge With Other Tracks..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:2736
 msgid "Split By Time"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2522
+#: ../src/viktrwlayer.c:2741
 msgid "Download maps along track..."
 msgstr "沿着轨迹下载地图..."
 
-#: ../src/viktrwlayer.c:2527
+#: ../src/viktrwlayer.c:2746
 msgid "Apply DEM Data"
 msgstr ""
 
-#: ../src/viktrwlayer.c:3514
+#: ../src/viktrwlayer.c:2751
+msgid "Extend track end"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2756
+msgid "Extend using magic scissors"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2770
+msgid "View Google Directions"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2776
+msgid "Use with filter"
+msgstr ""
+
+#: ../src/viktrwlayer.c:3739
 msgid "Could not launch eog to open file."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3568
+#: ../src/viktrwlayer.c:3793
 #, c-format
 msgid "Creating %d Image Thumbnails..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3788
+#: ../src/viktrwlayer.c:4013
 msgid "No map layer in use. Create one first"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:649
+#: ../src/viktrwlayer_propwin.c:686
 msgid "Failed spliting track. Track unchanged"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:666
+#: ../src/viktrwlayer_propwin.c:703
 msgid "Operation Aborted. Track unchanged"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:704
+#: ../src/viktrwlayer_propwin.c:757
 #, c-format
 msgid "%s - Track Properties"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:709
+#: ../src/viktrwlayer_propwin.c:762
 msgid "Split at Marker"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:710
+#: ../src/viktrwlayer_propwin.c:763
 msgid "Split Segments"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:711
+#: ../src/viktrwlayer_propwin.c:764
 msgid "Reverse"
 msgstr "反转"
 
-#: ../src/viktrwlayer_propwin.c:712
+#: ../src/viktrwlayer_propwin.c:765
 msgid "Delete Dupl."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Comment:</b>"
 msgstr "<b>说明:</b>"
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Track Length:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Trackpoints:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Segments:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Duplicate Points:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Max Speed:</b>"
 msgstr "<b>最大速度:</b>"
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Avg. Speed:</b>"
 msgstr "<b>平均速度:</b>"
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Avg. Dist. Between TPs:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Elevation Range:</b>"
 msgstr "<b>高度范围:</b>"
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Total Elevation Gain/Loss:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Start:</b>"
 msgstr "<b>开始:</b>"
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>End:</b>"
 msgstr "<b>结束:</b>"
 
-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Duration:</b>"
 msgstr "<b>持续时间:</b>"
 
-#: ../src/viktrwlayer_propwin.c:735
-msgid "<b>Track Distance/Time:</b>"
-msgstr ""
-
-#: ../src/viktrwlayer_propwin.c:763 ../src/viktrwlayer_propwin.c:770
-#: ../src/viktrwlayer_propwin.c:779 ../src/viktrwlayer_propwin.c:786
-#: ../src/viktrwlayer_propwin.c:825 ../src/viktrwlayer_propwin.c:826
-#: ../src/viktrwlayer_propwin.c:827 ../src/viktrwlayer_propwin.c:829
+#: ../src/viktrwlayer_propwin.c:828 ../src/viktrwlayer_propwin.c:852
+#: ../src/viktrwlayer_propwin.c:889 ../src/viktrwlayer_propwin.c:907
+#: ../src/viktrwlayer_propwin.c:957 ../src/viktrwlayer_propwin.c:958
+#: ../src/viktrwlayer_propwin.c:959 ../src/viktrwlayer_propwin.c:981
+#: ../src/viktrwlayer_propwin.c:988
 #, c-format
 msgid "No Data"
 msgstr "没有数据"
 
-#: ../src/viktrwlayer_propwin.c:822
+#: ../src/viktrwlayer_propwin.c:954
 #, c-format
 msgid "%d minutes"
 msgstr "%d 分钟"
 
-#: ../src/viktrwlayer_propwin.c:849
+#: ../src/viktrwlayer_propwin.c:977
+msgid "Statistics"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:982
+msgid "<b>Track Distance:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:983
 msgid "Elevation-distance"
 msgstr "高度-距离"
 
-#: ../src/viktrwlayer_propwin.c:852
+#: ../src/viktrwlayer_propwin.c:989
+msgid "<b>Track Time:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:990
 msgid "Speed-time"
 msgstr "速度-时间"
 
-#: ../src/viktrwlayer_tpwin.c:101
+#: ../src/viktrwlayer_tpwin.c:115
 msgid "<b>Part of Track:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:102
+#: ../src/viktrwlayer_tpwin.c:116
 msgid "<b>Latitude:</b>"
 msgstr "<b>纬度 :</b>"
 
-#: ../src/viktrwlayer_tpwin.c:103
+#: ../src/viktrwlayer_tpwin.c:117
 msgid "<b>Longitude:</b>"
 msgstr "<b>经度 :</b>"
 
-#: ../src/viktrwlayer_tpwin.c:104
+#: ../src/viktrwlayer_tpwin.c:118
 msgid "<b>Altitude:</b>"
 msgstr "<b>高度 :</b>"
 
-#: ../src/viktrwlayer_tpwin.c:105
+#: ../src/viktrwlayer_tpwin.c:119
 msgid "<b>Timestamp:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:106
+#: ../src/viktrwlayer_tpwin.c:120
 msgid "<b>Time:</b>"
 msgstr "<b>时间 :</b>"
 
-#: ../src/viktrwlayer_tpwin.c:107
+#: ../src/viktrwlayer_tpwin.c:121
 msgid "<b>Distance Difference:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:108
+#: ../src/viktrwlayer_tpwin.c:122
 msgid "<b>Time Difference:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:109
+#: ../src/viktrwlayer_tpwin.c:123
 msgid "<b>\"Speed\" Between:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:117
+#: ../src/viktrwlayer_tpwin.c:124
+msgid "<b>VDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:125
+msgid "<b>HDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:126
+msgid "<b>PDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:127
+msgid "<b>SAT/FIX:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:136
 msgid "Trackpoint"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:122
+#: ../src/viktrwlayer_tpwin.c:141
 msgid "Split Here"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:123
+#: ../src/viktrwlayer_tpwin.c:142
 msgid "Join With Last"
 msgstr ""
 
-#: ../src/vikwindow.c:176
+#: ../src/vikwindow.c:186
 msgid "Pan"
 msgstr "移动"
 
-#: ../src/vikwindow.c:176
+#: ../src/vikwindow.c:186
 msgid "Zoom"
 msgstr "缩放"
 
-#: ../src/vikwindow.c:176
+#: ../src/vikwindow.c:186
 msgid "Ruler"
 msgstr "测距"
 
-#: ../src/vikwindow.c:350
+#: ../src/vikwindow.c:361
 #, c-format
 msgid ""
 "Do you want to save the changes you made to the document \"%s\"?\n"
@@ -1548,446 +1734,584 @@ msgid ""
 "Your changes will be lost if you don't save them."
 msgstr ""
 
-#: ../src/vikwindow.c:353 ../src/vikwindow.c:1279
+#: ../src/vikwindow.c:364 ../src/vikwindow.c:1366
 msgid "Untitled"
-msgstr "未命名的"
+msgstr "无标题"
 
-#: ../src/vikwindow.c:354
+#: ../src/vikwindow.c:365
 msgid "Don't Save"
 msgstr "不保存"
 
-#: ../src/vikwindow.c:387
+#: ../src/vikwindow.c:398
 msgid "mpp"
 msgstr "mpp"
 
-#: ../src/vikwindow.c:387
+#: ../src/vikwindow.c:398
 msgid "pixelfact"
 msgstr "pixelfact"
 
-#: ../src/vikwindow.c:510
+#: ../src/vikwindow.c:532
 #, c-format
-msgid "Cursor: %f %f %dm"
-msgstr "光标: %f %f %dm"
+msgid "%s %s %dm"
+msgstr ""
 
-#: ../src/vikwindow.c:512
+#: ../src/vikwindow.c:534
 #, c-format
-msgid "Cursor: %f %f"
-msgstr "光标: %f %f"
+msgid "%s %s"
+msgstr ""
 
-#: ../src/vikwindow.c:1089
+#: ../src/vikwindow.c:1155
 msgid "You must select a layer to show its properties."
 msgstr "您必须选一个层才能显示它的属性"
 
-#: ../src/vikwindow.c:1105
+#: ../src/vikwindow.c:1181
 msgid "You must select a layer to delete."
 msgstr "您必须选一个层才可删除"
 
-#: ../src/vikwindow.c:1312
+#: ../src/vikwindow.c:1461
+#, c-format
+msgid "Unable to add '%s' to the list of recently used documents"
+msgstr ""
+
+#: ../src/vikwindow.c:1475
 msgid "The file you requested could not be opened."
 msgstr "您选的文件不能被打开"
 
-#: ../src/vikwindow.c:1355
+#: ../src/vikwindow.c:1521
 msgid "Please select a GPS data file to open. "
-msgstr "请选择一个GPS数据文件来打开"
+msgstr "请选择一个GPS数据文件来打开 "
 
-#: ../src/vikwindow.c:1398
+#: ../src/vikwindow.c:1564
 msgid "Save as Viking File."
 msgstr "另存为Viking文件."
 
-#: ../src/vikwindow.c:1626
+#: ../src/vikwindow.c:1855
 msgid ""
 "Viewable region outside allowable pixel size bounds for image. Clipping "
 "width/height values."
 msgstr ""
 
-#: ../src/vikwindow.c:1645
+#: ../src/vikwindow.c:1877
 #, c-format
 msgid "Total area: %ldm x %ldm (%.3f sq. km)"
 msgstr "全部区域: %ldm x %ldm (%.3f 平方公里)"
 
+#: ../src/vikwindow.c:1880
+#, c-format
+msgid "Total area: %ldm x %ldm (%.3f sq. miles)"
+msgstr ""
+
 #. todo: default for answers inside VikWindow or static (thruout instance)
-#: ../src/vikwindow.c:1653
+#: ../src/vikwindow.c:1894
 msgid "Save to Image File"
 msgstr "保存为图片文件"
 
-#: ../src/vikwindow.c:1671
+#: ../src/vikwindow.c:1912
 msgid "Width (pixels):"
 msgstr "宽度 (像素) :"
 
-#: ../src/vikwindow.c:1673
+#: ../src/vikwindow.c:1914
 msgid "Height (pixels):"
 msgstr "高度 (像素) :"
 
-#: ../src/vikwindow.c:1676
+#: ../src/vikwindow.c:1917
 msgid "Zoom (meters per pixel):"
 msgstr "缩放 (米／像素) :"
 
-#: ../src/vikwindow.c:1682
+#: ../src/vikwindow.c:1923
 msgid "Area in current viewable window"
 msgstr ""
 
-#: ../src/vikwindow.c:1692
+#: ../src/vikwindow.c:1933
 msgid "Save as PNG"
 msgstr "保存为PNG"
 
-#: ../src/vikwindow.c:1693
+#: ../src/vikwindow.c:1934
 msgid "Save as JPEG"
 msgstr "保存为JPEG"
 
-#: ../src/vikwindow.c:1713
+#: ../src/vikwindow.c:1954
 msgid "East-west image tiles:"
 msgstr ""
 
-#: ../src/vikwindow.c:1715
+#: ../src/vikwindow.c:1956
 msgid "North-south image tiles:"
 msgstr ""
 
-#: ../src/vikwindow.c:1755
+#: ../src/vikwindow.c:1996
 msgid "You must be in UTM mode to use this feature"
 msgstr "你必须在UTM模式中来使用这个特性"
 
-#: ../src/vikwindow.c:1766
+#: ../src/vikwindow.c:2007
 msgid "Save Image"
 msgstr "保存图像"
 
-#: ../src/vikwindow.c:1793
-#, fuzzy
+#: ../src/vikwindow.c:2034
 msgid "Choose a directory to hold images"
-msgstr "_D 创建图片的目录"
+msgstr ""
 
-#: ../src/vikwindow.c:1885
+#: ../src/vikwindow.c:2120
 msgid "Choose a background color"
 msgstr "选择一个背景色"
 
-#: ../src/vikwindow.c:1906
+#: ../src/vikwindow.c:2141
 msgid "_File"
-msgstr "_F 文件"
+msgstr "文件(_F)"
 
-#: ../src/vikwindow.c:1907
+#: ../src/vikwindow.c:2142
 msgid "_Edit"
-msgstr "_E 编辑"
+msgstr "编辑(_E)"
 
-#: ../src/vikwindow.c:1908
+#: ../src/vikwindow.c:2143
 msgid "_View"
-msgstr "_V 视图"
+msgstr "视图(_V)"
 
-#: ../src/vikwindow.c:1909 ../src/vikwindow.c:1981
+#: ../src/vikwindow.c:2144 ../src/vikwindow.c:2228
 msgid "_Zoom"
-msgstr "_Z 缩放"
+msgstr "缩放(_Z)"
 
-#: ../src/vikwindow.c:1910 ../src/vikwindow.c:1980
+#: ../src/vikwindow.c:2145 ../src/vikwindow.c:2227
 msgid "_Pan"
-msgstr "_P 平移"
+msgstr "平移(_P )"
 
-#: ../src/vikwindow.c:1911
+#: ../src/vikwindow.c:2146
 msgid "_Layers"
-msgstr "_L 图层"
+msgstr "图层(_L)"
 
-#: ../src/vikwindow.c:1912
+#: ../src/vikwindow.c:2147
 msgid "_Tools"
-msgstr "_T 工具"
+msgstr "工具(_T)"
 
-#: ../src/vikwindow.c:1913
+#: ../src/vikwindow.c:2148
+msgid "_Webtools"
+msgstr ""
+
+#: ../src/vikwindow.c:2149 ../src/vikwindow.c:2215
 msgid "_Help"
-msgstr "_H 帮助"
+msgstr "帮助(_H)"
 
-#: ../src/vikwindow.c:1915
+#: ../src/vikwindow.c:2151
 msgid "_New"
-msgstr "_N 新建"
+msgstr "新建(_N)"
 
-#: ../src/vikwindow.c:1915
+#: ../src/vikwindow.c:2151
 msgid "New file"
 msgstr "新建文件"
 
-#: ../src/vikwindow.c:1916
-msgid "_Open"
-msgstr "_O 打开"
+#: ../src/vikwindow.c:2152
+msgid "_Open..."
+msgstr "_O 打开..."
 
-#: ../src/vikwindow.c:1916
+#: ../src/vikwindow.c:2152
 msgid "Open a file"
 msgstr "打开一个文件"
 
-#: ../src/vikwindow.c:1917
-msgid "A_ppend File"
-msgstr "_p 增加文件"
+#: ../src/vikwindow.c:2153
+msgid "Open _Recent File"
+msgstr ""
 
-#: ../src/vikwindow.c:1917
+#: ../src/vikwindow.c:2154
+msgid "Append _File..."
+msgstr "_p 增加文件..."
+
+#: ../src/vikwindow.c:2154
 msgid "Append data from a different file"
 msgstr "从不同的文件中追加数据"
 
-#: ../src/vikwindow.c:1918
+#: ../src/vikwindow.c:2155
 msgid "A_cquire"
 msgstr "_c 获取"
 
-#: ../src/vikwindow.c:1919
-msgid "From _GPS"
-msgstr "_G 从GPS"
+#: ../src/vikwindow.c:2156
+msgid "From _GPS..."
+msgstr "_G 从GPS..."
 
-#: ../src/vikwindow.c:1919
+#: ../src/vikwindow.c:2156
 msgid "Transfer data from a GPS device"
 msgstr "从一个GPS接收器获得数据"
 
-#: ../src/vikwindow.c:1920
-msgid "Google _Directions"
-msgstr "_D 谷歌方位"
+#: ../src/vikwindow.c:2157
+msgid "Google _Directions..."
+msgstr "_D 谷歌方位..."
 
-#: ../src/vikwindow.c:1920
+#: ../src/vikwindow.c:2157
 msgid "Get driving directions from Google"
 msgstr "从谷歌获得驾驶方位"
 
-#: ../src/vikwindow.c:1922
-msgid "Geo_caches"
-msgstr "Geo_caches"
+#: ../src/vikwindow.c:2159
+msgid "Geo_caches..."
+msgstr ""
 
-#: ../src/vikwindow.c:1922
+#: ../src/vikwindow.c:2159
 msgid "Get Geocaches from geocaching.com"
 msgstr "从geocaching.com获得地理缓存数据"
 
-#: ../src/vikwindow.c:1924
+#: ../src/vikwindow.c:2161
 msgid "_Save"
 msgstr "_S 保存"
 
-#: ../src/vikwindow.c:1924
+#: ../src/vikwindow.c:2161
 msgid "Save the file"
 msgstr "保存这个文件"
 
-#: ../src/vikwindow.c:1925
-msgid "Save _As"
-msgstr "_A 另存为"
+#: ../src/vikwindow.c:2162
+msgid "Save _As..."
+msgstr "_A 另存为..."
 
-#: ../src/vikwindow.c:1925
+#: ../src/vikwindow.c:2162
 msgid "Save the file under different name"
 msgstr "保存为其它名字的文件"
 
-#: ../src/vikwindow.c:1926
-msgid "_Generate Image File"
-msgstr "_G 生成图形文件"
+#: ../src/vikwindow.c:2163
+msgid "_Generate Image File..."
+msgstr "_G 生成图形文件..."
 
-#: ../src/vikwindow.c:1926
+#: ../src/vikwindow.c:2163
 msgid "Save a snapshot of the workspace into a file"
 msgstr ""
 
-#: ../src/vikwindow.c:1927
-msgid "Generate _Directory of Images"
-msgstr "_D 创建图片的目录"
+#: ../src/vikwindow.c:2164
+msgid "Generate _Directory of Images..."
+msgstr "_D 创建图片的目录..."
 
-#: ../src/vikwindow.c:1927
+#: ../src/vikwindow.c:2164
 msgid "FIXME:IMGDIR"
 msgstr ""
 
-#: ../src/vikwindow.c:1930
+#: ../src/vikwindow.c:2167
 msgid "_Print..."
 msgstr "_P 打印"
 
-#: ../src/vikwindow.c:1930
+#: ../src/vikwindow.c:2167
 msgid "Print maps"
 msgstr "打印地图"
 
-#: ../src/vikwindow.c:1933
+#: ../src/vikwindow.c:2170
 msgid "E_xit"
 msgstr "_x 退出"
 
-#: ../src/vikwindow.c:1933
+#: ../src/vikwindow.c:2170
 msgid "Exit the program"
 msgstr "退出程序"
 
-#: ../src/vikwindow.c:1934
+#: ../src/vikwindow.c:2171
 msgid "Save and Exit"
 msgstr "保存并退出"
 
-#: ../src/vikwindow.c:1934
+#: ../src/vikwindow.c:2171
 msgid "Save and Exit the program"
 msgstr "保存并退出程序"
 
-#: ../src/vikwindow.c:1936
-msgid "Go To Google Maps location"
-msgstr "前往谷歌地图地点"
+#: ../src/vikwindow.c:2173
+msgid "Go to the _Default Location"
+msgstr ""
+
+#: ../src/vikwindow.c:2173
+msgid "Go to the default location"
+msgstr ""
 
-#: ../src/vikwindow.c:1936
-msgid "Go to address/place using Google Maps search"
+#: ../src/vikwindow.c:2174
+msgid "Go to Location..."
 msgstr ""
 
-#: ../src/vikwindow.c:1937
-msgid "_Go to Lat\\/Lon..."
+#: ../src/vikwindow.c:2174
+msgid "Go to address/place using text search"
+msgstr ""
+
+#: ../src/vikwindow.c:2175
+msgid "_Go to Lat/Lon..."
 msgstr "_G 前往一个经纬度值..."
 
-#: ../src/vikwindow.c:1937
-msgid "Go to arbitrary lat\\/lon coordinate"
+#: ../src/vikwindow.c:2175
+msgid "Go to arbitrary lat/lon coordinate"
 msgstr "前往任意的经纬度座标"
 
-#: ../src/vikwindow.c:1938
+#: ../src/vikwindow.c:2176
 msgid "Go to UTM..."
 msgstr "前往UTM..."
 
-#: ../src/vikwindow.c:1938
+#: ../src/vikwindow.c:2176
 msgid "Go to arbitrary UTM coordinate"
 msgstr "前往任意的UTM座标"
 
-#: ../src/vikwindow.c:1939
+#: ../src/vikwindow.c:2177
 msgid "Set Background Color..."
 msgstr "设置背景色 ..."
 
-#: ../src/vikwindow.c:1940
+#: ../src/vikwindow.c:2178
 msgid "Zoom _In"
 msgstr "_I 缩小"
 
-#: ../src/vikwindow.c:1941
+#: ../src/vikwindow.c:2179
 msgid "Zoom _Out"
 msgstr "_O 放大"
 
-#: ../src/vikwindow.c:1942
-msgid "Zoom _To"
-msgstr "_T 缩放到"
+#: ../src/vikwindow.c:2180
+msgid "Zoom _To..."
+msgstr "_T 缩放到..."
 
-#: ../src/vikwindow.c:1943
+#: ../src/vikwindow.c:2181
 msgid "0.25"
 msgstr "0.25"
 
-#: ../src/vikwindow.c:1944
+#: ../src/vikwindow.c:2182
 msgid "0.5"
 msgstr "0.5"
 
-#: ../src/vikwindow.c:1945
+#: ../src/vikwindow.c:2183
 msgid "1"
 msgstr "1"
 
-#: ../src/vikwindow.c:1946
+#: ../src/vikwindow.c:2184
 msgid "2"
 msgstr "2"
 
-#: ../src/vikwindow.c:1947
+#: ../src/vikwindow.c:2185
 msgid "4"
 msgstr "4"
 
-#: ../src/vikwindow.c:1948
+#: ../src/vikwindow.c:2186
 msgid "8"
 msgstr "8"
 
-#: ../src/vikwindow.c:1949
+#: ../src/vikwindow.c:2187
 msgid "16"
 msgstr "16"
 
-#: ../src/vikwindow.c:1950
+#: ../src/vikwindow.c:2188
 msgid "32"
 msgstr "32"
 
-#: ../src/vikwindow.c:1951
+#: ../src/vikwindow.c:2189
 msgid "64"
 msgstr "64"
 
-#: ../src/vikwindow.c:1952
+#: ../src/vikwindow.c:2190
 msgid "128"
 msgstr "128"
 
-#: ../src/vikwindow.c:1953
+#: ../src/vikwindow.c:2191
+msgid "256"
+msgstr ""
+
+#: ../src/vikwindow.c:2192
+msgid "512"
+msgstr ""
+
+#: ../src/vikwindow.c:2193
+msgid "1024"
+msgstr ""
+
+#: ../src/vikwindow.c:2194
+msgid "2048"
+msgstr ""
+
+#: ../src/vikwindow.c:2195
+msgid "4096"
+msgstr ""
+
+#: ../src/vikwindow.c:2196
+msgid "8192"
+msgstr ""
+
+#: ../src/vikwindow.c:2197
+msgid "16384"
+msgstr ""
+
+#: ../src/vikwindow.c:2198
+msgid "32768"
+msgstr ""
+
+#: ../src/vikwindow.c:2199
 msgid "Pan North"
 msgstr "向北"
 
-#: ../src/vikwindow.c:1954
+#: ../src/vikwindow.c:2200
 msgid "Pan East"
 msgstr "向东"
 
-#: ../src/vikwindow.c:1955
+#: ../src/vikwindow.c:2201
 msgid "Pan South"
 msgstr "向南"
 
-#: ../src/vikwindow.c:1956
+#: ../src/vikwindow.c:2202
 msgid "Pan West"
 msgstr "向西"
 
-#: ../src/vikwindow.c:1957
+#: ../src/vikwindow.c:2203
 msgid "Background _Jobs"
 msgstr "_J 后台任务"
 
-#: ../src/vikwindow.c:1959
+#: ../src/vikwindow.c:2205
 msgid "Cu_t"
 msgstr "_t 剪切"
 
-#: ../src/vikwindow.c:1960
+#: ../src/vikwindow.c:2206
 msgid "_Copy"
 msgstr "_C 拷贝"
 
-#: ../src/vikwindow.c:1961
+#: ../src/vikwindow.c:2207
 msgid "_Paste"
 msgstr "_P 粘贴"
 
-#: ../src/vikwindow.c:1962
+#: ../src/vikwindow.c:2208
 msgid "_Delete"
 msgstr "_D 删除"
 
-#: ../src/vikwindow.c:1963
+#: ../src/vikwindow.c:2209
 msgid "Delete All"
 msgstr "全部删除"
 
-#: ../src/vikwindow.c:1964
-msgid "_Preferences..."
-msgstr "_P 首选项..."
+#: ../src/vikwindow.c:2210
+msgid "_Flush Map Cache"
+msgstr ""
+
+#: ../src/vikwindow.c:2211
+msgid "_Set the Default Location"
+msgstr ""
+
+#: ../src/vikwindow.c:2211
+msgid "Set the Default Location to the current position"
+msgstr ""
+
+#: ../src/vikwindow.c:2212
+msgid "_Preferences"
+msgstr "_P 首选项"
 
-#: ../src/vikwindow.c:1965
+#: ../src/vikwindow.c:2213
 msgid "_Properties"
-msgstr "_P 属性"
+msgstr "属性(_P)"
 
-#: ../src/vikwindow.c:1967
+#: ../src/vikwindow.c:2216
 msgid "_About"
-msgstr "_A 关于"
+msgstr "关于(_A)"
 
-#: ../src/vikwindow.c:1972
+#: ../src/vikwindow.c:2221
 msgid "_UTM Mode"
 msgstr "_UTM 模式"
 
-#: ../src/vikwindow.c:1973
+#: ../src/vikwindow.c:2222
 msgid "_Expedia Mode"
 msgstr "_Expedia 模式"
 
-#: ../src/vikwindow.c:1974
-msgid "_Old Google Mode"
-msgstr "_O 老的谷歌模式"
-
-#: ../src/vikwindow.c:1975
-msgid "Old _KH Mode"
-msgstr "_K 老的KH模式"
-
-#: ../src/vikwindow.c:1976
-msgid "_Google Mode"
-msgstr "_G 谷歌模式"
+#: ../src/vikwindow.c:2223
+msgid "_Mercator Mode"
+msgstr ""
 
-#: ../src/vikwindow.c:1980
+#: ../src/vikwindow.c:2227
 msgid "Pan Tool"
 msgstr ""
 
-#: ../src/vikwindow.c:1981
+#: ../src/vikwindow.c:2228
 msgid "Zoom Tool"
 msgstr "缩放工具"
 
-#: ../src/vikwindow.c:1982
+#: ../src/vikwindow.c:2229
 msgid "_Ruler"
 msgstr "_R 测距"
 
-#: ../src/vikwindow.c:1982
+#: ../src/vikwindow.c:2229
 msgid "Ruler Tool"
 msgstr "测距工具"
 
-#: ../src/vikwindow.c:1986
+#: ../src/vikwindow.c:2233
+msgid "_Show Scale"
+msgstr ""
+
+#: ../src/vikwindow.c:2233
 msgid "Show Scale"
 msgstr "显示比例尺"
 
-#: ../src/vikwindow.c:1987
+#: ../src/vikwindow.c:2234
+msgid "Show _Center Mark"
+msgstr ""
+
+#: ../src/vikwindow.c:2234
 msgid "Show Center Mark"
 msgstr "显示中心标记"
 
-#: ../src/vikwindow.c:1988
-msgid "Full Screen"
+#: ../src/vikwindow.c:2235
+msgid "_Full Screen"
 msgstr "全屏"
 
-#: ../src/vikwindow.c:2050
+#: ../src/vikwindow.c:2235
+msgid "Activate full screen mode"
+msgstr ""
+
+#: ../src/vikwindow.c:2236
+msgid "Show Side Panel"
+msgstr ""
+
+#: ../src/vikwindow.c:2298
 #, c-format
 msgid "New %s Layer"
 msgstr "新图层 \"%s\""
 
 #: ../src/viking.desktop.in.h:1
-msgid "Map Based GPS Data Manager (live data capable)."
+msgid "GPS Data Manager"
 msgstr ""
 
 #: ../src/viking.desktop.in.h:2
+msgid "Map Based GPS Data Manager (live data capable)."
+msgstr ""
+
+#: ../src/viking.desktop.in.h:3
 msgid "Viking"
 msgstr ""
+
+#~ msgid "Zoom factor (in meters per pixel:"
+#~ msgstr "缩放参数 (米／像素):"
+
+#~ msgid "The password used to login"
+#~ msgstr "登录用的密码"
+
+#~ msgid "Enter the password you use to login into www.openstreetmap.org."
+#~ msgstr "请输入您登录www.openstreetmap.org的密码."
+
+#~ msgid "The name of the file on OSM"
+#~ msgstr "OSM上的文件名"
+
+#~ msgid "Maps Directory (Optional):"
+#~ msgstr "地图目录(可选):"
+
+#~ msgid "Download Onscreen Maps"
+#~ msgstr "下载屏幕地图"
+
+#~ msgid "_Open"
+#~ msgstr "_O 打开"
+
+#~ msgid "A_ppend File"
+#~ msgstr "_p 增加文件"
+
+#~ msgid "From _GPS"
+#~ msgstr "_G 从GPS"
+
+#~ msgid "Google _Directions"
+#~ msgstr "_D 谷歌方位"
+
+#~ msgid "Geo_caches"
+#~ msgstr "Geo_caches"
+
+#~ msgid "Save _As"
+#~ msgstr "_A 另存为"
+
+#~ msgid "_Generate Image File"
+#~ msgstr "_G 生成图形文件"
+
+#~ msgid "Generate _Directory of Images"
+#~ msgstr "_D 创建图片的目录"
+
+#~ msgid "_Go to Lat\\/Lon..."
+#~ msgstr "_G 前往一个经纬度值..."
+
+#~ msgid "Go to arbitrary lat\\/lon coordinate"
+#~ msgstr "前往任意的经纬度座标"
+
+#~ msgid "Zoom _To"
+#~ msgstr "_T 缩放到"
+
+#~ msgid "_Preferences..."
+#~ msgstr "_P 首选项..."
+
+#~ msgid "Full Screen"
+#~ msgstr "全屏"