Various improvements and tidy ups.

[andy/viking.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 237320f3f3f6e8d325b67cf33e96dc3b4940a1eb..46423ec8039de6724686100704172742afc3ba4f 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: Viking\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-02-04 22:47+0100\n"
-"PO-Revision-Date: 2009-02-04 22:19+0000\n"
-"Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\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=1; plural=0;\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=1; plural=0;\n"

-"X-Launchpad-Export-Date: 2009-02-08 13:36+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 20:48+0000\n"

 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: Simplified Chinese\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."
 
 #: ../src/acquire.c:141
 msgid "Error: acquisition failed."

-msgstr ""
+msgstr "错误: 接收失败。"

 
 

-#: ../src/acquire.c:149 ../src/vikgpslayer.c:957
+#: ../src/acquire.c:149 ../src/vikgpslayer.c:1013

 msgid "Done."
 msgid "Done."

-msgstr "完成."
+msgstr "完成。"
+
+#: ../src/acquire.c:156
+msgid "No data."
+msgstr ""

 
 

-#: ../src/acquire.c:326 ../src/vikgpslayer.c:996
+#: ../src/acquire.c:338 ../src/vikgpslayer.c:1052

 msgid "Status: detecting gpsbabel"
 msgid "Status: detecting gpsbabel"

-msgstr "状态 : 检测  gpsbabel"
+msgstr "状态: 检测  gpsbabel"

 
 

-#: ../src/background.c:54
+#: ../src/background.c:57

 #, c-format
 msgid "%d items"
 #, c-format
 msgid "%d items"

-msgstr "%d 条目"
+msgstr "%d 项目"

 
 

-#: ../src/background.c:212
+#: ../src/background.c:224

 msgid "Job"
 msgstr "任务"
 
 msgid "Job"
 msgstr "任务"
 

-#: ../src/background.c:216
+#: ../src/background.c:228

 msgid "Progress"
 msgid "Progress"

-msgstr "进程"
+msgstr "进度"

 
 

-#: ../src/background.c:227
+#: ../src/background.c:239

 msgid "Viking Background Jobs"
 msgstr "Viking 后台任务"
 
 msgid "Viking Background Jobs"
 msgstr "Viking 后台任务"
 


@@ -58,7 +62,7 @@ msgstr "剪贴版数据尺寸错误"
 #: ../src/clipboard.c:113
 #, c-format
 msgid ""
 #: ../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 ""
 
 "of this type to paste the clipboard data."
 msgstr ""
 


@@ -68,139 +72,139 @@ msgid ""
 "into."
 msgstr ""
 
 "into."
 msgstr ""
 

-#: ../src/curl_download.c:85
+#: ../src/curl_download.c:98

 #, c-format
 msgid "%s() Curl perform failed: %s"
 msgstr ""
 
 #, c-format
 msgid "%s() Curl perform failed: %s"
 msgstr ""
 

-#: ../src/dialog.c:54 ../src/dialog.c:102
+#: ../src/dialog.c:49 ../src/dialog.c:97

 msgid "Go to Lat/Lon"
 msgstr ""
 
 msgid "Go to Lat/Lon"
 msgstr ""
 

-#: ../src/dialog.c:66 ../src/dialog.c:230
+#: ../src/dialog.c:61 ../src/dialog.c:236

 msgid "Latitude:"
 msgid "Latitude:"

-msgstr "纬度 :"
+msgstr "纬度："

 
 

-#: ../src/dialog.c:72 ../src/dialog.c:235
+#: ../src/dialog.c:67 ../src/dialog.c:241

 msgid "Longitude:"
 msgid "Longitude:"

-msgstr "经度 :"
+msgstr "经度："

 
 

-#: ../src/dialog.c:115
+#: ../src/dialog.c:110

 msgid "Northing:"
 msgstr "Northing :"
 
 msgid "Northing:"
 msgstr "Northing :"
 

-#: ../src/dialog.c:121
+#: ../src/dialog.c:116

 msgid "Easting:"
 msgstr "Easting :"
 
 msgid "Easting:"
 msgstr "Easting :"
 

-#: ../src/dialog.c:128
+#: ../src/dialog.c:123

 msgid "Zone:"
 msgstr "Zone :"
 
 msgid "Zone:"
 msgstr "Zone :"
 

-#: ../src/dialog.c:131
+#: ../src/dialog.c:126

 msgid "Letter:"
 msgid "Letter:"

-msgstr "Lettre :"
+msgstr "信函:"

 
 

-#: ../src/dialog.c:192
+#: ../src/dialog.c:187

 msgid "Waypoint Properties"
 msgstr ""
 
 msgid "Waypoint Properties"
 msgstr ""
 

-#: ../src/dialog.c:218
+#: ../src/dialog.c:224

 msgid "Name:"
 msgstr "名称:"
 
 msgid "Name:"
 msgstr "名称:"
 

-#: ../src/dialog.c:240
+#: ../src/dialog.c:246

 msgid "Altitude:"
 msgstr "海拔:"
 
 msgid "Altitude:"
 msgstr "海拔:"
 

-#: ../src/dialog.c:245
+#: ../src/dialog.c:251

 msgid "Comment:"
 msgstr "注释:"
 
 msgid "Comment:"
 msgstr "注释:"
 

-#: ../src/dialog.c:259
+#: ../src/dialog.c:258

 msgid "Image:"
 msgstr "图片:"
 
 msgid "Image:"
 msgstr "图片:"
 

-#: ../src/dialog.c:264
+#: ../src/dialog.c:263

 msgid "Symbol:"
 msgstr "符号:"
 
 msgid "Symbol:"
 msgstr "符号:"
 

-#: ../src/dialog.c:273
+#: ../src/dialog.c:272

 msgid "(none)"
 msgstr "(无)"
 
 #. TODO: other checks (isalpha or whatever )
 msgid "(none)"
 msgstr "(无)"
 
 #. TODO: other checks (isalpha or whatever )

-#: ../src/dialog.c:328
+#: ../src/dialog.c:327

 msgid "Please enter a name for the waypoint."
 msgstr "请为该航点输入一个名字."
 
 msgid "Please enter a name for the waypoint."
 msgstr "请为该航点输入一个名字."
 

-#: ../src/dialog.c:332
+#: ../src/dialog.c:331

 #, c-format
 msgid "The waypoint \"%s\" exists, do you want to overwrite it?"
 msgstr ""
 
 #, c-format
 msgid "The waypoint \"%s\" exists, do you want to overwrite it?"
 msgstr ""
 

-#: ../src/dialog.c:462 ../src/geonamessearch.c:301
+#: ../src/dialog.c:484 ../src/geonamessearch.c:228

 msgid "Nothing was selected"
 msgstr ""
 
 msgid "Nothing was selected"
 msgstr ""
 

-#: ../src/dialog.c:470
+#: ../src/dialog.c:492

 msgid "Add Track"
 msgstr "添加轨迹:"
 
 msgid "Add Track"
 msgstr "添加轨迹:"
 

-#: ../src/dialog.c:478
+#: ../src/dialog.c:500

 msgid "Track Name:"
 msgstr "轨迹名称:"
 
 msgid "Track Name:"
 msgstr "轨迹名称:"
 

-#: ../src/dialog.c:493
+#: ../src/dialog.c:515

 msgid "Please enter a name for the track."
 msgstr "请为该轨迹输入一个名字."
 
 msgid "Please enter a name for the track."
 msgstr "请为该轨迹输入一个名字."
 

-#: ../src/dialog.c:497
+#: ../src/dialog.c:519

 #, c-format
 msgid "The track \"%s\" exists, do you want to overwrite it?"
 msgstr ""
 
 #, c-format
 msgid "The track \"%s\" exists, do you want to overwrite it?"
 msgstr ""
 

-#: ../src/dialog.c:559
+#: ../src/dialog.c:581

 msgid "Zoom Factors..."
 msgstr "缩放参数..."
 
 msgid "Zoom Factors..."
 msgstr "缩放参数..."
 

-#: ../src/dialog.c:573
-msgid "Zoom factor (in meters per pixel:"
-msgstr "缩放参数 (米／像素):"
+#: ../src/dialog.c:595
+msgid "Zoom factor (in meters per pixel):"
+msgstr ""

 
 

-#: ../src/dialog.c:574
+#: ../src/dialog.c:596

 msgid "X (easting): "
 msgstr "X (东方): "
 
 msgid "X (easting): "
 msgstr "X (东方): "
 

-#: ../src/dialog.c:575
+#: ../src/dialog.c:597

 msgid "Y (northing): "
 msgstr "Y (北方): "
 
 msgid "Y (northing): "
 msgstr "Y (北方): "
 

-#: ../src/dialog.c:580
+#: ../src/dialog.c:602

 msgid "X and Y zoom factors must be equal"
 msgstr "X和Y缩放参数必须相等"
 
 msgid "X and Y zoom factors must be equal"
 msgstr "X和Y缩放参数必须相等"
 

-#: ../src/dialog.c:633
+#: ../src/dialog.c:655

 msgid "1 min"
 msgstr "1 分钟"
 
 msgid "1 min"
 msgstr "1 分钟"
 

-#: ../src/dialog.c:634
+#: ../src/dialog.c:656

 msgid "1 hour"
 msgstr "1 小时"
 
 msgid "1 hour"
 msgstr "1 小时"
 

-#: ../src/dialog.c:635
+#: ../src/dialog.c:657

 msgid "1 day"
 msgstr "1 天"
 
 msgid "1 day"
 msgstr "1 天"
 

-#: ../src/dialog.c:636
+#: ../src/dialog.c:658

 msgid "Custom (in minutes):"
 msgstr ""
 
 msgid "Custom (in minutes):"
 msgstr ""
 

-#: ../src/dialog.c:691
+#: ../src/dialog.c:713

 msgid "GPS Data and Topo Analyzer, Explorer, and Manager."
 msgstr "GPS 数据和拓扑分析、浏览、管理工具."
 
 msgid "GPS Data and Topo Analyzer, Explorer, and Manager."
 msgstr "GPS 数据和拓扑分析、浏览、管理工具."
 

-#: ../src/dialog.c:692
+#: ../src/dialog.c:714

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


@@ -217,15 +221,15 @@ msgid ""
 "Place, Suite 330, Boston, MA 02111-1307, USA"
 msgstr ""
 
 "Place, Suite 330, Boston, MA 02111-1307, USA"
 msgstr ""
 

-#: ../src/dialog.c:726
+#: ../src/dialog.c:748

 msgid "Download along track"
 msgstr "沿着轨迹下载"
 
 msgid "Download along track"
 msgstr "沿着轨迹下载"
 

-#: ../src/dialog.c:728
+#: ../src/dialog.c:750

 msgid "Map type:"
 msgstr "地图类型:"
 
 msgid "Map type:"
 msgstr "地图类型:"
 

-#: ../src/dialog.c:733
+#: ../src/dialog.c:755

 msgid "Zoom level:"
 msgstr "缩放程度:"
 
 msgid "Zoom level:"
 msgstr "缩放程度:"
 


@@ -251,38 +255,52 @@ msgid ""
 "report and delete image file!): %s"
 msgstr ""
 
 "report and delete image file!): %s"
 msgstr ""
 

-#: ../src/geonamessearch.c:117 ../src/geonamessearch.c:133
-#: ../src/geonamessearch.c:151 ../src/googlesearch.c:68
-#: ../src/googlesearch.c:86
+#: ../src/geonamessearch.c:98

 msgid "Search"
 msgstr "搜索"
 
 msgid "Search"
 msgstr "搜索"
 

-#: ../src/geonamessearch.c:119
+#: ../src/geonamessearch.c:100

 msgid "No entries found!"
 msgstr ""
 
 msgid "No entries found!"
 msgstr ""
 

-#: ../src/geonamessearch.c:135 ../src/googlesearch.c:70
-msgid "I don't know that place. Do you want another search?"
-msgstr ""
-
-#: ../src/geonamessearch.c:153 ../src/googlesearch.c:88
-msgid "Enter address or place name:"
-msgstr "输入地址或者地点名称:"
-
-#: ../src/geonamessearch.c:327 ../src/googlesearch.c:127
+#: ../src/geonamessearch.c:254 ../src/googlesearch.c:121

 msgid "couldn't map temp file"
 msgstr ""
 
 msgid "couldn't map temp file"
 msgstr ""
 

-#: ../src/geonamessearch.c:509 ../src/googlesearch.c:200
+#: ../src/geonamessearch.c:395 ../src/vikgototool.c:250

 msgid "couldn't open temp file"
 msgstr "不能打开临时文件"
 
 msgid "couldn't open temp file"
 msgstr "不能打开临时文件"
 

-#: ../src/globals.c:41
+#: ../src/globals.c:42

 msgid "Degree format:"
 msgstr ""
 
 msgid "Degree format:"
 msgstr ""
 

+#: ../src/globals.c:46
+msgid "Distance units:"
+msgstr ""
+
+#: ../src/globals.c:50
+msgid "Speed units:"
+msgstr ""
+
+#: ../src/globals.c:54
+msgid "Height units:"
+msgstr ""
+
+#: ../src/globals.c:58
+msgid "Use large waypoint icons:"
+msgstr ""
+
+#: ../src/globals.c:62
+msgid "Default latitude:"
+msgstr ""
+
+#: ../src/globals.c:65
+msgid "Default longitude:"
+msgstr ""
+

 #. Webtools
 #. Webtools

-#: ../src/google.c:34
+#: ../src/google.c:36

 msgid "Google"
 msgstr ""
 
 msgid "Google"
 msgstr ""
 


@@ -294,24 +312,24 @@ msgstr "下载 Geocaches"
 msgid "Geocaching.com Caches"
 msgstr "Geocaching.com 缓存"
 
 msgid "Geocaching.com Caches"
 msgstr "Geocaching.com 缓存"
 

-#: ../src/datasource_gc.c:78
+#: ../src/datasource_gc.c:79

 msgid "geocaching.com username:"
 msgstr "geocaching.com 用户名:"
 
 msgid "geocaching.com username:"
 msgstr "geocaching.com 用户名:"
 

-#: ../src/datasource_gc.c:79
+#: ../src/datasource_gc.c:80

 msgid "geocaching.com password:"
 msgstr "geocaching.com 密码:"
 
 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 ""
 
 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 ""
 
 msgid "Number geocaches:"
 msgstr ""
 

-#: ../src/datasource_gc.c:171
+#: ../src/datasource_gc.c:172

 msgid "Centered around:"
 msgstr ""
 
 msgid "Centered around:"
 msgstr ""
 


@@ -319,65 +337,71 @@ msgstr ""
 msgid "Google Directions"
 msgstr "Google 方位"
 
 msgid "Google Directions"
 msgstr "Google 方位"
 

-#: ../src/datasource_google.c:74
+#: ../src/datasource_google.c:75

 msgid "From:"
 msgstr "从 :"
 
 msgid "From:"
 msgstr "从 :"
 

-#: ../src/datasource_google.c:76
+#: ../src/datasource_google.c:77

 msgid "To:"
 msgstr "至 :"
 
 msgid "To:"
 msgstr "至 :"
 

-#: ../src/datasource_gps.c:48
+#: ../src/datasource_gps.c:53

 msgid "Acquire from GPS"
 msgstr "从GPS获取"
 
 msgid "Acquire from GPS"
 msgstr "从GPS获取"
 

-#: ../src/datasource_gps.c:49
+#: ../src/datasource_gps.c:54

 msgid "Acquired from GPS"
 msgstr "已从GPS获取的"
 
 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"
 
 #, c-format
 msgid "using cmdline '%s' and file '%s'\n"
 msgstr "使用命令行 '%s' 和文件 '%s'\n"
 

-#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:711
+#: ../src/datasource_gps.c:204 ../src/vikgpslayer.c:755

 #, c-format
 msgid "Downloading %d waypoint..."
 msgid_plural "Downloading %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Downloading %d waypoint..."
 msgid_plural "Downloading %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:713
+#: ../src/datasource_gps.c:206 ../src/vikgpslayer.c:757

 #, c-format
 msgid "Downloading %d trackpoint..."
 msgid_plural "Downloading %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Downloading %d trackpoint..."
 msgid_plural "Downloading %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/datasource_gps.c:170
+#: ../src/datasource_gps.c:224

 #, c-format
 msgid "Downloaded %d out of %d %s..."
 msgstr ""
 
 #, 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 ""
 
 #, c-format
 msgid "Downloaded %d %s."
 msgstr ""
 

-#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:783
+#: ../src/datasource_gps.c:239 ../src/vikgpslayer.c:827

 #, c-format
 msgid "GPS Device: %s"
 msgstr "GPS设备: %s"
 
 #, c-format
 msgid "GPS Device: %s"
 msgstr "GPS设备: %s"
 

-#: ../src/datasource_gps.c:262 ../src/vikgpslayer.c:133
+#: ../src/datasource_gps.c:328 ../src/vikgpslayer.c:144

 msgid "GPS Protocol:"
 msgstr "GPS 协议:"
 
 msgid "GPS Protocol:"
 msgstr "GPS 协议:"
 

-#: ../src/datasource_gps.c:269 ../src/vikgpslayer.c:134
+#: ../src/datasource_gps.c:335 ../src/vikgpslayer.c:145

 msgid "Serial Port:"
 msgstr "串口:"
 
 msgid "Serial Port:"
 msgstr "串口:"
 

-#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:1001
+#: ../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设备: 无"
 
 msgid "GPS device: N/A"
 msgstr "GPS设备: 无"
 


@@ -398,7 +422,11 @@ msgstr ""
 msgid "Couldn't map file %s: %s"
 msgstr ""
 
 msgid "Couldn't map file %s: %s"
 msgstr ""
 

-#: ../src/download.c:121
+#: ../src/download.c:111
+msgid "Tile age (s):"
+msgstr ""
+
+#: ../src/download.c:206

 #, c-format
 msgid "Download error: %s"
 msgstr "下载错误: %s"
 #, c-format
 msgid "Download error: %s"
 msgstr "下载错误: %s"


@@ -408,6 +436,116 @@ msgstr "下载错误: %s"
 msgid "Draw mode '%s' no more supported"
 msgstr ""
 
 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:232
+#, c-format
+msgid "curl_easy_getinfo failed: %d"
+msgstr ""
+
+#: ../src/osm-traces.c:236
+#, c-format
+msgid "curl request failed: %s"
+msgstr ""
+
+#: ../src/osm-traces.c:264
+#, c-format
+msgid "failed to open temporary file: %s"
+msgstr ""
+
+#: ../src/osm-traces.c:298
+#, c-format
+msgid "failed to unlink temporary file: %s"
+msgstr ""
+
+#: ../src/osm-traces.c:310
+msgid "OSM upload"
+msgstr ""
+
+#: ../src/osm-traces.c:331
+msgid "Email:"
+msgstr "电子邮箱 :"
+
+#: ../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:345
+msgid "Password:"
+msgstr "密码:"
+
+#: ../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:359
+msgid "File's name:"
+msgstr "文件名称:"
+
+#: ../src/osm-traces.c:369
+msgid ""
+"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:373
+msgid "Description:"
+msgstr "Description :"
+
+#: ../src/osm-traces.c:378
+msgid "The description of the trace"
+msgstr ""
+
+#: ../src/osm-traces.c:380
+msgid "Tags:"
+msgstr ""
+
+#: ../src/osm-traces.c:385
+msgid "The tags associated to the trace"
+msgstr ""
+
+#: ../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 "无"
 #: ../src/print.c:53
 msgid "None"
 msgstr "无"


@@ -450,15 +588,15 @@ msgstr ""
 msgid "Image S_ize:"
 msgstr ""
 
 msgid "Image S_ize:"
 msgstr ""
 

-#: ../src/util.c:75
+#: ../src/util.c:76

 msgid "Could not launch web browser."
 msgstr ""
 
 msgid "Could not launch web browser."
 msgstr ""
 

-#: ../src/util.c:86
+#: ../src/util.c:87

 msgid "Could not create new email."
 msgstr ""
 
 msgid "Could not create new email."
 msgstr ""
 

-#: ../src/vikcoordlayer.c:46 ../src/vikdemlayer.c:110
+#: ../src/vikcoordlayer.c:46 ../src/vikdemlayer.c:121

 msgid "Color:"
 msgstr ""
 
 msgid "Color:"
 msgstr ""
 


@@ -466,7 +604,7 @@ msgstr ""
 msgid "Minutes Width:"
 msgstr ""
 
 msgid "Minutes Width:"
 msgstr ""
 

-#: ../src/vikcoordlayer.c:48 ../src/vikdemlayer.c:113
+#: ../src/vikcoordlayer.c:48 ../src/vikdemlayer.c:125

 msgid "Line Thickness:"
 msgstr ""
 
 msgid "Line Thickness:"
 msgstr ""
 


@@ -474,32 +612,32 @@ msgstr ""
 msgid "Max number of points:"
 msgstr ""
 
 msgid "Max number of points:"
 msgstr ""
 

-#: ../src/datasource_bfilter.c:54
+#: ../src/datasource_bfilter.c:60

 msgid "Simplify All Tracks"
 msgstr ""
 
 msgid "Simplify All Tracks"
 msgstr ""
 

-#: ../src/datasource_bfilter.c:55
+#: ../src/datasource_bfilter.c:61

 msgid "Simplified Tracks"
 msgstr ""
 
 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 ""
 
 msgid "Remove Duplicate Waypoints"
 msgstr ""
 

-#: ../src/datasource_bfilter.c:117
+#: ../src/datasource_bfilter.c:125

 msgid "Waypoints Inside This"
 msgstr ""
 
 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 ""
 
 msgstr ""
 

-#: ../src/datasource_bfilter.c:150
+#: ../src/datasource_bfilter.c:159

 msgid "Waypoints Outside This"
 msgstr ""
 
 msgid "Waypoints Outside This"
 msgstr ""
 

-#: ../src/main.c:116
-msgid "Use smaller symbols for waypoints"
+#: ../src/datasource_bfilter.c:160
+msgid "Polygonzied Layer"

 msgstr ""
 
 #: ../src/main.c:117
 msgstr ""
 
 #: ../src/main.c:117


@@ -514,167 +652,75 @@ msgstr ""
 msgid "Show version"
 msgstr "显示版本"
 
 msgid "Show version"
 msgstr "显示版本"
 

-#: ../src/osm.c:85
+#: ../src/osm.c:77

 msgid "OSM (view)"
 msgstr ""
 
 msgid "OSM (view)"
 msgstr ""
 

-#: ../src/osm.c:89
+#: ../src/osm.c:81

 msgid "OSM (edit)"
 msgstr ""
 
 msgid "OSM (edit)"
 msgstr ""
 

-#: ../src/osm.c:93
+#: ../src/osm.c:85

 msgid "OSM (render)"
 msgstr ""
 
 msgid "OSM (render)"
 msgstr ""
 

-#: ../src/osm-traces.c:77
-msgid "OSM username:"
-msgstr ""
-
-#: ../src/osm-traces.c:78
-msgid "OSM password:"
-msgstr ""
-
-#: ../src/osm-traces.c:218
-#, c-format
-msgid "failed to upload data: HTTP response is %ld"
-msgstr ""
-
-#: ../src/osm-traces.c:221
-#, c-format
-msgid "curl_easy_getinfo failed: %d"
-msgstr ""
-
-#: ../src/osm-traces.c:225
-#, c-format
-msgid "curl request failed: %s"
-msgstr ""
-
-#: ../src/osm-traces.c:253
-#, c-format
-msgid "failed to open temporary file: %s"
-msgstr ""
-
-#: ../src/osm-traces.c:287
-#, c-format
-msgid "failed to unlink temporary file: %s"
-msgstr ""
-
-#: ../src/osm-traces.c:299
-msgid "OSM upload"
-msgstr ""
-
-#: ../src/osm-traces.c:322
-msgid "Email:"
-msgstr "电子邮箱 :"
-
-#: ../src/osm-traces.c:335
-msgid "The email used as login"
-msgstr ""
-
-#: ../src/osm-traces.c:336
-msgid "Enter the email you use to login into www.openstreetmap.org."
-msgstr ""
-
-#: ../src/osm-traces.c:338
-msgid "Password:"
-msgstr "密码:"
-
-#: ../src/osm-traces.c:351
-msgid "The password used to login"
-msgstr "登录用的密码"
-
-#: ../src/osm-traces.c:352
-msgid "Enter the password you use to login into www.openstreetmap.org."
-msgstr "请输入您登录www.openstreetmap.org的密码."
-
-#: ../src/osm-traces.c:354
-msgid "File's name:"
-msgstr "文件名称:"
-
-#: ../src/osm-traces.c:366
-msgid "The name of the file on OSM"
-msgstr "OSM上的文件名"
-
-#: ../src/osm-traces.c:367
-msgid ""
-"This is the name of the file created on the server. This is not the name of "
-"the local file."
-msgstr ""
-
-#: ../src/osm-traces.c:370
-msgid "Description:"
-msgstr "Description :"
-
-#: ../src/osm-traces.c:377
-msgid "The description of the trace"
-msgstr ""
-
-#: ../src/osm-traces.c:380
-msgid "Tags:"
+#: ../src/uibuilder.c:148
+msgid "Take care that this password will be stored clearly in a plain file."

 msgstr ""
 
 msgstr ""
 

-#: ../src/osm-traces.c:387
-msgid "The tags associated to the trace"
+#: ../src/vikdemlayer.c:101
+msgid "Absolute height"

 msgstr ""
 
 msgstr ""
 

-#: ../src/osm-traces.c:390
-msgid "Public"
-msgstr "Public"
-
-#: ../src/osm-traces.c:396
-msgid "Indicates if the trace is public or not"
+#: ../src/vikdemlayer.c:102
+msgid "Height gradient"

 msgstr ""
 
 msgstr ""
 

-#: ../src/osm-traces.c:417
-#, c-format
-msgid "Uploading %s to OSM"
-msgstr "上传 %s 到 OSM"
-
-#: ../src/uibuilder.c:134
-msgid "Take care that this password will be stored clearly in a plain file."
-msgstr ""
-
-#: ../src/vikdemlayer.c:108
+#: ../src/vikdemlayer.c:119

 msgid "DEM Files:"
 msgstr "DEM 文件:"
 
 msgid "DEM Files:"
 msgstr "DEM 文件:"
 

-#: ../src/vikdemlayer.c:109
+#: ../src/vikdemlayer.c:120

 msgid "Download Source:"
 msgstr "下载源:"
 
 msgid "Download Source:"
 msgstr "下载源:"
 

-#: ../src/vikdemlayer.c:111
+#: ../src/vikdemlayer.c:122
+msgid "Type:"
+msgstr ""
+
+#: ../src/vikdemlayer.c:123

 msgid "Min Elev:"
 msgstr "最低高度:"
 
 msgid "Min Elev:"
 msgstr "最低高度:"
 

-#: ../src/vikdemlayer.c:112
+#: ../src/vikdemlayer.c:124

 msgid "Max Elev:"
 msgstr "最高高度:"
 
 msgid "Max Elev:"
 msgstr "最高高度:"
 

-#: ../src/vikdemlayer.c:124
+#: ../src/vikdemlayer.c:136

 msgid "DEM Download/Import"
 msgstr "DEM下载/导入"
 
 msgid "DEM Download/Import"
 msgstr "DEM下载/导入"
 

-#: ../src/vikdemlayer.c:754
+#: ../src/vikdemlayer.c:804

 #, c-format
 msgid "No SRTM data available for %f, %f"
 msgstr "没有可以的SRTM数据给 %f, %f"
 
 #, c-format
 msgid "No SRTM data available for %f, %f"
 msgstr "没有可以的SRTM数据给 %f, %f"
 

-#: ../src/vikdemlayer.c:992
+#: ../src/vikdemlayer.c:1042

 msgid "No download source selected. Edit layer properties."
 msgstr "没有下载源被选. 编辑图层属性."
 
 msgid "No download source selected. Edit layer properties."
 msgstr "没有下载源被选. 编辑图层属性."
 

-#: ../src/vikdemlayer.c:1015
+#: ../src/vikdemlayer.c:1065

 #, c-format
 msgid "Downloading DEM %s"
 msgstr "正在下载 DEM %s"
 
 #, c-format
 msgid "Downloading DEM %s"
 msgstr "正在下载 DEM %s"
 

-#: ../src/vikfileentry.c:67
+#: ../src/vikfileentry.c:68

 msgid "Browse..."
 msgstr "浏览..."
 
 msgid "Browse..."
 msgstr "浏览..."
 

-#: ../src/vikfileentry.c:94
+#: ../src/vikfileentry.c:96

 msgid "Choose file"
 msgid "Choose file"

-msgstr "选择一个文件"
+msgstr "选择文件"

 
 #: ../src/vikfilelist.c:47
 msgid "Choose file(s)"
 
 #: ../src/vikfilelist.c:47
 msgid "Choose file(s)"


@@ -688,360 +734,446 @@ msgstr "添加 ..."
 msgid "Delete"
 msgstr "删除"
 
 msgid "Delete"
 msgstr "删除"
 

-#: ../src/vikgeoreflayer.c:66
+#: ../src/vikgeoreflayer.c:68

 msgid "Georef Move Map"
 msgstr ""
 
 msgid "Georef Move Map"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:70
+#: ../src/vikgeoreflayer.c:72

 msgid "Georef Zoom Tool"
 msgstr ""
 
 msgid "Georef Zoom Tool"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:268 ../src/vikmapslayer.c:544
+#: ../src/vikgeoreflayer.c:311 ../src/vikmapslayer.c:606

 #, c-format
 msgid "Couldn't open image file: %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't open image file: %s"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:293
+#: ../src/vikgeoreflayer.c:341

 msgid "Unexpected end of file reading World file."
 msgstr ""
 
 msgid "Unexpected end of file reading World file."
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:309 ../src/vikgeoreflayer.c:354
+#: ../src/vikgeoreflayer.c:357 ../src/vikgeoreflayer.c:402

 msgid "Choose World file"
 msgstr ""
 
 msgid "Choose World file"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:322
+#: ../src/vikgeoreflayer.c:370

 msgid "The World file you requested could not be opened for reading."
 msgstr ""
 
 msgid "The World file you requested could not be opened for reading."
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:367
+#: ../src/vikgeoreflayer.c:415

 msgid "The file you requested could not be opened for writing."
 msgstr ""
 
 msgid "The file you requested could not be opened for writing."
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:384
+#: ../src/vikgeoreflayer.c:432 ../src/viklayer.c:463

 msgid "Layer Properties"
 msgstr ""
 
 msgid "Layer Properties"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:400
+#: ../src/vikgeoreflayer.c:448

 msgid "World File Parameters:"
 msgstr ""
 
 msgid "World File Parameters:"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:401
+#: ../src/vikgeoreflayer.c:449

 msgid "Load From File..."
 msgstr ""
 
 msgid "Load From File..."
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:406
+#: ../src/vikgeoreflayer.c:454

 msgid "Corner pixel easting:"
 msgstr ""
 
 msgid "Corner pixel easting:"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:409
+#: ../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 ""
 
 msgid "Corner pixel northing:"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:412
+#: ../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 ""
 
 msgid "X (easting) scale (mpp): "
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:413
+#: ../src/vikgeoreflayer.c:463

 msgid "Y (northing) scale (mpp): "
 msgstr ""
 
 msgid "Y (northing) scale (mpp): "
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:418
+#: ../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 "地图图片："
 
 msgid "Map Image:"
 msgstr "地图图片："
 

-#: ../src/vikgeoreflayer.c:522
+#: ../src/vikgeoreflayer.c:574

 msgid "Zoom to Fit Map"
 msgstr ""
 
 msgid "Zoom to Fit Map"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:527
+#: ../src/vikgeoreflayer.c:579

 msgid "Goto Map Center"
 msgstr "前往地图中心"
 
 msgid "Goto Map Center"
 msgstr "前往地图中心"
 

-#: ../src/vikgeoreflayer.c:532
+#: ../src/vikgeoreflayer.c:584

 msgid "Export to World File"
 msgstr ""
 
 msgid "Export to World File"
 msgstr ""
 

-#: ../src/vikgpslayer.c:137
+#: ../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 "正在纪录轨迹"
 
 msgid "Recording tracks"
 msgstr "正在纪录轨迹"
 

-#: ../src/vikgpslayer.c:138
+#: ../src/vikgpslayer.c:149

 msgid "Jump to current position on start"
 msgstr "在开始时跳到当前位置"
 
 msgid "Jump to current position on start"
 msgstr "在开始时跳到当前位置"
 

-#: ../src/vikgpslayer.c:139
+#: ../src/vikgpslayer.c:150

 msgid "Moving Map Method:"
 msgstr ""
 
 msgid "Moving Map Method:"
 msgstr ""
 

-#: ../src/vikgpslayer.c:140
+#: ../src/vikgpslayer.c:151

 msgid "Gpsd Host:"
 msgstr "Gpsd 主机:"
 
 msgid "Gpsd Host:"
 msgstr "Gpsd 主机:"
 

-#: ../src/vikgpslayer.c:141
+#: ../src/vikgpslayer.c:152

 msgid "Gpsd Port:"
 msgstr "Gpsd 端口:"
 
 msgid "Gpsd Port:"
 msgstr "Gpsd 端口:"
 

-#: ../src/vikgpslayer.c:142
+#: ../src/vikgpslayer.c:153

 msgid "Gpsd Retry Interval (seconds):"
 msgstr ""
 
 msgid "Gpsd Retry Interval (seconds):"
 msgstr ""
 

-#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989
+#: ../src/vikgpslayer.c:217 ../src/vikgpslayer.c:1045

 msgid "GPS Download"
 msgstr "GPS 下载"
 
 msgid "GPS Download"
 msgstr "GPS 下载"
 

-#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:989
+#: ../src/vikgpslayer.c:217 ../src/vikgpslayer.c:1045

 msgid "GPS Upload"
 msgstr "GPS 上传"
 
 msgid "GPS Upload"
 msgstr "GPS 上传"
 

-#: ../src/vikgpslayer.c:208
+#: ../src/vikgpslayer.c:219

 msgid "GPS Realtime Tracking"
 msgstr "GPS实时跟踪"
 
 msgid "GPS Realtime Tracking"
 msgstr "GPS实时跟踪"
 

-#: ../src/vikgpslayer.c:373
+#: ../src/vikgpslayer.c:382

 msgid "Unknown GPS Protocol"
 msgstr "未知的GPS协议"
 
 msgid "Unknown GPS Protocol"
 msgstr "未知的GPS协议"
 

-#: ../src/vikgpslayer.c:379
+#: ../src/vikgpslayer.c:401

 msgid "Unknown serial port device"
 msgstr "未知的串口设备"
 
 msgid "Unknown serial port device"
 msgstr "未知的串口设备"
 

-#: ../src/vikgpslayer.c:444
+#: ../src/vikgpslayer.c:467

 #, c-format
 msgid "%s: unknown parameter"
 msgstr "%s: 未知的参数"
 
 #, c-format
 msgid "%s: unknown parameter"
 msgstr "%s: 未知的参数"
 

-#: ../src/vikgpslayer.c:545
+#: ../src/vikgpslayer.c:581

 msgid "Upload to GPS"
 msgstr "上传到GPS"
 
 msgid "Upload to GPS"
 msgstr "上传到GPS"
 

-#: ../src/vikgpslayer.c:550
+#: ../src/vikgpslayer.c:586

 msgid "Download from GPS"
 msgstr "从GPS下载"
 
 msgid "Download from GPS"
 msgstr "从GPS下载"
 

-#: ../src/vikgpslayer.c:568
+#: ../src/vikgpslayer.c:604

 msgid "Empty Upload"
 msgstr "清空上传"
 
 msgid "Empty Upload"
 msgstr "清空上传"
 

-#: ../src/vikgpslayer.c:573
+#: ../src/vikgpslayer.c:609

 msgid "Empty Download"
 msgstr "清空下载"
 
 msgid "Empty Download"
 msgstr "清空下载"
 

-#: ../src/vikgpslayer.c:578
+#: ../src/vikgpslayer.c:614

 msgid "Empty All"
 msgstr "清空全部"
 
 msgid "Empty All"
 msgstr "清空全部"
 

-#: ../src/vikgpslayer.c:718
+#. 
+#. 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] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Uploading %d waypoint..."
 msgid_plural "Uploading %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikgpslayer.c:720
+#: ../src/vikgpslayer.c:764

 #, c-format
 msgid "Uploading %d trackpoint..."
 msgid_plural "Uploading %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Uploading %d trackpoint..."
 msgid_plural "Uploading %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikgpslayer.c:744
+#: ../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] ""
 
 #, c-format
 msgid "Downloaded %d out of %d waypoint..."
 msgid_plural "Downloaded %d out of %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikgpslayer.c:746
+#: ../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] ""
 
 #, c-format
 msgid "Downloaded %d out of %d trackpoint..."
 msgid_plural "Downloaded %d out of %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikgpslayer.c:750
+#: ../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] ""
 
 #, c-format
 msgid "Uploaded %d out of %d waypoint..."
 msgid_plural "Uploaded %d out of %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikgpslayer.c:752
+#: ../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] ""
 
 #, c-format
 msgid "Uploaded %d out of %d trackpoint..."
 msgid_plural "Uploaded %d out of %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikgpslayer.c:759
+#: ../src/vikgpslayer.c:803

 #, c-format
 msgid "Downloaded %d waypoint"
 msgid_plural "Downloaded %d waypoints"
 msgstr[0] "下载的 %d 航点"
 
 #, c-format
 msgid "Downloaded %d waypoint"
 msgid_plural "Downloaded %d waypoints"
 msgstr[0] "下载的 %d 航点"
 

-#: ../src/vikgpslayer.c:761
+#: ../src/vikgpslayer.c:805

 #, c-format
 msgid "Downloaded %d trackpoint"
 msgid_plural "Downloaded %d trackpoints"
 msgstr[0] "下载的 %d 轨迹点"
 
 #, c-format
 msgid "Downloaded %d trackpoint"
 msgid_plural "Downloaded %d trackpoints"
 msgstr[0] "下载的 %d 轨迹点"
 

-#: ../src/vikgpslayer.c:765
+#: ../src/vikgpslayer.c:809

 #, c-format
 msgid "Uploaded %d waypoint"
 msgid_plural "Uploaded %d waypoints"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Uploaded %d waypoint"
 msgid_plural "Uploaded %d waypoints"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikgpslayer.c:767
+#: ../src/vikgpslayer.c:811

 #, c-format
 msgid "Uploaded %d trackpoint"
 msgid_plural "Uploaded %d trackpoints"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Uploaded %d trackpoint"
 msgid_plural "Uploaded %d trackpoints"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikgpslayer.c:952
+#: ../src/vikgpslayer.c:1008

 msgid "Error: couldn't find gpsbabel."
 msgstr "错误: 没有发现 gpsbabel."
 
 msgid "Error: couldn't find gpsbabel."
 msgstr "错误: 没有发现 gpsbabel."
 

-#: ../src/viklayerspanel.c:59
+#: ../src/viklayerspanel.c:57

 msgid "/C_ut"
 msgstr "/_u 剪切"
 
 msgid "/C_ut"
 msgstr "/_u 剪切"
 

-#: ../src/viklayerspanel.c:60
+#: ../src/viklayerspanel.c:58

 msgid "/_Copy"
 msgstr "/_C 拷贝"
 
 msgid "/_Copy"
 msgstr "/_C 拷贝"
 

-#: ../src/viklayerspanel.c:61
+#: ../src/viklayerspanel.c:59

 msgid "/_Paste"
 msgstr "/_P 粘贴"
 
 msgid "/_Paste"
 msgstr "/_P 粘贴"
 

-#: ../src/viklayerspanel.c:62
+#: ../src/viklayerspanel.c:60

 msgid "/_Delete"
 msgstr "/_D 删除"
 
 msgid "/_Delete"
 msgstr "/_D 删除"
 

-#: ../src/viklayerspanel.c:63
+#: ../src/viklayerspanel.c:61

 msgid "/New Layer"
 msgstr "/新图层"
 
 msgid "/New Layer"
 msgstr "/新图层"
 

-#: ../src/viklayerspanel.c:152
+#: ../src/viklayerspanel.c:150

 msgid "Top Layer"
 msgstr "顶层"
 
 msgid "Top Layer"
 msgstr "顶层"
 

-#: ../src/viklayerspanel.c:487
+#: ../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 ""
 
 msgid "Aggregate Layers have no settable properties."
 msgstr ""
 

-#: ../src/viklayerspanel.c:537
+#: ../src/viklayerspanel.c:542

 msgid "You cannot cut the Top Layer."
 msgstr "您不能剪切掉顶层"
 
 msgid "You cannot cut the Top Layer."
 msgstr "您不能剪切掉顶层"
 

-#: ../src/viklayerspanel.c:592
+#: ../src/viklayerspanel.c:597

 msgid "You cannot delete the Top Layer."
 msgstr "您不能删除顶层"
 
 msgid "You cannot delete the Top Layer."
 msgstr "您不能删除顶层"
 

-#: ../src/viklayerspanel.c:676
+#: ../src/viklayerspanel.c:681

 msgid "Are you sure you wish to delete all layers?"
 msgstr "您真的确认要删除所有的图层?"
 
 #. ******* MAPZOOMS ********
 msgid "Are you sure you wish to delete all layers?"
 msgstr "您真的确认要删除所有的图层?"
 
 #. ******* MAPZOOMS ********

-#: ../src/vikmapslayer.c:88
+#: ../src/vikmapslayer.c:90

 msgid "Use Viking Zoom Level"
 msgstr ""
 
 msgid "Use Viking Zoom Level"
 msgstr ""
 

-#: ../src/vikmapslayer.c:119
+#: ../src/vikmapslayer.c:122

 msgid "Map Type:"
 msgstr "地图类型:"
 
 msgid "Map Type:"
 msgstr "地图类型:"
 

-#: ../src/vikmapslayer.c:120
-msgid "Maps Directory (Optional):"
-msgstr "地图目录(可选):"
+#: ../src/vikmapslayer.c:123
+msgid "Maps Directory:"
+msgstr ""

 
 

-#: ../src/vikmapslayer.c:121
+#: ../src/vikmapslayer.c:124

 msgid "Alpha:"
 msgstr "Alpha:"
 
 msgid "Alpha:"
 msgstr "Alpha:"
 

-#: ../src/vikmapslayer.c:122
+#: ../src/vikmapslayer.c:125

 msgid "Autodownload maps:"
 msgstr "自动下载地图:"
 
 msgid "Autodownload maps:"
 msgstr "自动下载地图:"
 

-#: ../src/vikmapslayer.c:123
+#: ../src/vikmapslayer.c:126

 msgid "Zoom Level:"
 msgstr "缩放程度 :"
 
 msgid "Zoom Level:"
 msgstr "缩放程度 :"
 

-#: ../src/vikmapslayer.c:129
+#: ../src/vikmapslayer.c:132

 msgid "Maps Download"
 msgstr "地图下载"
 
 msgid "Maps Download"
 msgstr "地图下载"
 

-#: ../src/vikmapslayer.c:135
+#: ../src/vikmapslayer.c:138

 msgid "Map"
 msgstr "地图"
 
 msgid "Map"
 msgstr "地图"
 

-#: ../src/vikmapslayer.c:388
+#: ../src/vikmapslayer.c:212
+msgid "Default maplayer directory:"
+msgstr ""
+
+#: ../src/vikmapslayer.c:449

 msgid "Unknown map type"
 msgstr "未知的地图类型"
 
 msgid "Unknown map type"
 msgstr "未知的地图类型"
 

-#: ../src/vikmapslayer.c:398
+#: ../src/vikmapslayer.c:459

 msgid "Unknown Map Zoom"
 msgstr ""
 
 msgid "Unknown Map Zoom"
 msgstr ""
 

-#: ../src/vikmapslayer.c:467
+#: ../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 ""
 
 #, 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:609
+#: ../src/vikmapslayer.c:670

 #, c-format
 msgid ""
 "Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out "
 "factor"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out "
 "factor"
 msgstr ""
 

-#: ../src/vikmapslayer.c:924
+#: ../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] ""
 
 #, c-format
 msgid "Redownloading up to %d %s map..."
 msgid_plural "Redownloading up to %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikmapslayer.c:926
+#: ../src/vikmapslayer.c:1045

 #, c-format
 msgid "Redownloading %d %s map..."
 msgid_plural "Redownloading %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Redownloading %d %s map..."
 msgid_plural "Redownloading %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikmapslayer.c:930 ../src/vikmapslayer.c:1001
+#: ../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 地图..."
 
 #, c-format
 msgid "Downloading %d %s map..."
 msgid_plural "Downloading %d %s maps..."
 msgstr[0] "正在下载 %d %s 地图..."
 

-#: ../src/vikmapslayer.c:1058
+#: ../src/vikmapslayer.c:1183

 msgid "Redownload bad map(s)"
 msgstr "重新下载损坏的地图"
 
 msgid "Redownload bad map(s)"
 msgstr "重新下载损坏的地图"
 

-#: ../src/vikmapslayer.c:1062
+#: ../src/vikmapslayer.c:1187
+msgid "Redownload new map(s)"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1191

 msgid "Redownload all map(s)"
 msgstr "重新下载所有地图"
 
 msgid "Redownload all map(s)"
 msgstr "重新下载所有地图"
 

-#: ../src/vikmapslayer.c:1142
+#: ../src/vikmapslayer.c:1271

 #, c-format
 msgid ""
 "Wrong drawmode for this map.\n"
 "Select \"%s\" from View menu and try again."
 msgstr ""
 
 #, c-format
 msgid ""
 "Wrong drawmode for this map.\n"
 "Select \"%s\" from View menu and try again."
 msgstr ""
 

-#: ../src/vikmapslayer.c:1147
+#: ../src/vikmapslayer.c:1276

 msgid "Wrong zoom level for this map."
 msgstr "此地图无此缩放程度"
 
 msgid "Wrong zoom level for this map."
 msgstr "此地图无此缩放程度"
 

-#: ../src/vikmapslayer.c:1172
-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 ""

 
 #. TODO Add GTK_STOCK_REFRESH icon
 
 #. TODO Add GTK_STOCK_REFRESH icon

-#: ../src/vikmapslayer.c:1178
+#: ../src/vikmapslayer.c:1319

 msgid "Refresh Onscreen Tiles"
 msgstr ""
 
 msgid "Refresh Onscreen Tiles"
 msgstr ""
 


@@ -1083,13 +1215,13 @@ msgid "Magic Scissors"
 msgstr "魔术剪刀"
 
 #. ***** PARAMETERS *****
 msgstr "魔术剪刀"
 
 #. ***** PARAMETERS *****

-#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1399
-#: ../src/viktrwlayer.c:1401
+#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1401
+#: ../src/viktrwlayer.c:1403

 msgid "Waypoints"
 msgstr "航点"
 
 msgid "Waypoints"
 msgstr "航点"
 

-#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1389
-#: ../src/viktrwlayer.c:1391
+#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1391
+#: ../src/viktrwlayer.c:1393

 msgid "Tracks"
 msgstr "轨迹"
 
 msgid "Tracks"
 msgstr "轨迹"
 


@@ -1221,364 +1353,380 @@ msgstr "图片Alpha值:"
 msgid "Image Memory Cache Size:"
 msgstr "图片内存缓存尺寸:"
 
 msgid "Image Memory Cache Size:"
 msgstr "图片内存缓存尺寸:"
 

-#: ../src/viktrwlayer.c:1538
+#: ../src/viktrwlayer.c:1540

 msgid "This layer has no waypoints or trackpoints."
 msgstr ""
 
 msgid "This layer has no waypoints or trackpoints."
 msgstr ""
 

-#: ../src/viktrwlayer.c:1546
+#: ../src/viktrwlayer.c:1548

 msgid "Export Layer"
 msgstr "输出图层"
 
 msgid "Export Layer"
 msgstr "输出图层"
 

-#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1446 ../src/vikwindow.c:1820
+#: ../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 ""
 
 #, c-format
 msgid "The file \"%s\" exists, do you wish to overwrite it?"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1575 ../src/vikwindow.c:1464
+#: ../src/viktrwlayer.c:1577 ../src/vikwindow.c:1598

 msgid "The filename you requested could not be opened for writing."
 msgstr ""
 
 msgid "The filename you requested could not be opened for writing."
 msgstr ""
 

-#: ../src/viktrwlayer.c:1596
+#: ../src/viktrwlayer.c:1598

 msgid "Create"
 msgstr "创建"
 
 msgid "Create"
 msgstr "创建"
 

-#: ../src/viktrwlayer.c:1606
+#: ../src/viktrwlayer.c:1608

 msgid "Waypoint Name:"
 msgstr "航点名称:"
 
 msgid "Waypoint Name:"
 msgstr "航点名称:"
 

-#: ../src/viktrwlayer.c:1626
+#: ../src/viktrwlayer.c:1628

 msgid "Waypoint not found in this layer."
 msgstr "在此图层中没有发现航点"
 
 msgid "Waypoint not found in this layer."
 msgstr "在此图层中没有发现航点"
 

-#: ../src/viktrwlayer.c:1724
+#: ../src/viktrwlayer.c:1725

 msgid "Goto Center of Layer"
 msgstr "前往图层中心"
 
 msgid "Goto Center of Layer"
 msgstr "前往图层中心"
 

-#: ../src/viktrwlayer.c:1729
+#: ../src/viktrwlayer.c:1730

 msgid "Goto Waypoint"
 msgstr "前往航点"
 
 msgid "Goto Waypoint"
 msgstr "前往航点"
 

-#: ../src/viktrwlayer.c:1735
+#: ../src/viktrwlayer.c:1736

 msgid "Export layer"
 msgstr "输出图层"
 
 msgid "Export layer"
 msgstr "输出图层"
 

-#: ../src/viktrwlayer.c:1740
+#: ../src/viktrwlayer.c:1741

 msgid "Export as GPSPoint"
 msgstr "输出成GPS点"
 
 msgid "Export as GPSPoint"
 msgstr "输出成GPS点"
 

-#: ../src/viktrwlayer.c:1745
+#: ../src/viktrwlayer.c:1746

 msgid "Export as GPSMapper"
 msgstr "输出成GPS地图"
 
 msgid "Export as GPSMapper"
 msgstr "输出成GPS地图"
 

-#: ../src/viktrwlayer.c:1750
+#: ../src/viktrwlayer.c:1751

 msgid "Export as GPX"
 msgstr "输出成GPX文件"
 
 msgid "Export as GPX"
 msgstr "输出成GPX文件"
 

-#: ../src/viktrwlayer.c:1755 ../src/viktrwlayer.c:2794
+#: ../src/viktrwlayer.c:1756 ../src/viktrwlayer.c:2796

 msgid "New Waypoint"
 msgstr "新航点"
 
 msgid "New Waypoint"
 msgstr "新航点"
 

-#: ../src/viktrwlayer.c:1762
+#: ../src/viktrwlayer.c:1763

 msgid "Add Wikipedia Waypoints"
 msgstr ""
 
 msgid "Add Wikipedia Waypoints"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1767
+#: ../src/viktrwlayer.c:1768

 msgid "Within layer bounds"
 msgstr ""
 
 msgid "Within layer bounds"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1772
+#: ../src/viktrwlayer.c:1773

 msgid "Within current view"
 msgstr ""
 
 msgid "Within current view"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1779 ../src/viktrwlayer.c:2760
+#: ../src/viktrwlayer.c:1780 ../src/viktrwlayer.c:2762

 msgid "Upload to OSM"
 msgstr ""
 
 msgid "Upload to OSM"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2290
+#: ../src/viktrwlayer.c:2291

 msgid "Failed. This track does not have timestamp"
 msgstr ""
 
 msgid "Failed. This track does not have timestamp"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2304
+#: ../src/viktrwlayer.c:2305

 msgid "Failed. No other track in this layer has timestamp"
 msgstr ""
 
 msgid "Failed. No other track in this layer has timestamp"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2310
+#: ../src/viktrwlayer.c:2311

 msgid "Merge with..."
 msgstr ""
 
 msgid "Merge with..."
 msgstr ""
 

-#: ../src/viktrwlayer.c:2310
+#: ../src/viktrwlayer.c:2311

 msgid "Select track to merge with"
 msgstr ""
 
 msgid "Select track to merge with"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2347
+#: ../src/viktrwlayer.c:2348

 msgid "Merge Threshold..."
 msgstr ""
 
 msgid "Merge Threshold..."
 msgstr ""
 

-#: ../src/viktrwlayer.c:2348
+#: ../src/viktrwlayer.c:2349

 msgid "Merge when time between tracks less than:"
 msgstr ""
 
 msgid "Merge when time between tracks less than:"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2439
+#: ../src/viktrwlayer.c:2441

 msgid "Split Threshold..."
 msgstr ""
 
 msgid "Split Threshold..."
 msgstr ""
 

-#: ../src/viktrwlayer.c:2440
+#: ../src/viktrwlayer.c:2442

 msgid "Split when time between trackpoints exceeds:"
 msgstr ""
 
 msgid "Split when time between trackpoints exceeds:"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2523
+#: ../src/viktrwlayer.c:2525

 msgid "Waypoint Already Exists"
 msgstr "航点已经存在"
 
 msgid "Waypoint Already Exists"
 msgstr "航点已经存在"
 

-#: ../src/viktrwlayer.c:2564
+#: ../src/viktrwlayer.c:2566

 msgid "Track Already Exists"
 msgstr ""
 
 msgid "Track Already Exists"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2686
+#: ../src/viktrwlayer.c:2688

 msgid "Goto"
 msgstr "前往"
 
 msgid "Goto"
 msgstr "前往"
 

-#: ../src/viktrwlayer.c:2694
+#: ../src/viktrwlayer.c:2696

 msgid "Visit Geocache Webpage"
 msgstr "访问Geocache网页"
 
 msgid "Visit Geocache Webpage"
 msgstr "访问Geocache网页"
 

-#: ../src/viktrwlayer.c:2709
+#: ../src/viktrwlayer.c:2711

 msgid "Goto Startpoint"
 msgstr "Aller au premier point"
 
 msgid "Goto Startpoint"
 msgstr "Aller au premier point"
 

-#: ../src/viktrwlayer.c:2714
+#: ../src/viktrwlayer.c:2716

 msgid "Goto \"Center\""
 msgstr "前往“中间”"
 
 msgid "Goto \"Center\""
 msgstr "前往“中间”"
 

-#: ../src/viktrwlayer.c:2719
+#: ../src/viktrwlayer.c:2721

 msgid "Goto Endpoint"
 msgstr "前往最后一点"
 
 msgid "Goto Endpoint"
 msgstr "前往最后一点"
 

-#: ../src/viktrwlayer.c:2724
+#: ../src/viktrwlayer.c:2726

 msgid "Merge By Time"
 msgstr ""
 
 msgid "Merge By Time"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2729
+#: ../src/viktrwlayer.c:2731

 msgid "Merge With Other Tracks..."
 msgstr ""
 
 msgid "Merge With Other Tracks..."
 msgstr ""
 

-#: ../src/viktrwlayer.c:2734
+#: ../src/viktrwlayer.c:2736

 msgid "Split By Time"
 msgstr ""
 
 msgid "Split By Time"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2739
+#: ../src/viktrwlayer.c:2741

 msgid "Download maps along track..."
 msgstr "沿着轨迹下载地图..."
 
 msgid "Download maps along track..."
 msgstr "沿着轨迹下载地图..."
 

-#: ../src/viktrwlayer.c:2744
+#: ../src/viktrwlayer.c:2746

 msgid "Apply DEM Data"
 msgstr ""
 
 msgid "Apply DEM Data"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2749
+#: ../src/viktrwlayer.c:2751

 msgid "Extend track end"
 msgstr ""
 
 msgid "Extend track end"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2754
+#: ../src/viktrwlayer.c:2756

 msgid "Extend using magic scissors"
 msgstr ""
 
 msgid "Extend using magic scissors"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2768
+#: ../src/viktrwlayer.c:2770

 msgid "View Google Directions"
 msgstr ""
 
 msgid "View Google Directions"
 msgstr ""
 

-#: ../src/viktrwlayer.c:2774
+#: ../src/viktrwlayer.c:2776

 msgid "Use with filter"
 msgstr ""
 
 msgid "Use with filter"
 msgstr ""
 

-#: ../src/viktrwlayer.c:3736
+#: ../src/viktrwlayer.c:3739

 msgid "Could not launch eog to open file."
 msgstr ""
 
 msgid "Could not launch eog to open file."
 msgstr ""
 

-#: ../src/viktrwlayer.c:3790
+#: ../src/viktrwlayer.c:3793

 #, c-format
 msgid "Creating %d Image Thumbnails..."
 msgstr ""
 
 #, c-format
 msgid "Creating %d Image Thumbnails..."
 msgstr ""
 

-#: ../src/viktrwlayer.c:4010
+#: ../src/viktrwlayer.c:4013

 msgid "No map layer in use. Create one first"
 msgstr ""
 
 msgid "No map layer in use. Create one first"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:658
+#: ../src/viktrwlayer_propwin.c:686

 msgid "Failed spliting track. Track unchanged"
 msgstr ""
 
 msgid "Failed spliting track. Track unchanged"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:675
+#: ../src/viktrwlayer_propwin.c:703

 msgid "Operation Aborted. Track unchanged"
 msgstr ""
 
 msgid "Operation Aborted. Track unchanged"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:729
+#: ../src/viktrwlayer_propwin.c:757

 #, c-format
 msgid "%s - Track Properties"
 msgstr ""
 
 #, c-format
 msgid "%s - Track Properties"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:734
+#: ../src/viktrwlayer_propwin.c:762

 msgid "Split at Marker"
 msgstr ""
 
 msgid "Split at Marker"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:735
+#: ../src/viktrwlayer_propwin.c:763

 msgid "Split Segments"
 msgstr ""
 
 msgid "Split Segments"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:736
+#: ../src/viktrwlayer_propwin.c:764

 msgid "Reverse"
 msgstr "反转"
 
 msgid "Reverse"
 msgstr "反转"
 

-#: ../src/viktrwlayer_propwin.c:737
+#: ../src/viktrwlayer_propwin.c:765

 msgid "Delete Dupl."
 msgstr ""
 
 msgid "Delete Dupl."
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Comment:</b>"
 msgstr "<b>说明:</b>"
 
 msgid "<b>Comment:</b>"
 msgstr "<b>说明:</b>"
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Track Length:</b>"
 msgstr ""
 
 msgid "<b>Track Length:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Trackpoints:</b>"
 msgstr ""
 
 msgid "<b>Trackpoints:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Segments:</b>"
 msgstr ""
 
 msgid "<b>Segments:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Duplicate Points:</b>"
 msgstr ""
 
 msgid "<b>Duplicate Points:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Max Speed:</b>"
 msgstr "<b>最大速度:</b>"
 
 msgid "<b>Max Speed:</b>"
 msgstr "<b>最大速度:</b>"
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Avg. Speed:</b>"
 msgstr "<b>平均速度:</b>"
 
 msgid "<b>Avg. Speed:</b>"
 msgstr "<b>平均速度:</b>"
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Avg. Dist. Between TPs:</b>"
 msgstr ""
 
 msgid "<b>Avg. Dist. Between TPs:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Elevation Range:</b>"
 msgstr "<b>高度范围:</b>"
 
 msgid "<b>Elevation Range:</b>"
 msgstr "<b>高度范围:</b>"
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Total Elevation Gain/Loss:</b>"
 msgstr ""
 
 msgid "<b>Total Elevation Gain/Loss:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Start:</b>"
 msgstr "<b>开始:</b>"
 
 msgid "<b>Start:</b>"
 msgstr "<b>开始:</b>"
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>End:</b>"
 msgstr "<b>结束:</b>"
 
 msgid "<b>End:</b>"
 msgstr "<b>结束:</b>"
 

-#: ../src/viktrwlayer_propwin.c:760
+#: ../src/viktrwlayer_propwin.c:788

 msgid "<b>Duration:</b>"
 msgstr "<b>持续时间:</b>"
 
 msgid "<b>Duration:</b>"
 msgstr "<b>持续时间:</b>"
 

-#: ../src/viktrwlayer_propwin.c:788 ../src/viktrwlayer_propwin.c:795
-#: ../src/viktrwlayer_propwin.c:804 ../src/viktrwlayer_propwin.c:811
-#: ../src/viktrwlayer_propwin.c:850 ../src/viktrwlayer_propwin.c:851
-#: ../src/viktrwlayer_propwin.c:852 ../src/viktrwlayer_propwin.c:874
-#: ../src/viktrwlayer_propwin.c:881
+#: ../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 "没有数据"
 
 #, c-format
 msgid "No Data"
 msgstr "没有数据"
 

-#: ../src/viktrwlayer_propwin.c:847
+#: ../src/viktrwlayer_propwin.c:954

 #, c-format
 msgid "%d minutes"
 msgstr "%d 分钟"
 
 #, c-format
 msgid "%d minutes"
 msgstr "%d 分钟"
 

-#: ../src/viktrwlayer_propwin.c:870
+#: ../src/viktrwlayer_propwin.c:977

 msgid "Statistics"
 msgstr ""
 
 msgid "Statistics"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:875
+#: ../src/viktrwlayer_propwin.c:982

 msgid "<b>Track Distance:</b>"
 msgstr ""
 
 msgid "<b>Track Distance:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:876
+#: ../src/viktrwlayer_propwin.c:983

 msgid "Elevation-distance"
 msgstr "高度-距离"
 
 msgid "Elevation-distance"
 msgstr "高度-距离"
 

-#: ../src/viktrwlayer_propwin.c:882
+#: ../src/viktrwlayer_propwin.c:989

 msgid "<b>Track Time:</b>"
 msgstr ""
 
 msgid "<b>Track Time:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:883
+#: ../src/viktrwlayer_propwin.c:990

 msgid "Speed-time"
 msgstr "速度-时间"
 
 msgid "Speed-time"
 msgstr "速度-时间"
 

-#: ../src/viktrwlayer_tpwin.c:101
+#: ../src/viktrwlayer_tpwin.c:115

 msgid "<b>Part of Track:</b>"
 msgstr ""
 
 msgid "<b>Part of Track:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:102
+#: ../src/viktrwlayer_tpwin.c:116

 msgid "<b>Latitude:</b>"
 msgstr "<b>纬度 :</b>"
 
 msgid "<b>Latitude:</b>"
 msgstr "<b>纬度 :</b>"
 

-#: ../src/viktrwlayer_tpwin.c:103
+#: ../src/viktrwlayer_tpwin.c:117

 msgid "<b>Longitude:</b>"
 msgstr "<b>经度 :</b>"
 
 msgid "<b>Longitude:</b>"
 msgstr "<b>经度 :</b>"
 

-#: ../src/viktrwlayer_tpwin.c:104
+#: ../src/viktrwlayer_tpwin.c:118

 msgid "<b>Altitude:</b>"
 msgstr "<b>高度 :</b>"
 
 msgid "<b>Altitude:</b>"
 msgstr "<b>高度 :</b>"
 

-#: ../src/viktrwlayer_tpwin.c:105
+#: ../src/viktrwlayer_tpwin.c:119

 msgid "<b>Timestamp:</b>"
 msgstr ""
 
 msgid "<b>Timestamp:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:106
+#: ../src/viktrwlayer_tpwin.c:120

 msgid "<b>Time:</b>"
 msgstr "<b>时间 :</b>"
 
 msgid "<b>Time:</b>"
 msgstr "<b>时间 :</b>"
 

-#: ../src/viktrwlayer_tpwin.c:107
+#: ../src/viktrwlayer_tpwin.c:121

 msgid "<b>Distance Difference:</b>"
 msgstr ""
 
 msgid "<b>Distance Difference:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:108
+#: ../src/viktrwlayer_tpwin.c:122

 msgid "<b>Time Difference:</b>"
 msgstr ""
 
 msgid "<b>Time Difference:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:109
+#: ../src/viktrwlayer_tpwin.c:123

 msgid "<b>\"Speed\" Between:</b>"
 msgstr ""
 
 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 ""
 
 msgid "Trackpoint"
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:122
+#: ../src/viktrwlayer_tpwin.c:141

 msgid "Split Here"
 msgstr ""
 
 msgid "Split Here"
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:123
+#: ../src/viktrwlayer_tpwin.c:142

 msgid "Join With Last"
 msgstr ""
 
 msgid "Join With Last"
 msgstr ""
 

-#: ../src/vikwindow.c:188
+#: ../src/vikwindow.c:186

 msgid "Pan"
 msgstr "移动"
 
 msgid "Pan"
 msgstr "移动"
 

-#: ../src/vikwindow.c:188
+#: ../src/vikwindow.c:186

 msgid "Zoom"
 msgstr "缩放"
 
 msgid "Zoom"
 msgstr "缩放"
 

-#: ../src/vikwindow.c:188
+#: ../src/vikwindow.c:186

 msgid "Ruler"
 msgstr "测距"
 
 msgid "Ruler"
 msgstr "测距"
 

-#: ../src/vikwindow.c:363
+#: ../src/vikwindow.c:361

 #, c-format
 msgid ""
 "Do you want to save the changes you made to the document \"%s\"?\n"
 #, c-format
 msgid ""
 "Do you want to save the changes you made to the document \"%s\"?\n"


@@ -1586,441 +1734,515 @@ msgid ""
 "Your changes will be lost if you don't save them."
 msgstr ""
 
 "Your changes will be lost if you don't save them."
 msgstr ""
 

-#: ../src/vikwindow.c:366 ../src/vikwindow.c:1314
+#: ../src/vikwindow.c:364 ../src/vikwindow.c:1366

 msgid "Untitled"
 msgstr "无标题"
 
 msgid "Untitled"
 msgstr "无标题"
 

-#: ../src/vikwindow.c:367
+#: ../src/vikwindow.c:365

 msgid "Don't Save"
 msgstr "不保存"
 
 msgid "Don't Save"
 msgstr "不保存"
 

-#: ../src/vikwindow.c:400
+#: ../src/vikwindow.c:398

 msgid "mpp"
 msgstr "mpp"
 
 msgid "mpp"
 msgstr "mpp"
 

-#: ../src/vikwindow.c:400
+#: ../src/vikwindow.c:398

 msgid "pixelfact"
 msgstr "pixelfact"
 
 msgid "pixelfact"
 msgstr "pixelfact"
 

-#: ../src/vikwindow.c:527
+#: ../src/vikwindow.c:532

 #, c-format
 msgid "%s %s %dm"
 msgstr ""
 
 #, c-format
 msgid "%s %s %dm"
 msgstr ""
 

-#: ../src/vikwindow.c:529
+#: ../src/vikwindow.c:534

 #, c-format
 msgid "%s %s"
 msgstr ""
 
 #, c-format
 msgid "%s %s"
 msgstr ""
 

-#: ../src/vikwindow.c:1113
+#: ../src/vikwindow.c:1155

 msgid "You must select a layer to show its properties."
 msgstr "您必须选一个层才能显示它的属性"
 
 msgid "You must select a layer to show its properties."
 msgstr "您必须选一个层才能显示它的属性"
 

-#: ../src/vikwindow.c:1129
+#: ../src/vikwindow.c:1181

 msgid "You must select a layer to delete."
 msgstr "您必须选一个层才可删除"
 
 msgid "You must select a layer to delete."
 msgstr "您必须选一个层才可删除"
 

-#: ../src/vikwindow.c:1347
+#: ../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 "您选的文件不能被打开"
 
 msgid "The file you requested could not be opened."
 msgstr "您选的文件不能被打开"
 

-#: ../src/vikwindow.c:1390
+#: ../src/vikwindow.c:1521

 msgid "Please select a GPS data file to open. "
 msgstr "请选择一个GPS数据文件来打开 "
 
 msgid "Please select a GPS data file to open. "
 msgstr "请选择一个GPS数据文件来打开 "
 

-#: ../src/vikwindow.c:1433
+#: ../src/vikwindow.c:1564

 msgid "Save as Viking File."
 msgstr "另存为Viking文件."
 
 msgid "Save as Viking File."
 msgstr "另存为Viking文件."
 

-#: ../src/vikwindow.c:1667
+#: ../src/vikwindow.c:1855

 msgid ""
 "Viewable region outside allowable pixel size bounds for image. Clipping "
 "width/height values."
 msgstr ""
 
 msgid ""
 "Viewable region outside allowable pixel size bounds for image. Clipping "
 "width/height values."
 msgstr ""
 

-#: ../src/vikwindow.c:1686
+#: ../src/vikwindow.c:1877

 #, c-format
 msgid "Total area: %ldm x %ldm (%.3f sq. km)"
 msgstr "全部区域: %ldm x %ldm (%.3f 平方公里)"
 
 #, 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)
 #. todo: default for answers inside VikWindow or static (thruout instance)

-#: ../src/vikwindow.c:1694
+#: ../src/vikwindow.c:1894

 msgid "Save to Image File"
 msgstr "保存为图片文件"
 
 msgid "Save to Image File"
 msgstr "保存为图片文件"
 

-#: ../src/vikwindow.c:1712
+#: ../src/vikwindow.c:1912

 msgid "Width (pixels):"
 msgstr "宽度 (像素) :"
 
 msgid "Width (pixels):"
 msgstr "宽度 (像素) :"
 

-#: ../src/vikwindow.c:1714
+#: ../src/vikwindow.c:1914

 msgid "Height (pixels):"
 msgstr "高度 (像素) :"
 
 msgid "Height (pixels):"
 msgstr "高度 (像素) :"
 

-#: ../src/vikwindow.c:1717
+#: ../src/vikwindow.c:1917

 msgid "Zoom (meters per pixel):"
 msgstr "缩放 (米／像素) :"
 
 msgid "Zoom (meters per pixel):"
 msgstr "缩放 (米／像素) :"
 

-#: ../src/vikwindow.c:1723
+#: ../src/vikwindow.c:1923

 msgid "Area in current viewable window"
 msgstr ""
 
 msgid "Area in current viewable window"
 msgstr ""
 

-#: ../src/vikwindow.c:1733
+#: ../src/vikwindow.c:1933

 msgid "Save as PNG"
 msgstr "保存为PNG"
 
 msgid "Save as PNG"
 msgstr "保存为PNG"
 

-#: ../src/vikwindow.c:1734
+#: ../src/vikwindow.c:1934

 msgid "Save as JPEG"
 msgstr "保存为JPEG"
 
 msgid "Save as JPEG"
 msgstr "保存为JPEG"
 

-#: ../src/vikwindow.c:1754
+#: ../src/vikwindow.c:1954

 msgid "East-west image tiles:"
 msgstr ""
 
 msgid "East-west image tiles:"
 msgstr ""
 

-#: ../src/vikwindow.c:1756
+#: ../src/vikwindow.c:1956

 msgid "North-south image tiles:"
 msgstr ""
 
 msgid "North-south image tiles:"
 msgstr ""
 

-#: ../src/vikwindow.c:1796
+#: ../src/vikwindow.c:1996

 msgid "You must be in UTM mode to use this feature"
 msgstr "你必须在UTM模式中来使用这个特性"
 
 msgid "You must be in UTM mode to use this feature"
 msgstr "你必须在UTM模式中来使用这个特性"
 

-#: ../src/vikwindow.c:1807
+#: ../src/vikwindow.c:2007

 msgid "Save Image"
 msgstr "保存图像"
 
 msgid "Save Image"
 msgstr "保存图像"
 

-#: ../src/vikwindow.c:1834
+#: ../src/vikwindow.c:2034

 msgid "Choose a directory to hold images"
 msgstr ""
 
 msgid "Choose a directory to hold images"
 msgstr ""
 

-#: ../src/vikwindow.c:1920
+#: ../src/vikwindow.c:2120

 msgid "Choose a background color"
 msgstr "选择一个背景色"
 
 msgid "Choose a background color"
 msgstr "选择一个背景色"
 

-#: ../src/vikwindow.c:1941
+#: ../src/vikwindow.c:2141

 msgid "_File"
 msgid "_File"

-msgstr "_F 文件"
+msgstr "文件(_F)"

 
 

-#: ../src/vikwindow.c:1942
+#: ../src/vikwindow.c:2142

 msgid "_Edit"
 msgstr "编辑(_E)"
 
 msgid "_Edit"
 msgstr "编辑(_E)"
 

-#: ../src/vikwindow.c:1943
+#: ../src/vikwindow.c:2143

 msgid "_View"
 msgstr "视图(_V)"
 
 msgid "_View"
 msgstr "视图(_V)"
 

-#: ../src/vikwindow.c:1944 ../src/vikwindow.c:2015
+#: ../src/vikwindow.c:2144 ../src/vikwindow.c:2228

 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 

-#: ../src/vikwindow.c:1945 ../src/vikwindow.c:2014
+#: ../src/vikwindow.c:2145 ../src/vikwindow.c:2227

 msgid "_Pan"
 msgstr "平移(_P )"
 
 msgid "_Pan"
 msgstr "平移(_P )"
 

-#: ../src/vikwindow.c:1946
+#: ../src/vikwindow.c:2146

 msgid "_Layers"
 msgstr "图层(_L)"
 
 msgid "_Layers"
 msgstr "图层(_L)"
 

-#: ../src/vikwindow.c:1947
+#: ../src/vikwindow.c:2147

 msgid "_Tools"
 msgstr "工具(_T)"
 
 msgid "_Tools"
 msgstr "工具(_T)"
 

-#: ../src/vikwindow.c:1948
+#: ../src/vikwindow.c:2148

 msgid "_Webtools"
 msgstr ""
 
 msgid "_Webtools"
 msgstr ""
 

-#: ../src/vikwindow.c:1949
+#: ../src/vikwindow.c:2149 ../src/vikwindow.c:2215

 msgid "_Help"
 msgstr "帮助(_H)"
 
 msgid "_Help"
 msgstr "帮助(_H)"
 

-#: ../src/vikwindow.c:1951
+#: ../src/vikwindow.c:2151

 msgid "_New"
 msgstr "新建(_N)"
 
 msgid "_New"
 msgstr "新建(_N)"
 

-#: ../src/vikwindow.c:1951
+#: ../src/vikwindow.c:2151

 msgid "New file"
 msgstr "新建文件"
 
 msgid "New file"
 msgstr "新建文件"
 

-#: ../src/vikwindow.c:1952
-msgid "_Open"
-msgstr "_O 打开"
+#: ../src/vikwindow.c:2152
+msgid "_Open..."
+msgstr "_O 打开..."

 
 

-#: ../src/vikwindow.c:1952
+#: ../src/vikwindow.c:2152

 msgid "Open a file"
 msgstr "打开一个文件"
 
 msgid "Open a file"
 msgstr "打开一个文件"
 

-#: ../src/vikwindow.c:1953
-msgid "A_ppend File"
-msgstr "_p 增加文件"
+#: ../src/vikwindow.c:2153
+msgid "Open _Recent File"
+msgstr ""
+
+#: ../src/vikwindow.c:2154
+msgid "Append _File..."
+msgstr "_p 增加文件..."

 
 

-#: ../src/vikwindow.c:1953
+#: ../src/vikwindow.c:2154

 msgid "Append data from a different file"
 msgstr "从不同的文件中追加数据"
 
 msgid "Append data from a different file"
 msgstr "从不同的文件中追加数据"
 

-#: ../src/vikwindow.c:1954
+#: ../src/vikwindow.c:2155

 msgid "A_cquire"
 msgstr "_c 获取"
 
 msgid "A_cquire"
 msgstr "_c 获取"
 

-#: ../src/vikwindow.c:1955
-msgid "From _GPS"
-msgstr "_G 从GPS"
+#: ../src/vikwindow.c:2156
+msgid "From _GPS..."
+msgstr "_G 从GPS..."

 
 

-#: ../src/vikwindow.c:1955
+#: ../src/vikwindow.c:2156

 msgid "Transfer data from a GPS device"
 msgstr "从一个GPS接收器获得数据"
 
 msgid "Transfer data from a GPS device"
 msgstr "从一个GPS接收器获得数据"
 

-#: ../src/vikwindow.c:1956
-msgid "Google _Directions"
-msgstr "_D 谷歌方位"
+#: ../src/vikwindow.c:2157
+msgid "Google _Directions..."
+msgstr "_D 谷歌方位..."

 
 

-#: ../src/vikwindow.c:1956
+#: ../src/vikwindow.c:2157

 msgid "Get driving directions from Google"
 msgstr "从谷歌获得驾驶方位"
 
 msgid "Get driving directions from Google"
 msgstr "从谷歌获得驾驶方位"
 

-#: ../src/vikwindow.c:1958
-msgid "Geo_caches"
-msgstr "Geo_caches"
+#: ../src/vikwindow.c:2159
+msgid "Geo_caches..."
+msgstr ""

 
 

-#: ../src/vikwindow.c:1958
+#: ../src/vikwindow.c:2159

 msgid "Get Geocaches from geocaching.com"
 msgstr "从geocaching.com获得地理缓存数据"
 
 msgid "Get Geocaches from geocaching.com"
 msgstr "从geocaching.com获得地理缓存数据"
 

-#: ../src/vikwindow.c:1960
+#: ../src/vikwindow.c:2161

 msgid "_Save"
 msgstr "_S 保存"
 
 msgid "_Save"
 msgstr "_S 保存"
 

-#: ../src/vikwindow.c:1960
+#: ../src/vikwindow.c:2161

 msgid "Save the file"
 msgstr "保存这个文件"
 
 msgid "Save the file"
 msgstr "保存这个文件"
 

-#: ../src/vikwindow.c:1961
-msgid "Save _As"
-msgstr "_A 另存为"
+#: ../src/vikwindow.c:2162
+msgid "Save _As..."
+msgstr "_A 另存为..."

 
 

-#: ../src/vikwindow.c:1961
+#: ../src/vikwindow.c:2162

 msgid "Save the file under different name"
 msgstr "保存为其它名字的文件"
 
 msgid "Save the file under different name"
 msgstr "保存为其它名字的文件"
 

-#: ../src/vikwindow.c:1962
-msgid "_Generate Image File"
-msgstr "_G 生成图形文件"
+#: ../src/vikwindow.c:2163
+msgid "_Generate Image File..."
+msgstr "_G 生成图形文件..."

 
 

-#: ../src/vikwindow.c:1962
+#: ../src/vikwindow.c:2163

 msgid "Save a snapshot of the workspace into a file"
 msgstr ""
 
 msgid "Save a snapshot of the workspace into a file"
 msgstr ""
 

-#: ../src/vikwindow.c:1963
-msgid "Generate _Directory of Images"
-msgstr "_D 创建图片的目录"
+#: ../src/vikwindow.c:2164
+msgid "Generate _Directory of Images..."
+msgstr "_D 创建图片的目录..."

 
 

-#: ../src/vikwindow.c:1963
+#: ../src/vikwindow.c:2164

 msgid "FIXME:IMGDIR"
 msgstr ""
 
 msgid "FIXME:IMGDIR"
 msgstr ""
 

-#: ../src/vikwindow.c:1966
+#: ../src/vikwindow.c:2167

 msgid "_Print..."
 msgstr "_P 打印"
 
 msgid "_Print..."
 msgstr "_P 打印"
 

-#: ../src/vikwindow.c:1966
+#: ../src/vikwindow.c:2167

 msgid "Print maps"
 msgstr "打印地图"
 
 msgid "Print maps"
 msgstr "打印地图"
 

-#: ../src/vikwindow.c:1969
+#: ../src/vikwindow.c:2170

 msgid "E_xit"
 msgstr "_x 退出"
 
 msgid "E_xit"
 msgstr "_x 退出"
 

-#: ../src/vikwindow.c:1969
+#: ../src/vikwindow.c:2170

 msgid "Exit the program"
 msgstr "退出程序"
 
 msgid "Exit the program"
 msgstr "退出程序"
 

-#: ../src/vikwindow.c:1970
+#: ../src/vikwindow.c:2171

 msgid "Save and Exit"
 msgstr "保存并退出"
 
 msgid "Save and Exit"
 msgstr "保存并退出"
 

-#: ../src/vikwindow.c:1970
+#: ../src/vikwindow.c:2171

 msgid "Save and Exit the program"
 msgstr "保存并退出程序"
 
 msgid "Save and Exit the program"
 msgstr "保存并退出程序"
 

-#: ../src/vikwindow.c:1972
-msgid "Go To location"
+#: ../src/vikwindow.c:2173
+msgid "Go to the _Default Location"

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikwindow.c:1972
+#: ../src/vikwindow.c:2173
+msgid "Go to the default location"
+msgstr ""
+
+#: ../src/vikwindow.c:2174
+msgid "Go to Location..."
+msgstr ""
+
+#: ../src/vikwindow.c:2174

 msgid "Go to address/place using text search"
 msgstr ""
 
 msgid "Go to address/place using text search"
 msgstr ""
 

-#: ../src/vikwindow.c:1973
-msgid "_Go to Lat\\/Lon..."
+#: ../src/vikwindow.c:2175
+msgid "_Go to Lat/Lon..."

 msgstr "_G 前往一个经纬度值..."
 
 msgstr "_G 前往一个经纬度值..."
 

-#: ../src/vikwindow.c:1973
-msgid "Go to arbitrary lat\\/lon coordinate"
+#: ../src/vikwindow.c:2175
+msgid "Go to arbitrary lat/lon coordinate"

 msgstr "前往任意的经纬度座标"
 
 msgstr "前往任意的经纬度座标"
 

-#: ../src/vikwindow.c:1974
+#: ../src/vikwindow.c:2176

 msgid "Go to UTM..."
 msgstr "前往UTM..."
 
 msgid "Go to UTM..."
 msgstr "前往UTM..."
 

-#: ../src/vikwindow.c:1974
+#: ../src/vikwindow.c:2176

 msgid "Go to arbitrary UTM coordinate"
 msgstr "前往任意的UTM座标"
 
 msgid "Go to arbitrary UTM coordinate"
 msgstr "前往任意的UTM座标"
 

-#: ../src/vikwindow.c:1975
+#: ../src/vikwindow.c:2177

 msgid "Set Background Color..."
 msgstr "设置背景色 ..."
 
 msgid "Set Background Color..."
 msgstr "设置背景色 ..."
 

-#: ../src/vikwindow.c:1976
+#: ../src/vikwindow.c:2178

 msgid "Zoom _In"
 msgstr "_I 缩小"
 
 msgid "Zoom _In"
 msgstr "_I 缩小"
 

-#: ../src/vikwindow.c:1977
+#: ../src/vikwindow.c:2179

 msgid "Zoom _Out"
 msgstr "_O 放大"
 
 msgid "Zoom _Out"
 msgstr "_O 放大"
 

-#: ../src/vikwindow.c:1978
-msgid "Zoom _To"
-msgstr "_T 缩放到"
+#: ../src/vikwindow.c:2180
+msgid "Zoom _To..."
+msgstr "_T 缩放到..."

 
 

-#: ../src/vikwindow.c:1979
+#: ../src/vikwindow.c:2181

 msgid "0.25"
 msgstr "0.25"
 
 msgid "0.25"
 msgstr "0.25"
 

-#: ../src/vikwindow.c:1980
+#: ../src/vikwindow.c:2182

 msgid "0.5"
 msgstr "0.5"
 
 msgid "0.5"
 msgstr "0.5"
 

-#: ../src/vikwindow.c:1981
+#: ../src/vikwindow.c:2183

 msgid "1"
 msgstr "1"
 
 msgid "1"
 msgstr "1"
 

-#: ../src/vikwindow.c:1982
+#: ../src/vikwindow.c:2184

 msgid "2"
 msgstr "2"
 
 msgid "2"
 msgstr "2"
 

-#: ../src/vikwindow.c:1983
+#: ../src/vikwindow.c:2185

 msgid "4"
 msgstr "4"
 
 msgid "4"
 msgstr "4"
 

-#: ../src/vikwindow.c:1984
+#: ../src/vikwindow.c:2186

 msgid "8"
 msgstr "8"
 
 msgid "8"
 msgstr "8"
 

-#: ../src/vikwindow.c:1985
+#: ../src/vikwindow.c:2187

 msgid "16"
 msgstr "16"
 
 msgid "16"
 msgstr "16"
 

-#: ../src/vikwindow.c:1986
+#: ../src/vikwindow.c:2188

 msgid "32"
 msgstr "32"
 
 msgid "32"
 msgstr "32"
 

-#: ../src/vikwindow.c:1987
+#: ../src/vikwindow.c:2189

 msgid "64"
 msgstr "64"
 
 msgid "64"
 msgstr "64"
 

-#: ../src/vikwindow.c:1988
+#: ../src/vikwindow.c:2190

 msgid "128"
 msgstr "128"
 
 msgid "128"
 msgstr "128"
 

-#: ../src/vikwindow.c:1989
+#: ../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 "向北"
 
 msgid "Pan North"
 msgstr "向北"
 

-#: ../src/vikwindow.c:1990
+#: ../src/vikwindow.c:2200

 msgid "Pan East"
 msgstr "向东"
 
 msgid "Pan East"
 msgstr "向东"
 

-#: ../src/vikwindow.c:1991
+#: ../src/vikwindow.c:2201

 msgid "Pan South"
 msgstr "向南"
 
 msgid "Pan South"
 msgstr "向南"
 

-#: ../src/vikwindow.c:1992
+#: ../src/vikwindow.c:2202

 msgid "Pan West"
 msgstr "向西"
 
 msgid "Pan West"
 msgstr "向西"
 

-#: ../src/vikwindow.c:1993
+#: ../src/vikwindow.c:2203

 msgid "Background _Jobs"
 msgstr "_J 后台任务"
 
 msgid "Background _Jobs"
 msgstr "_J 后台任务"
 

-#: ../src/vikwindow.c:1995
+#: ../src/vikwindow.c:2205

 msgid "Cu_t"
 msgstr "_t 剪切"
 
 msgid "Cu_t"
 msgstr "_t 剪切"
 

-#: ../src/vikwindow.c:1996
+#: ../src/vikwindow.c:2206

 msgid "_Copy"
 msgstr "_C 拷贝"
 
 msgid "_Copy"
 msgstr "_C 拷贝"
 

-#: ../src/vikwindow.c:1997
+#: ../src/vikwindow.c:2207

 msgid "_Paste"
 msgstr "_P 粘贴"
 
 msgid "_Paste"
 msgstr "_P 粘贴"
 

-#: ../src/vikwindow.c:1998
+#: ../src/vikwindow.c:2208

 msgid "_Delete"
 msgstr "_D 删除"
 
 msgid "_Delete"
 msgstr "_D 删除"
 

-#: ../src/vikwindow.c:1999
+#: ../src/vikwindow.c:2209

 msgid "Delete All"
 msgstr "全部删除"
 
 msgid "Delete All"
 msgstr "全部删除"
 

-#: ../src/vikwindow.c:2000
-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:2001
+#: ../src/vikwindow.c:2213

 msgid "_Properties"
 msgstr "属性(_P)"
 
 msgid "_Properties"
 msgstr "属性(_P)"
 

-#: ../src/vikwindow.c:2003
+#: ../src/vikwindow.c:2216

 msgid "_About"
 msgstr "关于(_A)"
 
 msgid "_About"
 msgstr "关于(_A)"
 

-#: ../src/vikwindow.c:2008
+#: ../src/vikwindow.c:2221

 msgid "_UTM Mode"
 msgstr "_UTM 模式"
 
 msgid "_UTM Mode"
 msgstr "_UTM 模式"
 

-#: ../src/vikwindow.c:2009
+#: ../src/vikwindow.c:2222

 msgid "_Expedia Mode"
 msgstr "_Expedia 模式"
 
 msgid "_Expedia Mode"
 msgstr "_Expedia 模式"
 

-#: ../src/vikwindow.c:2010
+#: ../src/vikwindow.c:2223

 msgid "_Mercator Mode"
 msgstr ""
 
 msgid "_Mercator Mode"
 msgstr ""
 

-#: ../src/vikwindow.c:2014
+#: ../src/vikwindow.c:2227

 msgid "Pan Tool"
 msgstr ""
 
 msgid "Pan Tool"
 msgstr ""
 

-#: ../src/vikwindow.c:2015
+#: ../src/vikwindow.c:2228

 msgid "Zoom Tool"
 msgstr "缩放工具"
 
 msgid "Zoom Tool"
 msgstr "缩放工具"
 

-#: ../src/vikwindow.c:2016
+#: ../src/vikwindow.c:2229

 msgid "_Ruler"
 msgstr "_R 测距"
 
 msgid "_Ruler"
 msgstr "_R 测距"
 

-#: ../src/vikwindow.c:2016
+#: ../src/vikwindow.c:2229

 msgid "Ruler Tool"
 msgstr "测距工具"
 
 msgid "Ruler Tool"
 msgstr "测距工具"
 

-#: ../src/vikwindow.c:2020
+#: ../src/vikwindow.c:2233
+msgid "_Show Scale"
+msgstr ""
+
+#: ../src/vikwindow.c:2233

 msgid "Show Scale"
 msgstr "显示比例尺"
 
 msgid "Show Scale"
 msgstr "显示比例尺"
 

-#: ../src/vikwindow.c:2021
+#: ../src/vikwindow.c:2234
+msgid "Show _Center Mark"
+msgstr ""
+
+#: ../src/vikwindow.c:2234

 msgid "Show Center Mark"
 msgstr "显示中心标记"
 
 msgid "Show Center Mark"
 msgstr "显示中心标记"
 

-#: ../src/vikwindow.c:2022
-msgid "Full Screen"
+#: ../src/vikwindow.c:2235
+msgid "_Full Screen"

 msgstr "全屏"
 
 msgstr "全屏"
 

-#: ../src/vikwindow.c:2022
+#: ../src/vikwindow.c:2235

 msgid "Activate full screen mode"
 msgstr ""
 
 msgid "Activate full screen mode"
 msgstr ""
 

-#: ../src/vikwindow.c:2023
+#: ../src/vikwindow.c:2236

 msgid "Show Side Panel"
 msgstr ""
 
 msgid "Show Side Panel"
 msgstr ""
 

-#: ../src/vikwindow.c:2085
+#: ../src/vikwindow.c:2298

 #, c-format
 msgid "New %s Layer"
 msgstr "新图层 \"%s\""
 #, c-format
 msgid "New %s Layer"
 msgstr "新图层 \"%s\""


@@ -2037,31 +2259,59 @@ msgstr ""
 msgid "Viking"
 msgstr ""
 
 msgid "Viking"
 msgstr ""
 

-#~ msgid "Google Satellite Images"
-#~ msgstr "谷歌卫星影象"
+#~ msgid "Zoom factor (in meters per pixel:"
+#~ msgstr "缩放参数 (米／像素):"

 
 

-#~ msgid "Google Terrain Maps"
-#~ msgstr "谷歌地形地图"
+#~ msgid "The password used to login"
+#~ msgstr "登录用的密码"

 
 

-#~ msgid "Old Google Maps"
-#~ msgstr "è\80\81ç\9a\84è°·æ­\8cå\9c°å\9b¾"
+#~ msgid "Enter the password you use to login into www.openstreetmap.org."
+#~ msgstr "请è¾\93å\85¥æ\82¨ç\99»å½\95www.openstreetmap.orgç\9a\84å¯\86ç \81."

 
 

-#~ msgid "Keep current position at center"
-#~ msgstr "保持现有未知在中央"
+#~ msgid "The name of the file on OSM"
+#~ msgstr "OSM上的文件名"

 
 

-#~ msgid "_Old Google Mode"
-#~ msgstr "_O 老的谷歌模式"
+#~ msgid "Maps Directory (Optional):"
+#~ msgstr "地图目录(可选):"

 
 

-#~ msgid "Old _KH Mode"
-#~ msgstr "_K 老的KH模式"
+#~ msgid "Download Onscreen Maps"
+#~ msgstr "下载屏幕地图"

 
 

-#~ msgid "_Google Mode"
-#~ msgstr "_G 谷歌模式"
+#~ msgid "_Open"
+#~ msgstr "_O 打开"

 
 

-#, c-format
-#~ msgid "couldn't open temp file %s"
-#~ msgstr "不能打开临时文件 %s"
+#~ msgid "A_ppend File"
+#~ msgstr "_p 增加文件"

 
 

-#, c-format
-#~ msgid "Failed downloading %s"
-#~ msgstr "下载 %s 失败"
+#~ 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 "全屏"