/[filezilla]/FileZilla3/trunk/locales/zh_CN.po

Diff of /FileZilla3/trunk/locales/zh_CN.po

Parent Directory | Revision Log | View Patch Patch

-revision 3288 by botg,
Tue Jun  9 07:41:00 2009 UTC
+revision 3289 by botg,
Sun Aug  2 13:28:59 2009 UTC
 Line 2 
 msgid ""
  msgstr ""
  "Project-Id-Version: FileZilla 3\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-06-08 23:28+0200\n"
+ "POT-Creation-Date: 2009-08-02 15:26+0200\n"
- "PO-Revision-Date: 2009-06-08 18:08+0800\n"
+ "PO-Revision-Date: 2009-07-02 16:55+0800\n"
  "Last-Translator: Sun Junwen <sunjw8888@gmail.com>\n"
  "Language-Team: Sun Junwen <sunjw8888@gmail.com>\n"
  "MIME-Version: 1.0\n"
 Line 24 
 msgstr "已耗 %H:%M:%S"
  msgid "%H:%M:%S left"
  msgstr "剩余 %H:%M:%S"
- #: resources.h:278
+ #: resources.h:734
  #, no-c-format
  msgid ""
  "%a - Account (Lines containing this will be omitted if not using Account "
  "logontype)"
  msgstr "%a - 帐号 (如果不是使用帐号登录的方式，该行就会被忽略)"
- #: ../../locales/../src/interface/filelist_statusbar.cpp:53
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:55
- #: ../../locales/../src/interface/filelist_statusbar.cpp:64
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:66
- #: ../../locales/../src/interface/filelist_statusbar.cpp:76
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:78
  #, c-format
  msgid "%d directory"
  msgid_plural "%d directories"
  msgstr[0] "%d 个目录"
- #: ../../locales/../src/interface/RemoteListView.cpp:1639
+ #: ../../locales/../src/interface/RemoteListView.cpp:1645
- #: ../../locales/../src/interface/search.cpp:780
+ #: ../../locales/../src/interface/search.cpp:800
- #: ../../locales/../src/interface/search.cpp:1027
+ #: ../../locales/../src/interface/search.cpp:1047
  #, c-format
  msgid "%d directory with its contents"
  msgid_plural "%d directories with their contents"
  msgstr[0] "%d 个目录及其内容"
- #: ../../locales/../src/interface/filelist_statusbar.cpp:52
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:54
- #: ../../locales/../src/interface/filelist_statusbar.cpp:75
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:77
- #: ../../locales/../src/interface/RemoteListView.cpp:1638
+ #: ../../locales/../src/interface/RemoteListView.cpp:1644
- #: ../../locales/../src/interface/search.cpp:779
+ #: ../../locales/../src/interface/search.cpp:799
- #: ../../locales/../src/interface/search.cpp:1026
+ #: ../../locales/../src/interface/search.cpp:1046
  #, c-format
  msgid "%d file"
  msgid_plural "%d files"
  msgstr[0] "%d 个文件"
- #: ../../locales/../src/interface/filelist_statusbar.cpp:71
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:73
  #, c-format
  msgid "%d file. Total size: %s"
  msgid_plural "%d files. Total size: %s"
  msgstr[0] "%d 个文件。大小总共: %s"
- #: ../../locales/../src/interface/filelist_statusbar.cpp:69
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:71
  #, c-format
  msgid "%d file. Total size: At least %s"
  msgid_plural "%d files. Total size: At least %s"
  msgstr[0] "%d 个文件。大小总共: 至少 %s"
- #: ../../locales/../src/interface/QueueView.cpp:2738
+ #: ../../locales/../src/interface/QueueView.cpp:2742
  #, c-format
  msgid "%d files added to queue"
  msgstr "%d 个文件加入到队列"
- #: resources.h:275
+ #: resources.h:731
  msgid "%h - Host"
  msgstr "%h - 主机"
- #: resources.h:277
+ #: resources.h:733
  #, no-c-format
  msgid "%p - Password"
  msgstr "%p - 密码"
- #: ../../locales/../src/interface/verifycertdialog.cpp:52
+ #: ../../locales/../src/interface/verifycertdialog.cpp:38
  #, c-format
  msgid "%s - Certificate expired!"
  msgstr "%s - 证书已过期!"
- #: ../../locales/../src/interface/verifycertdialog.cpp:36
+ #: ../../locales/../src/interface/verifycertdialog.cpp:22
  #, c-format
  msgid "%s - Not yet valid!"
  msgstr "%s - 尚未有效!"
- #: resources.h:279
+ #: resources.h:735
  #, no-c-format
  msgid "%s - Proxy user"
  msgstr "%s - 代理服务器用户"
- #: ../../locales/../src/interface/filelist_statusbar.cpp:81
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:83
  #, c-format
  msgid "%s and %s. Total size: %s"
  msgstr "%s 和 %s。大小总共: %s"
- #: ../../locales/../src/interface/filelist_statusbar.cpp:79
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:81
  #, c-format
  msgid "%s and %s. Total size: At least %s"
  msgstr "%s 和 %s。大小总共: 至少 %s"
- #: ../../locales/../src/interface/LocalListView.cpp:483
+ #: ../../locales/../src/interface/LocalListView.cpp:494
- #: ../../locales/../src/interface/LocalListView.cpp:500
+ #: ../../locales/../src/interface/LocalListView.cpp:511
  #, c-format
  msgid "%s byte"
  msgid_plural "%s bytes"
 Line 172 
 msgstr ""
  "- 确保 %s 这个目录在您的环境变量中的 PATH 里被列出。\n"
  "- 在 FZ_FZSFTP 环境变量中把全路经设置到 %s 。"
- #: ../../locales/../src/interface/verifycertdialog.cpp:69
+ #: ../../locales/../src/interface/verifycertdialog.cpp:55
  #, c-format
  msgid "%s with %d bits"
  msgstr "%s 和 %d 比特"
- #: resources.h:276
+ #: resources.h:732
  #, no-c-format
  msgid "%u - Username"
  msgstr "%u - 用户名"
- #: resources.h:280
+ #: resources.h:736
  #, no-c-format
  msgid "%w - Proxy password"
  msgstr "%w - 代理服务器密码"
- #: resources.h:738
+ #: resources.h:529
  msgid "&About..."
  msgstr "关于(&A)..."
- #: resources.h:107 resources.h:592
+ #: resources.h:85 resources.h:395
  msgid "&Account:"
  msgstr "帐号(&A):"
- #: resources.h:122 resources.h:521 resources.h:849
+ #: resources.h:100 resources.h:640 resources.h:700
  msgid "&Active"
  msgstr "主动(&A)"
- #: resources.h:730
+ #: resources.h:521
  msgid "&Add bookmark..."
  msgstr "添加书签(&A)..."
- #: resources.h:742 resources.h:758
+ #: resources.h:533 resources.h:549
  msgid "&Add files to queue"
  msgstr "添加文件到队列"
- #: resources.h:530
+ #: resources.h:744
  msgid "&Add keyfile..."
  msgstr "添加密钥文件(&A)..."
- #: resources.h:807 resources.h:826
+ #: resources.h:598 resources.h:617
  msgid "&Add to queue"
  msgstr "添加到队列(&A)"
- #: resources.h:22
+ #: resources.h:94
+ #, fuzzy
+ msgid "&Adjust server timezone offset:"
+ msgstr "调整服务器时区偏差:"
+ #: resources.h:23
  msgid "&Always trust certificate in future sessions."
  msgstr "在以后的会话中始终信任证书。"
- #: resources.h:334
+ #: resources.h:177
  msgid "&Always trust this host, add this key to the cache"
  msgstr "总是信任该主机，并将该密钥加入缓存(&A)"
- #: resources.h:261
+ #: resources.h:867
  msgid "&Always use default editor"
  msgstr "总是使用默认编辑器"
- #: resources.h:654
+ #: resources.h:438
  msgid "&Always use selection for unassociated files"
  msgstr "所有未关联文件总使用该选项(&A)"
- #: resources.h:87
+ #: resources.h:65
  msgid "&Always use this action"
  msgstr "总是使用这个操作"
- #: resources.h:420 resources.h:444
+ #: resources.h:248 resources.h:272
  msgid "&Ask for action"
  msgstr "询问操作(&A)"
- #: resources.h:390
+ #: resources.h:712
  msgid "&Ask your operating system for the external IP address"
  msgstr "向您的操作系统查询外部 IP 地址"
- #: resources.h:155 resources.h:715 resources.h:835
+ #: resources.h:506 resources.h:626 resources.h:779
  msgid "&Auto"
  msgstr "自动(&A)"
- #: resources.h:128
+ #: resources.h:106
  msgid "&Autodetect"
  msgstr "自动检测(&A)"
- #: resources.h:804
+ #: resources.h:595
  msgid "&Automatically remove successful transfers"
  msgstr "自动移除成功的传输(&A)"
- #: resources.h:157 resources.h:717 resources.h:837
+ #: resources.h:508 resources.h:628 resources.h:781
  msgid "&Binary"
  msgstr "二进制(&B)"
- #: resources.h:222
+ #: resources.h:827
  msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
  msgstr "使用 SI 式二进制前缀 (即 1 KB = 1024 bytes) (&B)"
- #: resources.h:729
+ #: resources.h:520
  msgid "&Bookmarks"
  msgstr "书签(&B)"
- #: resources.h:113 resources.h:237 resources.h:258 resources.h:574
+ #: resources.h:91 resources.h:377 resources.h:414 resources.h:420
- #: resources.h:611 resources.h:617 resources.h:653 resources.h:673
+ #: resources.h:437 resources.h:455 resources.h:864 resources.h:886
  msgid "&Browse..."
  msgstr "浏览(&B)..."
- #: resources.h:65
+ #: resources.h:774
  msgid "&Burst tolerance:"
  msgstr "峰值容忍(&B):"
- #: resources.h:149 resources.h:153 resources.h:287 resources.h:348
+ #: resources.h:127 resources.h:130 resources.h:191 resources.h:688
  msgid "&Cancel"
  msgstr "取消(&C)"
- #: resources.h:401
+ #: resources.h:229
  msgid "&Check for beta versions of FileZilla"
  msgstr "检查测试版的 FileZilla(&C)"
- #: resources.h:693
+ #: resources.h:484
  msgid "&Clear private data..."
  msgstr "清除个人信息(&C)"
- #: resources.h:784
+ #: resources.h:575
  msgid "&Close FileZilla"
  msgstr "关闭 FileZilla (&C)"
- #: resources.h:134
+ #: resources.h:112
  msgid "&Connect"
  msgstr "连接(&C)"
- #: resources.h:370
+ #: resources.h:212
  msgid "&Copy"
  msgstr "复制(&C)"
- #: resources.h:685
+ #: resources.h:476
  msgid "&Copy current connection to Site Manager..."
  msgstr "复制当前的连接到站点管理器内(&C)..."
- #: resources.h:324 resources.h:793
+ #: resources.h:167 resources.h:584
  msgid "&Copy to clipboard"
  msgstr "复制到剪贴板(&C)"
- #: resources.h:796
+ #: resources.h:587
  msgid "&Crash"
  msgstr "崩溃(&C)"
- #: resources.h:750 resources.h:763 resources.h:809 resources.h:828
+ #: resources.h:541 resources.h:554 resources.h:600 resources.h:619
  msgid "&Create directory"
  msgstr "创建目录(&C)"
- #: ../../locales/../src/interface/Mainfrm.cpp:624
+ #: ../../locales/../src/interface/Mainfrm.cpp:657
  msgid "&Debug"
  msgstr "调试(&D)"
- #: resources.h:245
+ #: resources.h:894
  msgid "&Debug information in message log:"
  msgstr "消息记录中的调试信息(&D):"
- #: resources.h:254
+ #: resources.h:860
  msgid "&Default editor:"
  msgstr "默认编辑器(&D):"
- #: resources.h:713 resources.h:776
+ #: resources.h:504 resources.h:567
  msgid "&Default file exists action..."
  msgstr "对已存在文件的默认操作(&D)..."
- #: resources.h:186
+ #: resources.h:695
  msgid "&Delay between failed login attempts:"
  msgstr "在失败的登陆请求之间延迟(&D):"
- #: resources.h:98 resources.h:353 resources.h:368 resources.h:624
+ #: resources.h:76 resources.h:196 resources.h:210 resources.h:427
- #: resources.h:752 resources.h:830
+ #: resources.h:543 resources.h:621
  msgid "&Delete"
  msgstr "删除(&D)"
- #: resources.h:699
+ #: resources.h:468
+ msgid "&Delete symlink"
+ msgstr "删除符号链接(&D)"
+ #: resources.h:490
  msgid "&Directory comparison"
  msgstr "比较目录(&D)"
- #: resources.h:508
+ #: resources.h:336
  msgid "&Discard local file then download and edit file anew"
  msgstr "放弃本地文件，重新下载并编辑 (&D)"
- #: resources.h:723
+ #: resources.h:514
  msgid "&Disconnect"
  msgstr "断开连接(&D)"
- #: resources.h:785
+ #: resources.h:576
  msgid "&Disconnect from server"
  msgstr "从服务器断开(&D)"
- #: resources.h:220
+ #: resources.h:825
  msgid "&Display size in bytes"
  msgstr "以字节作为单位显示(&D)"
-Line 365 
 msgstr "以字节作为单位显示(&D)"
+Line 374 
 msgstr "以字节作为单位显示(&D)"
  msgid "&Don't show this dialog again."
  msgstr "不要再显示此对话框(&D)。"
- #: resources.h:395
+ #: resources.h:717
  msgid "&Don't use external IP address on local connections."
  msgstr "本地连接不使用外部 IP 地址(&L)。"
- #: resources.h:637
+ #: resources.h:847
  msgid "&Double-click action on files:"
  msgstr "双击文件操作:"
- #: resources.h:756 resources.h:805
+ #: resources.h:547 resources.h:596
  msgid "&Download"
  msgstr "下载(&D)"
- #: resources.h:672
+ #: resources.h:454
  msgid "&Download to:"
  msgstr "下载至(&D):"
- #: resources.h:838
+ #: resources.h:629
  msgid "&Download..."
  msgstr "下载(&D)..."
- #: resources.h:691 resources.h:748
+ #: resources.h:482 resources.h:539
  msgid "&Edit"
  msgstr "编辑(&E)"
- #: resources.h:361
+ #: resources.h:204
  msgid "&Edit filter rules..."
  msgstr "编辑过滤器规则(&E)..."
- #: resources.h:700 resources.h:820
+ #: resources.h:491 resources.h:611
  msgid "&Enable"
  msgstr "激活(&E)"
- #: resources.h:200
+ #: resources.h:875
  msgid "&Enable automatic update check"
  msgstr "激活自动检查更新功能(&E)"
- #: resources.h:132
+ #: resources.h:110
  msgid "&Encoding:"
  msgstr "编码(&E):"
- #: resources.h:792
+ #: resources.h:583
  msgid "&Enter custom command..."
  msgstr "输入自定义命令(&E)"
- #: resources.h:293
+ #: resources.h:136
  msgid "&Execute"
  msgstr "执行(&E)"
- #: resources.h:475
+ #: resources.h:303
  msgid "&Export Site Manager entries"
  msgstr "导出站点管理器记录(&S)"
- #: resources.h:686 resources.h:834
+ #: resources.h:477 resources.h:625
  msgid "&Export..."
  msgstr "导出(&E)..."
- #: resources.h:48
+ #: resources.h:722
  msgid "&Fall back to active mode"
  msgstr "回到主动模式(&F)"
- #: resources.h:682
+ #: resources.h:473
  msgid "&File"
  msgstr "文件(&F)"
- #: resources.h:817
+ #: resources.h:608
  msgid "&File Attributes..."
  msgstr "文件属性(&F)..."
- #: resources.h:771
+ #: resources.h:562
  msgid "&File permissions..."
  msgstr "文件权限(&F)"
- #: resources.h:573
+ #: resources.h:376
  msgid "&File:"
  msgstr "文件(&F):"
- #: resources.h:350
+ #: resources.h:214
+ #, fuzzy
+ msgid "&Filter conditions:"
+ msgstr "过滤器集合(&F):"
+ #: resources.h:193
  msgid "&Filter sets:"
  msgstr "过滤器集合(&F):"
- #: resources.h:366
+ #: resources.h:208
  msgid "&Filters:"
  msgstr "过滤器(&F):"
- #: resources.h:500
+ #: resources.h:328
  msgid "&Finish editing and delete local file"
  msgstr "结束编辑并删除本地文件(&F)"
- #: resources.h:676
+ #: resources.h:458
  msgid ""
  "&Flatten remote paths, download all contained files directly into target "
  "directory"
  msgstr "展开远程路径，将所有包含的文件下载到目标目录"
- #: resources.h:393
+ #: resources.h:469
+ msgid "&Follow symlink, delete target directory contents"
+ msgstr "跟踪符号链接，删除目标目录内容(&F)"
+ #: resources.h:715
  msgid "&Get external IP address from the following URL:"
  msgstr "从以下 URL 得到外部 IP 地址(&G):"
- #: resources.h:736
+ #: resources.h:527
  msgid "&Getting help..."
  msgstr "获得帮助(&H)..."
- #: resources.h:605
+ #: resources.h:408
  msgid "&Global bookmark"
  msgstr "全局书签(&G)"
- #: resources.h:562
+ #: resources.h:751
  msgid "&HTTP/1.1 using CONNECT method"
  msgstr "HTTP/1.1 使用 CONNECT 方式(&H)"
- #: resources.h:733
+ #: resources.h:524
  msgid "&Help"
  msgstr "帮助(&H)"
- #: resources.h:703 resources.h:823
+ #: resources.h:494 resources.h:614
  msgid "&Hide identical files"
  msgstr "隐藏相同的文件(&H)"
- #: resources.h:778
+ #: resources.h:569
  msgid "&Highest"
  msgstr "最高(&H)"
- #: resources.h:388
+ #: resources.h:710
  msgid "&Highest available port:"
  msgstr "最高可用端口(&H):"
- #: resources.h:101 resources.h:586 resources.h:887
+ #: resources.h:79 resources.h:389 resources.h:678
  msgid "&Host:"
  msgstr "主机(&H):"
- #: resources.h:221
+ #: resources.h:826
  msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
  msgstr "IEC 式二进制前缀 (即 1 KiB = 1024 bytes) (&I)"
- #: resources.h:209
+ #: resources.h:814
  msgid "&ISO 8601 (example: 2007-09-15)"
  msgstr "ISO 8601 (示例: 2007-09-15) (&I)"
- #: resources.h:687
+ #: resources.h:478
  msgid "&Import..."
  msgstr "导入(&I)..."
- #: resources.h:263
+ #: resources.h:869
  msgid "&Inherit system's filetype associations"
  msgstr "继承系统的文件格式关联(&I)"
- #: resources.h:675
+ #: resources.h:457
  msgid "&Keep remote path structure relative to search root"
  msgstr "保持相对于搜索根目录的远程目录结构(&K)"
- #: resources.h:167
+ #: resources.h:791
  msgid "&Layout of file and directory panes:"
  msgstr "文件和目录面板布局(&W):"
- #: resources.h:385
+ #: resources.h:707
  msgid "&Limit local ports used by FileZilla"
  msgstr "限制 FilaZila 使用本地端口(&L)"
- #: resources.h:124
+ #: resources.h:102
  msgid "&Limit number of simultaneous connections"
  msgstr "限制同时使用连接数(&L)"
- #: resources.h:708
+ #: resources.h:499
  msgid "&Local directory tree"
  msgstr "本地目录(&L)"
- #: resources.h:610 resources.h:616
+ #: resources.h:413 resources.h:419
  msgid "&Local directory:"
  msgstr "默认本地目录(&L):"
- #: resources.h:235
+ #: resources.h:884
  msgid "&Log to file"
  msgstr "记录到文件(&L)"
- #: resources.h:104 resources.h:589
+ #: resources.h:82 resources.h:392
  msgid "&Logontype:"
  msgstr "登录类型(&L):"
- #: resources.h:781
+ #: resources.h:572
  msgid "&Low"
  msgstr "低(&L)"
- #: resources.h:731
+ #: resources.h:522
  msgid "&Manage bookmarks..."
  msgstr "管理书签(&M)..."
- #: resources.h:719
+ #: resources.h:510
  msgid "&Manual transfer..."
  msgstr "手动传输(&M)..."
- #: resources.h:125
+ #: resources.h:103
  msgid "&Maximum number of connections:"
  msgstr "最大连接数(&M):"
- #: resources.h:184
+ #: resources.h:693
  msgid "&Maximum number of retries:"
  msgstr "最大重试次数(&M):"
- #: resources.h:707
+ #: resources.h:498
  msgid "&Message log"
  msgstr "消息日志(&L)"
- #: resources.h:179
+ #: resources.h:803
  msgid "&Minimize to tray"
  msgstr "最小化到托盘(&M)"
- #: resources.h:608
+ #: resources.h:411
  msgid "&Name:"
  msgstr "名字(&N):"
- #: resources.h:692
+ #: resources.h:483
  msgid "&Network configuration wizard..."
  msgstr "网络配置向导(&N)..."
- #: resources.h:367
+ #: resources.h:209
  msgid "&New"
  msgstr "新建(&N)"
- #: resources.h:94
+ #: resources.h:72
  msgid "&New Site"
  msgstr "新站点(&N)"
-Line 591 
 msgstr "新站点(&N)"
+Line 609 
 msgstr "新站点(&N)"
  msgid "&New version available!"
  msgstr "新版可用！(&N)"
- #: resources.h:502
+ #: resources.h:330
  msgid "&No"
  msgstr "否(&N)"
- #: resources.h:269 resources.h:561
+ #: resources.h:725 resources.h:750
  msgid "&None"
  msgstr "无(&N)"
- #: resources.h:780
+ #: resources.h:571
  msgid "&Normal"
  msgstr "普通(&N)"
- #: resources.h:201
+ #: resources.h:876
  msgid "&Number of days between update checks:"
  msgstr "检查更新的间隔天数(&N):"
- #: resources.h:302
+ #: resources.h:145
  msgid "&Numeric value:"
  msgstr "数字值(&N):"
- #: resources.h:135 resources.h:148 resources.h:626
+ #: resources.h:113 resources.h:126 resources.h:429
  msgid "&OK"
  msgstr "确认(&O)"
- #: resources.h:272
+ #: resources.h:728
  msgid "&OPEN"
  msgstr "打开(&O)"
- #: resources.h:746
+ #: resources.h:537
  msgid "&Open"
  msgstr "打开(&O)"
- #: resources.h:80 resources.h:421 resources.h:445
+ #: resources.h:58 resources.h:249 resources.h:273
  msgid "&Overwrite"
  msgstr "覆盖(&O)"
- #: resources.h:123
+ #: resources.h:101
  msgid "&Passive"
  msgstr "被动(&P)"
- #: resources.h:146
+ #: resources.h:124
  msgid "&Password:"
  msgstr "密码(&P):"
- #: resources.h:788
+ #: resources.h:579
  msgid "&Play sound"
  msgstr "播放声音(&P)"
- #: resources.h:102 resources.h:587 resources.h:891
+ #: resources.h:80 resources.h:390 resources.h:682
  msgid "&Port:"
  msgstr "端口(&P):"
- #: resources.h:173
+ #: resources.h:797
  msgid "&Position of the message log:"
  msgstr "消息日志的位置(&P): "
- #: resources.h:718
+ #: resources.h:509
  msgid "&Preserve timestamps of transferred files"
  msgstr "保留传输文件的时间戳(&P)"
- #: resources.h:484
+ #: resources.h:312
  msgid "&Queue"
  msgstr "队列(&Q)"
- #: resources.h:893
+ #: resources.h:684
  msgid "&Quickconnect"
  msgstr "快速连接(&Q)"
- #: resources.h:706
+ #: resources.h:497
  msgid "&Quickconnect bar"
  msgstr "快速连接工具栏(&Q)"
- #: resources.h:291
+ #: resources.h:134
  msgid "&Read"
  msgstr "读取(&R)"
- #: resources.h:722
+ #: resources.h:513
  msgid "&Reconnect"
  msgstr "重新连接(&R)"
- #: resources.h:697
+ #: resources.h:488
  msgid "&Refresh"
  msgstr "刷新(&R)"
- #: resources.h:147
+ #: resources.h:125
  msgid "&Remember password for this session"
  msgstr "为本次会话记住密码(&R)"
- #: resources.h:612 resources.h:618
+ #: resources.h:415 resources.h:421
  msgid "&Remote directory:"
  msgstr "远程目录(&R)"
- #: resources.h:576
+ #: resources.h:379
  msgid "&Remote path:"
  msgstr "远程路径(&R):"
- #: resources.h:161
+ #: resources.h:785
  msgid "&Remove"
  msgstr "删除(&R)"
- #: resources.h:531
+ #: resources.h:745
  msgid "&Remove key"
  msgstr "删除密钥(&R)"
- #: resources.h:666 resources.h:775
+ #: resources.h:566
  msgid "&Remove selected"
  msgstr "删除选定的(&R)"
- #: resources.h:97 resources.h:369 resources.h:623 resources.h:754
+ #: resources.h:75 resources.h:211 resources.h:426 resources.h:545
- #: resources.h:767 resources.h:813 resources.h:832
+ #: resources.h:558 resources.h:604 resources.h:623
  msgid "&Rename"
  msgstr "重命名(&R)"
- #: resources.h:352
+ #: resources.h:195
  msgid "&Rename..."
  msgstr "重命名(&R)..."
- #: resources.h:507
+ #: resources.h:335
  msgid "&Reopen local file"
  msgstr "重新打开本地文件 (&R)"
- #: resources.h:737
+ #: resources.h:528
  msgid "&Report a bug..."
  msgstr "报告错误(&R)..."
- #: resources.h:886
+ #: resources.h:677
  msgid "&Restart Wizard"
  msgstr "重新启动设置向导(&R)"
- #: resources.h:84 resources.h:425 resources.h:449
+ #: resources.h:62 resources.h:253 resources.h:277
  msgid "&Resume"
  msgstr "续传(&R)"
- #: resources.h:786
+ #: resources.h:577
  msgid "&Run command..."
  msgstr "运行命令(&R)..."
- #: resources.h:182
+ #: resources.h:691
  msgid "&Run configuration wizard now..."
  msgstr "运行配置向导(&R)..."
- #: resources.h:203
+ #: resources.h:878
  msgid "&Run update check now..."
  msgstr "现在运行检查更新(&R)..."
- #: resources.h:271
+ #: resources.h:727
  msgid "&SITE"
  msgstr "站点(&S)"
- #: resources.h:563
+ #: resources.h:752
  msgid "&SOCKS 5"
  msgstr "SOCKS 5 (&S)"
- #: resources.h:351
+ #: resources.h:194
  msgid "&Save as..."
  msgstr "保存为(&S)……"
- #: resources.h:659
+ #: resources.h:443
  msgid "&Search"
  msgstr "搜索(&S)"
- #: resources.h:724
+ #: resources.h:515
  msgid "&Search remote files..."
  msgstr "搜索远程文件(&S)..."
- #: resources.h:197
+ #: resources.h:71
+ #, fuzzy
+ msgid "&Select Entry:"
+ msgstr "选择项:"
+ #: resources.h:858
  msgid "&Select language:"
  msgstr "选择语言(&S):"
- #: resources.h:554
+ #: resources.h:367
  msgid "&Select the columns that should be displayed:"
  msgstr "设置要显示的栏目(&S):"
- #: resources.h:578 resources.h:720
+ #: resources.h:381 resources.h:511
  msgid "&Server"
  msgstr "服务器(&S)"
- #: resources.h:483
+ #: resources.h:311
  msgid "&Settings"
  msgstr "设置(&S)"
- #: resources.h:694
+ #: resources.h:485
  msgid "&Settings..."
  msgstr "设置(&S)..."
- #: resources.h:244
+ #: resources.h:893
  msgid "&Show debug menu"
  msgstr "显示调试菜单(&S)"
- #: resources.h:787
+ #: resources.h:578
  msgid "&Show message"
  msgstr "显示信息(&S)"
- #: resources.h:234
+ #: resources.h:883
  msgid "&Show timestamps in message log"
  msgstr "在消息日志中显示时间戳(&S)"
- #: resources.h:683
+ #: resources.h:474
  msgid "&Site Manager..."
  msgstr "站点管理器(&S)..."
- #: resources.h:606
+ #: resources.h:409
  msgid "&Site-specific bookmark"
  msgstr "站点特定书签(&S)"
- #: resources.h:86
+ #: resources.h:64
  msgid "&Skip"
  msgstr "跳过(&S)"
- #: resources.h:678
+ #: resources.h:460
  msgid "&Start transfer immediately"
  msgstr "立即开始传输(&S)"
- #: resources.h:172
+ #: resources.h:796
  msgid "&Swap local and remote panes"
  msgstr "交换本地和远程面板(&S)"
-Line 812 
 msgstr "交换本地和远程面板(&S)"
+Line 835 
 msgstr "交换本地和远程面板(&S)"
  msgid "&Test"
  msgstr "测试(&T)"
- #: resources.h:190
+ #: resources.h:806
  msgid "&Theme:"
  msgstr "主题(&T):"
- #: resources.h:711
+ #: resources.h:502
  msgid "&Transfer"
  msgstr "传输(&T)"
- #: resources.h:120
+ #: resources.h:98
  msgid "&Transfer mode:"
  msgstr "传输模式(&T):"
- #: resources.h:710
+ #: resources.h:501
  msgid "&Transfer queue"
  msgstr "传输队列(&T)"
- #: resources.h:164
+ #: resources.h:788
  msgid "&Treat dotfiles as ASCII files"
  msgstr "把点文件作为文本格式文件对待(&T)"
- #: resources.h:514
+ #: resources.h:342
  msgid "&Unedit"
  msgstr "放弃修改(&U)"
- #: resources.h:346
+ #: resources.h:189
  msgid "&Update cached key for this host"
  msgstr "为该主机机升级缓存的密钥(&U)"
- #: resources.h:740 resources.h:824
+ #: resources.h:531 resources.h:615
  msgid "&Upload"
  msgstr "上传(&U)"
- #: resources.h:652
+ #: resources.h:436
  msgid "&Use custom program"
  msgstr "使用自定义程序(&U)"
- #: resources.h:256
+ #: resources.h:93
+ #, fuzzy
+ msgid "&Use synchronized browsing"
+ msgstr "使用同步浏览(&S)"
+ #: resources.h:862
  msgid "&Use system's default editor for text files"
  msgstr "使用系统默认文本编辑器(&U)"
- #: resources.h:391
+ #: resources.h:713
  msgid "&Use the following IP address:"
  msgstr "使用以下 IP 地址:"
- #: resources.h:47
+ #: resources.h:721
  msgid "&Use the server's external IP address instead"
  msgstr "使用服务器的外部 IP 地址来代替(&U)"
- #: resources.h:224
+ #: resources.h:829
  msgid "&Use thousands separator"
  msgstr "使用千分位分隔符(&U)"
- #: resources.h:105 resources.h:145 resources.h:590
+ #: resources.h:83 resources.h:123 resources.h:393
  msgid "&User:"
  msgstr "用户(&U):"
- #: resources.h:889
+ #: resources.h:680
  msgid "&Username:"
  msgstr "用户名(&U):"
-Line 877 
 msgstr "用户名(&U):"
+Line 905 
 msgstr "用户名(&U):"
  msgid "&Version %s"
  msgstr "版本(&V) %s"
- #: resources.h:696
+ #: resources.h:487
  msgid "&View"
  msgstr "查看(&V)"
- #: resources.h:762
+ #: resources.h:553
  msgid "&View/Edit"
  msgstr "查看/编辑(&V)"
- #: resources.h:292
+ #: resources.h:868
+ msgid "&Watch locally edited files and prompt to upload modifications"
+ msgstr "监视本地被编辑的文件并且提示上传修改(&W)"
+ #: resources.h:135
  msgid "&Write"
  msgstr "写入(&W)"
- #: resources.h:501
+ #: resources.h:329
  msgid "&Yes"
  msgstr "是(&Y)"
-Line 911 
 msgstr "“%s” 不是目录"
+Line 943 
 msgstr "“%s” 不是目录"
  msgid "'Account' logontype not supported by selected protocol"
  msgstr "选定的协议不支持帐号登录"
- #: ../../locales/../src/interface/Mainfrm.cpp:717
+ #: ../../locales/../src/interface/Mainfrm.cpp:750
  msgid ""
  "'quote' is usually a local command used by commandline clients to send the "
  "arguments following 'quote' to the server. You might want to enter the raw "
-Line 920 
 msgstr ""
+Line 952 
 msgstr ""
  "'quote' 通常是本地命令行端向服务器端发送跟在 'quote' 之后的参数的命令。您也许"
  "想输入不以 'quote' 开头的命令"
- #: ../../locales/../src/interface/filelist_statusbar.cpp:86
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:88
- #: ../../locales/../src/interface/filelist_statusbar.cpp:95
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:97
  #, c-format
  msgid "(%d object filtered)"
  msgid_plural "(%d objects filtered)"
  msgstr[0] "(%d 个对象被过滤)"
- #: resources.h:53 resources.h:55
+ #: resources.h:762 resources.h:764
  msgid "(0 for no limit)"
  msgstr "(0 意味着没有限制)"
- #: resources.h:185
+ #: resources.h:694
  msgid "(0-99)"
  msgstr "(0-99)"
- #: resources.h:187
+ #: resources.h:696
  msgid "(0-999 seconds)"
  msgstr "(0-999 秒)"
- #: resources.h:51
+ #: resources.h:760
  msgid "(1-10)"
  msgstr "(1-10)"
- #: resources.h:58
+ #: resources.h:767
  msgid "(5-9999, 0 to disable)"
  msgstr "(5-9999， 0 意味着禁用)"
- #: resources.h:202
+ #: resources.h:877
  msgid "(At least 7 days)"
  msgstr "(至少7 天)"
- #: resources.h:217
+ #: resources.h:822
  msgid "(example: %H:%M)"
  msgstr "(示例: %H:%M)"
- #: resources.h:211
+ #: resources.h:816
  msgid "(example: %Y-%m-%d)"
  msgstr "(示例: %Y-%m-%d)"
- #: resources.h:62 resources.h:64
+ #: resources.h:771 resources.h:773
  msgid "(in KB/s)"
  msgstr "(单位 KB/s)"
-Line 971 
 msgstr "，剩下 %H:%M:%S"
+Line 1003 
 msgstr "，剩下 %H:%M:%S"
  msgid ", --:--:-- left"
  msgstr "，剩下 --:--:--"
- #: resources.h:874
+ #: resources.h:665
  msgid "-"
  msgstr "-"
-Line 980 
 msgstr "-"
+Line 1012 
 msgstr "-"
  msgid "--:--:-- left"
  msgstr "剩下 --:--:--"
- #: ../../locales/../src/interface/cmdline.cpp:72
+ #: ../../locales/../src/interface/cmdline.cpp:77
  msgid "-c cannot be used together with an FTP URL."
  msgstr "-c 不能与 FTP URL 一起使用。"
- #: ../../locales/../src/interface/cmdline.cpp:60
+ #: ../../locales/../src/interface/cmdline.cpp:86
+ #, fuzzy
+ msgid "-l can only be used together with an FTP URL."
+ msgstr "-c 不能与 FTP URL 一起使用。"
+ #: ../../locales/../src/interface/cmdline.cpp:65
  msgid "-s and -c cannot be present at the same time."
  msgstr "-s 和 -c 不能同时使用。"
- #: ../../locales/../src/interface/cmdline.cpp:66
+ #: ../../locales/../src/interface/cmdline.cpp:71
  msgid "-s cannot be used together with an FTP URL."
  msgstr "-s 不能与 FTP URL 一起使用。"
- #: resources.h:246
+ #: resources.h:895
  msgid "0 - None"
  msgstr "0 - 无"
- #: resources.h:247
+ #: resources.h:896
  msgid "1 - Warning"
  msgstr "1 - 警告"
- #: resources.h:248
+ #: resources.h:897
  msgid "2 - Info"
  msgstr "2 - 信息"
- #: resources.h:249
+ #: resources.h:898
  msgid "3 - Verbose"
  msgstr "3 - 详细"
- #: resources.h:250
+ #: resources.h:899
  msgid "4 - Debug"
  msgstr "4 - 调试"
- #: ../../locales/../src/engine/directorylistingparser.cpp:1626
+ #: ../../locales/../src/engine/directorylistingparser.cpp:1625
  msgid ";1"
  msgstr ";1"
- #: resources.h:732
+ #: resources.h:523
  msgid "?"
  msgstr "?"
-Line 1025 
 msgid ""
+Line 1062 
 msgid ""
  "A bookmark with the entered name already exists. Please enter an unused name."
  msgstr "该名称的书签已经存在。请输入一个未使用的名字。"
- #: ../../locales/../src/interface/optionspage_edit.cpp:155
+ #: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
  msgid "A default editor needs to be set."
  msgstr "需要设置默认编辑器。"
-Line 1034 
 msgstr "需要设置默认编辑器。"
+Line 1071 
 msgstr "需要设置默认编辑器。"
  msgid "A directory cannot be dragged into one if its subdirectories."
  msgstr "目录无法被拖入其子目录中。"
- #: resources.h:846
+ #: resources.h:637
  msgid ""
  "A few servers don't allow passive mode or are misconfigured. In such cases "
  "you would have to use active mode. In active mode, FileZilla opens a port "
-Line 1043 
 msgstr ""
+Line 1080 
 msgstr ""
  "有一些服务器不允许被动模式或者被错误地配置了。这样的情况下您必须使用主动模"
  "式。在主动模式下，FileZilla 打开一个端口并且让服务器来连接。"
- #: resources.h:489
+ #: resources.h:317
  msgid "A file previously opened has been changed."
  msgstr "之前打开的文件已被改动。"
- #: ../../locales/../src/interface/LocalListView.cpp:2317
+ #: ../../locales/../src/interface/LocalListView.cpp:2322
  #, c-format
  msgid ""
  "A file with that name is already being edited. Do you want to reopen '%s'?"
  msgstr "该名称的文件正在编辑。要重新打开 '%s'？"
- #: ../../locales/../src/interface/LocalListView.cpp:2313
+ #: ../../locales/../src/interface/LocalListView.cpp:2318
- #: ../../locales/../src/interface/RemoteListView.cpp:2676
+ #: ../../locales/../src/interface/RemoteListView.cpp:2674
  msgid "A file with that name is already being transferred."
  msgstr "该名称的文件已经传输。"
- #: ../../locales/../src/interface/RemoteListView.cpp:2681
+ #: ../../locales/../src/interface/RemoteListView.cpp:2679
  msgid ""
  "A file with that name is still being edited. Please close it and try again."
  msgstr "该名称的文件仍在编辑，请将其关闭后再试一次。"
-Line 1076 
 msgstr ""
+Line 1113 
 msgstr ""
  "除非解决了这个问题，不然文件在文件列表中可能会不显示。\n"
  "本次会话不会再显示警告信息了。"
- #: resources.h:403
+ #: resources.h:231
  msgid "A newer version of FileZilla is available:"
  msgstr "新版 FileZilla 可供下载:"
- #: ../../locales/../src/interface/Mainfrm.cpp:776
+ #: ../../locales/../src/interface/Mainfrm.cpp:809
  msgid ""
  "A proper server always shows all files, but some broken servers hide files "
  "from the user. Use this option to force the server to show all files."
-Line 1088 
 msgstr ""
+Line 1125 
 msgstr ""
  "一个正常的服务器总是会显示所有文件，但有些配置不恰当的服务器会把文件隐藏起"
  "来。打开这个选项强制显示服务器的所有文件。"
- #: resources.h:526
+ #: resources.h:705
  msgid ""
  "A proper server does not require this. Contact the server administrator if "
  "you need this."
  msgstr "正常的服务器是不需要这项的，如果您需要的话请联系服务器管理员。"
- #: ../../locales/../src/interface/state.cpp:94
+ #: ../../locales/../src/interface/state.cpp:206
  msgid ""
  "A remote operation is in progress and synchronized browsing is enabled.\n"
  "Disable synchronized browsing and continue changing the local directory?"
-Line 1102 
 msgstr ""
+Line 1139 
 msgstr ""
  "一个远程操作正在进行并且同步浏览是启用的。\n"
  "关闭同步浏览并且继续修改本地目录？"
- #: resources.h:156 resources.h:716 resources.h:836
+ #: resources.h:507 resources.h:627 resources.h:780
  msgid "A&SCII"
  msgstr "A&SCII"
- #: resources.h:160
+ #: resources.h:784
  msgid "A&dd"
  msgstr "添加(&d)"
- #: resources.h:462
+ #: resources.h:290
  msgid "A&llow resume of ASCII files"
  msgstr "允许续传文本格式文件(&L)"
-Line 1122 
 msgstr "只对下载起作用(&p)"
+Line 1159 
 msgstr "只对下载起作用(&p)"
  msgid "A&pply only to uploads"
  msgstr "只对上传起作用(&p)"
- #: resources.h:305
+ #: resources.h:148
  msgid "A&pply to all files and directories"
  msgstr "应用到所有文件和目录吗？(&P)"
- #: resources.h:430 resources.h:453
+ #: resources.h:258 resources.h:281
  msgid "A&sk for action"
  msgstr "询问操作(&S)"
- #: resources.h:597
+ #: resources.h:400
  msgid "ASCII"
  msgstr "ASCII"
- #: resources.h:310
+ #: resources.h:153
  msgid "About FileZilla"
  msgstr "关于 FileZilla"
- #: resources.h:174
+ #: resources.h:798
  msgid "Above the file lists"
  msgstr "在文件列表之上"
-Line 1154 
 msgstr "在文件列表之上"
+Line 1191 
 msgstr "在文件列表之上"
  msgid "Account"
  msgstr "帐号"
- #: resources.h:783
+ #: resources.h:574
  msgid "Action after queue &completion"
  msgstr "队列完成后执行动作(&C)"
- #: resources.h:513
+ #: resources.h:341
  msgid "Action on selected file:"
  msgstr "所选文件的动作:"
- #: resources.h:506
+ #: resources.h:334
  msgid "Action to perform:"
  msgstr "执行动作: "
- #: resources.h:79
+ #: resources.h:57
  msgid "Action:"
  msgstr "动作(&A):"
- #: ../../locales/../src/interface/settingsdialog.cpp:116
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:118
  msgid "Active mode"
  msgstr "主动模式"
-Line 1197 
 msgstr ""
+Line 1234 
 msgstr ""
  "主动模式 FTP 测试失败。FileZilla 知道正确的外部 IP 地址，但是您的路由器或防火"
  "墙错误地修改了传输地址。"
- #: resources.h:396
+ #: resources.h:718
  msgid "Active mode IP"
  msgstr "主动模式 IP"
- #: resources.h:376 resources.h:665
+ #: resources.h:461
- msgid "Add &more"
- msgstr "增加(&m)"
- #: resources.h:679
  msgid "Add files to &queue only"
  msgstr "只添加文件到队列"
- #: resources.h:808 resources.h:827
+ #: resources.h:599 resources.h:618
  msgid "Add selected directory to the transfer queue"
  msgstr "添加选中的文件和文件夹到传输队列"
- #: resources.h:743 resources.h:759
+ #: resources.h:534 resources.h:550
  msgid "Add selected files and folders to the transfer queue"
  msgstr "添加选中的文件和文件夹到传输队列"
- #: resources.h:639 resources.h:645
+ #: resources.h:849 resources.h:855
  msgid "Add to queue"
  msgstr "添加到队列"
-Line 1225 
 msgstr "添加到队列"
+Line 1258 
 msgstr "添加到队列"
  msgid "Address type not supported"
  msgstr "不支持该地址类型"
- #: resources.h:116
+ #: resources.h:87
- msgid "Adjust server timezone offset:"
- msgstr "调整服务器时区偏差:"
- #: resources.h:109
  msgid "Advanced"
  msgstr "高级"
- #: resources.h:400
+ #: resources.h:228
  msgid "Advanced options:"
  msgstr "高级选项:"
- #: resources.h:536
+ #: resources.h:349
  msgid "Algorithm:"
  msgstr "算法:"
- #: resources.h:875
+ #: resources.h:666
  msgid "All ports in the given range have to be between 1024 and 65535."
  msgstr "所有指定的端口范围必须在 1024 和 65535 之间。"
- #: resources.h:522
+ #: resources.h:701
  msgid "Allow &fall back to other transfer mode on failure"
  msgstr "失败后允许返回到其他传输模式(&A)"
- #: resources.h:850
+ #: resources.h:641
  msgid "Allow fallback to other transfer mode on failure"
  msgstr "失败后允许返回到其他传输模式"
- #: resources.h:532
+ #: resources.h:746
  msgid ""
  "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
  "FileZilla does recognize Pageant."
  msgstr ""
  "另外你能使用PuTTY内的Pageant工具去管理你的密钥。FileZilla同样也会认可。"
- #: resources.h:533
+ #: resources.h:747
  msgid ""
  "Alternatively you can use your system's SSH agent. To do so, make sure the "
  "SSH_AUTH_SOCK environment variable is set."
-Line 1290 
 msgstr "目标位置已存在与拖拽�
+Line 1319 
 msgstr "目标位置已存在与拖拽�
  msgid "Anonymous"
  msgstr "匿名"
- #: ../../locales/../src/interface/state.cpp:829
+ #: ../../locales/../src/interface/state.cpp:917
  msgid ""
  "Another remote operation is already in progress, cannot change directory now."
  msgstr "另一个远程操作已经进行，现在不能修改目录。"
-Line 1313 
 msgstr "任何对过滤器的更改都�
+Line 1342 
 msgstr "任何对过滤器的更改都�
  msgid "Any changes made to the filters will not be saved."
  msgstr "任何对过滤器的更改都将不被保存。"
- #: resources.h:374 resources.h:663
+ #: resources.h:150
- msgid "Any of the following"
- msgstr "以下任意"
- #: resources.h:307
  msgid "App&ly to directories only"
  msgstr "只应用到目录(&L)"
- #: resources.h:364
+ #: resources.h:207
  msgid "Apply"
  msgstr "应用"
- #: resources.h:88
+ #: resources.h:66
  msgid "Apply to &current queue only"
  msgstr "只应用到当前队列(&c)"
- #: resources.h:306
+ #: resources.h:149
  msgid "Apply to &files only"
  msgstr "只应用到文件(&F)"
- #: ../../locales/../src/interface/filter_conditions_dialog.cpp:73
+ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:79
  #: ../../locales/../src/interface/updatewizard.cpp:237
  msgid "Archive"
  msgstr "归档"
- #: resources.h:176
+ #: resources.h:800
  msgid "As tab in the transfer queue pane"
  msgstr "作为传输队列区域的标签"
-Line 1348 
 msgstr "作为传输队列区域的标�
+Line 1373 
 msgstr "作为传输队列区域的标�
  msgid "Ask for password"
  msgstr "询问密码"
- #: resources.h:871
+ #: resources.h:662
  msgid "Ask operating system for a port."
  msgstr "跟操作系统询问端口。"
- #: resources.h:861
+ #: resources.h:652
  msgid "Ask your operating system for the external IP address"
  msgstr "跟您的操作系统询问外部 IP 地址"
- #: ../../locales/../src/interface/optionspage_edit.cpp:186
+ #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64
  msgid "Associated program not found:"
  msgstr "找不到关联的程序:"
- #: ../../locales/../src/interface/filter_conditions_dialog.cpp:485
+ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:609
  msgid "At least one filter condition is incomplete"
  msgstr "至少有一个过滤条件不完整"
- #: resources.h:880
+ #: resources.h:671
  msgid "At this point, all required information has been gathered."
  msgstr "至此，所有必须的信息已经收集成功。"
- #: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
  msgid "Attribute"
  msgstr "属性(&F)..."
-Line 1376 
 msgstr "属性(&F)..."
+Line 1401 
 msgstr "属性(&F)..."
  msgid "Authentication failed."
  msgstr "认证失败"
- #: resources.h:191
+ #: resources.h:807
  msgid "Author:"
  msgstr "作者:"
- #: resources.h:594
+ #: resources.h:397
  msgid "Auto"
  msgstr "自动"
- #: resources.h:158
+ #: resources.h:782
  msgid "Automatic file type classification"
  msgstr "自动对文件进行分类"
- #: resources.h:199
+ #: resources.h:874
  msgid "Automatic update check"
  msgstr "自动升级检查"
- #: resources.h:195
+ #: resources.h:811
  msgid "Available sizes"
  msgstr "可用大小"
- #: ../../locales/../src/interface/LocalListView.cpp:617
+ #: ../../locales/../src/interface/LocalListView.cpp:628
  #: ../../locales/../src/interface/statusbar.cpp:355
  msgid "B <Unit symbol for bytes. Only translate first letter>"
  msgstr "B <字节单位符号。只传送第一个字母>"
- #: resources.h:111
+ #: resources.h:89
  msgid "B&ypass proxy"
  msgstr "绕过代理(&B)"
- #: resources.h:178
+ #: resources.h:802
  msgid "Behaviour"
  msgstr "行为"
- #: ../../locales/../src/interface/edithandler.cpp:1234
+ #: ../../locales/../src/interface/edithandler.cpp:1249
- #: ../../locales/../src/interface/edithandler.cpp:1262
+ #: ../../locales/../src/interface/edithandler.cpp:1277
  msgid "Being edited"
  msgstr "正在编辑"
- #: resources.h:598
+ #: resources.h:401
  msgid "Binary"
  msgstr "二进制"
- #: resources.h:171
+ #: resources.h:795
  msgid "Blackboard"
  msgstr "黑板"
  #: ../../locales/../src/interface/bookmarks_dialog.cpp:264
- #: ../../locales/../src/interface/Mainfrm.cpp:1032
+ #: ../../locales/../src/interface/Mainfrm.cpp:1065
  #: ../../locales/../src/interface/sitemanager.cpp:367
  msgid "Bookmark"
  msgstr "书签"
- #: resources.h:621
+ #: resources.h:424
  msgid "Bookmark:"
  msgstr "书签: "
- #: resources.h:620
+ #: resources.h:423
  msgid "Bookmarks"
  msgstr "书签"
- #: ../../locales/../src/interface/state.cpp:325
+ #: ../../locales/../src/interface/state.cpp:425
  msgid "Break current connection?"
  msgstr "中断当前连接？"
- #: resources.h:318
+ #: resources.h:161
  msgid "Build date:"
  msgstr "编译日期:"
- #: resources.h:315
+ #: resources.h:158
  msgid "Build information"
  msgstr "编译信息"
- #: resources.h:386
+ #: ../../locales/../src/interface/verifycertdialog.cpp:162
+ msgid "Business category:"
+ msgstr "业务类型:"
+ #: resources.h:708
  msgid ""
  "By default uses any available local port to establish transfers in active "
  "mode. If you want to limit FileZilla to use only a small range of ports, "
-Line 1457 
 msgstr ""
+Line 1486 
 msgstr ""
  "默认情况下主动模式可以使用任何可用的本地端口来进行传输。如果您想限制让"
  "FileZilla只使用一个小范围内的端口，那就在下面填入端口范围。"
- #: resources.h:721
+ #: resources.h:512
  msgid "C&ancel current operation"
  msgstr "取消当前操作(&C)"
- #: resources.h:402
+ #: resources.h:230
  msgid "C&heck for nightly builds of FileZilla"
  msgstr "检查自动编译的 FileZilla(&H)"
- #: resources.h:794
+ #: resources.h:585
  msgid "C&lear all"
  msgstr "全部清除(&C)"
- #: resources.h:769 resources.h:815
+ #: resources.h:560 resources.h:606
  msgid "C&opy URL(s) to clipboard"
  msgstr "复制 URL 到剪贴板(&C)"
- #: resources.h:210
+ #: resources.h:815
  msgid "C&ustom"
  msgstr "自定义(&U)"
- #: resources.h:264
+ #: resources.h:870
  msgid "C&ustom filetype associations:"
  msgstr "自定义文件格式关联:"
-Line 1501 
 msgstr "无法写数据到文件。"
+Line 1530 
 msgstr "无法写数据到文件。"
  msgid "Can't write data to file: %s"
  msgstr "无法写数据到文件: %s"
- #: resources.h:24 resources.h:91 resources.h:136 resources.h:309
+ #: resources.h:25 resources.h:69 resources.h:114 resources.h:152
- #: resources.h:336 resources.h:363 resources.h:383 resources.h:441
+ #: resources.h:179 resources.h:206 resources.h:223 resources.h:269
- #: resources.h:472 resources.h:479 resources.h:487 resources.h:510
+ #: resources.h:300 resources.h:307 resources.h:315 resources.h:338
- #: resources.h:558 resources.h:601 resources.h:615 resources.h:627
+ #: resources.h:371 resources.h:404 resources.h:418 resources.h:430
- #: resources.h:656 resources.h:681
+ #: resources.h:440 resources.h:463 resources.h:472
  msgid "Cancel"
  msgstr "取消(&C)"
- #: resources.h:908
+ #: resources.h:917
  msgid "Cancel current operation"
  msgstr "取消当前操作"
- #: resources.h:909
+ #: resources.h:918
  msgid "Cancels the current operation"
  msgstr "取消当前操作"
-Line 1522 
 msgstr "取消当前操作"
+Line 1551 
 msgstr "取消当前操作"
  msgid "Cannot access '%s', no media inserted or drive not ready."
  msgstr "无法访问 '%s'，没有媒介插入或者驱动器未准备好。"
- #: ../../locales/../src/interface/Mainfrm.cpp:689
+ #: ../../locales/../src/interface/Mainfrm.cpp:722
  msgid "Cannot add server to Site Manager"
  msgstr "不能添加服务器到管理器内"
-Line 1532 
 msgid ""
+Line 1561 
 msgid ""
  "directories are enabled"
  msgstr "无法比较目录，本地与远程目录使用了不同的过滤器"
- #: ../../locales/../src/interface/RemoteListView.cpp:2776
+ #: ../../locales/../src/interface/RemoteListView.cpp:2774
  msgid "Cannot compare directories, not connected to a server."
  msgstr "没有连接到任何服务器，无法比较目录。"
- #: ../../locales/../src/interface/filteredit.cpp:122
+ #: ../../locales/../src/interface/filteredit.cpp:141
  msgid "Cannot create new filter"
  msgstr "无法创建新过滤器"
- #: ../../locales/../src/interface/LocalListView.cpp:2295
+ #: ../../locales/../src/interface/LocalListView.cpp:2300
- #: ../../locales/../src/interface/LocalListView.cpp:2426
+ #: ../../locales/../src/interface/LocalListView.cpp:2431
- #: ../../locales/../src/interface/RemoteListView.cpp:2610
+ #: ../../locales/../src/interface/RemoteListView.cpp:2608
- #: ../../locales/../src/interface/RemoteListView.cpp:2656
+ #: ../../locales/../src/interface/RemoteListView.cpp:2654
  msgid "Cannot edit file"
  msgstr "无法编辑文件"
- #: ../../locales/../src/interface/LocalListView.cpp:2215
+ #: ../../locales/../src/interface/LocalListView.cpp:2216
  msgid "Cannot edit file, not connected to any server."
  msgstr "不能编辑文件，没有连接到任何服务器。"
- #: ../../locales/../src/interface/LocalListView.cpp:2223
+ #: ../../locales/../src/interface/LocalListView.cpp:2227
  msgid "Cannot edit file, remote path unknown."
  msgstr "不能编辑文件，未知远程路径。"
-Line 1570 
 msgstr "无法从资源文件导入快�
+Line 1599 
 msgstr "无法从资源文件导入快�
  msgid "Cannot load file, not a valid XML file."
  msgstr "无法加载文件，这不是有效的 XML 文件。"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:389
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
  msgid "Cannot load keyfile"
  msgstr "不能加载密钥文件"
- #: ../../locales/../src/interface/Mainfrm.cpp:590
+ #: ../../locales/../src/interface/Mainfrm.cpp:623
  msgid "Cannot load main menu from resource file"
  msgstr "无法从资源文件导入主菜单"
- #: ../../locales/../src/interface/Mainfrm.cpp:1260
+ #: ../../locales/../src/interface/Mainfrm.cpp:1293
  msgid "Cannot load toolbar from resource file"
  msgstr "无法从资源文件导入工具栏"
-Line 1587 
 msgstr "无法从资源文件导入工�
+Line 1616 
 msgstr "无法从资源文件导入工�
  msgid "Cannot rename entry"
  msgstr "重命名记录失败"
- #: ../../locales/../src/interface/RemoteListView.cpp:1852
+ #: ../../locales/../src/interface/RemoteListView.cpp:1873
  msgid "Cannot rename file"
  msgstr "重命名文件失败"
-Line 1600 
 msgstr "无法保存过滤器集合"
+Line 1629 
 msgstr "无法保存过滤器集合"
  msgid "Cannot select filter"
  msgstr "无法选择过滤器"
- #: ../../locales/../src/interface/edithandler.cpp:1602
+ #: ../../locales/../src/interface/edithandler.cpp:1617
- #: ../../locales/../src/interface/edithandler.cpp:1607
+ #: ../../locales/../src/interface/edithandler.cpp:1622
- #: ../../locales/../src/interface/edithandler.cpp:1646
+ #: ../../locales/../src/interface/edithandler.cpp:1661
  msgid "Cannot set file association"
  msgstr "不能设置文件格式关联"
- #: ../../locales/../src/interface/edithandler.cpp:1193
+ #: ../../locales/../src/interface/edithandler.cpp:1208
  msgid "Cannot show dialog"
  msgstr "无法显示对话框"
- #: ../../locales/../src/interface/LocalListView.cpp:2313
+ #: ../../locales/../src/interface/LocalListView.cpp:2318
- #: ../../locales/../src/interface/RemoteListView.cpp:2676
+ #: ../../locales/../src/interface/RemoteListView.cpp:2674
  msgid "Cannot view/edit selected file"
  msgstr "无法查看/编辑所选的文件"
- #: resources.h:466
+ #: resources.h:294
  msgid "Categories"
  msgstr "分类目录"
-Line 1623 
 msgstr "分类目录"
+Line 1652 
 msgstr "分类目录"
  msgid "Certificate and session data are not available yet."
  msgstr "证书和绘画数据目前不可用。"
- #: resources.h:25
+ #: resources.h:26
  msgid "Certificate details"
  msgstr "证书细节"
- #: resources.h:14 resources.h:37
+ #: resources.h:3 resources.h:27
+ msgid "Certificate in chain:"
+ msgstr "证书链"
+ #: resources.h:13 resources.h:37
  msgid "Certificate issuer"
  msgstr "证书颁发者"
- #: resources.h:144
+ #: resources.h:122
  msgid "Challenge:"
  msgstr "需要确认:"
- #: resources.h:288
+ #: resources.h:131
  msgid "Change file attributes"
  msgstr "改变文件属性"
- #: resources.h:772 resources.h:818
+ #: resources.h:563 resources.h:609
  msgid "Change the file permissions."
  msgstr "改变文件权限。"
- #: resources.h:242
+ #: resources.h:891
  msgid "Changing logfile settings requires restart of FileZilla."
  msgstr "修改日志文件设置需要重启 FileZilla。"
-Line 1651 
 msgstr "修改日志文件设置需要�
+Line 1684 
 msgstr "修改日志文件设置需要�
  msgid "Character encoding issue"
  msgstr "字符编码问题"
- #: resources.h:126
+ #: resources.h:104
  msgid "Charset"
  msgstr "字符集"
- #: resources.h:204
+ #: resources.h:879
  msgid "Check for &beta versions and release candidates"
  msgstr "检查测试和候选发布版的 FileZilla(&C)"
- #: resources.h:734
+ #: resources.h:525
  msgid "Check for &updates..."
  msgstr "检查更新(&U)..."
- #: resources.h:735
+ #: resources.h:526
  msgid "Check for newer versions of FileZilla"
  msgstr "检查新版的 FileZilla"
-Line 1671 
 msgstr "检查新版的 FileZilla"
+Line 1704 
 msgstr "检查新版的 FileZilla"
  msgid "Check for updates"
  msgstr "检查更新"
- #: ../../locales/../src/interface/Mainfrm.cpp:1975
+ #: ../../locales/../src/interface/Mainfrm.cpp:2008
  msgid "Check for updates failed"
  msgstr "检查更新失败"
-Line 1679 
 msgstr "检查更新失败"
+Line 1712 
 msgstr "检查更新失败"
  msgid "Checking for correct external IP address"
  msgstr "检查正确的外部 IP 地址"
- #: resources.h:398
+ #: resources.h:226
  msgid "Checking for updates"
  msgstr "正在检查更新"
-Line 1697 
 msgstr "选择本地目录"
+Line 1730 
 msgstr "选择本地目录"
  msgid "Chunk data improperly terminated"
  msgstr "块数据被错误地中止了"
- #: resources.h:17 resources.h:40
+ #: resources.h:18 resources.h:42
  msgid "Cipher:"
  msgstr "密码:"
- #: resources.h:168
+ #: resources.h:792
  msgid "Classic"
  msgstr "经典"
- #: resources.h:469
+ #: resources.h:297
  msgid "Clear &Site Manager entries"
  msgstr "清除站点管理器记录(&S)"
- #: resources.h:795
+ #: resources.h:586
  msgid "Clear &layout cache"
  msgstr "清空外观缓存(&L)"
- #: resources.h:467
+ #: resources.h:295
  msgid "Clear &quickconnect history"
  msgstr "清除快速连接栏里的历史(&Q)"
- #: resources.h:468
+ #: resources.h:296
  msgid "Clear &reconnect information"
  msgstr "清除重新连接信息(&R)"
- #: resources.h:470
+ #: resources.h:298
  msgid "Clear &transfer queue"
  msgstr "清除传输队列(&T)"
-Line 1729 
 msgstr "清除传输队列(&T)"
+Line 1762 
 msgstr "清除传输队列(&T)"
  msgid "Clear history"
  msgstr "清除历史记录"
- #: resources.h:464 ../../locales/../src/interface/clearprivatedata.cpp:34
+ #: resources.h:292 ../../locales/../src/interface/clearprivatedata.cpp:34
  #: ../../locales/../src/interface/clearprivatedata.cpp:40
  #: ../../locales/../src/interface/clearprivatedata.cpp:46
  #: ../../locales/../src/interface/clearprivatedata.cpp:69
-Line 1749 
 msgstr "点击完成，保存您的配�
+Line 1782 
 msgstr "点击完成，保存您的配�
  msgid "Click on next to download the new version."
  msgstr "点击文字下载最新版 FileZilla。"
- #: resources.h:545
+ #: resources.h:358
  msgid "Client to server MAC:"
  msgstr "本地至服务器 MAC:"
- #: resources.h:543
+ #: resources.h:356
  msgid "Client to server cipher:"
  msgstr "本地至服务器密码:"
- #: resources.h:690 ../../locales/../src/interface/Mainfrm.cpp:1350
+ #: resources.h:481 ../../locales/../src/interface/Mainfrm.cpp:1383
- #: ../../locales/../src/interface/Mainfrm.cpp:1373
+ #: ../../locales/../src/interface/Mainfrm.cpp:1406
  msgid "Close FileZilla"
  msgstr "关闭 FileZilla"
- #: ../../locales/../src/interface/cmdline.cpp:10
+ #: ../../locales/../src/interface/cmdline.cpp:11
  msgid "Close all running instances of FileZilla"
  msgstr "关闭所有运行的 FileZilla 实例"
- #: resources.h:108
+ #: resources.h:86
  msgid "Co&mments:"
  msgstr "注释(&m):"
-Line 1774 
 msgstr "注释(&m):"
+Line 1807 
 msgstr "注释(&m):"
  msgid "Column properties"
  msgstr "栏目属性"
- #: resources.h:552
+ #: resources.h:365
  msgid "Column setup"
  msgstr "栏目设置"
- #: resources.h:259
+ #: resources.h:865
  msgid "Command and its arguments should be properly quoted."
  msgstr "命令与其参数需要正确引用。"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:139
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:153
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:170
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170
  msgid "Command failed"
  msgstr "命令执行失败"
-Line 1802 
 msgstr "命令不被该协议支持"
+Line 1835 
 msgstr "命令不被该协议支持"
  msgid "Command:"
  msgstr "命令:"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:40
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40
  msgid "Comment"
  msgstr "注释"
- #: ../../locales/../src/interface/verifycertdialog.cpp:131
+ #: ../../locales/../src/interface/verifycertdialog.cpp:160
  msgid "Common name:"
  msgstr "公用名:"
-Line 1815 
 msgstr "公用名:"
+Line 1848 
 msgstr "公用名:"
  msgid "Communication tainted by router or firewall"
  msgstr "通讯已受路由器或防火墙影响"
- #: resources.h:702 resources.h:822
+ #: resources.h:493 resources.h:613
  msgid "Compare &modification time"
  msgstr "比较修改时间(&M)"
- #: resources.h:701 resources.h:821
+ #: resources.h:492 resources.h:612
  msgid "Compare file&size"
  msgstr "比较文件大小(&S)"
- #: resources.h:635
+ #: resources.h:845
  msgid "Comparison &threshold (in minutes):"
  msgstr "对比差异值(分钟):"
- #: ../../locales/../src/interface/optionspage_filelists.cpp:39
+ #: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39
  msgid "Comparison threshold needs to be between 0 and 1440 minutes."
  msgstr "对比值必须在 0 和 1440 分钟之间。"
- #: resources.h:316
+ #: resources.h:159
  msgid "Compiled for:"
  msgstr "编译目标:"
- #: resources.h:317
+ #: resources.h:160
  msgid "Compiled on:"
  msgstr "编译平台:"
- #: resources.h:319
+ #: resources.h:162
  msgid "Compiled with:"
  msgstr "编译器:"
- #: resources.h:320
+ #: resources.h:163
  msgid "Compiler flags:"
  msgstr "编译参数:"
- #: ../../locales/../src/interface/filter_conditions_dialog.cpp:74
+ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:80
  msgid "Compressed"
  msgstr "已压缩"
- #: resources.h:49
+ #: resources.h:758
  msgid "Concurrent transfers"
  msgstr "同时传输"
- #: resources.h:378 resources.h:667
+ #: resources.h:218 resources.h:449
  msgid "Conditions are c&ase sensitive"
  msgstr "条件是区分大小写的(&a)"
- #: resources.h:879
+ #: resources.h:670
  msgid "Configuration test"
  msgstr "配置测试"
- #: resources.h:853
+ #: resources.h:644
  msgid "Configure passive mode"
  msgstr "配置被动模式"
- #: resources.h:869
+ #: resources.h:660
  msgid "Configure port range"
  msgstr "配置端口范围"
- #: ../../locales/../src/interface/search.cpp:1031
+ #: ../../locales/../src/interface/search.cpp:1051
  msgid "Confirm deletion"
  msgstr "确认删除"
  #: ../../locales/../src/engine/local_filesys.cpp:129
- #: ../../locales/../src/interface/LocalListView.cpp:2266
+ #: ../../locales/../src/interface/LocalListView.cpp:2271
- #: ../../locales/../src/interface/LocalListView.cpp:2386
+ #: ../../locales/../src/interface/LocalListView.cpp:2391
- #: ../../locales/../src/interface/RemoteListView.cpp:1643
+ #: ../../locales/../src/interface/RemoteListView.cpp:1649
- #: ../../locales/../src/interface/RemoteListView.cpp:2627
+ #: ../../locales/../src/interface/RemoteListView.cpp:2625
  #: ../../locales/../src/interface/RemoteTreeView.cpp:1119
  msgid "Confirmation needed"
  msgstr "需要确认"
-Line 1932 
 msgstr "连接到 %s:%d..."
+Line 1965 
 msgstr "连接到 %s:%d..."
  msgid "Connecting to server"
  msgstr "正在连接到服务器"
- #: ../../locales/../src/interface/settingsdialog.cpp:114
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:116
  msgid "Connection"
  msgstr "连接"
-Line 1997 
 msgstr "连接超时"
+Line 2030 
 msgstr "连接超时"
  msgid "Connection timed out."
  msgstr "连接超时。"
- #: ../../locales/../src/interface/search.cpp:683
+ #: ../../locales/../src/interface/search.cpp:700
  msgid "Connection to server lost."
  msgstr "与服务器的连接丢失。"
-Line 2013 
 msgstr "服务器过早地关闭了连�
+Line 2046 
 msgstr "服务器过早地关闭了连�
  msgid "Connection with the test server failed."
  msgstr "测试服务器的连接失败。"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:273
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
  msgid "Convert keyfile"
  msgstr "转换密钥文件"
- #: resources.h:99 resources.h:625
+ #: resources.h:77 resources.h:428
  msgid "Cop&y"
  msgstr "复制(&y)"
-Line 2033 
 msgstr "复制 (%d) of %s"
+Line 2066 
 msgstr "复制 (%d) of %s"
  msgid "Copy of %s"
  msgstr "复制 %s"
- #: resources.h:770 resources.h:816
+ #: resources.h:561 resources.h:607
  msgid "Copy the URLs of the selected items to clipboard."
  msgstr "复制选中项的 URL 到剪贴板。"
-Line 2060 
 msgstr "无法连接到服务器: %s"
+Line 2093 
 msgstr "无法连接到服务器: %s"
  msgid "Could not convert command to server encoding"
  msgstr "无法转换命令到服务器编码模式"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:315
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:325
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
  msgid "Could not convert private key"
  msgstr "不能转换私钥"
- #: ../../locales/../src/interface/RemoteListView.cpp:3081
+ #: ../../locales/../src/interface/RemoteListView.cpp:3079
  #: ../../locales/../src/interface/RemoteTreeView.cpp:1448
  msgid "Could not copy URLs"
  msgstr "无法复制 URL"
-Line 2074 
 msgstr "无法复制 URL"
+Line 2107 
 msgstr "无法复制 URL"
  msgid "Could not copy data"
  msgstr "无法复制数据"
- #: ../../locales/../src/interface/RemoteListView.cpp:2502
+ #: ../../locales/../src/interface/RemoteListView.cpp:2528
  #: ../../locales/../src/interface/RemoteTreeView.cpp:893
  msgid ""
  "Could not determine the target of the Drag&Drop operation.\n"
-Line 2103 
 msgstr ""
+Line 2136 
 msgstr ""
  msgid "Could not generate custom login sequence."
  msgstr "无法生成自定义登录过程"
- #: ../../locales/../src/interface/state.cpp:813
+ #: ../../locales/../src/interface/state.cpp:901
  msgid "Could not get full remote path."
  msgstr "无法得到完整远程路径"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:153
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:170
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170
  msgid "Could not get reply from fzputtygen."
  msgstr "不能取得fzputtygen的回应。"
- #: ../../locales/../src/interface/RemoteListView.cpp:2610
+ #: ../../locales/../src/interface/RemoteListView.cpp:2608
  msgid "Could not get temporary directory to download file into."
  msgstr "找不到放置下载文件时所需的临时目录。"
-Line 2127 
 msgstr ""
+Line 2160 
 msgstr ""
  "无法导入“ %s” ，请确认文件有效并且有权访问。\n"
  "任何对站点管理器的修改将不被保存。"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:223
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
  msgid "Could not load keyfile"
  msgstr "不能加载密钥文件"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:300
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
  msgid "Could not load private key"
  msgstr "不能加载私钥"
- #: ../../locales/../src/interface/state.cpp:839
+ #: ../../locales/../src/interface/state.cpp:927
  #, c-format
  msgid ""
  "Could not obtain corresponding local directory for the remote directory '%"
-Line 2145 
 msgstr ""
+Line 2178 
 msgstr ""
  "远程目录“%s”不能获得相应的本地目录。\n"
  "关闭同步浏览并且继续修改本地目录？"
- #: ../../locales/../src/interface/state.cpp:191
+ #: ../../locales/../src/interface/state.cpp:303
  #, c-format
  msgid ""
  "Could not obtain corresponding local directory for the remote directory '%"
-Line 2155 
 msgstr ""
+Line 2188 
 msgstr ""
  "远程目录“%s”不能获得相应的本地目录。\n"
  "同步浏览已经被关闭。"
- #: ../../locales/../src/interface/state.cpp:105
+ #: ../../locales/../src/interface/state.cpp:217
  #, c-format
  msgid ""
  "Could not obtain corresponding remote directory for the local directory '%"
-Line 2166 
 msgstr ""
+Line 2199 
 msgstr ""
  "同步浏览已经被关闭。"
  #: ../../locales/../src/interface/aboutdialog.cpp:143
- #: ../../locales/../src/interface/RemoteListView.cpp:3081
+ #: ../../locales/../src/interface/RemoteListView.cpp:3079
  #: ../../locales/../src/interface/RemoteTreeView.cpp:1448
  msgid "Could not open clipboard"
  msgstr "无法打开剪贴板"
-Line 2204 
 msgstr "无法找到文件中偏移为%s
+Line 2237 
 msgstr "无法找到文件中偏移为%s
  msgid "Could not seek to the end of the file"
  msgstr "无法找到文件尾"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:139
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
  msgid "Could not send command to fzputtygen."
  msgstr "不能将命令送达fzputtygen。"
-Line 2230 
 msgid ""
+Line 2263 
 msgid ""
  "s"
  msgstr "不能写入“%s”，任何对站点管理器的更改不能被保存: %s"
- #: ../../locales/../src/interface/bookmarks_dialog.cpp:840
+ #: ../../locales/../src/interface/bookmarks_dialog.cpp:848
  #, c-format
  msgid "Could not write \"%s\", the bookmark could not be added: %s"
  msgstr "不能写入“%s”，无法添加该书签: %s"
-Line 2251 
 msgstr ""
+Line 2284 
 msgstr ""
  "%s"
  #: ../../locales/../src/interface/sitemanager.cpp:2642
- #: ../../locales/../src/interface/sitemanager.cpp:2998
+ #: ../../locales/../src/interface/sitemanager.cpp:3004
- #: ../../locales/../src/interface/sitemanager.cpp:3060
+ #: ../../locales/../src/interface/sitemanager.cpp:3066
  #, c-format
  msgid "Could not write \"%s\", the selected sites could not be exported: %s"
  msgstr "不能写入“%s”，所选择的站点不能导出: %s"
-Line 2262 
 msgstr "不能写入“%s”，所选择
+Line 2295 
 msgstr "不能写入“%s”，所选择
  msgid "Could not write \"%s\": %s"
  msgstr "无法写入“%s”: %s"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:325
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
  #, c-format
  msgid "Could not write keyfile: %s"
  msgstr "不能写入密钥文件: %s"
-Line 2283 
 msgstr "不能写入日志文件: %s"
+Line 2316 
 msgstr "不能写入日志文件: %s"
  msgid "Could not write to socket: %s"
  msgstr "不能向接口 (socket) 写入: %s"
- #: ../../locales/../src/interface/verifycertdialog.cpp:135
+ #: ../../locales/../src/interface/verifycertdialog.cpp:165
  msgid "Country:"
  msgstr "国家:"
- #: resources.h:797
+ #: resources.h:588
  msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
  msgstr "使 Filezilla 立即崩溃。只用作特殊调试"
- #: resources.h:751 resources.h:764 resources.h:810 resources.h:829
+ #: resources.h:542 resources.h:555 resources.h:601 resources.h:620
  msgid "Create a new subdirectory in the current directory"
  msgstr "在当前目录创建一个新的子目录"
- #: ../../locales/../src/interface/LocalListView.cpp:1397
+ #: ../../locales/../src/interface/LocalListView.cpp:1393
- #: ../../locales/../src/interface/LocalTreeView.cpp:1320
+ #: ../../locales/../src/interface/LocalTreeView.cpp:1158
- #: ../../locales/../src/interface/RemoteListView.cpp:1552
+ #: ../../locales/../src/interface/RemoteListView.cpp:1553
  #: ../../locales/../src/interface/RemoteTreeView.cpp:1270
  msgid "Create directory"
  msgstr "创建目录"
-Line 2316 
 msgstr "创建目录‘ %s’ ..."
+Line 2349 
 msgstr "创建目录‘ %s’ ..."
  msgid "Critical error"
  msgstr "严重错误"
- #: ../../locales/../src/interface/state.cpp:180
+ #: ../../locales/../src/interface/state.cpp:292
  #, c-format
  msgid ""
  "Current remote directory (%s) is not below the synchronization root (%s).\n"
-Line 2337 
 msgstr "当前的传送类型为自动�
+Line 2370 
 msgstr "当前的传送类型为自动�
  msgid "Current transfer type is set to binary."
  msgstr "当前的传送类型被设置到二进制模式。"
- #: resources.h:216 resources.h:273
+ #: resources.h:729 resources.h:821
  msgid "Cus&tom"
  msgstr "自定义(&T)"
-Line 2345 
 msgstr "自定义(&T)"
+Line 2378 
 msgstr "自定义(&T)"
  msgid "Custom filter set"
  msgstr "自定义过滤器集合"
- #: resources.h:584 resources.h:585
+ #: resources.h:387 resources.h:388
  msgid "Custom server"
  msgstr "自定义服务器"
- #: resources.h:593
+ #: resources.h:396
  msgid "D&ata type"
  msgstr "数据类型(&D)"
- #: resources.h:223
+ #: resources.h:828
  msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
  msgstr "使用 SI 式十进制前缀 (即 1 KB = 1000 bytes) (&D)"
- #: resources.h:121
+ #: resources.h:99
  msgid "D&efault"
  msgstr "默认(&e)"
- #: resources.h:765 resources.h:811 resources.h:839
+ #: resources.h:556 resources.h:602 resources.h:630
  msgid "D&elete"
  msgstr "删除(&e)"
- #: resources.h:356
+ #: resources.h:199
  msgid "D&isable all"
  msgstr "全部失效(&I)"
- #: resources.h:642
+ #: resources.h:852
  msgid "D&ouble-click action on directories:"
  msgstr "双击目录操作:"
-Line 2377 
 msgstr "双击目录操作:"
+Line 2410 
 msgstr "双击目录操作:"
  msgid "DOS-like with virtual paths"
  msgstr "DOS式(DOS-like)虚拟路径"
- #: ../../locales/../src/interface/LocalListView.cpp:2300
+ #: ../../locales/../src/interface/LocalListView.cpp:2305
- #: ../../locales/../src/interface/RemoteListView.cpp:2661
+ #: ../../locales/../src/interface/RemoteListView.cpp:2659
  msgid "Dangerous filetype"
  msgstr "可能会引起危险的文件格式。"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:41
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
  msgid "Data"
  msgstr "数据"
-Line 2391 
 msgstr "数据"
+Line 2424 
 msgstr "数据"
  msgid "Data socket closed too early."
  msgstr "数据接口过早关闭。"
- #: resources.h:207
+ #: resources.h:812
  msgid "Date formatting"
  msgstr "日期格式"
- #: ../../locales/../src/interface/settingsdialog.cpp:126
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:128
  msgid "Date/time format"
  msgstr "时间/日期格式"
-Line 2406 
 msgstr "时间/日期格式"
+Line 2439 
 msgstr "时间/日期格式"
  msgid "Date/time unknown"
  msgstr "日期/时间 未知"
- #: ../../locales/../src/interface/settingsdialog.cpp:138
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:141
  msgid "Debug"
  msgstr "调试"
- #: resources.h:243
+ #: resources.h:892
  msgid "Debugging settings"
  msgstr "调试设置"
- #: resources.h:112
+ #: resources.h:90
  msgid "Default &local directory:"
  msgstr "默认本地目录(&l):"
-Line 2422 
 msgstr "默认本地目录(&l):"
+Line 2455 
 msgstr "默认本地目录(&l):"
  msgid "Default (Autodetect)"
  msgstr "默认(自动检测)(&A)"
- #: ../../locales/../src/interface/optionspage_edit.cpp:140
+ #: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
  msgid "Default editor not properly quoted."
  msgstr "没有正确引用默认编辑器。"
- #: resources.h:416
+ #: resources.h:244
  msgid "Default file exists action"
  msgstr "默认对已存在文件的操作"
- #: resources.h:114
+ #: resources.h:92
  msgid "Default r&emote directory:"
  msgstr "默认远程目录(&e):"
-Line 2440 
 msgid ""
+Line 2473 
 msgid ""
  "by the selected servertype."
  msgstr "默认远程路经无法解析。请确认是否有效并且被选择的服务模式支持。"
- #: ../../locales/../src/interface/optionspage_language.cpp:78
+ #: ../../locales/../src/interface/settings/optionspage_language.cpp:78
  msgid "Default system language"
  msgstr "系统默认语言"
- #: resources.h:847
+ #: resources.h:638
  msgid "Default transfer mode:"
  msgstr "默认传输模式:"
- #: resources.h:154
+ #: resources.h:778
  msgid "Default transfer type:"
  msgstr "默认传输类型:"
- #: resources.h:394 resources.h:866
+ #: resources.h:657 resources.h:716
  msgid "Default: http://ip.filezilla-project.org/ip.php"
  msgstr "默认: http://ip.filezilla-project.org/ip.php"
- #: ../../locales/../src/interface/optionspage_connection.cpp:40
+ #: ../../locales/../src/interface/settings/optionspage_connection.cpp:40
  msgid ""
  "Delay between failed connection attempts has to be between 1 and 999 seconds."
  msgstr "在失败的登陆请求之间的延迟必须在1和999秒之间。"
-Line 2475 
 msgstr[0] "由于上一次尝试连接�
+Line 2508 
 msgstr[0] "由于上一次尝试连接�
  msgid "Delete Site Manager entry"
  msgstr "清除站点管理器记录"
- #: resources.h:812 resources.h:831
+ #: resources.h:603 resources.h:622
  msgid "Delete selected directory"
  msgstr "删除所选的文件夹"
- #: resources.h:753 resources.h:766
+ #: resources.h:544 resources.h:557
  msgid "Delete selected files and directories"
  msgstr "删除选定的文件和文件夹"
- #: ../../locales/../src/interface/search.cpp:1015
+ #: ../../locales/../src/interface/search.cpp:1035
  msgid "Deleting directories"
  msgstr "正在删除目录"
- #: ../../locales/../src/interface/search.cpp:1015
+ #: ../../locales/../src/interface/search.cpp:1035
  msgid "Deleting multiple unrelated directories is not yet supported"
  msgstr "目前不支持删除多个不相关的目录。"
- #: ../../locales/../src/interface/LocalTreeView.cpp:1020
+ #: resources.h:464
+ msgid "Deleting symbolic link"
+ msgstr "正在删除符号链接"
+ #: ../../locales/../src/interface/LocalTreeView.cpp:1022
  msgid "Desktop"
  msgstr "桌面"
- #: resources.h:3 resources.h:26 resources.h:328
+ #: resources.h:4 resources.h:28 resources.h:171
  msgid "Details"
  msgstr "详细资料"
- #: resources.h:340
+ #: resources.h:183
  msgid "Details for new key:"
  msgstr "新密钥的详细资料:"
- #: resources.h:381
+ #: resources.h:221
  msgid "Dire&ctories"
  msgstr "目录"
-Line 2515 
 msgstr "方向"
+Line 2552 
 msgstr "方向"
  msgid "Directory"
  msgstr "目录"
- #: resources.h:633 resources.h:819 resources.h:917
+ #: resources.h:610 resources.h:843 resources.h:926
  #: ../../locales/../src/interface/filelistctrl.cpp:375
- #: ../../locales/../src/interface/Mainfrm.cpp:2509
+ #: ../../locales/../src/interface/Mainfrm.cpp:2540
  msgid "Directory comparison"
  msgstr "比较目录"
-Line 2527 
 msgstr "比较目录"
+Line 2564 
 msgstr "比较目录"
  msgid "Directory comparison failed"
  msgstr "比较目录失败"
- #: ../../locales/../src/interface/optionspage_logging.cpp:71
+ #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
  msgid "Directory containing the logfile does not exist or filename is invalid."
  msgstr "保存日志文件的目录不存在或文件名无效。"
-Line 2535 
 msgstr "保存日志文件的目录不�
+Line 2572 
 msgstr "保存日志文件的目录不�
  msgid "Directory listing aborted by user"
  msgstr "目录列表被用户终止"
- #: ../../locales/../src/interface/RemoteListView.cpp:2304
+ #: ../../locales/../src/interface/RemoteListView.cpp:2330
  msgid "Directory listing failed"
  msgstr "目录列表失败"
- #: resources.h:349
+ #: resources.h:192
  msgid "Directory listing filters"
  msgstr "目录过滤器"
-Line 2547 
 msgstr "目录过滤器"
+Line 2584 
 msgstr "目录过滤器"
  msgid "Directory listing successful"
  msgstr "列目录成功"
- #: resources.h:359
+ #: resources.h:202
  msgid "Disa&ble all"
  msgstr "全部失效(&B)"
- #: ../../locales/../src/interface/state.cpp:847
+ #: ../../locales/../src/interface/state.cpp:935
  msgid ""
  "Disable synchronized browsing and continue changing the remote directory?"
  msgstr "关闭同步浏览并且继续修改本地目录？"
- #: ../../locales/../src/interface/Mainfrm.cpp:778
+ #: ../../locales/../src/interface/Mainfrm.cpp:811
  msgid ""
  "Disable this option again if you will not be able to see the correct "
  "directory contents anymore."
  msgstr "如果您无法再看见文件时请停用此选项。"
- #: resources.h:910
+ #: resources.h:919
  msgid "Disconnect from server"
  msgstr "从服务器断开"
-Line 2588 
 msgstr "已从服务器断开: %s"
+Line 2625 
 msgstr "已从服务器断开: %s"
  msgid "Disconnecting from previous server"
  msgstr "正在从上一个服务器断开连接"
- #: resources.h:911
+ #: resources.h:920
  msgid "Disconnects from the currently visible server"
  msgstr "断开当前可见的服务器"
- #: resources.h:739
+ #: resources.h:530
  msgid "Display about dialog"
  msgstr "显示关于对话框"
- #: resources.h:255
+ #: resources.h:861
  msgid "Do &not use default editor"
  msgstr "不使用默认编辑器(&N)"
- #: resources.h:791
+ #: resources.h:582
  msgid "Do &nothing"
  msgstr "什么都不做(&N)"
- #: ../../locales/../src/interface/optionspage_updatecheck.cpp:60
+ #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:60
  #: ../../locales/../src/interface/updatewizard.cpp:156
  msgid ""
  "Do you really want to check for beta versions?\n"
-Line 2613 
 msgstr ""
+Line 2650 
 msgstr ""
  "您真的想检查测试版吗？\n"
  "除非您想测试新功能，否则请使用稳定的正式版。"
- #: ../../locales/../src/interface/Mainfrm.cpp:1353
+ #: ../../locales/../src/interface/Mainfrm.cpp:1386
- #: ../../locales/../src/interface/Mainfrm.cpp:1377
+ #: ../../locales/../src/interface/Mainfrm.cpp:1410
  msgid "Do you really want to close FileZilla?"
  msgstr "您真的要关闭 FileZilla？"
-Line 2635 
 msgstr "您确是想删除所选的记�
+Line 2672 
 msgstr "您确是想删除所选的记�
  msgid "Do you really want to delete the transfer queue?"
  msgstr "您确是想删除传输队列？"
- #: ../../locales/../src/interface/Mainfrm.cpp:718
+ #: ../../locales/../src/interface/Mainfrm.cpp:751
  #, c-format
  msgid "Do you really want to send '%s' to the server?"
  msgstr "您确是想发送'%s'给服务器吗?"
- #: resources.h:868
+ #: resources.h:659
  msgid "Don't use external IP address on &local connections."
  msgstr "本地连接不使用外部 IP 地址(&L)。"
- #: resources.h:165
+ #: resources.h:789
  msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
  msgstr "文件名的开始是以一个点开始的，比如: .htaccess"
- #: resources.h:636
+ #: resources.h:846
  msgid "Double-click action"
  msgstr "双击操作"
- #: resources.h:570
+ #: resources.h:373
  msgid "Download"
  msgstr "下载"
- #: resources.h:61
+ #: resources.h:770
  msgid "Download &limit:"
  msgstr "下载限制(&L)"
- #: resources.h:670 ../../locales/../src/interface/search.cpp:821
+ #: resources.h:452 ../../locales/../src/interface/search.cpp:841
- #: ../../locales/../src/interface/search.cpp:827
+ #: ../../locales/../src/interface/search.cpp:847
  msgid "Download search results"
  msgstr "下载搜索结果"
- #: resources.h:806
+ #: resources.h:597
  msgid "Download selected directory"
  msgstr "下载选定的文件夹"
- #: resources.h:757
+ #: resources.h:548
  msgid "Download selected files and directories"
  msgstr "下载选定的文件和文件夹"
- #: ../../locales/../src/interface/edithandler.cpp:1219
+ #: ../../locales/../src/interface/edithandler.cpp:1234
  msgid "Downloading"
  msgstr "正在下载"
-Line 2683 
 msgstr "正在下载"
+Line 2720 
 msgstr "正在下载"
  msgid "Downloading %s"
  msgstr "正在下载 %s"
- #: ../../locales/../src/interface/search.cpp:930
+ #: ../../locales/../src/interface/search.cpp:950
  msgid "Downloading multiple unrelated directories is not yet supported"
  msgstr "目前不支持下载多个不相关的目录。"
- #: ../../locales/../src/interface/search.cpp:930
+ #: ../../locales/../src/interface/search.cpp:950
  msgid "Downloading search results"
  msgstr "正在下载搜索结果"
- #: resources.h:418 resources.h:443
+ #: resources.h:246 resources.h:271
  msgid "Downloads"
  msgstr "下载"
- #: ../../locales/../src/interface/LocalListView.cpp:101
+ #: ../../locales/../src/interface/LocalListView.cpp:102
- #: ../../locales/../src/interface/LocalTreeView.cpp:103
+ #: ../../locales/../src/interface/LocalTreeView.cpp:104
  #: ../../locales/../src/interface/QueueView.cpp:78
  #: ../../locales/../src/interface/RemoteListView.cpp:99
  #: ../../locales/../src/interface/RemoteTreeView.cpp:85
-Line 2705 
 msgid ""
+Line 2742 
 msgid ""
  "yet."
  msgstr "在不同的FileZilla的实例间拖放还未被实现"
- #: ../../locales/../src/interface/LocalListView.cpp:107
+ #: ../../locales/../src/interface/LocalListView.cpp:108
- #: ../../locales/../src/interface/LocalTreeView.cpp:109
+ #: ../../locales/../src/interface/LocalTreeView.cpp:110
  #: ../../locales/../src/interface/QueueView.cpp:89
  #: ../../locales/../src/interface/RemoteListView.cpp:105
  #: ../../locales/../src/interface/RemoteTreeView.cpp:91
  msgid "Drag&drop between different servers has not been implemented yet."
  msgstr "在不同服务器之间拖放还未被实现。"
- #: ../../locales/../src/interface/filteredit.cpp:128
+ #: ../../locales/../src/interface/filteredit.cpp:147
- #: ../../locales/../src/interface/filteredit.cpp:196
+ #: ../../locales/../src/interface/filteredit.cpp:215
- #: ../../locales/../src/interface/filteredit.cpp:235
+ #: ../../locales/../src/interface/filteredit.cpp:254
  msgid "Duplicate filter name"
  msgstr "重复的过滤器名称"
- #: resources.h:355
+ #: resources.h:198
  msgid "E&nable all"
  msgstr "全部生效(&N)"
- #: resources.h:744 resources.h:760
+ #: resources.h:535 resources.h:551
  msgid "E&nter directory"
  msgstr "进入目录(&N)"
- #: resources.h:297
+ #: resources.h:140
  msgid "E&xecute"
  msgstr "执行(&X)"
- #: resources.h:689
+ #: resources.h:480
  msgid "E&xit"
  msgstr "退出(&X)"
- #: ../../locales/../src/interface/verifycertdialog.cpp:139
+ #: ../../locales/../src/interface/verifycertdialog.cpp:170
  msgid "E-Mail:"
  msgstr "电子邮件:"
- #: ../../locales/../src/interface/filter_conditions_dialog.cpp:467
+ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:591
  msgid "Each filter needs at least one condition."
  msgstr "每个过滤器至少要有一个条件。"
- #: resources.h:365
+ #: resources.h:224
  msgid "Edit filters"
  msgstr "编辑过滤器"
- #: resources.h:749
+ #: resources.h:540
  msgid ""
  "Edit the file with the configured editor and upload changes to the server."
  msgstr "使用配置好的编辑器编辑文件并上传修改后的文件回服务器。"
- #: ../../locales/../src/interface/LocalListView.cpp:2215
+ #: ../../locales/../src/interface/LocalListView.cpp:2216
- #: ../../locales/../src/interface/LocalListView.cpp:2223
+ #: ../../locales/../src/interface/LocalListView.cpp:2227
  msgid "Editing failed"
  msgstr "编辑失败"
- #: resources.h:193
+ #: resources.h:809
  msgid "Email:"
  msgstr "电子邮件:"
- #: ../../locales/../src/interface/QueueView.cpp:2131
+ #: ../../locales/../src/interface/QueueView.cpp:2135
  msgid "Empty command"
  msgstr "清空命令"
- #: ../../locales/../src/interface/optionspage_edit.cpp:182
+ #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60
  msgid "Empty command."
  msgstr "清空命令。"
- #: ../../locales/../src/interface/RemoteListView.cpp:2306
+ #: ../../locales/../src/interface/RemoteListView.cpp:2332
  msgid "Empty directory listing"
  msgstr "空目录列表"
- #: ../../locales/../src/interface/filelist_statusbar.cpp:91
+ #: ../../locales/../src/interface/filelist_statusbar.cpp:24
  msgid "Empty directory."
  msgstr "空目录"
- #: ../../locales/../src/interface/optionspage_edit.cpp:175
+ #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53
  msgid "Empty file extension."
  msgstr "空文件扩展名。"
- #: ../../locales/../src/interface/filteredit.cpp:187
+ #: ../../locales/../src/interface/filteredit.cpp:206
- #: ../../locales/../src/interface/filteredit.cpp:229
+ #: ../../locales/../src/interface/filteredit.cpp:248
  msgid "Empty filter names are not allowed."
  msgstr "过滤器名称不能为空。"
- #: ../../locales/../src/interface/filteredit.cpp:187
+ #: ../../locales/../src/interface/filteredit.cpp:206
- #: ../../locales/../src/interface/filteredit.cpp:229
+ #: ../../locales/../src/interface/filteredit.cpp:248
  msgid "Empty name"
  msgstr "空名称"
- #: ../../locales/../src/interface/optionspage_edit.cpp:143
+ #: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
  msgid "Empty quoted string."
  msgstr "空的引用字串。"
- #: resources.h:358
+ #: resources.h:201
  msgid "En&able all"
  msgstr "全部生效(&A)"
- #: ../../locales/../src/interface/filter_conditions_dialog.cpp:75
+ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:81
  msgid "Encrypted"
  msgstr "已加密"
- #: resources.h:542
+ #: resources.h:355
  msgid "Encryption"
  msgstr "加密"
- #: resources.h:534
+ #: resources.h:347
  msgid "Encryption details"
  msgstr "加密细节"
-Line 2815 
 msgstr "加密细节"
+Line 2852 
 msgstr "加密细节"
  msgid "End comparison and change sorting order?"
  msgstr "结束对比并改变排序?"
- #: resources.h:726
+ #: resources.h:517
  msgid "Enter &custom command..."
  msgstr "输入自定义命令(&c)..."
- #: ../../locales/../src/interface/QueueView.cpp:2120
+ #: ../../locales/../src/interface/QueueView.cpp:2124
  msgid "Enter command"
  msgstr "输入命令"
- #: ../../locales/../src/interface/Mainfrm.cpp:700
+ #: ../../locales/../src/interface/Mainfrm.cpp:733
  msgid "Enter custom command"
  msgstr "输入自定义命令"
- #: resources.h:643
+ #: resources.h:853
  msgid "Enter directory"
  msgstr "进入目录"
- #: ../../locales/../src/interface/filteredit.cpp:115
+ #: ../../locales/../src/interface/filteredit.cpp:134
- #: ../../locales/../src/interface/filteredit.cpp:175
+ #: ../../locales/../src/interface/filteredit.cpp:194
- #: ../../locales/../src/interface/filteredit.cpp:222
+ #: ../../locales/../src/interface/filteredit.cpp:241
  msgid "Enter filter name"
  msgstr "请输入过滤器名称"
-Line 2845 
 msgstr "给过滤器集合输入名称"
+Line 2882 
 msgstr "给过滤器集合输入名称"
  msgid "Enter new name for filterset"
  msgstr "给过滤器集合输入新名称"
- #: resources.h:137
+ #: resources.h:115
  msgid "Enter password"
  msgstr "输入密码"
- #: resources.h:745 resources.h:761
+ #: resources.h:536 resources.h:552
  msgid "Enter selected directory"
  msgstr "进入所选的文件夹"
- #: resources.h:888
+ #: resources.h:679
  msgid ""
  "Enter the address of the server.\n"
  "To specify the server protocol, prepend the host with the protocol "
-Line 2868 
 msgstr ""
+Line 2905 
 msgstr ""
  "您也可以键入完整的URL地址，使用如下格式 protocol://user:pass@host:port ，这样"
  "其它的输入框的值会被覆盖。"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:279
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
  #, c-format
  msgid ""
  "Enter the password for the file '%s'.\n"
-Line 2877 
 msgstr ""
+Line 2914 
 msgstr ""
  "请为文件‘%s’输入密码。\n"
  "请注意转换的文件不会被此密码进行加密。"
- #: resources.h:892
+ #: resources.h:683
  msgid ""
  "Enter the port on which the server listens.\n"
  "The default for FTP is 21, the default for SFTP is 22."
-Line 2908 
 msgstr "导入出错"
+Line 2945 
 msgstr "导入出错"
  #: ../../locales/../src/interface/filter.cpp:948
  #: ../../locales/../src/interface/import.cpp:121
  #: ../../locales/../src/interface/import.cpp:312
- #: ../../locales/../src/interface/Options.cpp:177
+ #: ../../locales/../src/interface/Options.cpp:180
  #: ../../locales/../src/interface/QueueView.cpp:1861
  #: ../../locales/../src/interface/QueueView.cpp:1888
  #: ../../locales/../src/interface/sitemanager.cpp:682
-Line 2918 
 msgstr "导入出错"
+Line 2955 
 msgstr "导入出错"
  #: ../../locales/../src/interface/sitemanager.cpp:2717
  #: ../../locales/../src/interface/sitemanager.cpp:2823
  #: ../../locales/../src/interface/sitemanager.cpp:2943
- #: ../../locales/../src/interface/sitemanager.cpp:3024
+ #: ../../locales/../src/interface/sitemanager.cpp:3030
  #: ../../locales/../src/interface/wrapengine.cpp:927
  msgid "Error loading xml file"
  msgstr "导入 XML 文件错误"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:97
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:119
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
  msgid "Error starting program"
  msgstr "启动程序错误"
  #: ../../locales/../src/interface/bookmarks_dialog.cpp:321
- #: ../../locales/../src/interface/bookmarks_dialog.cpp:841
+ #: ../../locales/../src/interface/bookmarks_dialog.cpp:849
  #: ../../locales/../src/interface/QueueView.cpp:1872
  #: ../../locales/../src/interface/QueueView.cpp:1908
  #: ../../locales/../src/interface/sitemanager.cpp:859
  #: ../../locales/../src/interface/sitemanager.cpp:2643
  #: ../../locales/../src/interface/sitemanager.cpp:2878
- #: ../../locales/../src/interface/sitemanager.cpp:2999
+ #: ../../locales/../src/interface/sitemanager.cpp:3005
- #: ../../locales/../src/interface/sitemanager.cpp:3061
+ #: ../../locales/../src/interface/sitemanager.cpp:3067
  #: ../../locales/../src/interface/wrapengine.cpp:1086
  msgid "Error writing xml file"
  msgstr "写入 XML 文件错误"
-Line 2947 
 msgstr "写入 XML 文件错误"
+Line 2984 
 msgstr "写入 XML 文件错误"
  msgid "Error:"
  msgstr "错误:"
- #: resources.h:266
+ #: resources.h:872
  msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
  msgstr "示例: png \"c:\\program files\\viewer\\viewer.exe\" -open"
- #: resources.h:226
+ #: resources.h:831
  msgid "Examples"
  msgstr "示例"
- #: resources.h:301
+ #: resources.h:144
  msgid "Exe&cute"
  msgstr "执行(&C)"
-Line 2963 
 msgstr "执行(&C)"
+Line 3000 
 msgstr "执行(&C)"
  msgid "Executable"
  msgstr "可执行"
- #: ../../locales/../src/interface/Mainfrm.cpp:1975
+ #: ../../locales/../src/interface/Mainfrm.cpp:2008
  msgid "Executable contains no version info, cannot check for updates."
  msgstr "程序未包含版本信息，无法检查更新。"
- #: resources.h:169
+ #: resources.h:793
  msgid "Explorer"
  msgstr "浏览器"
- #: resources.h:477
+ #: resources.h:305
  msgid "Export &Queue"
  msgstr "导出队列(&Q)"
- #: resources.h:476
+ #: resources.h:304
  msgid "Export &Settings"
  msgstr "导出设置(&S)"
- #: resources.h:473
+ #: resources.h:301
  msgid "Export settings"
  msgstr "导出设置"
- #: resources.h:371
+ #: resources.h:213
  msgid "F&ilter name:"
  msgstr "过滤器名:"
- #: ../../locales/../src/interface/settingsdialog.cpp:115
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
  #: ../../locales/../src/interface/sitemanager.cpp:1577
  msgid "FTP"
  msgstr "FTP"
-Line 2996 
 msgstr "FTP"
+Line 3033 
 msgstr "FTP"
  msgid "FTP Engine not initialized, can't connect"
  msgstr "FTP 引擎没有初始化，无法连接"
- #: resources.h:524
+ #: resources.h:703
  msgid "FTP Keep-alive"
  msgstr "FTP 防掉线"
- #: resources.h:267 ../../locales/../src/interface/settingsdialog.cpp:118
+ #: resources.h:723
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
  msgid "FTP Proxy"
  msgstr "FTP 代理服务器"
- #: ../../locales/../src/interface/cmdline.cpp:15
+ #: ../../locales/../src/interface/cmdline.cpp:16
  msgid "FTP URL"
  msgstr "FTP 地址"
- #: resources.h:844
+ #: resources.h:635
  msgid ""
  "FTP uses secondary connections for data transfers. These additional "
  "connections can be established in two ways."
-Line 3022 
 msgstr "FTPES - 通过显式 TLS/SSL 的
+Line 3060 
 msgstr "FTPES - 通过显式 TLS/SSL 的
  msgid "FTPS - FTP over implicit TLS/SSL"
  msgstr "FTPS - 通过隐式 TLS/SSL 的 FTP"
- #: ../../locales/../src/interface/LocalListView.cpp:728
+ #: ../../locales/../src/interface/LocalListView.cpp:739
- #: ../../locales/../src/interface/LocalListView.cpp:810
+ #: ../../locales/../src/interface/LocalListView.cpp:821
- #: ../../locales/../src/interface/LocalListView.cpp:1509
+ #: ../../locales/../src/interface/LocalListView.cpp:1505
- #: ../../locales/../src/interface/LocalTreeView.cpp:878
+ #: ../../locales/../src/interface/LocalTreeView.cpp:880
  #: ../../locales/../src/interface/viewheader.cpp:515
  msgid "Failed to change directory"
  msgstr "改变目录失败"
-Line 3033 
 msgstr "改变目录失败"
+Line 3071 
 msgstr "改变目录失败"
  #: ../../locales/../src/interface/FileZilla.cpp:224
  #: ../../locales/../src/interface/FileZilla.cpp:232
  #: ../../locales/../src/interface/FileZilla.cpp:234
- #: ../../locales/../src/interface/optionspage_language.cpp:53
+ #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
  msgid "Failed to change language"
  msgstr "改变语言失败"
-Line 3062 
 msgstr "为主动模式传输创建监�
+Line 3100 
 msgstr "为主动模式传输创建监�
  msgid "Failed to download the latest version of FileZilla."
  msgstr "下载最新版 FileZilla 失败。"
- #: ../../locales/../src/interface/LocalTreeView.cpp:647
+ #: ../../locales/../src/interface/LocalTreeView.cpp:649
  msgid "Failed to get 'My Documents' path"
  msgstr "取得“我的文档”路径失败"
- #: ../../locales/../src/interface/LocalTreeView.cpp:633
+ #: ../../locales/../src/interface/LocalTreeView.cpp:635
  msgid "Failed to get desktop path"
  msgstr "改变桌面路径失败"
-Line 3078 
 msgstr "获取对等地址控制连接�
+Line 3116 
 msgstr "获取对等地址控制连接�
  msgid "Failed to get peer address of data connection, connection closed."
  msgstr "获取对等地址数据连接失败，连接已关闭。"
- #: ../../locales/../src/interface/Mainfrm.cpp:261
+ #: ../../locales/../src/interface/Mainfrm.cpp:292
  msgid "Failed to initialize FTP engine"
  msgstr "FTP 引擎初始化失败"
-Line 3087 
 msgstr "FTP 引擎初始化失败"
+Line 3125 
 msgstr "FTP 引擎初始化失败"
  msgid "Failed to initialize TLS."
  msgstr " TLS初始化失败"
- #: ../../locales/../src/interface/settingsdialog.cpp:169
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:172
  msgid "Failed to load panels, invalid resource files?"
  msgstr "导入面板失败，无效资源文件？"
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:299
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
  #, c-format
  msgid "Failed to load private key: %s"
  msgstr "加载私钥: %s 失败"
-Line 3162 
 msgid "Failed to set language to %s (%s)
+Line 3200 
 msgid "Failed to set language to %s (%s)
  msgstr "无法设置语言为 %s (%s)，使用系统默认语言。"
  #: ../../locales/../src/interface/FileZilla.cpp:234
- #: ../../locales/../src/interface/optionspage_language.cpp:53
+ #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
  #, c-format
  msgid "Failed to set language to %s, using default system language"
  msgstr "设置语言为 %s 失败，使用默认系统语言"
-Line 3177 
 msgstr "无法设置语言为 %s，使�
+Line 3215 
 msgstr "无法设置语言为 %s，使�
  msgid "Failed to set language to %s, using default system language."
  msgstr "无法设置语言为 %s，使用系统默认语言。"
- #: ../../locales/../src/interface/optionspage.cpp:205
+ #: ../../locales/../src/interface/settings/optionspage.cpp:205
  msgid "Failed to validate settings"
  msgstr "校验设置失败"
-Line 3194 
 msgstr "写入 xml 文件错误"
+Line 3232 
 msgstr "写入 xml 文件错误"
  msgid "Failed transfers"
  msgstr "传输失败"
- #: resources.h:859
+ #: resources.h:650
  msgid "Fall back to active mode"
  msgstr "回到主动模式"
- #: resources.h:577
+ #: resources.h:380
  msgid "Fil&e:"
  msgstr "文件(&E):"
- #: resources.h:380
+ #: resources.h:220
  msgid "Fil&es"
  msgstr "文件(&E)"
-Line 3212 
 msgstr "文件(&E)"
+Line 3250 
 msgstr "文件(&E)"
  msgid "File"
  msgstr "文件"
- #: ../../locales/../src/interface/settingsdialog.cpp:122
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:124
  msgid "File Types"
  msgstr "文件类型"
-Line 3220 
 msgstr "文件类型"
+Line 3258 
 msgstr "文件类型"
  msgid "File does not contain any importable data."
  msgstr "文件中不包含任何可导入的数据。"
- #: ../../locales/../src/interface/settingsdialog.cpp:130
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:132
  msgid "File editing"
  msgstr "正在编辑文件"
- #: ../../locales/../src/interface/RemoteListView.cpp:1867
+ #: ../../locales/../src/interface/RemoteListView.cpp:1888
  msgid "File exists"
  msgstr "文件已存在"
- #: ../../locales/../src/interface/settingsdialog.cpp:123
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:125
  msgid "File exists action"
  msgstr "对已存在文件的操作"
- #: resources.h:488
+ #: resources.h:316
  msgid "File has changed"
  msgstr "文件已改变"
- #: ../../locales/../src/interface/settingsdialog.cpp:128
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:130
  msgid "File lists"
  msgstr "文件列表"
- #: ../../locales/../src/interface/edithandler.cpp:1686
+ #: ../../locales/../src/interface/edithandler.cpp:1701
  #: ../../locales/../src/interface/FileZilla.cpp:768
  #: ../../locales/../src/interface/FileZilla.cpp:862
- #: ../../locales/../src/interface/optionspage_edit.cpp:218
+ #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
  msgid "File not found"
  msgstr "文件未找到"
- #: resources.h:921
+ #: resources.h:930
  msgid "File search"
  msgstr "文件搜索"
-Line 3255 
 msgstr "文件搜索"
+Line 3293 
 msgstr "文件搜索"
  msgid "File transfer successful"
  msgstr "文件传输成功"
- #: ../../locales/../src/interface/Mainfrm.cpp:1352
+ #: ../../locales/../src/interface/Mainfrm.cpp:1385
  msgid "File transfers still in progress."
  msgstr "仍在进行文件传输。"
- #: resources.h:595
+ #: resources.h:398
  msgid "File would transfer with ASCII data type."
  msgstr "文件将以 ASCII 的数据类型传送。"
- #: resources.h:596
+ #: resources.h:399
  msgid "File would transfer with binary data type."
  msgstr "文件将以二进制的数据类型传送。"
-Line 3272 
 msgstr "文件将以二进制的数据�
+Line 3310 
 msgstr "文件将以二进制的数据�
  msgid "FileZilla Error"
  msgstr "FileZilla错误"
- #: resources.h:881
+ #: resources.h:672
  msgid ""
  "FileZilla can now test your configuration to ensure everything is configured "
  "properly."
-Line 3287 
 msgstr ""
+Line 3325 
 msgstr ""
  "FileZilla 运行于公共模式。\n"
  "'正常' 和 '帐户' 登陆方式再次模式下不可用。"
- #: ../../locales/../src/interface/Mainfrm.cpp:1736
+ #: ../../locales/../src/interface/Mainfrm.cpp:1769
  msgid "FileZilla needs to be restarted for the language change to take effect."
  msgstr "改变语言需要重启 FileZilla 才会生效。"
- #: resources.h:705
+ #: resources.h:496
  msgid "Filelist status &bars"
  msgstr "文件列表状态栏(&B)"
- #: ../../locales/../src/interface/edithandler.cpp:1204
+ #: ../../locales/../src/interface/edithandler.cpp:1219
- #: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
- #: ../../locales/../src/interface/LocalListView.cpp:260
+ #: ../../locales/../src/interface/LocalListView.cpp:265
- #: ../../locales/../src/interface/optionspage_connection_sftp.cpp:39
+ #: ../../locales/../src/interface/RemoteListView.cpp:359
- #: ../../locales/../src/interface/RemoteListView.cpp:358
  #: ../../locales/../src/interface/search.cpp:382
+ #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
  msgid "Filename"
  msgstr "文件名"
- #: resources.h:698
+ #: resources.h:489
  msgid "Filename &filters..."
  msgstr "文件过滤器(&F)..."
-Line 3314 
 msgstr "文件过滤器(&F)..."
+Line 3352 
 msgstr "文件过滤器(&F)..."
  msgid "Filename cannot be constructed for directory %s and filename %s"
  msgstr "不能为目录 %s 和文件名 %s 构造文件名"
- #: ../../locales/../src/interface/RemoteListView.cpp:1852
+ #: ../../locales/../src/interface/RemoteListView.cpp:1873
  msgid "Filename invalid"
  msgstr "文件名无效"
-Line 3322 
 msgstr "文件名无效"
+Line 3360 
 msgstr "文件名无效"
  msgid "Filename unchanged"
  msgstr "文件名没有改变"
- #: resources.h:236 resources.h:490
+ #: resources.h:318 resources.h:885
  msgid "Filename:"
  msgstr "文件名:"
- #: ../../locales/../src/interface/LocalListView.cpp:1583
+ #: ../../locales/../src/interface/LocalListView.cpp:1579
  msgid "Filenames may not contain any of the following characters: / * ? < > |"
  msgstr "文件名不能包含以下任何字符: / * ? < > |"
- #: ../../locales/../src/interface/LocalListView.cpp:1558
+ #: ../../locales/../src/interface/LocalListView.cpp:1554
  msgid ""
  "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
  "|"
  msgstr "文件名不能包含以下任何字符: / \\ : * ? \" < > |"
- #: resources.h:511
+ #: resources.h:339
  msgid "Files currently being edited"
  msgstr "正在编辑的文件"
- #: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
- #: ../../locales/../src/interface/LocalListView.cpp:261
+ #: ../../locales/../src/interface/LocalListView.cpp:266
- #: ../../locales/../src/interface/RemoteListView.cpp:359
+ #: ../../locales/../src/interface/RemoteListView.cpp:360
  #: ../../locales/../src/interface/search.cpp:384
  msgid "Filesize"
  msgstr "文件大小"
- #: ../../locales/../src/interface/settingsdialog.cpp:127
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:129
  msgid "Filesize format"
  msgstr "文件尺寸格式"
- #: ../../locales/../src/interface/LocalListView.cpp:262
+ #: ../../locales/../src/interface/LocalListView.cpp:267
- #: ../../locales/../src/interface/RemoteListView.cpp:360
+ #: ../../locales/../src/interface/RemoteListView.cpp:361
  #: ../../locales/../src/interface/search.cpp:385
  msgid "Filetype"
  msgstr "文件类型"
- #: resources.h:262
+ #: resources.h:873
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
  msgid "Filetype associations"
  msgstr "文件格式关联"
- #: resources.h:372
+ #: resources.h:219
- msgid "Filter &out all files that:"
- msgstr "过滤所有文件满足(&o):"
- #: resources.h:379
  msgid "Filter applies to:"
  msgstr "过滤器应用到:"
- #: ../../locales/../src/interface/filteredit.cpp:337
+ #: ../../locales/../src/interface/filteredit.cpp:356
  msgid "Filter name already exists"
  msgstr "过滤器名已经存在"
+ #: resources.h:215
+ #, fuzzy
+ msgid "Filter out items matching all of the following"
+ msgstr "匹配以下所有"
+ #: resources.h:216
+ #, fuzzy
+ msgid "Filter out items matching any of the following"
+ msgstr "匹配以下所有"
+ #: resources.h:217
+ #, fuzzy
+ msgid "Filter out items matching none of the following"
+ msgstr "匹配以下所有"
  #: ../../locales/../src/interface/filter.cpp:343
  #: ../../locales/../src/interface/filter.cpp:404
  msgid "Filter set already exists"
  msgstr "过滤器集合已经存在"
- #: resources.h:914
+ #: resources.h:923
  msgid "Filter the directory listings"
  msgstr "过滤目录列表"
- #: ../../locales/../src/interface/filteredit.cpp:319
+ #: ../../locales/../src/interface/filteredit.cpp:338
- #: ../../locales/../src/interface/filteredit.cpp:328
+ #: ../../locales/../src/interface/filteredit.cpp:347
- #: ../../locales/../src/interface/filteredit.cpp:337
+ #: ../../locales/../src/interface/filteredit.cpp:356
  msgid "Filter validation failed"
  msgstr "过滤器核对失败"
- #: resources.h:10 resources.h:33
+ #: resources.h:9 resources.h:33
  msgid "Fingerprint (MD5):"
  msgstr "指纹(MD5):"
- #: resources.h:11 resources.h:34
+ #: resources.h:10 resources.h:34
  msgid "Fingerprint (SHA-1):"
  msgstr "指纹(SHA-1):"
- #: resources.h:331 resources.h:343
+ #: resources.h:174 resources.h:186
  msgid "Fingerprint:"
  msgstr "指纹:"
-Line 3404 
 msgstr "指纹:"
+Line 3454 
 msgstr "指纹:"
  msgid "Firewall and router configuration wizard"
  msgstr "防火墙和路由器配置向导"
- #: resources.h:181
+ #: resources.h:690
  msgid ""
  "For more detailed information about what these options do, please run the "
  "network configuration wizard."
  msgstr "请运行网络配置向导获取关于这些选项的更多信息"
- #: resources.h:876
+ #: resources.h:667
  msgid "For reliability you should specify a range of at least 10 ports."
  msgstr "您至少需要指定 10 个端口才能保证可靠性。"
- #: ../../locales/../src/interface/Options.cpp:176
+ #: ../../locales/../src/interface/Options.cpp:179
  msgid ""
  "For this session the default settings will be used. Any changes to the "
  "settings will not be saved."
  msgstr "当前会话将使用默认设置，并且任何设置的修改都不被保存。"
- #: resources.h:130
+ #: resources.h:108
  msgid "Force &UTF-8"
  msgstr "强制 UTF-8(&U)"
- #: resources.h:728
+ #: resources.h:519
  msgid "Force showing &hidden files"
  msgstr "强制显示隐藏文件(&H)"
- #: ../../locales/../src/interface/Mainfrm.cpp:773
+ #: ../../locales/../src/interface/Mainfrm.cpp:806
  msgid "Force showing hidden files"
  msgstr "强制显示隐藏文件"
- #: resources.h:274
+ #: resources.h:730
  msgid "Format specifications:"
  msgstr "指定格式: "
- #: resources.h:265
+ #: resources.h:871
  msgid "Format: Extension followed by properly quoted command and arguments."
  msgstr "格式: 扩展名后跟随正确的指令和参数。"
- #: resources.h:100
+ #: resources.h:78
  msgid "General"
  msgstr "通用"
-Line 3448 
 msgstr "通用"
+Line 3498 
 msgstr "通用"
  msgid "General SOCKS server failure"
  msgstr "SOCKS 服务器失败"
- #: resources.h:559 ../../locales/../src/interface/settingsdialog.cpp:120
+ #: resources.h:748
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
  msgid "Generic proxy"
  msgstr "代理"
- #: resources.h:865
+ #: resources.h:656
  msgid "Get external IP address from the following URL:"
  msgstr "从以下 URL 得到外部 IP 地址:"
-Line 3465 
 msgstr "给定的过滤器集合名已�
+Line 3516 
 msgstr "给定的过滤器集合名已�
  msgid "Global bookmarks"
  msgstr "全局书签"
- #: resources.h:322
+ #: resources.h:165
  msgid "GnuTLS:"
  msgstr "GnuTLS:"
- #: resources.h:294
+ #: resources.h:137
  msgid "Group permissions"
  msgstr "组权限"
- #: resources.h:779
+ #: resources.h:570
  msgid "H&igh"
  msgstr "高(&I)"
- #: resources.h:538
+ #: resources.h:351
  msgid "Hash:"
  msgstr "哈希值:"
- #: ../../locales/../src/interface/filter_conditions_dialog.cpp:76
+ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:82
  msgid "Hidden"
  msgstr "隐藏"
- #: resources.h:67 ../../locales/../src/interface/queue.cpp:894
+ #: resources.h:776 ../../locales/../src/interface/queue.cpp:894
  #: ../../locales/../src/interface/queue.cpp:975
  msgid "High"
  msgstr "高"
-Line 3495 
 msgstr "高"
+Line 3546 
 msgstr "高"
  msgid "Highest"
  msgstr "最高"
- #: ../../locales/../src/interface/optionspage_connection_active.cpp:74
+ #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:74
  msgid "Highest available port has to be a number between 1024 and 65535."
  msgstr "最高的可用端口号必须在 1024 到 65535 之间。"
- #: resources.h:360
+ #: resources.h:203
  msgid ""
  "Hold the shift key to toggle the filter state on both sides simultaneously."
  msgstr "按住 shift 键，同时切换两边的过滤器状态。"
- #: resources.h:313
+ #: resources.h:156
  msgid "Homepage:"
  msgstr "主页:"
- #: resources.h:540
+ #: resources.h:353
  msgid "Host key fingerprint:"
  msgstr "加密指纹:"
- #: resources.h:337
+ #: resources.h:180
  msgid "Host key mismatch"
  msgstr "主机密钥不匹配"
-Line 3524 
 msgstr "主机名以 '[' 开始，但没
+Line 3575 
 msgstr "主机名以 '[' 开始，但没
  msgid "Host unreachable"
  msgstr "无法联络主机"
- #: resources.h:4 resources.h:27 resources.h:142 resources.h:329
+ #: resources.h:16 resources.h:40 resources.h:120 resources.h:172
- #: resources.h:341
+ #: resources.h:184
  msgid "Host:"
  msgstr "主机:"
- #: resources.h:117
+ #: resources.h:95
  msgid "Hours,"
  msgstr "小时，"
- #: resources.h:215
+ #: resources.h:820
  msgid "I&SO 8601 (example: 15:47)"
  msgstr "ISO 8601 (示例: 15:47) (&S)"
- #: resources.h:59
+ #: resources.h:768
  msgid ""
  "If no data can be sent or received during this time, the connection will be "
  "closed and FileZilla will try to reconnect."
  msgstr "如果这段时间内没有数据交换，连接将被关闭，FileZilla 会尝试重新连接。"
- #: resources.h:252
+ #: resources.h:901
  msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
  msgstr "如果要报告 Bug，请提供“详细”等级的日志文件。"
- #: resources.h:856
+ #: resources.h:647
  msgid ""
  "If the automatic test at the end of this wizard succeeds, but you cannot "
  "transfer files to a particular server, the server might be misconfigured and "
-Line 3558 
 msgstr ""
+Line 3609 
 msgstr ""
  "那个服务器可能配置有问题，您要试着使用主动模式。您可以在站点管理器里设定单服"
  "务器的传输模式。"
- #: resources.h:851
+ #: resources.h:642
  msgid ""
  "If the fallback option is enabled, you will be able to connect to "
  "misconfigured servers which reject the selected transfer mode."
-Line 3577 
 msgid ""
+Line 3628 
 msgid ""
  "connection."
  msgstr "如果这个问题仍然存在，某些路由器或防火墙仍在打断该连接。"
- #: resources.h:241
+ #: resources.h:890
  msgid ""
  "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
  "\" to the end of the filename (possibly overwriting older logfiles) and a "
-Line 3586 
 msgstr ""
+Line 3637 
 msgstr ""
  "如果日志文件的体积达到限制，它将以文件名末尾将加上“.1”的方式重命名(有可能覆盖"
  "久的日志文件)，之后新的文件将会被创建。"
+ #: resources.h:466
+ msgid ""
+ "If the symlink points to a directory, FileZilla can either delete the "
+ "symbolic link or remove the contents of the linked directory."
+ msgstr ""
+ "如果符号链接指向一个目录，FileZilla 可以删除符号链接或者删除所指向的目录内"
+ "容。"
  #: ../../locales/../src/interface/netconfwizard.cpp:624
  msgid ""
  "If this problem persists, please contact your router or firewall "
-Line 3596 
 msgstr "如果这个问题仍然存在�
+Line 3655 
 msgstr "如果这个问题仍然存在�
  msgid "If this problem stays, please contact your router manufacturer."
  msgstr "如果这个问题仍然存在，请联系您的路由器制造商。"
- #: resources.h:439 resources.h:461
+ #: resources.h:267 resources.h:289
  msgid ""
  "If using 'overwrite if newer', your system time has to be synchronized with "
  "the server. If the time differs (e.g. different timezone), specify a "
-Line 3605 
 msgstr ""
+Line 3664 
 msgstr ""
  "要是选择“如果较新就覆盖”，您的系统时间需要与服务器同步。若时间不同（比如不同"
  "的时区），请在站点管理器中选择一个时区。"
- #: resources.h:634
+ #: resources.h:844
  msgid ""
  "If using timestamp based comparison, consider two files equal if their "
  "timestamp difference does not exceed this threshold."
  msgstr "如果使用时间戳方式比较，只要两个文件的时间差异不超过限定值便视为相同。"
- #: resources.h:198
+ #: resources.h:859
  msgid "If you change the language, you should restart FileZilla."
  msgstr "如果您改变了语言，您需要重启 FileZilla。"
- #: resources.h:882
+ #: resources.h:673
  msgid ""
  "If you click on test, FileZilla will connect to probe.filezilla-project.org "
  "and will perform some simple tests."
-Line 3623 
 msgstr ""
+Line 3682 
 msgstr ""
  "如果您点击了测试，FileZilla 会连接到 probe.filezilla-project.org 并且进行一些"
  "简单测试。"
- #: ../../locales/../src/interface/Mainfrm.cpp:1376
+ #: ../../locales/../src/interface/Mainfrm.cpp:1409
  msgid "If you close FileZilla, your changes will be lost."
  msgstr "如果关闭 FileZilla，您所做的改变将会丢失。"
- #: resources.h:162
+ #: resources.h:786
  msgid ""
  "If you enter the wrong filetypes, those files may get corrupted when "
  "transferred."
  msgstr "如果您输入了错误的文件类型，那些文件可能会在传输完成后被损坏。"
- #: resources.h:883
+ #: resources.h:674
  msgid "If you get any errors, your configuration is not correct."
  msgstr "如果显示任何错误，说明您的配置是有问题的。"
- #: resources.h:523
+ #: resources.h:702
  msgid ""
  "If you have problems to retrieve directory listings or to transfer files, "
  "try to change the default transfer mode."
-Line 3652 
 msgstr ""
+Line 3711 
 msgstr ""
  "如果在一个特定的服务器上一直有问题，那个服务器本身或者路由器可能被配置错了。"
  "这种情况下您可以试着切换被动模式，并和服务器管理员联系以获取帮助。"
- #: resources.h:842
+ #: resources.h:633
  msgid ""
  "If you successfully complete the wizard and the final test succeeds, any "
  "firewalls and routers you have should be configured properly."
-Line 3660 
 msgstr ""
+Line 3719 
 msgstr ""
  "如果您成功完成了向导，最后测试也成功，任何您使用的防火墙和路由器也应该已经正"
  "确配置了。"
- #: resources.h:878
+ #: resources.h:669
  msgid ""
  "If you use a firewall, make sure FileZilla is allowed to accept connection "
  "on all given ports."
  msgstr "如果您使用了防火墙，确保 FileZilla 被允许在所有给定的端口上进行连接。"
- #: resources.h:877
+ #: resources.h:668
  msgid ""
  "If you use a router, make sure all these ports are forwarded to the machine "
  "you're running FileZilla on."
-Line 3683 
 msgstr "如果您的路由器总是变�
+Line 3742 
 msgstr "如果您的路由器总是变�
  msgid "Import data from older version"
  msgstr "从旧版中导入数据"
- #: resources.h:480
+ #: resources.h:308
  msgid "Import settings"
  msgstr "导入设置"
-Line 3692 
 msgstr "导入设置"
+Line 3751 
 msgstr "导入设置"
  msgid "Import successful"
  msgstr "导入成功"
- #: ../../locales/../src/interface/optionspage_edit.cpp:172
+ #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50
- #: ../../locales/../src/interface/optionspage_edit.cpp:179
+ #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57
  msgid "Improperly quoted association."
  msgstr "不正确的引用关联。"
- #: resources.h:870
+ #: resources.h:661
  msgid ""
  "In active mode, FileZilla has to listen on a port for data transfers. You "
  "have to specify which ports FileZilla will use."
-Line 3705 
 msgstr ""
+Line 3764 
 msgstr ""
  "主动模式下，FileZilla 必须监听一个端口以便进行数据传输。您必须指定 FileZilla "
  "使用哪个端口。"
- #: resources.h:872
+ #: resources.h:663
  msgid ""
  "In case you have a router, you will have to forward all available ports, as "
  "FileZilla has no influence on the ports your system chooses."
-Line 3713 
 msgstr ""
+Line 3772 
 msgstr ""
  "如果您有路由器，您必须转发所有可用的端口，因为 FileZilla 无法影响您的系统选择"
  "哪个端口。"
- #: resources.h:415
+ #: resources.h:243
  msgid ""
  "In case you prefer automatic updates, you can enable automatic update checks "
  "in the settings dialog."
  msgstr "如果您喜欢使用自动升级，您可以在设置对话框中激活自动升级检查功能。"
- #: resources.h:389 resources.h:860
+ #: resources.h:651 resources.h:711
  msgid ""
  "In order to use active mode, FileZilla needs to know your external IP "
  "address."
  msgstr "为了使用主动模式，FileZilla 需要知道您的外部 IP 地址。"
- #: resources.h:845
+ #: resources.h:636
  msgid ""
  "In passive mode, which is recommended for most users, FileZilla asks the "
  "server for a port and connects to the given port. Not much configuration has "
-Line 3748 
 msgstr "初始化 TLS 中..."
+Line 3807 
 msgstr "初始化 TLS 中..."
  msgid "Interactive"
  msgstr "交互式"
- #: ../../locales/../src/interface/settingsdialog.cpp:124
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:126
  msgid "Interface"
  msgstr "用户界面"
-Line 3783 
 msgstr "无效的块大小"
+Line 3842 
 msgstr "无效的块大小"
  msgid "Invalid data received"
  msgstr "收到无效数据"
- #: ../../locales/../src/interface/verifycertdialog.cpp:45
+ #: ../../locales/../src/interface/verifycertdialog.cpp:31
- #: ../../locales/../src/interface/verifycertdialog.cpp:61
+ #: ../../locales/../src/interface/verifycertdialog.cpp:47
  msgid "Invalid date"
  msgstr "无效数据"
- #: ../../locales/../src/interface/LocalListView.cpp:1558
+ #: ../../locales/../src/interface/LocalListView.cpp:1554
- #: ../../locales/../src/interface/LocalListView.cpp:1583
+ #: ../../locales/../src/interface/LocalListView.cpp:1579
  msgid "Invalid filename"
  msgstr "文件名无效"
-Line 3821 
 msgstr ""
+Line 3880 
 msgstr ""
  "ftps:// 表示 FTP over SSL (implicit) 以及\n"
  "ftpes:// 表示 FTP over SSL (explicit)。"
- #: ../../locales/../src/interface/search.cpp:705
+ #: ../../locales/../src/interface/search.cpp:722
  msgid "Invalid regular expression in search conditions."
  msgstr "无效的搜索条件正则表达式。"
-Line 3829 
 msgstr "无效的搜索条件正则表�
+Line 3888 
 msgstr "无效的搜索条件正则表�
  msgid "Invalid response code"
  msgstr "无效的响应码"
- #: ../../locales/../src/interface/search.cpp:699
+ #: ../../locales/../src/interface/search.cpp:716
  #, c-format
  msgid "Invalid search conditions: %s"
  msgstr "无效的搜索条件: %s"
-Line 3843 
 msgstr "无效的搜索条件: %s"
+Line 3902 
 msgstr "无效的搜索条件: %s"
  #: ../../locales/../src/interface/sitemanager.cpp:2729
  #: ../../locales/../src/interface/sitemanager.cpp:2955
  #: ../../locales/../src/interface/sitemanager.cpp:2962
- #: ../../locales/../src/interface/sitemanager.cpp:3036
+ #: ../../locales/../src/interface/sitemanager.cpp:3042
- #: ../../locales/../src/interface/sitemanager.cpp:3043
+ #: ../../locales/../src/interface/sitemanager.cpp:3049
  msgid "Invalid site path"
  msgstr "无效的站点路径"
- #: ../../locales/../src/interface/filter_conditions_dialog.cpp:500
+ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:624
  msgid "Invalid size in condition"
  msgstr "条件指定了无效的大小"
-Line 3856 
 msgstr "条件指定了无效的大小"
+Line 3915 
 msgstr "条件指定了无效的大小"
  msgid "Invalid username given."
  msgstr "给定的用户名无效。"
- #: resources.h:631
+ #: ../../locales/../src/interface/verifycertdialog.cpp:171
+ msgid "Jurisdiction country:"
+ msgstr "司法管辖国家:"
+ #: ../../locales/../src/interface/verifycertdialog.cpp:173
+ msgid "Jurisdiction locality:"
+ msgstr "司法管辖地区:"
+ #: ../../locales/../src/interface/verifycertdialog.cpp:172
+ msgid "Jurisdiction state or province:"
+ msgstr "司法管辖州或省:"
+ #: resources.h:841
  msgid "Keep directories on top"
  msgstr "保持目录在最上方"
- #: ../../locales/../src/interface/Mainfrm.cpp:777
+ #: ../../locales/../src/interface/Mainfrm.cpp:810
  msgid ""
  "Keep in mind that not all servers support this feature and may return "
  "incorrect listings if this option is enabled. Although FileZilla performs "
-Line 3870 
 msgstr ""
+Line 3941 
 msgstr ""
  "的列表。虽然 FileZilla 会先执行一些测试看看服务器是否支持这个功能，但这些测试"
  "也可能会失败。"
- #: resources.h:535
+ #: resources.h:348
  msgid "Key exchange"
  msgstr "密钥交换"
- #: resources.h:782
+ #: resources.h:573
  msgid "L&owest"
  msgstr "最低(&O)"
- #: resources.h:196 ../../locales/../src/interface/settingsdialog.cpp:129
+ #: resources.h:857
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
  msgid "Language"
  msgstr "语言"
- #: ../../locales/../src/interface/Mainfrm.cpp:1736
+ #: ../../locales/../src/interface/Mainfrm.cpp:1769
  msgid "Language changed"
  msgstr "已经变更语言"
- #: ../../locales/../src/interface/LocalListView.cpp:263
+ #: ../../locales/../src/interface/LocalListView.cpp:268
- #: ../../locales/../src/interface/RemoteListView.cpp:361
+ #: ../../locales/../src/interface/RemoteListView.cpp:362
  #: ../../locales/../src/interface/search.cpp:386
  msgid "Last modified"
  msgstr "最近修改"
- #: resources.h:166
+ #: resources.h:790
  msgid "Layout"
  msgstr "布局"
- #: resources.h:52
+ #: resources.h:761
  msgid "Limit for concurrent &downloads:"
  msgstr "同时下载限制(&D):"
- #: resources.h:54
+ #: resources.h:763
  msgid "Limit for concurrent &uploads:"
  msgstr "同时上传限制(&U):"
- #: resources.h:384
+ #: resources.h:706
  msgid "Limit local ports"
  msgstr "限制本地端口"
- #: resources.h:238
+ #: resources.h:887
  msgid "Limit size of logfile"
  msgstr "日志文件大小限制"
- #: resources.h:239
+ #: resources.h:888
  msgid "Limit:"
  msgstr "限制:"
-Line 3920 
 msgstr "限制:"
+Line 3992 
 msgstr "限制:"
  msgid "Line length exceeded"
  msgstr "行长度已超出"
- #: resources.h:323
+ #: resources.h:166
  msgid "Linked against"
  msgstr "逆向连接"
-Line 3934 
 msgstr "监听接口已关闭"
+Line 4006 
 msgstr "监听接口已关闭"
  msgid "Listing:"
  msgstr "列表:"
- #: resources.h:387
+ #: resources.h:709
  msgid "Lo&west available port:"
  msgstr "最低可用端口(&O):"
- #: ../../locales/../src/interface/edithandler.cpp:1252
+ #: ../../locales/../src/interface/edithandler.cpp:1267
- #: ../../locales/../src/interface/edithandler.cpp:1503
+ #: ../../locales/../src/interface/edithandler.cpp:1518
  msgid "Local"
  msgstr "本地"
- #: resources.h:572
+ #: resources.h:375
  msgid "Local file"
  msgstr "本地文件"
-Line 3955 
 msgstr "本地文件不存在。"
+Line 4027 
 msgstr "本地文件不存在。"
  msgid "Local file is a directory instead of a regular file."
  msgstr "本地文件是一个目录而不是一个普通文件。"
- #: resources.h:354
+ #: resources.h:197
  msgid "Local filters:"
  msgstr "本地过滤器:"
-Line 3963 
 msgstr "本地过滤器:"
+Line 4035 
 msgstr "本地过滤器:"
  msgid "Local site:"
  msgstr "本地站点:"
- #: ../../locales/../src/interface/verifycertdialog.cpp:137
+ #: ../../locales/../src/interface/verifycertdialog.cpp:167
  msgid "Locality:"
  msgstr "站点:"
- #: ../../locales/../src/interface/optionspage_logging.cpp:97
+ #: ../../locales/../src/interface/settings/optionspage_logging.cpp:97
  msgid "Log file"
  msgstr "日志文件"
- #: resources.h:233 ../../locales/../src/interface/settingsdialog.cpp:137
+ #: resources.h:882
+ #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
  msgid "Logging"
  msgstr "日志"
-Line 3994 
 msgstr ""
+Line 4067 
 msgstr ""
  msgid "Login sequence fully executed yet not logged in. Aborting."
  msgstr "登录过程已完全执行，但依然无法登录。正在终止。"
+ #: ../../locales/../src/interface/cmdline.cpp:92
+ msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
+ msgstr ""
+ #: ../../locales/../src/interface/cmdline.cpp:9
+ msgid ""
+ "Logontype, can only be used together with FTP URL. Argument has to be either "
+ "'ask' or 'interactive'"
+ msgstr ""
  #: ../../locales/../src/interface/queue.cpp:889
  #: ../../locales/../src/interface/queue.cpp:970
  msgid "Low"
-Line 4004 
 msgstr "低"
+Line 4087 
 msgstr "低"
  msgid "Lowest"
  msgstr "最低"
- #: ../../locales/../src/interface/optionspage_connection_active.cpp:68
+ #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:68
  msgid "Lowest available port has to be a number between 1024 and 65535."
  msgstr "最低的可用端口号必须在 1024 到 65535 之间。"
- #: resources.h:19 resources.h:42
+ #: resources.h:20 resources.h:44
  msgid "MAC:"
  msgstr "MAC:"
-Line 4033 
 msgstr "错误的头:%s"
+Line 4116 
 msgstr "错误的头:%s"
  msgid "Malformed reply, server not sending proper line endings"
  msgstr "畸形的回应，服务器没有发送正确的行结尾"
- #: resources.h:602 ../../locales/../src/interface/manual_transfer.cpp:305
+ #: resources.h:405 ../../locales/../src/interface/manual_transfer.cpp:305
  #: ../../locales/../src/interface/manual_transfer.cpp:312
  #: ../../locales/../src/interface/manual_transfer.cpp:319
  #: ../../locales/../src/interface/manual_transfer.cpp:324
-Line 4043 
 msgstr "畸形的回应，服务器没�
+Line 4126 
 msgstr "畸形的回应，服务器没�
  msgid "Manual transfer"
  msgstr "手动传输"
- #: resources.h:373 resources.h:662
+ #: resources.h:446
  msgid "Match all of the following"
  msgstr "匹配以下所有"
- #: resources.h:50
+ #: resources.h:447
+ #, fuzzy
+ msgid "Match any of the following"
+ msgstr "匹配以下所有"
+ #: resources.h:448
+ #, fuzzy
+ msgid "Match none of the following"
+ msgstr "匹配以下所有"
+ #: resources.h:759
  msgid "Maximum simultaneous &transfers:"
  msgstr "最大同时传输(&T):"
- #: ../../locales/../src/interface/Mainfrm.cpp:374
+ #: ../../locales/../src/interface/Mainfrm.cpp:405
- #: ../../locales/../src/interface/Mainfrm.cpp:2058
+ #: ../../locales/../src/interface/Mainfrm.cpp:2091
  msgid "Message log"
  msgstr "消息日志"
- #: resources.h:177
+ #: resources.h:801
  msgid "Message log position"
  msgstr "消息日志位置"
- #: resources.h:240
+ #: resources.h:889
  msgid "MiB"