SF.net SVN: geany:[4334] trunk/po - Commits

19 Oct 2009

Revision: 4334
          http://geany.svn.sourceforge.net/geany/?rev=4334&view=rev
Author:   frlan
Date:     2009-10-19 07:12:37 +0000 (Mon, 19 Oct 2009)
Log Message:
-----------
Update of simplified Chinese translation
Modified Paths:
--------------
    trunk/po/ChangeLog
    trunk/po/zh_CN.po
Modified: trunk/po/ChangeLog
===================================================================

--- trunk/po/ChangeLog	2009-10-19 07:12:08 UTC (rev 4333)
+++ trunk/po/ChangeLog	2009-10-19 07:12:37 UTC (rev 4334)
@@ -1,3 +1,8 @@
+2009-10-19  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
+
+ * zh_CN.po: Update of simplified Chinese translation. Thanks to Xhacker Liu.
+
+
 2009-10-17  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
* Minor update of German translation.
Modified: trunk/po/zh_CN.po
===================================================================
--- trunk/po/zh_CN.po	2009-10-19 07:12:08 UTC (rev 4333)
+++ trunk/po/zh_CN.po	2009-10-19 07:12:37 UTC (rev 4334)
@@ -4,25 +4,26 @@
 # This file is distributed under the same license as the geany package.
 #
 # Dormouse Young dormouse.young@gmail.com, 2006-2008, 2009.
+# Xhacker Liu liu.dongyuan@gmail.com, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: Geany 0.18\n"
+"Project-Id-Version: Geany 0.19\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-16 18:09+0200\n"
-"PO-Revision-Date: 2009-04-25 11:19+0800\n"
-"Last-Translator: Dormouse Young\n"
-"Language-Team: zh_CN\n"
+"POT-Creation-Date: 2009-10-19 08:44+0200\n"
+"PO-Revision-Date: 2009-10-18 08:22+0800\n"
+"Last-Translator: Xhacker Liu liu.dongyuan@gmail.com\n"
+"Language-Team: zh_CN <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: ../geany.desktop.in.h:1
 msgid "A fast and lightweight IDE using GTK2"
-msgstr "一个使用 GTK2 编写的轻快的IDE"
+msgstr "一个使用 GTK2 编写的轻快的 IDE"
-#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476
+#: ../geany.desktop.in.h:2 ../src/interface.c:260 ../src/interface.c:1480
 msgid "Geany"
 msgstr "Geany"
@@ -30,360 +31,355 @@
 msgid "Integrated Development Environment"
 msgstr "集成开发环境"
-#: ../src/about.c:139
+#: ../src/about.c:140
 msgid "About Geany"
 msgstr "关于 Geany"
-#: ../src/about.c:189
+#: ../src/about.c:190
 msgid "A fast and lightweight IDE"
-msgstr "一个轻快的IDE"
+msgstr "一个轻快的 IDE"
-#: ../src/about.c:210
+#: ../src/about.c:211
 #, c-format
 msgid "(built on or after %s)"
-msgstr "(基于%s生成或之后)"
+msgstr "（%s或之后生成）"
#. gtk_container_add(GTK_CONTAINER(info_box), cop_label);
-#: ../src/about.c:241
+#: ../src/about.c:242
 msgid "Info"
 msgstr "信息"
-#: ../src/about.c:257
+#: ../src/about.c:258
 msgid "Developers"
 msgstr "开发人员"
-#: ../src/about.c:266
+#: ../src/about.c:267
 msgid "maintainer"
 msgstr "主管"
-#: ../src/about.c:274
+#: ../src/about.c:275
 msgid "developer"
 msgstr "开发"
-#: ../src/about.c:282
+#: ../src/about.c:283
 msgid "translation maintainer"
 msgstr "翻译"
-#: ../src/about.c:291
+#: ../src/about.c:292
 msgid "Translators"
 msgstr "翻译者"
-#: ../src/about.c:311
+#: ../src/about.c:312
 msgid "Previous Translators"
-msgstr "前译者"
+msgstr "原翻译者"
-#: ../src/about.c:332
+#: ../src/about.c:333
 msgid "Contributors"
 msgstr "贡献者"
-#: ../src/about.c:342
+#: ../src/about.c:343
 #, c-format
 msgid ""
 "Some of the many contributors (for a more detailed list, see the file %s):"
-msgstr "一部分贡献者（详细清单参见文件 %s ）"
+msgstr "一部分贡献者（详细清单参见文件 %s）"
-#: ../src/about.c:368
+#: ../src/about.c:369
 msgid "Credits"
 msgstr "荣誉"
-#: ../src/about.c:382
+#: ../src/about.c:383
 msgid "License"
 msgstr "许可条款"
-#: ../src/about.c:391
+#: ../src/about.c:392
 msgid ""
 "License text could not be found, please visit http://www.gnu.org/licenses/"
 "gpl-2.0.txt to view it online."
 msgstr ""
 "许可条款未找到，请到 http://www.gnu.org/licenses/gpl-2.0.txt 在线查看。"
-#: ../src/build.c:221 ../src/build.c:745
+#. fall back to %d
+#: ../src/build.c:582
 #, c-format
-msgid ""
-"Could not find terminal "%s" (check path for Terminal tool setting in "
-"Preferences)"
-msgstr "无法找到虚拟终端“'%s” (请检查在首选项中的路径设置)"
+msgid "failed to substitute %%p, no project active"
+msgstr ""
-#: ../src/build.c:236 ../src/build.c:650
+#: ../src/build.c:620
+#, fuzzy
+msgid "Process failed, no working directory"
+msgstr "改变工作路径到“%s”失败"
+
+#: ../src/build.c:646
 #, c-format
-msgid "Failed to execute "%s" (start-script could not be created)"
-msgstr "执行 %s 失败(开始代码无法创建)"
+msgid "%s (in directory: %s)"
+msgstr "%s（在目录 %s 中）"
-#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778
-#: ../src/search.c:1411
+#: ../src/build.c:666 ../src/build.c:890 ../src/search.c:1412
 #, c-format
 msgid "Process failed (%s)"
-msgstr "进程失败(%s)"
+msgstr "进程失败（%s）"
-#: ../src/build.c:508
+#: ../src/build.c:736
 #, c-format
-msgid "%s (in directory: %s)"
-msgstr "%s (在目录%s中)"
+msgid "Failed to change the working directory to "%s""
+msgstr "改变工作路径到“%s”失败"
-#: ../src/build.c:613
+#: ../src/build.c:765
 #, c-format
-msgid "Failed to change the working directory to "%s""
-msgstr "改变工作路径到 "%s" 失败"
+msgid "Failed to execute "%s" (start-script could not be created)"
+msgstr "执行 %s 失败（启动脚本无法创建）"
-#: ../src/build.c:707
+#: ../src/build.c:819
 msgid ""
 "Could not execute the file in the VTE because it probably contains a command."
 msgstr "因为文件中可能含有命令所以无法在虚拟终端中执行这个文件"
-#: ../src/build.c:914
+#: ../src/build.c:857
+#, c-format
+msgid ""
+"Could not find terminal "%s" (check path for Terminal tool setting in "
+"Preferences)"
+msgstr "无法找到虚拟终端“'%s”（请检查在首选项中的路径设置）"
+
+#: ../src/build.c:1027
 msgid "Compilation failed."
-msgstr "编译失败"
+msgstr "编译失败。"
-#: ../src/build.c:928
+#: ../src/build.c:1041
 msgid "Compilation finished successfully."
 msgstr "编译成功结束。"
-#. compile the code
-#: ../src/build.c:1039
-msgid "_Compile"
-msgstr "编译(_C)"
+#: ../src/build.c:1197
+#, fuzzy
+msgid "Custom Text"
+msgstr "编译自定义目标"
-#. build the code
-#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976
-msgid "_Build"
-msgstr "生成(_B)"
+#: ../src/build.c:1198
+#, fuzzy
+msgid "Enter custom text here, all entered text is appended to the command."
+msgstr "在这里输入自定义参数，所有输入的文本将作为 make 命令的参数。"
-#. build the code with make all
-#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131
-msgid "_Make All"
-msgstr "生成全部(_M)"
-
-#. build the code with make custom
-#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139
-msgid "Make Custom _Target"
-msgstr "生成自定义目标(_T)"
-
-#. build the code with make object
-#: ../src/build.c:1077 ../src/build.c:2147
-msgid "Make _Object"
-msgstr "生成目标文件(_O)"
-
-#. next error
-#: ../src/build.c:1090 ../src/build.c:1187
+#: ../src/build.c:1276
 msgid "_Next Error"
 msgstr "下一个错误(_N)"
-#: ../src/build.c:1097 ../src/build.c:1194
+#: ../src/build.c:1278
 msgid "_Previous Error"
 msgstr "前一个错误(_P)"
-#. arguments
-#: ../src/build.c:1122 ../src/build.c:2159
-msgid "_Set Includes and Arguments"
-msgstr "设置编译参数(_S)"
+#: ../src/build.c:1288
+#, fuzzy
+msgid "_Set Build Commands"
+msgstr "设置自定义命令"
-#. DVI
-#: ../src/build.c:1143
-msgid "LaTeX -> _DVI"
-msgstr "LaTeX -> _DVI"
+#: ../src/build.c:1554 ../src/toolbar.c:344
+msgid "Build the current file"
+msgstr "生成当前文件"
-#. PDF
-#: ../src/build.c:1152
-msgid "LaTeX -> _PDF"
-msgstr "LaTeX -> _PDF"
+#: ../src/build.c:1568
+msgid "Build the current file with Make and the default target"
+msgstr "使用 Make 和缺省目标来生成当前文件"
-#. DVI view
-#: ../src/build.c:1206
-msgid "_View DVI File"
-msgstr "查看DVI文件(_V)"
+#: ../src/build.c:1570
+msgid "Build the current file with Make and the specified target"
+msgstr "使用 Make 和特定目标来生成当前文件"
-#. PDF view
-#: ../src/build.c:1216
-msgid "V_iew PDF File"
-msgstr "查看PDF文件(_I)"
+#: ../src/build.c:1572
+msgid "Compile the current file with Make"
+msgstr "使用 Make 来编译文件"
-#. arguments
-#: ../src/build.c:1231
-msgid "_Set Arguments"
-msgstr "设置参数(_S)"
+#: ../src/build.c:1599
+#, c-format
+msgid "Process could not be stopped (%s)."
+msgstr "进程无法停止（%s）"
-#: ../src/build.c:1306
-msgid "Set Arguments"
-msgstr "设置参数"
+#: ../src/build.c:1616 ../src/build.c:1628
+msgid "No more build errors."
+msgstr "没有生成错误。"
-#: ../src/build.c:1313
-msgid "Set programs and options for compiling and viewing (La)TeX files."
-msgstr "为编译和查看(La)TeX文件设置程序和参数"
+#: ../src/build.c:1700
+msgid "Item"
+msgstr ""
-#: ../src/build.c:1324
-msgid "DVI creation:"
-msgstr "DVI生成:"
+#: ../src/build.c:1701 ../src/symbols.c:636
+msgid "Label"
+msgstr "标签"
-#: ../src/build.c:1344
-msgid "PDF creation:"
-msgstr "PDF生成:"
+#: ../src/build.c:1702 ../src/symbols.c:631
+msgid "Command"
+msgstr "命令"
-#: ../src/build.c:1364
-msgid "DVI preview:"
-msgstr "DVI预览"
+#: ../src/build.c:1703
+#, fuzzy
+msgid "Working directory"
+msgstr "%s（在目录 %s 中）"
-#: ../src/build.c:1384
-msgid "PDF preview:"
-msgstr "PDF预览"
+#: ../src/build.c:1704
+#, fuzzy
+msgid "Clear"
+msgstr "编译器"
-#: ../src/build.c:1401 ../src/build.c:1583
-#, c-format
-msgid ""
-"%f will be replaced by the current filename, e.g. test_file.c\n"
-"%e will be replaced by the filename without extension, e.g. test_file"
-msgstr ""
-"%f 会被替换为当前文件名，如： test_file.c\n"
-"%e 会被替换为没有扩展名的当前文件名如. test_file"
+#: ../src/build.c:1806 ../src/build.c:1808
+#, fuzzy, c-format
+msgid "%s Commands"
+msgstr "%s 命令"
-#: ../src/build.c:1486
-msgid "Set Includes and Arguments"
-msgstr "设置包含和参数"
+#: ../src/build.c:1808
+#, fuzzy
+msgid "No Filetype"
+msgstr "设置文件类型(_T)"
-#: ../src/build.c:1493
-msgid "Set the commands for building and running programs."
-msgstr "设置生成命令并运行程序"
+#: ../src/build.c:1816 ../src/build.c:1851
+#, fuzzy
+msgid "Error Regular Expression:"
+msgstr "_Grep正则表达式"
-#. in-dialog heading for the "Set Includes and Arguments" dialog
-#: ../src/build.c:1501
-#, c-format
-msgid "%s commands"
-msgstr "%s 命令"
+#: ../src/build.c:1844
+msgid "Non-Filetype Commands"
+msgstr ""
-#: ../src/build.c:1516
-msgid "Compile:"
-msgstr "编译:"
+#: ../src/build.c:1874
+msgid "Note: Item 2 opens a dialog and appends the response to the command."
+msgstr ""
-#: ../src/build.c:1538
-msgid "Build:"
-msgstr "生成:"
+#: ../src/build.c:1883
+#, fuzzy
+msgid "Execute Commands"
+msgstr "设置自定义命令"
-#: ../src/build.c:1560 ../src/dialogs.c:1223
-msgid "Execute:"
-msgstr "执行:"
+#: ../src/build.c:1894
+#, c-format
+msgid ""
+"%d, %e, %f, %p are substituted in command and directory fields, see manual "
+"for details."
+msgstr ""
-#: ../src/build.c:1892 ../src/toolbar.c:344
-msgid "Build the current file"
-msgstr "生成当前文件"
+#: ../src/build.c:2046
+#, fuzzy
+msgid "Set Build Commands"
+msgstr "设置自定义命令"
-#: ../src/build.c:1917
-msgid "Make Custom Target"
-msgstr "编译自定义目标"
+#: ../src/build.c:2310 ../src/build.c:2494
+#, fuzzy
+msgid "_Execute"
+msgstr "执行："
-#: ../src/build.c:1918
-msgid ""
-"Enter custom options here, all entered text is passed to the make command."
-msgstr "在这里输入自定义参数，所有输入的文本将作为 make 命令的参数。"
+#: ../src/build.c:2491
+#, fuzzy
+msgid "_Make"
+msgstr "生成："
-#: ../src/build.c:1967
-msgid "Build the current file with Make and the default target"
-msgstr "使用 Make 和缺省目标来生成当前文件"
+#. build the code with make custom
+#: ../src/build.c:2492 ../src/build.c:2545
+msgid "Make Custom _Target"
+msgstr "生成自定义目标(_T)"
-#: ../src/build.c:1970
-msgid "Build the current file with Make and the specified target"
-msgstr "使用 Make 和特定目标来生成当前文件"
+#. build the code with make object
+#: ../src/build.c:2493 ../src/build.c:2553
+msgid "Make _Object"
+msgstr "生成目标文件(_O)"
-#: ../src/build.c:1973
-msgid "Compile the current file with Make"
-msgstr "使用 Make 来编译文件"
+#. build the code
+#: ../src/build.c:2525 ../src/interface.c:967
+msgid "_Build"
+msgstr "生成(_B)"
-#: ../src/build.c:2035
-msgid "Failed to execute the view program"
-msgstr "执行查看程序失败"
+#. build the code with make all
+#: ../src/build.c:2537
+msgid "_Make All"
+msgstr "生成全部(_M)"
-#: ../src/build.c:2073
-#, c-format
-msgid "Process could not be stopped (%s)."
-msgstr "进程无法停止(%s)"
+#. arguments
+#: ../src/build.c:2565
+#, fuzzy
+msgid "_Set Build Menu Commands"
+msgstr "设置自定义命令"
-#: ../src/build.c:2092 ../src/build.c:2106
-msgid "No more build errors."
-msgstr "没有 生成 错误。"
-
 #: ../src/callbacks.c:152
 msgid "Do you really want to quit?"
 msgstr "您真的要退出吗？"
-#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340
-#: ../src/treeviews.c:578
+#: ../src/callbacks.c:471 ../src/document.c:2911 ../src/interface.c:331
+#: ../src/sidebar.c:580
 msgid "_Reload"
 msgstr "重新载入(_R)"
-#: ../src/callbacks.c:470
+#: ../src/callbacks.c:472
 msgid "Any unsaved changes will be lost."
-msgstr "未保存的东东会消失。"
+msgstr "未保存的东西会丢失。"
-#: ../src/callbacks.c:471
+#: ../src/callbacks.c:473
 #, c-format
 msgid "Are you sure you want to reload '%s'?"
-msgstr "您确定要重新载入 '%s' 吗？"
+msgstr "您确定要重新载入“%s”吗？"
-#: ../src/callbacks.c:1249 ../src/keybindings.c:376
+#: ../src/callbacks.c:1260 ../src/keybindings.c:398
 msgid "Go to Line"
-msgstr "跳转行"
+msgstr "跳转到行"
-#: ../src/callbacks.c:1249
+#: ../src/callbacks.c:1260
 msgid "Enter the line you want to go to:"
-msgstr "输入您要跳转到的行号:"
+msgstr "输入您要跳转到的行号："
-#: ../src/callbacks.c:1344 ../src/callbacks.c:1369
+#: ../src/callbacks.c:1357 ../src/callbacks.c:1382
 msgid ""
 "Please set the filetype for the current file before using this function."
 msgstr "在使用这个功能前请设置当前文件的文件类型。"
-#: ../src/callbacks.c:1474 ../src/ui_utils.c:542
+#: ../src/callbacks.c:1494 ../src/ui_utils.c:542
 msgid "dd.mm.yyyy"
 msgstr "dd.mm.yyyy"
-#: ../src/callbacks.c:1476 ../src/ui_utils.c:543
+#: ../src/callbacks.c:1496 ../src/ui_utils.c:543
 msgid "mm.dd.yyyy"
 msgstr "mm.dd.yyyy"
-#: ../src/callbacks.c:1478 ../src/ui_utils.c:544
+#: ../src/callbacks.c:1498 ../src/ui_utils.c:544
 msgid "yyyy/mm/dd"
 msgstr "yyyy/mm/dd"
-#: ../src/callbacks.c:1480 ../src/ui_utils.c:553
+#: ../src/callbacks.c:1500 ../src/ui_utils.c:553
 msgid "dd.mm.yyyy hh:mm:ss"
 msgstr "dd.mm.yyyy hh:mm:ss"
-#: ../src/callbacks.c:1482 ../src/ui_utils.c:554
+#: ../src/callbacks.c:1502 ../src/ui_utils.c:554
 msgid "mm.dd.yyyy hh:mm:ss"
 msgstr "mm.dd.yyyy hh:mm:ss"
-#: ../src/callbacks.c:1484 ../src/ui_utils.c:555
+#: ../src/callbacks.c:1504 ../src/ui_utils.c:555
 msgid "yyyy/mm/dd hh:mm:ss"
 msgstr "yyyy/mm/dd hh:mm:ss"
-#: ../src/callbacks.c:1486 ../src/ui_utils.c:564
+#: ../src/callbacks.c:1506 ../src/ui_utils.c:564
 msgid "_Use Custom Date Format"
 msgstr "使用自定义日期格式(_U)"
-#: ../src/callbacks.c:1497
+#: ../src/callbacks.c:1510
 msgid "Custom Date Format"
 msgstr "自定义日期格式"
-#: ../src/callbacks.c:1498
+#: ../src/callbacks.c:1511
 msgid ""
 "Enter here a custom date and time format. You can use any conversion "
 "specifiers which can be used with the ANSI C strftime function."
 msgstr ""
-"请在这里输入自定义日期和时间格式。你可以使用ANSI C strftime函数中的任何一个转"
-"义符。"
+"请在这里输入自定义日期和时间格式。你可以使用 ANSI C strftime 函数中的任何一个"
+"转义符。"
-#: ../src/callbacks.c:1516
+#: ../src/callbacks.c:1529
 msgid "Date format string could not be converted (possibly too long)."
-msgstr "日期格式字符串无法转换(可能太长了)"
+msgstr "日期格式字符串无法转换（可能太长了）。"
-#: ../src/callbacks.c:1738 ../src/callbacks.c:1748
+#: ../src/callbacks.c:1751 ../src/callbacks.c:1761
 msgid "No more message items."
 msgstr "没有消息"
#. initialize the dialog
-#: ../src/dialogs.c:140 ../src/prefs.c:1640
+#: ../src/dialogs.c:140 ../src/prefs.c:1651
 msgid "Open File"
 msgstr "打开文件"
-#: ../src/dialogs.c:144 ../src/interface.c:691
+#: ../src/dialogs.c:144 ../src/interface.c:682
 msgid "_View"
 msgstr "查看(_V)"
@@ -397,7 +393,7 @@
 msgid "Detect by file extension"
 msgstr "根据文件扩展名探测"
-#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150
+#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5122
 msgid "Detect from file"
 msgstr "根据文件探测"
@@ -412,7 +408,7 @@
#: ../src/dialogs.c:276
 msgid "Set encoding:"
-msgstr "设置编码"
+msgstr "设置编码："
#: ../src/dialogs.c:286
 msgid ""
@@ -428,7 +424,7 @@
 #. line 2 with filetype combo
 #: ../src/dialogs.c:293
 msgid "Set filetype:"
-msgstr "设置文件类型:"
+msgstr "设置文件类型："
#: ../src/dialogs.c:303
 msgid ""
@@ -441,13 +437,12 @@
 "如果同时打开多个文件，则所在文件都被以该类型打开。"
#: ../src/dialogs.c:389
-#, fuzzy
 msgid "Overwrite?"
-msgstr "覆写(_O)"
+msgstr "覆盖？"
#: ../src/dialogs.c:390
 msgid "Filename already exists!"
-msgstr ""
+msgstr "文件名已经存在！"
#: ../src/dialogs.c:424
 msgid "Save File"
@@ -471,146 +466,150 @@
 "new tab"
 msgstr "不关闭未保存的文件并在新标签中打开新保存的文件。"
-#: ../src/dialogs.c:567 ../src/win32.c:562
+#: ../src/dialogs.c:566 ../src/win32.c:562
 msgid "Error"
 msgstr "错误"
-#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568
+#: ../src/dialogs.c:569 ../src/dialogs.c:1382 ../src/win32.c:568
 #: ../src/win32.c:627
 msgid "Question"
 msgstr "问题"
-#: ../src/dialogs.c:573 ../src/win32.c:574
+#: ../src/dialogs.c:572 ../src/win32.c:574
 msgid "Warning"
 msgstr "警告"
-#: ../src/dialogs.c:576 ../src/win32.c:580
+#: ../src/dialogs.c:575 ../src/win32.c:580
 msgid "Information"
 msgstr "信息"
-#: ../src/dialogs.c:656
+#: ../src/dialogs.c:655
 msgid "_Don't save"
 msgstr "不保存(_D)"
-#: ../src/dialogs.c:687
+#: ../src/dialogs.c:686
 #, c-format
 msgid "The file '%s' is not saved."
-msgstr "文件 %s 没有保存"
+msgstr "文件“%s”没有保存。"
-#: ../src/dialogs.c:689
+#: ../src/dialogs.c:688
 msgid "Do you want to save it before closing?"
 msgstr "您要在关闭文件前保存吗？"
-#: ../src/dialogs.c:764
+#: ../src/dialogs.c:763
 msgid "Choose font"
 msgstr "选择字体"
-#: ../src/dialogs.c:1005
+#: ../src/dialogs.c:1004
 msgid ""
 "An error occurred or file information could not be retrieved (e.g. from a "
 "new file)."
-msgstr "产生了一个错误或文件信息取不到(比如一个空文件)"
+msgstr "发生了一个错误或无法取得文件信息（比如一个空文件）。"
-#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026
-#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034
-#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779
+#: ../src/dialogs.c:1023 ../src/dialogs.c:1024 ../src/dialogs.c:1025
+#: ../src/dialogs.c:1031 ../src/dialogs.c:1032 ../src/dialogs.c:1033
+#: ../src/symbols.c:1692 ../src/symbols.c:1713 ../src/symbols.c:1765
 #: ../src/ui_utils.c:216
 msgid "unknown"
 msgstr "未知"
-#: ../src/dialogs.c:1039 ../src/symbols.c:780
+#: ../src/dialogs.c:1038 ../src/symbols.c:779
 msgid "Properties"
 msgstr "属性"
-#: ../src/dialogs.c:1070
+#: ../src/dialogs.c:1067
 msgid "<b>Type:</b>"
-msgstr "<b>类型:</b>"
+msgstr "<b>类型：</b>"
-#: ../src/dialogs.c:1084
+#: ../src/dialogs.c:1081
 msgid "<b>Size:</b>"
-msgstr "<b>大小:</b>"
+msgstr "<b>大小：</b>"
-#: ../src/dialogs.c:1100
+#: ../src/dialogs.c:1097
 msgid "<b>Location:</b>"
-msgstr "<b>位置:</b>"
+msgstr "<b>位置：</b>"
-#: ../src/dialogs.c:1114
+#: ../src/dialogs.c:1111
 msgid "<b>Read-only:</b>"
-msgstr "<b>只读:</b>"
+msgstr "<b>只读：</b>"
-#: ../src/dialogs.c:1121
+#: ../src/dialogs.c:1118
 msgid "(only inside Geany)"
-msgstr "(仅在Geany中)"
+msgstr "（仅在Geany中）"
-#: ../src/dialogs.c:1130
+#: ../src/dialogs.c:1127
 msgid "<b>Encoding:</b>"
-msgstr "<b>编码:</b>"
+msgstr "<b>编码：</b>"
#. BOM = byte order mark
-#: ../src/dialogs.c:1140 ../src/ui_utils.c:219
+#: ../src/dialogs.c:1137 ../src/ui_utils.c:219
 msgid "(with BOM)"
-msgstr "(含有 BOM)"
+msgstr "（含有 BOM）"
-#: ../src/dialogs.c:1140
+#: ../src/dialogs.c:1137
 msgid "(without BOM)"
-msgstr "(没有 BOM)"
+msgstr "（没有 BOM）"
-#: ../src/dialogs.c:1151
+#: ../src/dialogs.c:1148
 msgid "<b>Modified:</b>"
-msgstr "<b>修改于:</b>"
+msgstr "<b>修改于：</b>"
-#: ../src/dialogs.c:1165
+#: ../src/dialogs.c:1162
 msgid "<b>Changed:</b>"
-msgstr "<b>变更于:</b>"
+msgstr "<b>变更于：</b>"
-#: ../src/dialogs.c:1179
+#: ../src/dialogs.c:1176
 msgid "<b>Accessed:</b>"
-msgstr "<b>访问于:</b>"
+msgstr "<b>访问于：</b>"
-#: ../src/dialogs.c:1201
+#: ../src/dialogs.c:1198
 msgid "<b>Permissions:</b>"
-msgstr "<b>权限:</b>"
+msgstr "<b>权限：</b>"
#. Header
-#: ../src/dialogs.c:1209
+#: ../src/dialogs.c:1206
 msgid "Read:"
-msgstr "读:"
+msgstr "读："
-#: ../src/dialogs.c:1216
+#: ../src/dialogs.c:1213
 msgid "Write:"
-msgstr "写:"
+msgstr "写："
+#: ../src/dialogs.c:1220
+msgid "Execute:"
+msgstr "执行："
+
 #. Owner
-#: ../src/dialogs.c:1231
+#: ../src/dialogs.c:1228
 msgid "Owner:"
-msgstr "所有者:"
+msgstr "所有者："
#. Group
-#: ../src/dialogs.c:1267
+#: ../src/dialogs.c:1264
 msgid "Group:"
-msgstr "组:"
+msgstr "组："
#. Other
-#: ../src/dialogs.c:1303
+#: ../src/dialogs.c:1300
 msgid "Other:"
-msgstr "其他"
+msgstr "其他："
-#: ../src/document.c:622
+#: ../src/document.c:643
 #, c-format
 msgid "File %s closed."
 msgstr "文件 %s 已关闭。"
-#: ../src/document.c:745
+#: ../src/document.c:768
 #, c-format
 msgid "New file "%s" opened."
-msgstr "新文件 "%s" 已打开。"
+msgstr "新文件“%s”已打开。"
-#: ../src/document.c:918 ../src/document.c:1421
+#: ../src/document.c:941 ../src/document.c:1451
 #, c-format
 msgid "Could not open file %s (%s)"
-msgstr "无法打开文件 %s (%s)"
+msgstr "无法打开文件 %s（%s）"
-#: ../src/document.c:948
+#: ../src/document.c:971
 #, c-format
 msgid ""
 "The file "%s" could not be opened properly and has been truncated. This "
@@ -618,48 +617,48 @@
 "cause data loss.\n"
 "The file was set to read-only."
 msgstr ""
-"文件"%s"无法正确打开并已被截短。可以因为文件含有空字节。保存文件会导致数据"
-"丢失。\n"
+"文件“%s”无法正确打开并已被截短。可能因为文件含有 NULL 字节。保存文件会导致数"
+"据丢失。\n"
 "文件被设置为只读状态。"
#. For translators: the second wildcard is an encoding name, e.g.
 #. * The file "test.txt" is not valid UTF-8.
-#: ../src/document.c:974
+#: ../src/document.c:997
 #, c-format
 msgid "The file "%s" is not valid %s."
-msgstr "文件 "%s" 是非法的 %s."
+msgstr "文件“%s”是非法的 %s。"
-#: ../src/document.c:984
+#: ../src/document.c:1007
 #, c-format
 msgid ""
 "The file "%s" does not look like a text file or the file encoding is not "
 "supported."
-msgstr "文件 "%s" 可能不是文本文件或文件编码不支持。"
+msgstr "文件“%s”可能不是文本文件或文件编码不支持。"
-#: ../src/document.c:1122
+#: ../src/document.c:1150
 msgid "Spaces"
 msgstr "空格"
-#: ../src/document.c:1125
+#: ../src/document.c:1153
 msgid "Tabs"
 msgstr "制表符"
-#: ../src/document.c:1128
+#: ../src/document.c:1156
 msgid "Tabs and Spaces"
 msgstr "制表符和空格"
#. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs
 #. * and Spaces), the second one is the filename
-#: ../src/document.c:1133
+#: ../src/document.c:1161
 #, c-format
 msgid "Setting %s indentation mode for %s."
-msgstr "设置 %s 缩进模式用于 %s 。"
+msgstr "为  %s  设置 %s 缩进模式。"
-#: ../src/document.c:1186
+#: ../src/document.c:1214
 msgid "Invalid filename"
 msgstr "非法文件名"
-#: ../src/document.c:1309
+#: ../src/document.c:1329
 #, c-format
 msgid "File %s reloaded."
 msgstr "文件 %s 已重新载入。"
@@ -667,105 +666,104 @@
 #. For translators: this is the status window message for opening a file. %d is the number
 #. * of the newly opened file, %s indicates whether the file is opened read-only
 #. * (it is replaced with the string ", read-only").
-#: ../src/document.c:1314
+#: ../src/document.c:1334
 #, c-format
 msgid "File %s opened(%d%s)."
-msgstr "文件 %s 已打开(%d%s)。"
+msgstr "文件 %s 已打开（%d%s）。"
-#: ../src/document.c:1316
+#: ../src/document.c:1336
 msgid ", read-only"
-msgstr ", 只读"
+msgstr "，只读"
-#: ../src/document.c:1512
+#: ../src/document.c:1546
 msgid "Error renaming file."
 msgstr "重命名文件出错。"
-#: ../src/document.c:1587
+#: ../src/document.c:1621
 #, c-format
 msgid ""
 "An error occurred while converting the file from UTF-8 in "%s". The file "
 "remains unsaved."
-msgstr "文件 "%s".从UTF-8转换过来时出错。文件未保存。"
+msgstr "文件“%s”从UTF-8转换过来时出错。文件未保存。"
-#: ../src/document.c:1609
+#: ../src/document.c:1643
 #, c-format
 msgid ""
 "Error message: %s\n"
 "The error occurred at "%s" (line: %d, column: %d)."
 msgstr ""
-"出错信息： %s\n"
-"错误产生于 "%s" (行： %d, 列： %d)。"
+"错误信息：%s\n"
+"错误产生于“%s”（行：%d，列：%d）。"
-#: ../src/document.c:1614
+#: ../src/document.c:1648
 #, c-format
 msgid "Error message: %s."
-msgstr "出错信息： %s 。"
+msgstr "错误信息：%s 。"
-#: ../src/document.c:1715 ../src/document.c:1775
+#: ../src/document.c:1751 ../src/document.c:1814
 msgid "Error saving file."
 msgstr "保存文件出错。"
-#: ../src/document.c:1774
+#: ../src/document.c:1813
 #, c-format
 msgid "Error saving file (%s)."
-msgstr "保存文件(%s)出错。"
+msgstr "保存文件出错（%s）。"
-#: ../src/document.c:1799
+#: ../src/document.c:1838
 #, c-format
 msgid "File %s saved."
 msgstr "文件 %s 已保存。"
-#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932
+#: ../src/document.c:1906 ../src/document.c:1963 ../src/document.c:1971
 #, c-format
 msgid ""%s" was not found."
-msgstr ""%s" 未找到。"
+msgstr "“%s”未找到。"
-#: ../src/document.c:1932
+#: ../src/document.c:1971
 msgid "Wrap search and find again?"
-msgstr "要从循环查找吗？"
+msgstr "要循环查找吗？"
-#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688
-#: ../src/search.c:1689
+#: ../src/document.c:2050 ../src/search.c:1085 ../src/search.c:1659
+#: ../src/search.c:1660
 #, c-format
 msgid "No matches found for "%s"."
-msgstr "未找到匹配项“'%s”。"
+msgstr "未找到匹配项“%s”。"
-#: ../src/document.c:2022 ../src/document.c:2031
+#: ../src/document.c:2061 ../src/document.c:2070
 #, c-format
 msgid "%s: replaced %d occurrence of "%s" with "%s"."
 msgid_plural "%s: replaced %d occurrences of "%s" with "%s"."
-msgstr[0] "%s:替换了 %d 处，由"%s" 变为 "%s"。"
-msgstr[1] "%s:替换了 %d 处，由"%s" 变为 "%s"。"
+msgstr[0] "%s：替换了 %d 处，从“%s”变为“%s”。"
-#: ../src/document.c:2868
+#: ../src/document.c:2912
 msgid "Do you want to reload it?"
 msgstr "您要重新载入吗？"
-#: ../src/document.c:2869
+#: ../src/document.c:2913
 #, c-format
 msgid ""
 "The file '%s' on the disk is more recent than\n"
 "the current buffer."
 msgstr ""
-"磁盘中的文件 '%s' \n"
+"磁盘中的文件“%s”\n"
 "比当前编辑的新。"
-#: ../src/document.c:2890
+#: ../src/document.c:2934
 msgid "Try to resave the file?"
 msgstr "尝试重新保存文件？"
-#: ../src/document.c:2891
+#: ../src/document.c:2935
 #, c-format
 msgid "File "%s" was not found on disk!"
-msgstr "文件 "%s" 未找到！"
+msgstr "文件“%s”未找到！"
-#: ../src/editor.c:4288
+#: ../src/editor.c:4320
 msgid "Enter Tab Width"
 msgstr "输入制表符宽度"
-#: ../src/editor.c:4289
+#: ../src/editor.c:4321
 msgid "Enter the amount of spaces which should be replaced by a tab character."
-msgstr "输入制表符占用多少空格的宽度。"
+msgstr "输入要用一个制表符代替多少个空格。"
#: ../src/encodings.c:76
 msgid "Celtic"
@@ -804,11 +802,11 @@
#: ../src/encodings.c:98
 msgid "Cyrillic/Russian"
-msgstr "斯拉夫/俄语"
+msgstr "斯拉夫／俄语"
#: ../src/encodings.c:99
 msgid "Cyrillic/Ukrainian"
-msgstr "斯拉夫/乌克兰语"
+msgstr "斯拉夫／乌克兰语"
#: ../src/encodings.c:100
 msgid "Romanian"
@@ -825,7 +823,7 @@
#: ../src/encodings.c:109
 msgid "Hebrew Visual"
-msgstr "视觉希伯来语"
+msgstr "希伯来语（Hebrew Visual）"
#: ../src/encodings.c:111
 msgid "Armenian"
@@ -877,564 +875,561 @@
 msgid "Without encoding"
 msgstr "没有编码"
-#: ../src/encodings.c:374
+#: ../src/encodings.c:375
 msgid "_West European"
 msgstr "西欧语系(_W)"
-#: ../src/encodings.c:380
+#: ../src/encodings.c:381
 msgid "_East European"
 msgstr "东欧语系(_E)"
-#: ../src/encodings.c:386
+#: ../src/encodings.c:387
 msgid "East _Asian"
 msgstr "东亚语系(_A)"
-#: ../src/encodings.c:392
+#: ../src/encodings.c:393
 msgid "_SE & SW Asian"
 msgstr "东南亚和西南亚语系(_S)"
-#: ../src/encodings.c:398
+#: ../src/encodings.c:399
 msgid "_Middle Eastern"
 msgstr "中东语系(_M)"
-#: ../src/encodings.c:404
+#: ../src/encodings.c:405
 msgid "_Unicode"
 msgstr "_Unicode"
-#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226
-#: ../src/filetypes.c:237 ../src/filetypes.c:259
+#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231
+#: ../src/filetypes.c:242 ../src/filetypes.c:264
 #, c-format
 msgid "%s source file"
 msgstr "%s 源文件"
-#: ../src/filetypes.c:97
-#, fuzzy, c-format
+#: ../src/filetypes.c:102
+#, c-format
 msgid "%s file"
-msgstr "%s 源文件"
+msgstr "%s 文件"
-#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501
-#: ../src/interface.c:5069
+#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3501
+#: ../src/interface.c:5041
 msgid "None"
 msgstr "没有"
-#: ../src/filetypes.c:382
+#: ../src/filetypes.c:409
 msgid "Shell script file"
-msgstr "Shell 源文件"
+msgstr "Shell 脚本文件"
-#: ../src/filetypes.c:394
+#: ../src/filetypes.c:421
 msgid "Makefile"
 msgstr "Makefile"
-#: ../src/filetypes.c:406
+#: ../src/filetypes.c:433
 msgid "XML document"
 msgstr "XML 文档"
-#: ../src/filetypes.c:441
+#: ../src/filetypes.c:468
 msgid "Cascading StyleSheet"
-msgstr "样式表"
+msgstr "层叠样式表"
-#: ../src/filetypes.c:452
+#: ../src/filetypes.c:479
 msgid "SQL Dump file"
 msgstr "SQL 转储文件"
-#: ../src/filetypes.c:496
+#: ../src/filetypes.c:523
 msgid "Config file"
 msgstr "配置文件"
-#: ../src/filetypes.c:508
+#: ../src/filetypes.c:535
 msgid "Gettext translation file"
 msgstr "Gettext 翻译文件"
-#: ../src/filetypes.c:541
+#: ../src/filetypes.c:568
 #, c-format
 msgid "%s script file"
 msgstr "%s 脚本文件"
-#: ../src/filetypes.c:738
+#: ../src/filetypes.c:814
 msgid "_Programming Languages"
 msgstr "编程语言(_P)"
-#: ../src/filetypes.c:739
+#: ../src/filetypes.c:815
 msgid "_Scripting Languages"
 msgstr "脚本语言(_S)"
-#: ../src/filetypes.c:740
+#: ../src/filetypes.c:816
 msgid "_Markup Languages"
 msgstr "标记语言(_M)"
-#: ../src/filetypes.c:741
+#: ../src/filetypes.c:817
 msgid "M_iscellaneous Languages"
 msgstr "其他语言(_I)"
-#: ../src/filetypes.c:1331 ../src/win32.c:107
+#: ../src/filetypes.c:1369 ../src/win32.c:107
 msgid "All Source"
 msgstr "所有源文件"
-#: ../src/filetypes.c:1356 ../src/project.c:292
+#: ../src/filetypes.c:1394 ../src/project.c:292
 msgid "All files"
 msgstr "所有文件"
-#: ../src/filetypes.c:1414
+#: ../src/filetypes.c:1452
 #, c-format
 msgid "Bad regex for filetype %s: %s"
-msgstr "文件类型 %s 的错误正则表达式: %s"
+msgstr "文件类型 %s 的错误正则表达式：%s"
#: ../src/geany.h:53
 msgid "untitled"
 msgstr "未命名"
-#: ../src/interface.c:276
+#: ../src/interface.c:274
 msgid "_File"
 msgstr "文件(_F)"
-#: ../src/interface.c:287
+#: ../src/interface.c:285
 msgid "New (with _Template)"
 msgstr "根据模板新建(_T)"
-#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537
-#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851
-#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072
-#: ../src/interface.c:2086
-msgid "invisible"
-msgstr "不可见"
-
-#: ../src/interface.c:300
-msgid "dummy tooltip, don't translate this."
-msgstr ""
-
-#: ../src/interface.c:311 ../src/interface.c:1940
+#: ../src/interface.c:302 ../src/interface.c:1944
 msgid "Open Selected F_ile"
 msgstr "打开选择的文件(_I)"
-#: ../src/interface.c:315
+#: ../src/interface.c:306
 msgid "Recent _Files"
 msgstr "最近打开的文件(_F)"
-#: ../src/interface.c:332
+#: ../src/interface.c:323
 msgid "Save A_ll"
 msgstr "全部保存(_L)"
-#: ../src/interface.c:348
+#: ../src/interface.c:339
 msgid "R_eload As"
 msgstr "重新载入为(_E)"
-#: ../src/interface.c:376
+#: ../src/interface.c:350 ../src/interface.c:528 ../src/interface.c:582
+#: ../src/interface.c:596 ../src/interface.c:842 ../src/interface.c:852
+#: ../src/interface.c:2022 ../src/interface.c:2076 ../src/interface.c:2090
+msgid "invisible"
+msgstr "不可见"
+
+#: ../src/interface.c:367
 msgid "Page Set_up"
 msgstr "页面设置(_U)"
-#: ../src/interface.c:393 ../src/notebook.c:240
+#: ../src/interface.c:384 ../src/notebook.c:213
 msgid "Close Ot_her Documents"
 msgstr "关闭其它文件(_H)"
-#: ../src/interface.c:401 ../src/notebook.c:245
+#: ../src/interface.c:392 ../src/notebook.c:218
 msgid "C_lose All"
 msgstr "全部关闭(_L)"
-#: ../src/interface.c:418
+#: ../src/interface.c:409
 msgid "_Edit"
 msgstr "编辑(_E)"
-#: ../src/interface.c:468 ../src/interface.c:1949
+#: ../src/interface.c:459 ../src/interface.c:1953
 msgid "_Format"
-msgstr "格式化(_F)"
+msgstr "格式(_F)"
-#: ../src/interface.c:475 ../src/interface.c:1956
+#: ../src/interface.c:466 ../src/interface.c:1960
 msgid "T_oggle Case of Selection"
 msgstr "切换大小写(_O)"
-#: ../src/interface.c:484 ../src/interface.c:1965
+#: ../src/interface.c:475 ../src/interface.c:1969
 msgid "_Comment Line(s)"
 msgstr "转换为注释(_C)"
-#: ../src/interface.c:488 ../src/interface.c:1969
+#: ../src/interface.c:479 ../src/interface.c:1973
 msgid "U_ncomment Line(s)"
-msgstr "去除注释(_N)"
+msgstr "取消注释(_N)"
-#: ../src/interface.c:492 ../src/interface.c:1973
+#: ../src/interface.c:483 ../src/interface.c:1977
 msgid "_Toggle Line Commentation"
 msgstr "切换注释状态(_T)"
-#: ../src/interface.c:496 ../src/interface.c:1977
+#: ../src/interface.c:487 ../src/interface.c:1981
 msgid "Du_plicate Line or Selection"
-msgstr "复制行或选中的文本"
+msgstr "复制行或选中的文本(_P)"
-#: ../src/interface.c:505 ../src/interface.c:1986
+#: ../src/interface.c:496 ../src/interface.c:1990
 msgid "_Increase Indent"
 msgstr "增加缩进(_I)"
-#: ../src/interface.c:513 ../src/interface.c:1994
+#: ../src/interface.c:504 ../src/interface.c:1998
 msgid "_Decrease Indent"
 msgstr "减少缩进(_D)"
-#: ../src/interface.c:526 ../src/interface.c:2007
+#: ../src/interface.c:517 ../src/interface.c:2011
 msgid "_Send Selection to Terminal"
 msgstr "发送选中的文字到终端(_S)"
-#: ../src/interface.c:530 ../src/interface.c:2011
+#: ../src/interface.c:521 ../src/interface.c:2015
 msgid "_Send Selection to"
 msgstr "发送选中的文字到(_S)"
-#: ../src/interface.c:545 ../src/interface.c:2026
+#: ../src/interface.c:536 ../src/interface.c:2030
 msgid "I_nsert Comments"
 msgstr "插入注释(_N)"
-#: ../src/interface.c:556 ../src/interface.c:2037
+#: ../src/interface.c:547 ../src/interface.c:2041
 msgid "Insert _ChangeLog Entry"
 msgstr "插入更改记录(_C)"
-#: ../src/interface.c:560 ../src/interface.c:2041
+#: ../src/interface.c:551 ../src/interface.c:2045
 msgid "Insert File _Header"
 msgstr "插入文件头(_H)"
-#: ../src/interface.c:564 ../src/interface.c:2045
+#: ../src/interface.c:555 ../src/interface.c:2049
 msgid "Insert _Function Description"
 msgstr "插入函数描述(_F)"
-#: ../src/interface.c:568 ../src/interface.c:2049
+#: ../src/interface.c:559 ../src/interface.c:2053
 msgid "Insert _Multiline Comment"
 msgstr "插入多行注释(_M)"
-#: ../src/interface.c:572 ../src/interface.c:2053
+#: ../src/interface.c:563 ../src/interface.c:2057
 msgid "Insert _GPL Notice"
-msgstr "插入GPL告知(_G)"
+msgstr "插入 GPL 公告(_G)"
-#: ../src/interface.c:576 ../src/interface.c:2057
+#: ../src/interface.c:567 ../src/interface.c:2061
 msgid "Insert _BSD License Notice"
-msgstr "插入BSD许可公告(_B)"
+msgstr "插入 BSD 许可公告(_B)"
-#: ../src/interface.c:580 ../src/interface.c:2061
+#: ../src/interface.c:571 ../src/interface.c:2065
 msgid "Insert Dat_e"
 msgstr "插入日期(_E)"
-#: ../src/interface.c:594 ../src/interface.c:2075
+#: ../src/interface.c:585 ../src/interface.c:2079
 msgid "_Insert "include <...>""
-msgstr "插入 "include <...>"(I)"
+msgstr "插入“include <...>”(_I)"
-#: ../src/interface.c:613
+#: ../src/interface.c:604
 msgid "Preference_s"
 msgstr "首选项(_S)"
-#: ../src/interface.c:621
+#: ../src/interface.c:612
 msgid "_Search"
 msgstr "搜索(_S)"
-#: ../src/interface.c:632
+#: ../src/interface.c:623
 msgid "Find _Next"
 msgstr "查找下一个(_N)"
-#: ../src/interface.c:636
+#: ../src/interface.c:627
 msgid "Find _Previous"
 msgstr "查找上一个(_P)"
-#: ../src/interface.c:640
+#: ../src/interface.c:631
 msgid "Find in F_iles"
 msgstr "在多个文件中查找(_I)"
-#: ../src/interface.c:644 ../src/search.c:524
+#: ../src/interface.c:635 ../src/search.c:524
 msgid "_Replace"
 msgstr "替换(_R)"
-#: ../src/interface.c:657
+#: ../src/interface.c:648
 msgid "Find _Selected"
 msgstr "查找选择的(_S)"
-#: ../src/interface.c:661
+#: ../src/interface.c:652
 msgid "Find Pre_vious Selected"
 msgstr "查找前一个选择的(_V)"
-#: ../src/interface.c:670
+#: ../src/interface.c:661
 msgid "Next _Message"
-msgstr "下一个信息"
+msgstr "下一个信息(_M)"
-#: ../src/interface.c:674
+#: ../src/interface.c:665
 msgid "Pr_evious Message"
-msgstr "下一个信息(_E)"
+msgstr "前一个信息(_E)"
-#: ../src/interface.c:683 ../src/interface.c:2127
+#: ../src/interface.c:674 ../src/interface.c:2131
 msgid "_Go to Line"
 msgstr "跳转到指定行(_G)"
-#: ../src/interface.c:698
+#: ../src/interface.c:689
 msgid "Change _Font"
-msgstr "修改字体(_F)"
+msgstr "更改字体(_F)"
-#: ../src/interface.c:711
+#: ../src/interface.c:702
 msgid "To_ggle All Additional Widgets"
-msgstr "开关所有附加构件(_G)"
+msgstr "开关所有附加部件(_G)"
-#: ../src/interface.c:715
+#: ../src/interface.c:706
 msgid "Full_screen"
 msgstr "全屏(_S)"
-#: ../src/interface.c:719
+#: ../src/interface.c:710
 msgid "Show Message _Window"
 msgstr "显示信息窗口(_W)"
-#: ../src/interface.c:724
+#: ../src/interface.c:715
 msgid "Show _Toolbar"
 msgstr "显示工具栏(_T)"
-#: ../src/interface.c:729
+#: ../src/interface.c:720
 msgid "Show Side_bar"
 msgstr "显示侧边栏(_B)"
-#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229
+#: ../src/interface.c:725 ../src/interface.c:3917 ../src/keybindings.c:252
 msgid "Editor"
 msgstr "编辑器"
-#: ../src/interface.c:741
+#: ../src/interface.c:732
 msgid "Show _Markers Margin"
-msgstr "显示标记页边空白(_M)"
+msgstr "显示页边标注区域(_M)"
-#: ../src/interface.c:746
+#: ../src/interface.c:737
 msgid "Show _Line Numbers"
 msgstr "显示行号(_L)"
-#: ../src/interface.c:751
+#: ../src/interface.c:742
 msgid "Show _White Space"
 msgstr "显示空白(_W)"
-#: ../src/interface.c:755
+#: ../src/interface.c:746
 msgid "Show Line _Endings"
 msgstr "显示行尾(_E)"
-#: ../src/interface.c:759
+#: ../src/interface.c:750
 msgid "Show _Indentation Guides"
 msgstr "显示缩进标记(_I)"
-#: ../src/interface.c:780
+#: ../src/interface.c:771
 msgid "_Document"
 msgstr "文档(_D)"
-#: ../src/interface.c:787
+#: ../src/interface.c:778
 msgid "_Line Wrapping"
 msgstr "自动换行(_L)"
-#: ../src/interface.c:792
+#: ../src/interface.c:783
 msgid "Line _Breaking"
-msgstr "自动换行(_B)"
+msgstr "自动断行(_B)"
-#: ../src/interface.c:796
+#: ../src/interface.c:787
 msgid "_Auto-indentation"
 msgstr "自动缩进(_A)"
-#: ../src/interface.c:801
+#: ../src/interface.c:792
 msgid "In_dent Type"
 msgstr "缩进类型(_D)"
-#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108
+#: ../src/interface.c:799 ../src/interface.c:3540 ../src/interface.c:5080
 msgid "_Tabs"
 msgstr "制表符(_T)"
-#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099
+#: ../src/interface.c:805 ../src/interface.c:3531 ../src/interface.c:5071
 msgid "_Spaces"
 msgstr "空格(_S)"
-#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117
+#: ../src/interface.c:811 ../src/interface.c:3549 ../src/interface.c:5089
 msgid "T_abs and Spaces"
 msgstr "制表符和空格(_A)"
-#: ../src/interface.c:831
+#: ../src/interface.c:822
 msgid "Read _Only"
 msgstr "只读(_O)"
-#: ../src/interface.c:835
+#: ../src/interface.c:826
 msgid "_Write Unicode BOM"
-msgstr "写Unicode BOM (_W)"
+msgstr "写 Unicode BOM (_W)"
-#: ../src/interface.c:844
+#: ../src/interface.c:835
 msgid "Set File_type"
 msgstr "设置文件类型(_T)"
-#: ../src/interface.c:854
+#: ../src/interface.c:845
 msgid "Set _Encoding"
 msgstr "设置文件编码(_E)"
-#: ../src/interface.c:864
+#: ../src/interface.c:855
 msgid "Set Line E_ndings"
 msgstr "设置换行符(_N)"
-#: ../src/interface.c:871
+#: ../src/interface.c:862
 msgid "Convert and Set to _CR/LF (Win)"
 msgstr "转换并设置为_CR/LF (Win)"
-#: ../src/interface.c:877
+#: ../src/interface.c:868
 msgid "Convert and Set to _LF (Unix)"
 msgstr "转换并设置为_LF (Unix)"
-#: ../src/interface.c:883
+#: ../src/interface.c:874
 msgid "Convert and Set to CR (_Mac)"
 msgstr "转换并设置为CR (_Mac)"
-#: ../src/interface.c:894
+#: ../src/interface.c:885
 msgid "_Strip Trailing Spaces"
 msgstr "去除行尾空白(_S)"
-#: ../src/interface.c:898
+#: ../src/interface.c:889
 msgid "_Replace Tabs by Spaces"
 msgstr "替换制表符为空格(_R)"
-#: ../src/interface.c:902
+#: ../src/interface.c:893
 msgid "Replace Spaces b_y Tabs"
 msgstr "替换空格为制表符为(_Y)"
-#: ../src/interface.c:911
+#: ../src/interface.c:902
 msgid "_Fold All"
 msgstr "全部折叠(_F)"
-#: ../src/interface.c:915
+#: ../src/interface.c:906
 msgid "_Unfold All"
 msgstr "全部展开(_U)"
-#: ../src/interface.c:924
+#: ../src/interface.c:915
 msgid "Remove _Markers"
 msgstr "去除记号(_M)"
-#: ../src/interface.c:928
+#: ../src/interface.c:919
 msgid "Remove Error _Indicators"
 msgstr "去除所有出错指示(_I)"
-#: ../src/interface.c:932
+#: ../src/interface.c:923
 msgid "_Project"
 msgstr "项目(_P)"
-#: ../src/interface.c:939
+#: ../src/interface.c:930
 msgid "_New"
 msgstr "新建(_N)"
-#: ../src/interface.c:947
+#: ../src/interface.c:938
 msgid "_Open"
 msgstr "打开(_O)"
-#: ../src/interface.c:955
+#: ../src/interface.c:946
 msgid "_Recent Projects"
 msgstr "最近项目(_R)"
-#: ../src/interface.c:959
+#: ../src/interface.c:950
 msgid "_Close"
 msgstr "关闭(_C)"
-#: ../src/interface.c:980
+#: ../src/interface.c:971
 msgid "_Tools"
 msgstr "工具(_T)"
-#: ../src/interface.c:987
+#: ../src/interface.c:978
+msgid "_Reload Configuration"
+msgstr "重新载入设置(_R)"
+
+#: ../src/interface.c:986
+msgid "C_onfiguration Files"
+msgstr "设置文件(_O)"
+
+#: ../src/interface.c:999
 msgid "_Color Chooser"
 msgstr "颜色选择器(_C)"
-#: ../src/interface.c:995
+#: ../src/interface.c:1007
 msgid "_Word Count"
 msgstr "字数统计(_W)"
-#: ../src/interface.c:999
+#: ../src/interface.c:1011
 msgid "Load Ta_gs"
 msgstr "载入标记文件(_G)"
-#: ../src/interface.c:1003
-msgid "_Reload Configuration"
-msgstr "重新载入设置(_R)"
-
-#: ../src/interface.c:1011 ../src/interface.c:1018
+#: ../src/interface.c:1015 ../src/interface.c:1022
 msgid "_Help"
 msgstr "帮助(_H)"
-#: ../src/interface.c:1026
+#: ../src/interface.c:1030
 msgid "_Website"
 msgstr "网站(_W)"
-#: ../src/interface.c:1030
+#: ../src/interface.c:1034
 msgid "_Keyboard Shortcuts"
 msgstr "快捷键(_K)"
-#: ../src/interface.c:1034
+#: ../src/interface.c:1038
 msgid "_Debug Messages"
 msgstr "除错信息(_D)"
-#: ../src/interface.c:1073 ../src/treeviews.c:119
+#: ../src/interface.c:1077 ../src/sidebar.c:121
 msgid "Symbols"
 msgstr "标记"
-#: ../src/interface.c:1087
+#: ../src/interface.c:1091
 msgid "Documents"
 msgstr "文档"
-#: ../src/interface.c:1123
+#: ../src/interface.c:1127
 msgid "Status"
 msgstr "状态"
-#: ../src/interface.c:1137
+#: ../src/interface.c:1141
 msgid "Compiler"
 msgstr "编译器"
-#: ../src/interface.c:1152
+#: ../src/interface.c:1156
 msgid "Messages"
 msgstr "信息"
-#: ../src/interface.c:1165
+#: ../src/interface.c:1169
 msgid "Scribble"
 msgstr "便签"
-#: ../src/interface.c:1727 ../src/interface.c:3286
+#: ../src/interface.c:1731 ../src/interface.c:3286
 msgid "Images _and Text"
 msgstr "图像和文字(_A)"
-#: ../src/interface.c:1732 ../src/interface.c:3318
+#: ../src/interface.c:1736 ../src/interface.c:3318
 msgid "_Images Only"
 msgstr "只有图像(_I)"
-#: ../src/interface.c:1737 ../src/interface.c:3310
+#: ../src/interface.c:1741 ../src/interface.c:3310
 msgid "_Text Only"
 msgstr "只有文字(_T)"
-#: ../src/interface.c:1748 ../src/interface.c:3302
+#: ../src/interface.c:1752 ../src/interface.c:3302
 msgid "_Large Icons"
 msgstr "大图标(_L)"
-#: ../src/interface.c:1753 ../src/interface.c:3294
+#: ../src/interface.c:1757 ../src/interface.c:3294
 msgid "_Small Icons"
 msgstr "小图标(_S)"
-#: ../src/interface.c:1758 ../src/interface.c:3326
+#: ../src/interface.c:1762 ../src/interface.c:3326
 msgid "_Very Small Icons"
 msgstr "小小图标(_V)"
-#: ../src/interface.c:1769
-#, fuzzy
+#: ../src/interface.c:1773
 msgid "_Customize Toolbar"
-msgstr "隐藏工具栏(_H)"
+msgstr "自定义工具栏(_C)"
-#: ../src/interface.c:1777
-#, fuzzy
+#: ../src/interface.c:1781
 msgid "_Hide Toolbar"
 msgstr "隐藏工具栏(_H)"
-#: ../src/interface.c:2094
+#: ../src/interface.c:2098
 msgid "Find _Usage"
 msgstr "查找用法(_U)"
-#: ../src/interface.c:2102
+#: ../src/interface.c:2106
 msgid "Find _Document Usage"
 msgstr "查找文档用法(_D)"
-#: ../src/interface.c:2110
+#: ../src/interface.c:2114
 msgid "Go to _Tag Definition"
 msgstr "跳转到标记定义(_T)"
-#: ../src/interface.c:2114
+#: ../src/interface.c:2118
 msgid "Go to T_ag Declaration"
 msgstr "跳转到标记说明(_A)"
-#: ../src/interface.c:2118
+#: ../src/interface.c:2122
 msgid "Conte_xt Action"
-msgstr "背景运行(_X)"
+msgstr "上下文动作(_X)"
-#: ../src/interface.c:2667 ../src/keybindings.c:337
+#: ../src/interface.c:2667 ../src/keybindings.c:359
 msgid "Preferences"
 msgstr "首选项"
#: ../src/interface.c:2703
 msgid "Load files from the last session"
-msgstr "打开上次会话的文件"
+msgstr "在启动时打开上次会话的文件"
#: ../src/interface.c:2706
 msgid "Opens at startup the files from the last session"
@@ -1448,7 +1443,7 @@
 msgid ""
 "Whether the virtual terminal emulation (VTE) should be loaded at startup, "
 "disable it if you do not need it"
-msgstr "是否有开始时载入虚拟终端，如果你不需要就禁用这个选项"
+msgstr "是否在开始时载入虚拟终端，如果你不需要就禁用这个选项"
#: ../src/interface.c:2712
 msgid "Enable plugin support"
@@ -1464,7 +1459,7 @@
#: ../src/interface.c:2738
 msgid "Saves the window position and geometry and restores it at the start"
-msgstr "保存窗口位置和尺寸"
+msgstr "保存窗口位置和尺寸并在启动时恢复"
#: ../src/interface.c:2740
 msgid "Confirm exit"
@@ -1480,7 +1475,7 @@
#: ../src/interface.c:2766
 msgid "Startup path:"
-msgstr "根路径:"
+msgstr "根路径："
#: ../src/interface.c:2778
 msgid ""
@@ -1491,15 +1486,15 @@
#: ../src/interface.c:2791
 msgid "Project files:"
-msgstr "项目路径:"
+msgstr "项目文件："
#: ../src/interface.c:2803
 msgid "Path to start in when opening project files"
-msgstr "当打开项目时的路径"
+msgstr "打开项目文件时的路径"
#: ../src/interface.c:2816
 msgid "Extra plugin path:"
-msgstr "额外插件路径:"
+msgstr "额外插件路径："
#: ../src/interface.c:2828
 msgid ""
@@ -1507,8 +1502,8 @@
 "configuration directory. The path entered here will be searched additionally "
 "for plugins. Leave blank to disable."
 msgstr ""
-"Geany 会在安装路径和定义路径中找寻插件。这里可以定义额外的插件路径。如果留空"
-"则取消这个功能。"
+"Geany 会在安装路径和设置文件夹中找寻插件。这里可以定义额外的插件路径。如果留"
+"空则取消这个功能。"
#: ../src/interface.c:2841
 msgid "<b>Paths</b>"
@@ -1536,7 +1531,7 @@
 msgid ""
 "Switch to the status message tab (in the notebook window at the bottom) if a "
 "new status message arrives"
-msgstr "有新的信息时切换到信息窗口(在底部的分页窗口中)"
+msgstr "有新的信息时切换到信息窗口（在底部的分页窗口中）"
#: ../src/interface.c:2878
 msgid "Suppress status messages in the status bar"
@@ -1549,9 +1544,8 @@
 msgstr "清空状态栏信息。保留状态信息窗口中的信息。"
#: ../src/interface.c:2883
-#, fuzzy
 msgid "Auto-focus widgets (focus follows mouse)"
-msgstr "自动焦点构件(焦点跟随鼠标)"
+msgstr "部件自动获得鼠标焦点"
#: ../src/interface.c:2886
 msgid ""
@@ -1559,8 +1553,8 @@
 "the main editor widget, the scribble, the toolbar search and goto line "
 "fields and the VTE."
 msgstr ""
-"鼠标下的构件自动获得焦点。起作用的构件有主编辑窗口、便签窗口、工具栏中查找定"
-"位框和VTE。"
+"将焦点自动给鼠标指针下的部件。起作用的部件有主编辑窗口、便签窗口、工具栏中查"
+"找和定位框和虚拟终端。"
#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126
 msgid "<b>Miscellaneous</b>"
@@ -1578,14 +1572,14 @@
#: ../src/interface.c:2913
 msgid "Use the current word under the cursor for Find dialogs"
-msgstr "使用查找时自动填入当前光标下单词"
+msgstr "使用查找时自动填入当前光标后面单词"
#: ../src/interface.c:2916
 msgid ""
 "Use current word under the cursor when opening the Find, Find in Files or "
 "Replace dialog and there is no selection"
 msgstr ""
-"在未选中单词时，打开查找、在文件中查找或替换对话框时使用当前光标下的单词。"
+"在未选中单词时，打开查找、在文件中查找或替换对话框时使用当前光标后面的单词。"
#: ../src/interface.c:2918
 msgid "Use the current file's directory for Find in Files"
@@ -1616,7 +1610,7 @@
 "directory. You can still change the path of the project file in the New "
 "Project dialog."
 msgstr ""
-"选用这个选项后，创建一个新项目时，缺省地项目文件会保存在项目文件的根目录。当"
+"选用这个选项后，创建一个新项目时，缺省的项目文件会保存在项目文件的根目录。当"
 "然你仍可以在新建项目对话框中改变项目文件的保存目录"
#: ../src/interface.c:2951
@@ -1653,15 +1647,15 @@
#: ../src/interface.c:3014
 msgid "Symbol list:"
-msgstr "标记列表:"
+msgstr "标记列表："
#: ../src/interface.c:3021 ../src/interface.c:3136
 msgid "Message window:"
-msgstr "信息窗口:"
+msgstr "信息窗口："
#: ../src/interface.c:3028 ../src/interface.c:3172
 msgid "Editor:"
-msgstr "编辑器:"
+msgstr "编辑器："
#: ../src/interface.c:3040
 msgid "Sets the font for the message window"
@@ -1691,11 +1685,11 @@
 msgid ""
 "Shows a small cross button in the file tabs to easily close files when "
 "clicking on it (requires restart of Geany)"
-msgstr "在文件标签栏上显示一个叉号，以方便关闭标签（需要重启 Geany )。"
+msgstr "在文件标签栏上显示一个叉号，以方便关闭标签（需要重启 Geany）。"
#: ../src/interface.c:3090
 msgid "Placement of new file tabs:"
-msgstr "把新文件标签放在:"
+msgstr "把新文件标签放在："
#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167
 #: ../src/interface.c:3185
@@ -1717,11 +1711,11 @@
#: ../src/interface.c:3110
 msgid "Double-clicking hides all additional widgets"
-msgstr "双击隐藏所有附加构件"
+msgstr "双击隐藏所有附加部件"
#: ../src/interface.c:3113
 msgid "Calls the View->Toggle All Additional Widgets command"
-msgstr "调用查看->开关所有附加构件命令"
+msgstr "调用查看 -> 开关所有附加部件的命令"
#: ../src/interface.c:3115
 msgid "<b>Editor tabs</b>"
@@ -1737,7 +1731,7 @@
#: ../src/interface.c:3154
 msgid "Sidebar:"
-msgstr "边栏:"
+msgstr "边栏："
#: ../src/interface.c:3190
 msgid "<b>Tab positions</b>"
@@ -1761,11 +1755,11 @@
#: ../src/interface.c:3246
 msgid "_Append Toolbar to the Menu"
-msgstr "向菜单添加工具栏(_A)"
+msgstr "将工具栏添加到菜单(_A)"
#: ../src/interface.c:3249
 msgid "Pack the toolbar to the main menu to save vertical space"
-msgstr "把工具栏放在菜单中以节省垂直空间"
+msgstr "把工具栏放在主菜单中以节省垂直空间"
#: ../src/interface.c:3251
 msgid "<b>Toolbar</b>"
@@ -1773,20 +1767,19 @@
#: ../src/interface.c:3272
 msgid "Icon style:"
-msgstr "图标样式:"
+msgstr "图标样式："
#: ../src/interface.c:3279
 msgid "Icon size:"
-msgstr "图标大小:"
+msgstr "图标大小："
#: ../src/interface.c:3334
 msgid "<b>Appearance</b>"
 msgstr "<b>外观</b>"
-#: ../src/interface.c:3359 ../src/toolbar.c:881
-#, fuzzy
+#: ../src/interface.c:3359 ../src/toolbar.c:882
 msgid "Customize Toolbar"
-msgstr "显示工具栏(_T)"
+msgstr "自定义工具栏(_T)"
#: ../src/interface.c:3363
 msgid "Toolbar"
@@ -1818,7 +1811,7 @@
 "its current position."
 msgstr ""
 "当启用“智能” home 键时，按下 HOME 键光标会移到本行的第一个非空字符，如果按下"
-"时光标已经在第一个非空字符则会移动到行首。禁用这个功能则按按下 HOME 键光标会"
+"时光标已经在第一个非空字符则会移动到行首。禁用这个功能时，按下 HOME 键光标会"
 "移到行首。"
#: ../src/interface.c:3400
@@ -1829,7 +1822,7 @@
 msgid ""
 "Disable drag and drop completely in the editor window so you can't drag and "
 "drop any selections within or outside of the editor window"
-msgstr "在编辑窗口完全禁用拖放。"
+msgstr "在编辑窗口完全禁用拖放"
#: ../src/interface.c:3405
 msgid "Enable folding"
@@ -1841,15 +1834,14 @@
#: ../src/interface.c:3410
 msgid "Fold/unfold all children of a fold point"
-msgstr "折叠或伸展一个折叠点的所有子孙"
+msgstr "展开折叠点的所有子折叠点"
#: ../src/interface.c:3413
 msgid ""
 "Fold or unfold all children of a fold point. By pressing the Shift key while "
 "clicking on a fold symbol the contrary behavior is used."
 msgstr ""
-"折叠或伸展一个折叠点的所有子孙。当按下 Shift 键时点击折叠点符号时使用相反的选"
-"项。"
+"展开折叠点的所有子折叠点。按下 Shift 键同时点击折叠点符号可以使用相反的选项。"
#: ../src/interface.c:3415
 msgid "Use indicators to show compile errors"
@@ -1859,23 +1851,23 @@
 msgid ""
 "Whether to use indicators (a squiggly underline) to highlight the lines "
 "where the compiler found a warning or an error"
-msgstr "使用指示器显示编译错误"
+msgstr "是否使用指示器（弯曲的下划线）将编译器找到错误或警告的行高亮。"
#: ../src/interface.c:3420
 msgid "Newline strips trailing spaces"
-msgstr "使用新的行去除行尾空白"
+msgstr "换行时去除行尾空白"
#: ../src/interface.c:3423
 msgid "Enable newline to strip the trailing spaces on the previous line"
-msgstr "使用新的行去除上一行的尾部空白。"
+msgstr "在换行时去除上一行的行尾空白"
#: ../src/interface.c:3429
 msgid "Line breaking column:"
-msgstr "换行列："
+msgstr "断行列："
#: ../src/interface.c:3443
 msgid "Comment toggle marker:"
-msgstr "注释开关记号："
+msgstr "注释开关标记："
#: ../src/interface.c:3450
 msgid ""
@@ -1891,60 +1883,60 @@
 msgid "Features"
 msgstr "功能"
-#: ../src/interface.c:3489 ../src/interface.c:5057
+#: ../src/interface.c:3489 ../src/interface.c:5029
 msgid "Auto-indent mode:"
-msgstr "自动缩进模式:"
+msgstr "自动缩进模式："
-#: ../src/interface.c:3502 ../src/interface.c:5070
+#: ../src/interface.c:3502 ../src/interface.c:5042
 msgid "Basic"
 msgstr "基本"
-#: ../src/interface.c:3503 ../src/interface.c:5071
+#: ../src/interface.c:3503 ../src/interface.c:5043
 msgid "Current chars"
 msgstr "当前字符"
-#: ../src/interface.c:3504 ../src/interface.c:5072
+#: ../src/interface.c:3504 ../src/interface.c:5044
 msgid "Match braces"
 msgstr "匹配花括号"
-#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074
+#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5046
 msgid "Type:"
-msgstr "类型:"
+msgstr "类型："
-#: ../src/interface.c:3513 ../src/interface.c:5081
+#: ../src/interface.c:3513 ../src/interface.c:5053
 msgid "Width:"
-msgstr "宽度:"
+msgstr "宽度："
-#: ../src/interface.c:3526 ../src/interface.c:5094
+#: ../src/interface.c:3526 ../src/interface.c:5066
 msgid "The width in chars of a single indent"
 msgstr "一个缩进的宽度"
-#: ../src/interface.c:3536 ../src/interface.c:5104
+#: ../src/interface.c:3536 ../src/interface.c:5076
 msgid "Use spaces when inserting indentation"
 msgstr "缩进时使用空格"
-#: ../src/interface.c:3545 ../src/interface.c:5113
+#: ../src/interface.c:3545 ../src/interface.c:5085
 msgid "Use one tab per indent"
 msgstr "每个缩进使用一个制表符"
-#: ../src/interface.c:3554 ../src/interface.c:5122
+#: ../src/interface.c:3554 ../src/interface.c:5094
 msgid ""
 "Use spaces if the total indent is less than the tab width, otherwise use both"
 msgstr "当缩进小于制表符宽度时使用空格，否则两者都使用"
-#: ../src/interface.c:3569 ../src/interface.c:5137
+#: ../src/interface.c:3569 ../src/interface.c:5109
 msgid "Hard tab width:"
-msgstr "硬制表符宽度:"
+msgstr "硬制表符宽度："
-#: ../src/interface.c:3577 ../src/interface.c:5145
+#: ../src/interface.c:3577 ../src/interface.c:5117
 msgid "The width of a tab when Tabs & Spaces is set for a document"
 msgstr "当文件设置“制表符和空格”时制表符的宽度"
-#: ../src/interface.c:3587 ../src/interface.c:5155
+#: ../src/interface.c:3587 ../src/interface.c:5127
 msgid ""
 "Whether to detect the indentation type from file contents when a file is "
 "opened"
-msgstr "当打开文件时自动探测使用哪种缩进方式。"
+msgstr "打开文件时自动探测使用哪种缩进方式"
#: ../src/interface.c:3589
 msgid "Tab key indents"
@@ -1953,13 +1945,13 @@
 #: ../src/interface.c:3592
 msgid ""
 "Pressing tab/shift-tab indents/unindents instead of inserting a tab character"
-msgstr "使用 tab/shift-tab 来缩进或突出，而不是插入一个制表符。"
+msgstr "使用 tab／shift-tab 来增加或减少缩进，而不是插入一个制表符"
#: ../src/interface.c:3594
 msgid "<b>Indentation</b>"
 msgstr "<b>缩进</b>"
-#: ../src/interface.c:3599 ../src/interface.c:5157
+#: ../src/interface.c:3599 ../src/interface.c:5129
 msgid "Indentation"
 msgstr "缩进"
@@ -1971,16 +1963,15 @@
 msgid ""
 "Type a defined short character sequence and complete it to a more complex "
 "string using a single keypress"
-msgstr "使用一个按键来使用输入的简短字符串变成一个复杂的语句。"
+msgstr "使用一个按键来使输入的简短字符串变成一个复杂的语句。"
#: ../src/interface.c:3627
-#, fuzzy
 msgid "XML tag autocompletion"
 msgstr "XML 标记自动完成"
#: ../src/interface.c:3630
 msgid "Automatic completion and closing of XML tags (includes HTML tags)"
-msgstr "XML标记自动完成(包括HTML标记)"
+msgstr "自动完成、关闭 XML 标记（包括HTML标记）"
#: ../src/interface.c:3632
 msgid "Automatic continuation of multi-line comments"
@@ -1995,21 +1986,21 @@
#: ../src/interface.c:3637
 msgid "Autocomplete symbols"
-msgstr ""
+msgstr "自动补全符号"
#: ../src/interface.c:3640
 msgid ""
 "Automatic completion of known symbols in open files (function names, global "
 "variables, ...)"
-msgstr "在打开的文件中用已知的符号自动自动补全(函数名、全局变量等等)"
+msgstr "在打开的文件中用已知的符号自动补全（函数名、全局变量等）"
#: ../src/interface.c:3642
 msgid "Autocomplete all words in document"
-msgstr ""
+msgstr "自动完成文档中的所有单词"
#: ../src/interface.c:3646
 msgid "Drop rest of word on completion"
-msgstr ""
+msgstr "弹出剩余文字以完成"
#: ../src/interface.c:3656
 msgid "Max. symbol name suggestions:"
@@ -2020,26 +2011,22 @@
 msgstr "自动完成列表高度："
#: ../src/interface.c:3670
-#, fuzzy
 msgid "Characters to type for autocompletion:"
-msgstr "用于自动完成的字符串："
+msgstr "键入多少字符启动自动完成："
#: ../src/interface.c:3683
-#, fuzzy
 msgid ""
 "The amount of characters which are necessary to show the symbol "
 "autocompletion list"
-msgstr "显示符号自动完成列表的最小字符数量。"
+msgstr "在键入多少字符时显示符号列表"
#: ../src/interface.c:3692
-#, fuzzy
 msgid "Display height in rows for the autocompletion list"
-msgstr "自动完成列表的行数。"
+msgstr "自动完成列表显示的行数"
#: ../src/interface.c:3701
-#, fuzzy
 msgid "Maximum number of entries to display in the autocompletion list"
-msgstr "自动完成列表的最大条目数。"
+msgstr "自动完成列表显示的最大条目数"
#: ../src/interface.c:3704
 msgid "<b>Completions</b>"
@@ -2098,10 +2085,9 @@
 msgstr "反转语法高亮颜色"
#: ../src/interface.c:3790
-msgid ""
-"Use white text on a black background and invert all colors, this option "
-"requires a restart of Geany"
-msgstr "使用白色文本和黑色背景，并且反转所有高亮颜色，重启 Geany 生效"
+#, fuzzy
+msgid "Invert all colors, by default using white text on a black background"
+msgstr "使用黑底白字"
#: ../src/interface.c:3792
 msgid "Show indentation guides"
@@ -2133,17 +2119,17 @@
#: ../src/interface.c:3810
 msgid "Shows or hides the Line Number margin"
-msgstr "显示或隐藏行号页边空白"
+msgstr "显示或隐藏行号页边的行号"
#: ../src/interface.c:3812
 msgid "Show markers margin"
-msgstr "显示标记页边空白"
+msgstr "显示页边标记区域"
#: ../src/interface.c:3815
 msgid ""
 "Shows or hides the small margin right of the line numbers, which is used to "
 "mark lines"
-msgstr "显示或隐藏行号右边的可作标记的空白"
+msgstr "显示或隐藏行号右边的可作标记的区域"
#: ../src/interface.c:3817
 msgid "Stop scrolling at last line"
@@ -2151,7 +2137,7 @@
#: ../src/interface.c:3820
 msgid "Whether to stop scrolling one page past the last line of a document"
-msgstr "当移动到文档的最后一行时停止滚动。"
+msgstr "当移动到文档的最后一行时停止滚动"
#: ../src/interface.c:3822
 msgid "<b>Display</b>"
@@ -2159,17 +2145,17 @@
#: ../src/interface.c:3843
 msgid "Long line marker:"
-msgstr "长行标志:"
+msgstr "长行标志："
#: ../src/interface.c:3850
 msgid "Long line marker color:"
-msgstr "长行标志颜色:"
+msgstr "长行标志颜色："
#: ../src/interface.c:3869
 msgid "Sets the color of the long line marker"
 msgstr "设置长行标志颜色"
-#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746
+#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:741
 #: ../src/vte.c:769 ../src/vte.c:776
 msgid "Color Chooser"
 msgstr "颜色选择器"
@@ -2241,24 +2227,28 @@
 msgstr "缺省编码（新文件）:"
#: ../src/interface.c:4007
-msgid "Default encoding (existing files):"
+#, fuzzy
+msgid "Default encoding (existing non-Unicode files):"
 msgstr "缺省编码（已存在文件）:"
#: ../src/interface.c:4019
-msgid "Sets the default encoding for opening existing files"
-msgstr "设置打开已存在文件的缺省编码。"
+#, fuzzy
+msgid "Sets the default encoding for opening existing non-Unicode files"
+msgstr "设置打开已存在文件时的缺省编码"
#: ../src/interface.c:4025
-msgid "Use fixed encoding when opening files"
+#, fuzzy
+msgid "Use fixed encoding when opening non-Unicode files"
 msgstr "使用固定的编码打开文件"
#: ../src/interface.c:4030
+#, fuzzy
 msgid ""
 "This option disables the automatic detection of the file encoding when "
-"opening files and opens the file with the specified encoding (usually not "
-"needed)"
+"opening non-Unicode files and opens the file with the specified encoding "
+"(usually not needed)"
 msgstr ""
-"这个选项禁止打开文件时进行编码检测并且用特定的编码打开文件(通常不需要)。"
+"这个选项禁止打开文件时进行编码检测并且用特定的编码打开文件（通常不需要）"
#: ../src/interface.c:4032
 msgid "<b>Encodings</b>"
@@ -2266,11 +2256,11 @@
#: ../src/interface.c:4051
 msgid "Ensure new line at file end"
-msgstr "保证文件尾有一个新的行"
+msgstr "保证文件尾有一个新行"
#: ../src/interface.c:4054
 msgid "Ensures that at the end of the file is a new line"
-msgstr "保证文件尾有一个新的行"
+msgstr "保证文件的末端是一个新行"
#: ../src/interface.c:4056
 msgid "Strip trailing spaces and tabs"
@@ -2280,7 +2270,7 @@
 msgid "Removes trailing spaces and tabs and the end of lines"
 msgstr "去除行尾空格和制表符"
-#: ../src/interface.c:4061 ../src/keybindings.c:460
+#: ../src/interface.c:4061 ../src/keybindings.c:482
 msgid "Replace tabs by space"
 msgstr "用空格替换制表符"
@@ -2310,119 +2300,111 @@
 "disables checking."
 msgstr "设置磁盘检查的间隔时间。零表示不检查。"
-#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013
+#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1034
 msgid "Files"
 msgstr "文件"
#: ../src/interface.c:4164
-msgid "Make:"
-msgstr "生成:"
+msgid "Terminal:"
+msgstr "虚拟终端："
#: ../src/interface.c:4171
-msgid "Terminal:"
-msgstr "虚拟终端:"
-
-#: ../src/interface.c:4178
 msgid "Browser:"
-msgstr "浏览器:"
+msgstr "浏览器："
-#: ../src/interface.c:4190
-msgid "Path and options for the make tool"
-msgstr "生成工具的路径和参数"
-
-#: ../src/interface.c:4197
+#: ../src/interface.c:4183
 msgid ""
 "A terminal emulator like xterm, gnome-terminal or konsole (should accept the "
 "-e argument)"
-msgstr "虚拟终端如xterm、gnome-terminal或konsole(应当接受 -e 参数)"
+msgstr "虚拟终端如 xterm、gnome-terminal 或 konsole（应当接受 -e 参数）"
-#: ../src/interface.c:4204
+#: ../src/interface.c:4190
 msgid "Path (and possibly additional arguments) to your favorite browser"
 msgstr "浏览器的路径和参数"
-#: ../src/interface.c:4236
+#: ../src/interface.c:4212
 msgid "Grep:"
-msgstr "Grep:"
+msgstr "Grep："
-#: ../src/interface.c:4259
+#: ../src/interface.c:4235
 msgid "<b>Tool paths</b>"
 msgstr "<b>工具路径</b>"
-#: ../src/interface.c:4280
+#: ../src/interface.c:4256
 msgid "Context action:"
-msgstr "背景运行:"
+msgstr "上下文动作："
-#: ../src/interface.c:4291
+#: ../src/interface.c:4267
 #, c-format
 msgid ""
 "Context action command. The currently selected word can be used with %s. It "
 "can appear anywhere in the given command and will be replaced before "
 "execution."
 msgstr ""
-"背景运行命令。当前选中的文字可以和%s一起使用。它可以在给出的命令的任何地方，"
-"并且在执行前会被替换。"
+"上下文动作命令。当前选中的文字可以与 %s 一起使用。它可以出现在给出命令的任何"
+"地方，在执行前会被替换。"
-#: ../src/interface.c:4304
+#: ../src/interface.c:4280
 msgid "<b>Commands</b>"
 msgstr "<b>命令</b>"
-#: ../src/interface.c:4309 ../src/keybindings.c:496
+#: ../src/interface.c:4285 ../src/keybindings.c:516
 msgid "Tools"
 msgstr "工具"
-#: ../src/interface.c:4343
+#: ../src/interface.c:4319
 msgid "email address of the developer"
 msgstr "开发者的电子邮件"
-#: ../src/interface.c:4350
+#: ../src/interface.c:4326
 msgid "Initials of the developer name"
 msgstr "开发者名字的开头字母"
-#: ../src/interface.c:4352
+#: ../src/interface.c:4328
 msgid "Initial version:"
-msgstr "开始的版本号:"
+msgstr "起始版本号："
-#: ../src/interface.c:4364
+#: ../src/interface.c:4340
 msgid "Version number, which a new file initially has"
 msgstr "新建文件使用的版本号"
-#: ../src/interface.c:4371
+#: ../src/interface.c:4347
 msgid "Company name"
 msgstr "公司名称"
-#: ../src/interface.c:4373
+#: ../src/interface.c:4349
 msgid "Developer:"
-msgstr "开发者:"
+msgstr "开发者："
-#: ../src/interface.c:4380
+#: ../src/interface.c:4356
 msgid "Company:"
-msgstr "公司:"
+msgstr "公司："
-#: ../src/interface.c:4387
+#: ../src/interface.c:4363
 msgid "Mail address:"
-msgstr "电子邮件:"
+msgstr "电子邮件："
-#: ../src/interface.c:4394
+#: ../src/interface.c:4370
 msgid "Initials:"
-msgstr "开头字母:"
+msgstr "开头字母："
-#: ../src/interface.c:4406
+#: ../src/interface.c:4382
 msgid "The name of the developer"
 msgstr "开发者的名字"
-#: ../src/interface.c:4408
+#: ../src/interface.c:4384
 msgid "Year:"
-msgstr "年:"
+msgstr "年："
-#: ../src/interface.c:4415
+#: ../src/interface.c:4391
 msgid "Date:"
-msgstr "日期:"
+msgstr "日期："
-#: ../src/interface.c:4422
+#: ../src/interface.c:4398
 msgid "Date & Time:"
-msgstr "日期和时间:"
+msgstr "日期和时间："
-#: ../src/interface.c:4434
+#: ../src/interface.c:4410
 msgid ""
 "Specify a format for the the {datetime} wildcard. You can use any conversion "
 "specifiers which can be used with the ANSI C strftime function."
@@ -2430,93 +2412,93 @@
 "定义 {datetime}（日期时间）通配符的格式。可以使用 ANSI C strftime 函数的转义"
 "符。"
-#: ../src/interface.c:4441
+#: ../src/interface.c:4417
 msgid ""
 "Specify a format for the the {year} wildcard. You can use any conversion "
 "specifiers which can be used with the ANSI C strftime function."
 msgstr "定义 {year}（年）通配符的格式。可以使用 ANSI C strftime 函数的转义符。"
-#: ../src/interface.c:4448
+#: ../src/interface.c:4424
 msgid ""
 "Specify a format for the the {date} wildcard. You can use any conversion "
 "specifiers which can be used with the ANSI C strftime function."
 msgstr ""
 "定义 {date}（日期）通配符的格式。可以使用 ANSI C strftime 函数的转义符。"
-#: ../src/interface.c:4450
+#: ../src/interface.c:4426
 msgid "<b>Template data</b>"
 msgstr "<b>模板数据</b>"
-#: ../src/interface.c:4455
+#: ../src/interface.c:4431
 msgid "Templates"
 msgstr "模板"
-#: ../src/interface.c:4493
+#: ../src/interface.c:4469
 msgid "C_hange"
-msgstr "改变(_H)"
+msgstr "更改(_H)"
-#: ../src/interface.c:4497
+#: ../src/interface.c:4473
 msgid "<b>Keyboard shortcuts</b>"
 msgstr "<b>快捷键</b>"
-#: ../src/interface.c:4502
+#: ../src/interface.c:4478
 msgid "Keybindings"
 msgstr "快捷键"
-#: ../src/interface.c:4525
+#: ../src/interface.c:4501
 msgid "Command:"
 msgstr "命令："
-#: ../src/interface.c:4532
+#: ../src/interface.c:4508
 #, c-format
 msgid "Path to the command for printing files (use %f for the filename)"
 msgstr "打印文件命令路径（使用 %f 作为文件名）"
-#: ../src/interface.c:4542
+#: ../src/interface.c:4518
 msgid "Use an external command for printing"
 msgstr "使用外部命令打印"
-#: ../src/interface.c:4562 ../src/printing.c:380
+#: ../src/interface.c:4538 ../src/printing.c:381
 msgid "Print line numbers"
 msgstr "打印行号"
-#: ../src/interface.c:4565 ../src/printing.c:382
+#: ../src/interface.c:4541 ../src/printing.c:383
 msgid "Add line numbers to the printed page"
-msgstr "在打印的页面上添加行号。"
+msgstr "在打印的页面上添加行号"
-#: ../src/interface.c:4567 ../src/printing.c:385
+#: ../src/interface.c:4543 ../src/printing.c:386
 msgid "Print page numbers"
-msgstr "打印页数"
+msgstr "打印页码"
-#: ../src/interface.c:4570 ../src/printing.c:387
+#: ../src/interface.c:4546 ../src/printing.c:388
 msgid ""
 "Add page numbers at the bottom of each page. It takes 2 lines of the page."
 msgstr "在每页底部打印页号，占用每页的两行。"
-#: ../src/interface.c:4572 ../src/printing.c:390
+#: ../src/interface.c:4548 ../src/printing.c:391
 msgid "Print page header"
 msgstr "打印页头"
-#: ../src/interface.c:4575 ../src/printing.c:392
+#: ../src/interface.c:4551 ../src/printing.c:393
 msgid ""
 "Add a little header to every page containing the page number, the filename "
 "and the current date (see below). It takes 3 lines of the page."
 msgstr ""
-"在每页打印页头。页头包括页号、文件名和当前日期（见下）。页头占用每页三行。"
+"在每页打印页头。页头包括页码、文件名和当前日期（见下）。页头占用每页三行。"
-#: ../src/interface.c:4592 ../src/printing.c:408
+#: ../src/interface.c:4568 ../src/printing.c:409
 msgid "Use the basename of the printed file"
-msgstr "使用打印文件的基本文件名"
+msgstr "只打印基本文件名"
-#: ../src/interface.c:4595
+#: ../src/interface.c:4571
 msgid "Print only the basename (without the path) of the printed file"
-msgstr "只打印文件的基本文件名，不包括路径。"
+msgstr "只打印文件的基本文件名，不包括路径"
-#: ../src/interface.c:4601 ../src/printing.c:416
+#: ../src/interface.c:4577 ../src/printing.c:417
 msgid "Date format:"
 msgstr "自定义日期格式："
-#: ../src/interface.c:4608 ../src/printing.c:422
+#: ../src/interface.c:4584 ../src/printing.c:423
 msgid ""
 "Specify a format for the date and time stamp which is added to the page "
 "header on each page. You can use any conversion specifiers which can be used "
@@ -2524,550 +2506,544 @@
 msgstr ""
 "定义用于每页页头的日期和时间戳的格式。可以使用 ANSI C strftime 函数的转义符。"
-#: ../src/interface.c:4611
+#: ../src/interface.c:4587
 msgid "Use native GTK printing"
 msgstr "使用本地 GTK 打印"
-#: ../src/interface.c:4617
+#: ../src/interface.c:4593
 msgid "Printing"
 msgstr "打印"
-#: ../src/interface.c:5040
+#: ../src/interface.c:5012
 msgid "Project Properties"
 msgstr "项目属性"
-#: ../src/keybindings.c:198 ../src/plugins.c:1099
+#: ../src/keybindings.c:221 ../src/plugins.c:1106
 msgid "File"
 msgstr "文件"
-#: ../src/keybindings.c:201
+#: ../src/keybindings.c:224
 msgid "New"
 msgstr "新建"
-#: ../src/keybindings.c:203
+#: ../src/keybindings.c:226
 msgid "Open"
 msgstr "打开"
-#: ../src/keybindings.c:206
+#: ../src/keybindings.c:229
 msgid "Open selected file"
 msgstr "打开选择的文件"
-#: ../src/keybindings.c:208
+#: ../src/keybindings.c:231
 msgid "Save"
 msgstr "保存"
-#: ../src/keybindings.c:210
+#: ../src/keybindings.c:233
 msgid "Save as"
 msgstr "另存为"
-#: ../src/keybindings.c:212
+#: ../src/keybindings.c:235
 msgid "Save all"
 msgstr "全部保存"
-#: ../src/keybindings.c:215
+#: ../src/keybindings.c:238
 msgid "Print"
 msgstr "打印"
-#: ../src/keybindings.c:217
+#: ../src/keybindings.c:240
 msgid "Close"
 msgstr "关闭"
-#: ../src/keybindings.c:219
+#: ../src/keybindings.c:242
 msgid "Close all"
 msgstr "全部关闭"
-#: ../src/keybindings.c:222
+#: ../src/keybindings.c:245
 msgid "Reload file"
 msgstr "重新载入文件"
-#: ../src/keybindings.c:224 ../src/project.c:495
+#: ../src/keybindings.c:247 ../src/project.c:520
 msgid "Project"
 msgstr "项目"
-#: ../src/keybindings.c:227
+#: ../src/keybindings.c:250
 msgid "Project properties"
 msgstr "项目属性"
-#: ../src/keybindings.c:232
+#: ../src/keybindings.c:255
 msgid "Undo"
 msgstr "撤消"
-#: ../src/keybindings.c:234
+#: ../src/keybindings.c:257
 msgid "Redo"
 msgstr "重做"
-#: ../src/keybindings.c:236
+#: ../src/keybindings.c:259
 msgid "Duplicate line or selection"
 msgstr "复制行或选中的文本"
-#: ../src/keybindings.c:239
+#: ../src/keybindings.c:262
 msgid "Delete current line(s)"
 msgstr "删除当前行"
-#: ../src/keybindings.c:242
-#, fuzzy
+#: ../src/keybindings.c:265
 msgid "Delete to line end"
-msgstr "删除当前行"
+msgstr "删除到行尾"
-#: ../src/keybindings.c:244
+#: ../src/keybindings.c:267
 msgid "Transpose current line"
 msgstr "调换当前行"
-#: ../src/keybindings.c:246
+#: ../src/keybindings.c:269
 msgid "Scroll to current line"
-msgstr "滚到当前行"
+msgstr "滚动到当前行"
-#: ../src/keybindings.c:248
+#: ../src/keybindings.c:271
 msgid "Scroll up the view by one line"
 msgstr "逐行移动"
-#: ../src/keybindings.c:250
+#: ../src/keybindings.c:273
 msgid "Scroll down the view by one line"
 msgstr "逐行地向下滚动视图"
-#: ../src/keybindings.c:253
+#: ../src/keybindings.c:275
 msgid "Complete snippet"
 msgstr "完成片断"
-#: ../src/keybindings.c:255
+#: ../src/keybindings.c:277
 msgid "Move cursor in snippet"
 msgstr "在片断中移动光标"
-#: ../src/keybindings.c:257
+#: ../src/keybindings.c:279
 msgid "Suppress snippet completion"
 msgstr "禁止完成片断"
-#: ../src/keybindings.c:259
+#: ../src/keybindings.c:281
 msgid "Context Action"
-msgstr "背景运行"
+msgstr "上下文动作"
-#: ../src/keybindings.c:261
+#: ../src/keybindings.c:283
 msgid "Complete word"
 msgstr "自动完成"
-#: ../src/keybindings.c:263
+#: ../src/keybindings.c:285
 msgid "Show calltip"
 msgstr "显示函数原型"
-#: ../src/keybindings.c:265
+#: ../src/keybindings.c:287
 msgid "Show macro list"
 msgstr "显示宏列表"
-#: ../src/keybindings.c:267
+#: ../src/keybindings.c:289
 msgid "Clipboard"
 msgstr "剪贴板"
-#: ../src/keybindings.c:270
+#: ../src/keybindings.c:292
 msgid "Cut"
 msgstr "剪切"
-#: ../src/keybindings.c:272
+#: ../src/keybindings.c:294
 msgid "Copy"
 msgstr "复制"
-#: ../src/keybindings.c:274
+#: ../src/keybindings.c:296
 msgid "Paste"
 msgstr "粘贴"
-#: ../src/keybindings.c:276
+#: ../src/keybindings.c:298
 msgid "Copy current line(s)"
 msgstr "复制当前行"
-#: ../src/keybindings.c:278
+#: ../src/keybindings.c:300
 msgid "Cut current line(s)"
 msgstr "剪切当前行"
-#: ../src/keybindings.c:280
+#: ../src/keybindings.c:302
 msgid "Select"
 msgstr "选择"
-#: ../src/keybindings.c:283
+#: ../src/keybindings.c:305
 msgid "Select All"
 msgstr "全选"
-#: ../src/keybindings.c:285
+#: ../src/keybindings.c:307
 msgid "Select current word"
 msgstr "选择当前词"
-#: ../src/keybindings.c:287
+#: ../src/keybindings.c:309
 msgid "Select current line(s)"
 msgstr "选择当前行"
-#: ../src/keybindings.c:289
+#: ../src/keybindings.c:311
 msgid "Select current paragraph"
 msgstr "选择当前节"
-#: ../src/keybindings.c:291
+#: ../src/keybindings.c:313
 msgid "Format"
-msgstr "格式化"
+msgstr "格式"
-#: ../src/keybindings.c:295
+#: ../src/keybindings.c:317
 msgid "Toggle Case of Selection"
 msgstr "开关注释"
-#: ../src/keybindings.c:297
+#: ../src/keybindings.c:319
 msgid "Toggle line commentation"
 msgstr "开关行注释"
-#: ../src/keybindings.c:300
+#: ../src/keybindings.c:322
 msgid "Comment line(s)"
 msgstr "注释行"
-#: ../src/keybindings.c:302
+#: ../src/keybindings.c:324
 msgid "Uncomment line(s)"
-msgstr "非注释行"
+msgstr "取消注释行"
-#: ../src/keybindings.c:304
+#: ../src/keybindings.c:326
 msgid "Increase indent"
-msgstr "增大缩进"
+msgstr "增加缩进"
-#: ../src/keybindings.c:307
+#: ../src/keybindings.c:329
 msgid "Decrease indent"
-msgstr "减小缩进"
+msgstr "减少缩进"
-#: ../src/keybindings.c:310
+#: ../src/keybindings.c:332
 msgid "Increase indent by one space"
-msgstr "增大缩进"
+msgstr "增加一个空格缩进"
-#: ../src/keybindings.c:312
+#: ../src/keybindings.c:334
 msgid "Decrease indent by one space"
-msgstr "减小缩进"
+msgstr "减少一个空格缩进"
-#: ../src/keybindings.c:314
+#: ../src/keybindings.c:336
 msgid "Smart line indent"
 msgstr "智能缩进"
-#: ../src/keybindings.c:316
+#: ../src/keybindings.c:338
 msgid "Send to Custom Command 1"
 msgstr "发送自定义命令 1"
-#: ../src/keybindings.c:318
+#: ../src/keybindings.c:340
 msgid "Send to Custom Command 2"
 msgstr "发送自定义命令 2"
-#: ../src/keybindings.c:320
+#: ../src/keybindings.c:342
 msgid "Send to Custom Command 3"
 msgstr "发送自定义命令 3"
-#: ../src/keybindings.c:322
+#: ../src/keybindings.c:344
 msgid "Send Selection to Terminal"
 msgstr "发送选中的文字到终端"
-#: ../src/keybindings.c:324
+#: ../src/keybindings.c:346
 msgid "Reflow lines/block"
-msgstr ""
+msgstr "重排行/区块"
-#: ../src/keybindings.c:326
+#: ../src/keybindings.c:348
 msgid "Insert"
 msgstr "插入"
-#: ../src/keybindings.c:329
+#: ../src/keybindings.c:351
 msgid "Insert date"
 msgstr "插入日期"
-#: ../src/keybindings.c:332
+#: ../src/keybindings.c:354
 msgid "Insert alternative white space"
-msgstr "入可选择的空白"
+msgstr "插入空白"
-#: ../src/keybindings.c:334
+#: ../src/keybindings.c:356
 msgid "Settings"
 msgstr "设置"
-#: ../src/keybindings.c:340 ../src/toolbar.c:350
+#: ../src/keybindings.c:362 ../src/toolbar.c:350
 msgid "Search"
 msgstr "搜索"
-#: ../src/keybindings.c:343 ../src/search.c:379
+#: ../src/keybindings.c:365 ../src/search.c:379
 msgid "Find"
 msgstr "查找"
-#: ../src/keybindings.c:345
+#: ../src/keybindings.c:367
 msgid "Find Next"
 msgstr "查找下一个"
-#: ../src/keybindings.c:347
+#: ../src/keybindings.c:369
 msgid "Find Previous"
 msgstr "查找上一个"
-#: ../src/keybindings.c:350
+#: ../src/keybindings.c:372
 msgid "Find Next Selection"
 msgstr "查找下一个选择"
-#: ../src/keybindings.c:352
+#: ../src/keybindings.c:374
 msgid "Find Previous Selection"
 msgstr "查找上一个选择"
-#: ../src/keybindings.c:354 ../src/search.c:514
+#: ../src/keybindings.c:376 ../src/search.c:514
 msgid "Replace"
 msgstr "替换"
-#: ../src/keybindings.c:356 ../src/search.c:686
+#: ../src/keybindings.c:378 ../src/search.c:686
 msgid "Find in Files"
 msgstr "在多个文件中查找"
-#: ../src/keybindings.c:359
+#: ../src/keybindings.c:381
 msgid "Next Message"
 msgstr "下一个信息"
-#: ../src/keybindings.c:361
+#: ../src/keybindings.c:383
 msgid "Previous Message"
-msgstr "前一个信息"
+msgstr "上一个信息"
-#: ../src/keybindings.c:363
+#: ../src/keybindings.c:385
 msgid "Find Usage"
 msgstr "查找用法"
-#: ../src/keybindings.c:365
+#: ../src/keybindings.c:387
 msgid "Find Document Usage"
 msgstr "查找文档用法"
-#: ../src/keybindings.c:367
-#, fuzzy
+#: ../src/keybindings.c:389
 msgid "Mark All"
-msgstr "生成全部(_M)"
+msgstr "标记全部(_M)"
-#: ../src/keybindings.c:369
+#: ../src/keybindings.c:391
 msgid "Go to"
-msgstr "跳转行"
+msgstr "跳转到行"
-#: ../src/keybindings.c:372 ../src/toolbar.c:66
+#: ../src/keybindings.c:394 ../src/toolbar.c:66
 msgid "Navigate back a location"
 msgstr "返回上一个位置"
-#: ../src/keybindings.c:374 ../src/toolbar.c:67
+#: ../src/keybindings.c:396 ../src/toolbar.c:67
 msgid "Navigate forward a location"
 msgstr "前进一个位置"
-#: ../src/keybindings.c:379
+#: ../src/keybindings.c:401
 msgid "Go to matching brace"
 msgstr "跳转到对应花括号"
-#: ../src/keybindings.c:382
+#: ../src/keybindings.c:404
 msgid "Toggle marker"
-msgstr "开关记号"
+msgstr "开关标记"
-#: ../src/keybindings.c:385
+#: ../src/keybindings.c:407
 msgid "Go to next marker"
-msgstr "到下一个记号"
+msgstr "到下一个标记"
-#: ../src/keybindings.c:388
+#: ../src/keybindings.c:410
 msgid "Go to previous marker"
-msgstr "回到前一个记号"
+msgstr "回到上一个记号"
-#: ../src/keybindings.c:390
+#: ../src/keybindings.c:412
 msgid "Go to Tag Definition"
-msgstr "跳转到标记边界"
+msgstr "跳转到标记定义"
-#: ../src/keybindings.c:392
+#: ../src/keybindings.c:414
 msgid "Go to Tag Declaration"
 msgstr "跳转到标记说明"
-#: ../src/keybindings.c:394
+#: ../src/keybindings.c:416
 msgid "Go to Start of Line"
 msgstr "跳转到行首"
-#: ../src/keybindings.c:396
+#: ../src/keybindings.c:418
 msgid "Go to End of Line"
-msgstr "跳转行尾"
+msgstr "跳转到行尾"
-#: ../src/keybindings.c:398
-#, fuzzy
+#: ../src/keybindings.c:420
 msgid "Go to End of Display Line"
-msgstr "跳转行尾"
+msgstr "跳转到显示的行尾"
-#: ../src/keybindings.c:400
+#: ../src/keybindings.c:422
 msgid "Go to Previous Word Part"
 msgstr "跳转到前一个词"
-#: ../src/keybindings.c:402
+#: ../src/keybindings.c:424
 msgid "Go to Next Word Part"
 msgstr "跳转到下一个词"
-#: ../src/keybindings.c:404
+#: ../src/keybindings.c:426
 msgid "View"
 msgstr "查看"
-#: ../src/keybindings.c:407
+#: ../src/keybindings.c:429
 msgid "Toggle All Additional Widgets"
-msgstr "开关所有附加构件"
+msgstr "开关所有附加部件"
-#: ../src/keybindings.c:410
+#: ../src/keybindings.c:432
 msgid "Fullscreen"
 msgstr "全屏"
-#: ../src/keybindings.c:412
+#: ../src/keybindings.c:434
 msgid "Toggle Messages Window"
 msgstr "开关信息窗口"
-#: ../src/keybindings.c:415
+#: ../src/keybindings.c:437
 msgid "Toggle Sidebar"
 msgstr "开关边栏"
-#: ../src/keybindings.c:417
+#: ../src/keybindings.c:439
 msgid "Zoom In"
-msgstr "缩小"
+msgstr "放大"
-#: ../src/keybindings.c:419
+#: ../src/keybindings.c:441
 msgid "Zoom Out"
-msgstr "扩大"
+msgstr "缩小"
-#: ../src/keybindings.c:421
+#: ../src/keybindings.c:443
 msgid "Focus"
 msgstr "焦点"
-#: ../src/keybindings.c:424
+#: ../src/keybindings.c:446
 msgid "Switch to Editor"
 msgstr "切换到编辑器"
-#: ../src/keybindings.c:426
+#: ../src/keybindings.c:448
 msgid "Switch to Scribble"
 msgstr "切换到便签"
-#: ../src/keybindings.c:428
+#: ../src/keybindings.c:450
 msgid "Switch to VTE"
 msgstr "切换到虚拟终端"
-#: ../src/keybindings.c:430
+#: ../src/keybindings.c:452
 msgid "Switch to Search Bar"
 msgstr "切换到查找栏"
-#: ../src/keybindings.c:432
+#: ../src/keybindings.c:454
 msgid "Switch to Sidebar"
 msgstr "切换到边栏"
-#: ../src/keybindings.c:434
+#: ../src/keybindings.c:456
 msgid "Switch to Compiler"
 msgstr "切换到编译器"
-#: ../src/keybindings.c:436
+#: ../src/keybindings.c:458
 msgid "Notebook tab"
-msgstr "分页窗口标签"
+msgstr "标签页"
-#: ../src/keybindings.c:439
+#: ../src/keybindings.c:461
 msgid "Switch to left document"
-msgstr "切换到左文档"
+msgstr "切换到左侧文档"
-#: ../src/keybindings.c:441
+#: ../src/keybindings.c:463
 msgid "Switch to right document"
-msgstr "切换到右文档"
+msgstr "切换到右侧文档"
-#: ../src/keybindings.c:443
+#: ../src/keybindings.c:465
 msgid "Switch to last used document"
 msgstr "切换到上次使用的文楼"
-#: ../src/keybindings.c:445
+#: ../src/keybindings.c:467
 msgid "Move document left"
 msgstr "向左移动文档"
-#: ../src/keybindings.c:447
+#: ../src/keybindings.c:469
 msgid "Move document right"
 msgstr "向右移动文档"
-#: ../src/keybindings.c:449
+#: ../src/keybindings.c:471
 msgid "Move document first"
-msgstr "移动到第一个文档"
+msgstr "将文档移动到最前"
-#: ../src/keybindings.c:451
+#: ../src/keybindings.c:473
 msgid "Move document last"
-msgstr "移动到最后一个文档"
+msgstr "将文档移动到最后"
-#: ../src/keybindings.c:453
+#: ../src/keybindings.c:475
 msgid "Document"
 msgstr "文档"
-#: ../src/keybindings.c:456
+#: ../src/keybindings.c:478
 msgid "Toggle Line wrapping"
 msgstr "切换自动换行"
-#: ../src/keybindings.c:458
+#: ../src/keybindings.c:480
 msgid "Toggle Line breaking"
 msgstr "切换自动断行"
-#: ../src/keybindings.c:462
+#: ../src/keybindings.c:484
 msgid "Replace spaces by tabs"
 msgstr "替换空格为制表符"
-#: ../src/keybindings.c:464
+#: ../src/keybindings.c:486
 msgid "Toggle current fold"
 msgstr "开关当前折叠点"
-#: ../src/keybindings.c:466
+#: ../src/keybindings.c:488
 msgid "Fold all"
 msgstr "折叠全部"
-#: ../src/keybindings.c:468
+#: ../src/keybindings.c:490
 msgid "Unfold all"
 msgstr "展开全部"
-#: ../src/keybindings.c:470
+#: ../src/keybindings.c:492
 msgid "Reload symbol list"
 msgstr "重新载入符号列表"
-#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787
+#: ../src/keybindings.c:494 ../src/keybindings.c:499 ../src/project.c:481
+#: ../src/ui_utils.c:1788
 msgid "Build"
-msgstr "生成全部"
+msgstr "生成"
-#: ../src/keybindings.c:475 ../src/toolbar.c:68
+#: ../src/keybindings.c:497 ../src/toolbar.c:68
 msgid "Compile"
 msgstr "编译"
-#: ../src/keybindings.c:479
+#: ../src/keybindings.c:501
 msgid "Make all"
-msgstr "产生全部"
+msgstr "生成全部"
-#: ../src/keybindings.c:482
+#: ../src/keybindings.c:504
 msgid "Make custom target"
-msgstr "自定义生成参数"
+msgstr "生成自定义目标"
-#: ../src/keybindings.c:484
+#: ../src/keybindings.c:506
 msgid "Make object"
-msgstr "生成目标"
+msgstr "生成目标文件"
-#: ../src/keybindings.c:486
+#: ../src/keybindings.c:508
 msgid "Next error"
 msgstr "下一个错误"
-#: ../src/keybindings.c:488
+#: ../src/keybindings.c:510
 msgid "Previous error"
-msgstr "前一个错误"
+msgstr "上一个错误"
-#: ../src/keybindings.c:490
+#: ../src/keybindings.c:512
 msgid "Run"
 msgstr "运行"
-#: ../src/keybindings.c:492
-msgid "Run (alternative command)"
-msgstr "运行(可选命令)"
-
-#: ../src/keybindings.c:494
+#: ../src/keybindings.c:514
 msgid "Build options"
 msgstr "生成参数"
-#: ../src/keybindings.c:499
+#: ../src/keybindings.c:519
 msgid "Show Color Chooser"
 msgstr "显示颜色选择器"
-#: ../src/keybindings.c:501 ../src/keybindings.c:504
+#: ../src/keybindings.c:521 ../src/keybindings.c:524
 msgid "Help"
 msgstr "帮助"
-#: ../src/keybindings.c:799
+#: ../src/keybindings.c:813
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
-#: ../src/keybindings.c:812
+#: ../src/keybindings.c:826
 msgid "The following keyboard shortcuts are configurable:"
-msgstr "下列快捷键可定义:"
+msgstr "下列快捷键可定义："
-#: ../src/keybindings.c:1583
+#: ../src/keybindings.c:1659
 msgid "Switch to Document"
 msgstr "切换到文档"
-#: ../src/keyfile.c:811
+#: ../src/keyfile.c:815
 msgid "Type here what you want, use it as a notice/scratch board"
-msgstr "您请随便写，当便签或草稿好了。"
+msgstr "随便谢谢，当便签或草稿好了。从前有座山，山里有个庙……"
-#: ../src/keyfile.c:1015
+#: ../src/keyfile.c:1019
 msgid "Failed to load one or more session files."
 msgstr "打开一个或多个上次会话的文件失败。"
@@ -3075,132 +3051,132 @@
 msgid "Debug Messages"
 msgstr "除错信息"
-#: ../src/main.c:124
+#: ../src/main.c:122
 msgid ""
 "Set initial column number for the first opened file (useful in conjunction "
 "with --line)"
-msgstr "设置第一个打开的文件的初始列（用于以--联结的行）"
+msgstr "设置第一个打开的文件的初始行号（用于以 --line 连接）"
-#: ../src/main.c:125
+#: ../src/main.c:123
 msgid "Use an alternate configuration directory"
 msgstr "使用自定义的设置文件目录"
-#: ../src/main.c:126 ../src/main.c:146
-msgid "Be verbose"
-msgstr "细节"
-
-#: ../src/main.c:127
+#: ../src/main.c:124
 msgid "Print internal filetype names"
 msgstr "打印内部文件类型名"
-#: ../src/main.c:128
+#: ../src/main.c:125
 msgid "Generate global tags file (see documentation)"
-msgstr "生成全局标记文件(参见文档)"
+msgstr "生成全局标记文件（参见文档）"
-#: ../src/main.c:129
+#: ../src/main.c:126
 msgid "Don't preprocess C/C++ files when generating tags"
 msgstr "当生成标记时不要预处理 C/C++ 文件"
-#: ../src/main.c:132
+#: ../src/main.c:128
 msgid "Don't open files in a running instance, force opening a new instance"
 msgstr "不要在一个已运行的实例中打开文件，强制在新的实例中打开"
-#: ../src/main.c:134
+#: ../src/main.c:130
 msgid "Set initial line number for the first opened file"
 msgstr "设置第一个打开的文件的初始行号"
-#: ../src/main.c:135
+#: ../src/main.c:131
 msgid "Don't show message window at startup"
 msgstr "启动时不要显示信息窗口"
-#: ../src/main.c:136
+#: ../src/main.c:132
 msgid "Don't load auto completion data (see documentation)"
 msgstr "不要载入自动完成数据（参见文档）"
-#: ../src/main.c:138
+#: ../src/main.c:134
 msgid "Don't load plugins"
 msgstr "不要载入插件"
-#: ../src/main.c:140
+#: ../src/main.c:136
 msgid "Print Geany's installation prefix"
-msgstr "打印 Geany 的安装前辍"
+msgstr "打印 Geany 安装前辍"
-#: ../src/main.c:141
+#: ../src/main.c:137
 msgid "Don't load the previous session's files"
 msgstr "不要载入上次会话文件"
-#: ../src/main.c:143
+#: ../src/main.c:139
 msgid "Don't load terminal support"
 msgstr "不要载入虚拟终端"
-#: ../src/main.c:144
+#: ../src/main.c:140
 msgid "Filename of libvte.so"
-msgstr "libvte.so的文件名"
+msgstr "libvte.so 的文件名"
-#: ../src/main.c:147
+#: ../src/main.c:142
+msgid "Be verbose"
+msgstr "细节"
+
+#: ../src/main.c:143
 msgid "Show version and exit"
-msgstr "显示版本和退出"
+msgstr "显示版本并退出"
-#: ../src/main.c:470
+#: ../src/main.c:467
 msgid "[FILES...]"
 msgstr "[文件...]"
-#: ../src/main.c:487
+#: ../src/main.c:484
 #, c-format
 msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
-msgstr "(创建于%s，使用GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr "（创建于 %s，使用GTK %d.%d.%d，GLib %d.%d.%d）"
-#: ../src/main.c:592
+#: ../src/main.c:575
 msgid "Move it now?"
 msgstr "现在移动？"
-#: ../src/main.c:594
+#: ../src/main.c:577
 msgid "Geany needs to move your old configuration directory before starting."
-msgstr "Geany 需要在开始前移动你的老设置路径。"
+msgstr "Geany 需要在开始前移动您原来的设置路径。"
-#: ../src/main.c:603
+#: ../src/main.c:586
 #, c-format
 msgid ""
 "Your configuration directory has been successfully moved from "%s" to "%s"
 ""."
-msgstr "你的设置路径已成功从 "%s" 变为 "%s". "
+msgstr "你的设置路径已成功从“%s”变为“%s”。"
#. for translators: the third %s in brackets is the error message which
 #. * describes why moving the dir didn't work
-#: ../src/main.c:613
+#: ../src/main.c:596
 #, c-format
 msgid ""
 "Your old configuration directory "%s" could not be moved to "%s" (%s). "
 "Please move manually the directory to the new location."
-msgstr "你的设置路径无法 "%s" 变为 "%s" (%s). 请手动变更。"
+msgstr "你的设置路径无法从“%s”移动到“%s”（%s)）。请手动移动文件夹到新路径。"
-#: ../src/main.c:694
+#: ../src/main.c:677
 #, c-format
 msgid ""
 "Configuration directory could not be created (%s).\n"
 "There could be some problems using Geany without a configuration directory.\n"
 "Start Geany anyway?"
 msgstr ""
-"设置文件目录无法创建 (%s)。\n"
-"如果没有设置文件目录Geany可能会出问题。\n"
-"不管他，继续使用？"
+"无法创建设置文件目录（%s）。\n"
+"如果没有设置文件目录 Geany 可能会出现问题。\n"
+"不管它，启动 Geany？"
-#: ../src/main.c:780 ../src/socket.c:164
+#: ../src/main.c:763 ../src/socket.c:164 ../src/templates.c:339
 #, c-format
 msgid "Could not find file '%s'."
-msgstr "无法找到 '%s'文件。"
+msgstr "无法找到“%s”文件。"
-#: ../src/main.c:990
+#: ../src/main.c:973
 #, c-format
 msgid "This is Geany %s."
-msgstr "这是Geany %s."
+msgstr "这是 Geany %s。"
-#: ../src/main.c:992
+#: ../src/main.c:975
 #, c-format
 msgid "Configuration directory could not be created (%s)."
-msgstr "设置文件目录无法创建 (%s)。"
+msgstr "无法创建设置文件目录（%s）。"
-#: ../src/main.c:1224
+#: ../src/main.c:1194
 msgid "Configuration files reloaded."
 msgstr "设置文件已重新载入。"
@@ -3210,141 +3186,147 @@
#: ../src/msgwindow.c:515
 msgid "Copy _All"
-msgstr "全部复制(_A)"
+msgstr "复制全部(_A)"
#: ../src/msgwindow.c:545
 msgid "_Hide Message Window"
 msgstr "隐藏信息窗口(_H)"
-#: ../src/plugins.c:425
+#: ../src/plugins.c:422
 #, c-format
 msgid ""
 "The plugin "%s" is not binary compatible with this release of Geany - "
 "please recompile it."
-msgstr "插件 "%s" 与这个版本的 Geany 不匹配，请重新编译该插件。"
+msgstr "插件“%s”与这个版本的 Geany 不匹配，请重新编译该插件。"
-#: ../src/plugins.c:869
+#: ../src/plugins.c:864
 msgid "_Plugin Manager"
 msgstr "插件管理器(_P)"
-#: ../src/plugins.c:1017
+#: ../src/plugins.c:1022
 #, c-format
 msgid ""
 "Plugin: %s %s\n"
 "Description: %s\n"
 "Author(s): %s"
 msgstr ""
-"插件： %s %s\n"
-"说明： %s\n"
-"作者： %s"
+"插件：%s %s\n"
+"说明：%s\n"
+"作者：%s"
-#: ../src/plugins.c:1087
+#: ../src/plugins.c:1094
 msgid "Active"
 msgstr "激活"
-#: ../src/plugins.c:1093
+#: ../src/plugins.c:1100
 msgid "Plugin"
 msgstr "插件"
-#: ../src/plugins.c:1117
+#: ../src/plugins.c:1124
 msgid "No plugins available."
 msgstr "没有可用插件。"
-#: ../src/plugins.c:1230
+#: ../src/plugins.c:1204
 msgid "Plugins"
 msgstr "插件"
-#: ../src/plugins.c:1250
-msgid ""
-"Below is a list of available plugins. Select the plugins which should be "
-"loaded when Geany is started."
-msgstr "以下是可用插件列表，请选择 Geany 启动时要载入的插件。"
+#: ../src/plugins.c:1224
+msgid "Choose which plugins should be loaded at startup:"
+msgstr ""
-#: ../src/plugins.c:1263
+#: ../src/plugins.c:1236
 msgid "<b>Plugin details:</b>"
 msgstr "<b>插件细节：</b>"
-#: ../src/prefs.c:160
+#: ../src/pluginutils.c:205
+msgid "Configure Plugins"
+msgstr ""
+
+#: ../src/prefs.c:161
 msgid "Grab Key"
 msgstr "获取按键"
-#: ../src/prefs.c:166
+#: ../src/prefs.c:167
 #, c-format
 msgid "Press the combination of the keys you want to use for "%s"."
-msgstr "请按下用于"%s"的按键组合。"
+msgstr "请按下用于“%s”的按键组合。"
-#: ../src/prefs.c:209 ../src/symbols.c:1848
+#: ../src/prefs.c:210 ../src/symbols.c:1834
 msgid "_Expand All"
 msgstr "全部展开(_E)"
-#: ../src/prefs.c:214 ../src/symbols.c:1853
+#: ../src/prefs.c:215 ../src/symbols.c:1839
 msgid "_Collapse All"
 msgstr "全部折叠(_C)"
-#: ../src/prefs.c:273
+#: ../src/prefs.c:274
 msgid "Action"
 msgstr "操作"
-#: ../src/prefs.c:278
+#: ../src/prefs.c:279
 msgid "Shortcut"
 msgstr "快捷键"
-#: ../src/prefs.c:1398
+#: ../src/prefs.c:1400
 msgid "_Override"
 msgstr "覆写(_O)"
-#: ../src/prefs.c:1399
+#: ../src/prefs.c:1400
+msgid "_Allow"
+msgstr ""
+
+#: ../src/prefs.c:1401
 msgid "Override that keybinding?"
 msgstr "覆写快捷键？"
-#: ../src/prefs.c:1400
+#: ../src/prefs.c:1402
 #, c-format
 msgid "The combination '%s' is already used for "%s"."
-msgstr "按键组合 '%s' 已用于 "%s" 。"
+msgstr "按键组合“%s”已用于“%s”。"
#. add manually GeanyWrapLabels because they can't be added with Glade
 #. page Tools
-#: ../src/prefs.c:1514
+#: ../src/prefs.c:1518
 msgid "Enter tool paths below. Tools you do not need can be left blank."
 msgstr "在下面输入工具路径。不需要的请留空。"
#. page Templates
-#: ../src/prefs.c:1519
+#: ../src/prefs.c:1523
 msgid ""
 "Set the information to be used in templates. See the documentation for "
 "details."
-msgstr "定义用于模板的信息。如果不清楚模板如何工作请帮助文档。"
+msgstr "定义用于模板的信息。查看帮助文档了解更多细节。"
-#: ../src/prefs.c:1523
+#: ../src/prefs.c:1527
 msgid ""
 "<i>Notice: For all changes you make here to take effect, you need to restart "
 "Geany or force the reload of the settings using Tools->Reload Configuration."
 "</i>"
 msgstr ""
-"<i>注意：这里所有改动要重启 Geany 后或者通过菜单中“工具->重新载入设置”后才会"
-"生效。 </i>"
+"<i>注意：这里所有改动要重启 Geany 或者通过点击菜单中的“工具->重新载入设置”后"
+"才会生效。 </i>"
#. page Keybindings
-#: ../src/prefs.c:1529
+#: ../src/prefs.c:1533
 msgid ""
 "Here you can change keyboard shortcuts for various actions. Select one and "
 "press the Change button to enter a new shortcut, or double click on an "
 "action to edit the string representation of the shortcut directly."
 msgstr ""
-"你可以在这里改变各种操作的快捷键。选择一个操作并按“改变”按钮输入一个按键或双"
-"击一个操作直接编辑快捷键的字符串，您就可以设置操作的快捷键。"
+"您可以在这里更改各种操作的快捷键。选择一个操作并按“更改”按钮输入一个按键或双"
+"击一个操作直接编辑快捷键的字符串。"
#. page Printing
-#: ../src/prefs.c:1534
+#: ../src/prefs.c:1538
 msgid ""
 "<i>Notice: Native GTK printing is only available if Geany was built against "
 "GTK 2.10 (or above) <b>and</b> Geany is running with GTK 2.10 (or above).</i>"
 msgstr ""
-"<i>注意：只有 Geany 使用 GTK 2.10 ( 或以上版本 ) 编译<b>并且</b> Geany 运行"
-"于 GTK 2.10 ( 或以上版本 ) 时本地 GTK 打印才可用。</i>"
+"<i>注意：只有 Geany 使用 GTK 2.10（或以上版本）编译<b>并且</b> Geany 运行于 "
+"GTK 2.10（或以上版本）时本地 GTK 打印才可用。</i>"
#. page Editor->Indentation
-#: ../src/prefs.c:1540
+#: ../src/prefs.c:1544
 msgid ""
 "<i>Warning: these settings are overridden by the current project. See "
 "<b>Project->Properties</b>.</i>"
@@ -3352,70 +3334,70 @@
#: ../src/printing.c:188
 msgid "The editor font is not a monospaced font!"
-msgstr ""
+msgstr "编辑器字体不是等宽字体！"
#: ../src/printing.c:189
 msgid "Text will be wrongly spaced."
-msgstr ""
+msgstr "文本将错误地空格"
-#: ../src/printing.c:305
+#: ../src/printing.c:306
 #, c-format
 msgid "<b>Page %d of %d</b>"
 msgstr "<b>第 %d 页，共 %d 页</b>"
-#: ../src/printing.c:375
+#: ../src/printing.c:376
 msgid "Document Setup"
 msgstr "文档设置"
-#: ../src/printing.c:410
+#: ../src/printing.c:411
 msgid "Print only the basename(without the path) of the printed file"
 msgstr "打印文件的基本文件名，不包括路径。"
-#: ../src/printing.c:526
+#: ../src/printing.c:527
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
-#: ../src/printing.c:776
+#: ../src/printing.c:781
 #, c-format
 msgid "Printing of file %s was cancelled."
-msgstr "打印 "%s" 取消。"
+msgstr "取消打印“%s”文件。"
-#: ../src/printing.c:778 ../src/printing.c:897
+#: ../src/printing.c:783 ../src/printing.c:905
 #, c-format
 msgid "File %s printed."
 msgstr "文件 %s 打印完毕。"
-#: ../src/printing.c:827
+#: ../src/printing.c:835
 #, c-format
 msgid "Printing of %s failed (%s)."
-msgstr "打印 %s 失败 (%s)。"
+msgstr "打印 %s 失败（%s）。"
-#: ../src/printing.c:867
+#: ../src/printing.c:875
 msgid "Please set a print command in the preferences dialog first."
 msgstr "请先在首选项对话框中设置打印命令。"
-#: ../src/printing.c:875
+#: ../src/printing.c:883
 #, c-format
 msgid ""
 "The file "%s" will be printed with the following command:\n"
 "\n"
 "%s"
 msgstr ""
-"文件 "%s" 会用以下命令打印:\n"
+"文件“%s”将会用以下命令打印：\n"
 "\n"
 "%s"
-#: ../src/printing.c:891
+#: ../src/printing.c:899
 #, c-format
 msgid "Printing of "%s" failed (return code: %s)."
-msgstr "打印 "%s" 失败 (返回代码: %s)。"
+msgstr "打印“%s”失败（返回代码：%s）。"
#. "projects" is part of the default project base path so be careful when translating
 #. * please avoid special characters and spaces, look at the source for details or ask Frank
-#: ../src/project.c:99
+#: ../src/project.c:98
 msgid "projects"
-msgstr "projects"
+msgstr "项目"
#: ../src/project.c:118
 msgid "New Project"
@@ -3425,19 +3407,19 @@
 msgid "C_reate"
 msgstr "创建(_R)"
-#: ../src/project.c:140 ../src/project.c:386
+#: ../src/project.c:140 ../src/project.c:418
 msgid "Name:"
-msgstr "名称:"
+msgstr "名称："
-#: ../src/project.c:149 ../src/project.c:399
+#: ../src/project.c:149 ../src/project.c:431
 msgid "Filename:"
-msgstr "文件名:"
+msgstr "文件名："
-#: ../src/project.c:165 ../src/project.c:429
+#: ../src/project.c:165 ../src/project.c:461
 msgid "Base path:"
-msgstr "根路径:"
+msgstr "根路径："
-#: ../src/project.c:171 ../src/project.c:438
+#: ../src/project.c:171 ../src/project.c:470
 msgid ""
 "Base directory of all files that make up the project. This can be a new "
 "path, or an existing directory tree. You can use paths relative to the "
@@ -3446,14 +3428,14 @@
 "组成项目的所有文件的根路径，可以是一个新路径或一个已存在的路径。你可以使用与"
 "项目名关联的路径。"
-#: ../src/project.c:174 ../src/project.c:441
+#: ../src/project.c:174 ../src/project.c:473
 msgid "Choose Project Base Path"
 msgstr "选择项目根目录"
-#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917
+#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:935
 #, c-format
 msgid "Project file "%s" could not be loaded."
-msgstr "项目文件 "%s" 无法载入。"
+msgstr "项目文件“%s”无法载入。"
#: ../src/project.c:264 ../src/project.c:276
 msgid "Open Project"
@@ -3463,99 +3445,94 @@
 msgid "Project files"
 msgstr "项目文件"
-#: ../src/project.c:330
+#: ../src/project.c:342
 #, c-format
 msgid "Project "%s" closed."
-msgstr "项目 %s 已关闭。"
+msgstr "项目"%s"已关闭。"
-#: ../src/project.c:412
+#: ../src/project.c:444
 msgid "Description:"
-msgstr "描述:"
+msgstr "描述："
-#: ../src/project.c:447
-msgid "Make in base path"
-msgstr "在根路径中编译"
+#: ../src/project.c:485
+msgid "Set the non-filetype working directories on build tab to use base path:"
+msgstr ""
-#: ../src/project.c:452
-msgid "Run command:"
-msgstr "运行命令:"
+#: ../src/project.c:488
+#, fuzzy
+msgid "Set"
+msgstr "第1节"
-#: ../src/project.c:461
+#: ../src/project.c:490
 msgid ""
-"Command-line to run in the project base directory. Options can be appended "
-"to the command. Leave blank to use the default run command."
+"Set the working directories (on the Build tab) for the non-filetype build "
+"commands to use the base path"
 msgstr ""
-"在项目根目录中运行的命令行。可以给命令添加参数。留空则使用缺省的运行命令。"
-#: ../src/project.c:476
+#: ../src/project.c:502
 msgid "File patterns:"
-msgstr "文件模式:"
+msgstr "文件模式："
-#: ../src/project.c:578
+#: ../src/project.c:599
 msgid "Do you want to close it before proceeding?"
 msgstr "您要在执行前关闭文件吗？"
-#: ../src/project.c:579
+#: ../src/project.c:600
 #, c-format
 msgid "The '%s' project is already open."
-msgstr "'%s' 项目已经打开。"
+msgstr "项目“%s”已经打开。"
-#: ../src/project.c:623
+#: ../src/project.c:644
 msgid "The specified project name is too short."
 msgstr "定义的项目名称太短。"
-#: ../src/project.c:629
+#: ../src/project.c:650
 #, c-format
 msgid "The specified project name is too long (max. %d characters)."
-msgstr "定义的项目名称太短。(最大%d个字符)。"
+msgstr "定义的项目名称太短。（最大%d个字符）。"
-#: ../src/project.c:637
+#: ../src/project.c:658
 msgid "You have specified an invalid project filename."
 msgstr "项目文件名非法。"
-#: ../src/project.c:660
+#: ../src/project.c:681
 msgid "Create the project's base path directory?"
 msgstr "创建项目根目录？"
-#: ../src/project.c:661
+#: ../src/project.c:682
 #, c-format
 msgid "The path "%s" does not exist."
-msgstr "路径 "%s" 不存在。"
+msgstr "路径“%s”不存在。"
-#: ../src/project.c:670
+#: ../src/project.c:691
 #, c-format
 msgid "Project base directory could not be created (%s)."
-msgstr "项目文件根目录无法创建 (%s)。"
+msgstr "项目根目录无法创建（%s）。"
-#: ../src/project.c:682
+#: ../src/project.c:703
 #, c-format
 msgid "Project file could not be written (%s)."
-msgstr "项目文件无法写入 (%s)。"
+msgstr "项目文件无法写入（%s）。"
-#: ../src/project.c:730
+#: ../src/project.c:778
 #, c-format
 msgid "Project "%s" created."
-msgstr "项目"%s"已创建。"
+msgstr "项目“%s”已创建。"
-#: ../src/project.c:732
+#: ../src/project.c:780
 #, c-format
 msgid "Project "%s" saved."
-msgstr "项目 "%s" 已保存。"
+msgstr "项目“%s”已保存。"
#. initialise the dialog
-#: ../src/project.c:798 ../src/project.c:809
+#: ../src/project.c:845 ../src/project.c:856
 msgid "Choose Project Filename"
 msgstr "选择项目文件名"
-#. initialise the dialog
-#: ../src/project.c:827 ../src/project.c:838
-msgid "Choose Project Run Command"
-msgstr "选择项目运行命令"
-
-#: ../src/project.c:907
+#: ../src/project.c:925
 #, c-format
 msgid "Project "%s" opened."
-msgstr "项目"%s"已打开。"
+msgstr "项目“%s”已打开。"
#: ../src/search.c:216
 msgid "_Use regular expressions"
@@ -3579,7 +3556,7 @@
 msgid ""
 "Replace \\, \t, \n, \r and \uXXXX (Unicode chararacters) with the "
 "corresponding control characters"
-msgstr "替换\\, \t, \n, \r and \uXXXX (Unicode字符串)为对应的控制字符。"
+msgstr "替换\\、\t、\n、\r和\uXXXX（Unicode字符串）为对应的控制字符。"
#: ../src/search.c:255 ../src/search.c:781
 msgid "C_ase sensitive"
@@ -3595,20 +3572,20 @@
#: ../src/search.c:386
 msgid "_Previous"
-msgstr "查找上一个(_P)"
+msgstr "上一个(_P)"
#: ../src/search.c:392
 msgid "_Next"
-msgstr "查找下一个(_N)"
+msgstr "下一个(_N)"
#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711
 msgid "_Search for:"
-msgstr "搜索(_S):"
+msgstr "搜索(_S)："
#. Now add the multiple match options
 #: ../src/search.c:424
 msgid "_Find All"
-msgstr "全部查找(_F)"
+msgstr "查找全部(_F)"
#: ../src/search.c:431
 msgid "_Mark"
@@ -3674,11 +3651,11 @@
#: ../src/search.c:764 ../src/search.c:772
 msgid "See grep's manual page for more information"
-msgstr "详情请参阅 grep 手册"
+msgstr "详情请参阅 Grep 手册"
#: ../src/search.c:769
 msgid "_Extended regular expressions"
-msgstr "扩展正则表达式"
+msgstr "扩展正则表达式(_E)"
#: ../src/search.c:776
 msgid "_Recurse in subfolders"
@@ -3694,87 +3671,84 @@
#: ../src/search.c:814
 msgid "E_xtra options:"
-msgstr "额外的参数:"
+msgstr "额外的参数：(_X)"
#: ../src/search.c:822
 msgid "Other options to pass to Grep"
-msgstr "传给Grep的其它参数"
+msgstr "传给 Grep 的其它参数"
-#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697
+#: ../src/search.c:1088 ../src/search.c:1665 ../src/search.c:1668
 #, c-format
 msgid "Found %d match for "%s"."
 msgid_plural "Found %d matches for "%s"."
-msgstr[0] "找到 %d 个 "%s" 的匹配项。"
-msgstr[1] "找到 %d 个 "%s" 的匹配项。"
+msgstr[0] "找到 %d 个“%s”的匹配项。"
-#: ../src/search.c:1203
+#: ../src/search.c:1204
 #, c-format
 msgid "Replaced text in %u file."
 msgid_plural "Replaced text in %u files."
 msgstr[0] "在 %u 个文件中替换了文本。"
-msgstr[1] "在 %u 个文件中替换了文本。"
-#: ../src/search.c:1304
+#: ../src/search.c:1305
 msgid "Invalid directory for find in files."
-msgstr "非法目录"
+msgstr "非法目录。"
-#: ../src/search.c:1324
+#: ../src/search.c:1325
 msgid "No text to find."
-msgstr "未找到"
+msgstr "未找到。"
-#: ../src/search.c:1351
+#: ../src/search.c:1352
 #, c-format
 msgid "Cannot execute grep tool '%s'; check the path setting in Preferences."
-msgstr "无法执行grep工具 '%s'，请检查首选项中的设置。"
+msgstr "无法执行 Grep 工具“%s”，请检查首选项中的设置。"
-#: ../src/search.c:1419
+#: ../src/search.c:1420
 msgid "Searching..."
 msgstr "搜索..."
-#: ../src/search.c:1431
+#: ../src/search.c:1432
 #, c-format
 msgid "%s %s -- %s (in directory: %s)"
-msgstr "%s %s -- %s (在目录 %s中)"
+msgstr "%s %s -- %s（在目录 %s 中）"
-#: ../src/search.c:1459
+#: ../src/search.c:1460
 #, c-format
 msgid "Could not open directory (%s)"
-msgstr "无法打开目录(%s)"
+msgstr "无法打开目录（%s）"
-#: ../src/search.c:1565
-msgid "Search failed (see Help->Debug Messages for details)."
-msgstr "搜索失败（详见 帮助->除错信息）"
+#: ../src/search.c:1538
+msgid "Search failed."
+msgstr "搜索失败。"
-#: ../src/search.c:1586
+#: ../src/search.c:1558
 #, c-format
 msgid "Search completed with %d match."
 msgid_plural "Search completed with %d matches."
 msgstr[0] "搜索完成，找到 %d 个匹配项。"
-msgstr[1] "搜索完成，找到 %d 个匹配项。"
-#: ../src/search.c:1594
+#: ../src/search.c:1566
 msgid "No matches found."
 msgstr "未找到匹配项。"
-#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700
+#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:699
 msgid "Chapter"
 msgstr "章"
-#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701
+#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:700
 msgid "Section"
 msgstr "节"
#: ../src/symbols.c:598
 msgid "Sect1"
-msgstr "节1"
+msgstr "第1节"
#: ../src/symbols.c:599
 msgid "Sect2"
-msgstr "节2"
+msgstr "第2节"
#: ../src/symbols.c:600
 msgid "Sect3"
-msgstr "节3"
+msgstr "第3节"
#: ../src/symbols.c:601
 msgid "Appendix"
@@ -3782,18 +3756,18 @@
#. &(tv_iters.tag_macro), _("Macros"),
 #. &(tv_iters.tag_variable), _("Variables"),
-#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769
-#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807
-#: ../src/symbols.c:822 ../src/symbols.c:867
+#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:657
+#: ../src/symbols.c:768 ../src/symbols.c:782 ../src/symbols.c:794
+#: ../src/symbols.c:806 ../src/symbols.c:821 ../src/symbols.c:866
 msgid "Other"
 msgstr "其他"
-#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847
+#: ../src/symbols.c:609 ../src/symbols.c:814 ../src/symbols.c:846
 msgid "Module"
 msgstr "模块"
-#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805
-#: ../src/symbols.c:820 ../src/symbols.c:832
+#: ../src/symbols.c:610 ../src/symbols.c:792 ../src/symbols.c:804
+#: ../src/symbols.c:819 ../src/symbols.c:831
 msgid "Types"
 msgstr "类型"
@@ -3802,9 +3776,9 @@
 msgstr "类型结构"
#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645
-#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681
-#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779
-#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854
+#: ../src/symbols.c:654 ../src/symbols.c:666 ../src/symbols.c:678
+#: ../src/symbols.c:733 ../src/symbols.c:747 ../src/symbols.c:778
+#: ../src/symbols.c:801 ../src/symbols.c:816 ../src/symbols.c:853
 msgid "Functions"
 msgstr "函数"
@@ -3814,230 +3788,213 @@
#: ../src/symbols.c:618
 msgid "Keys"
-msgstr "按键"
+msgstr "键值"
#. &(tv_iters.tag_class), _("Constants"),
 #. &(tv_iters.tag_member), _("Members"),
 #. &(tv_iters.tag_macro), _("Macros"),
-#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735
-#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794
-#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866
+#: ../src/symbols.c:625 ../src/symbols.c:668 ../src/symbols.c:734
+#: ../src/symbols.c:751 ../src/symbols.c:780 ../src/symbols.c:793
+#: ../src/symbols.c:802 ../src/symbols.c:818 ../src/symbols.c:865
 msgid "Variables"
 msgstr "变量"
-#: ../src/symbols.c:631
-msgid "Command"
-msgstr "命令"
-
 #: ../src/symbols.c:632
 msgid "Environment"
 msgstr "环境"
-#: ../src/symbols.c:634 ../src/symbols.c:702
+#: ../src/symbols.c:634 ../src/symbols.c:701
 msgid "Subsection"
 msgstr "小节"
-#: ../src/symbols.c:635 ../src/symbols.c:703
+#: ../src/symbols.c:635 ../src/symbols.c:702
 msgid "Subsubsection"
 msgstr "小小节"
-#: ../src/symbols.c:636
-msgid "Label"
-msgstr "标签"
-
 #: ../src/symbols.c:646
 msgid "Structures"
 msgstr "结构"
-#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776
+#: ../src/symbols.c:653 ../src/symbols.c:761 ../src/symbols.c:775
 msgid "Package"
 msgstr "包"
-#: ../src/symbols.c:655
-msgid "My"
-msgstr "我的"
+#: ../src/symbols.c:655 ../src/symbols.c:805 ../src/symbols.c:828
+msgid "Labels"
+msgstr "标签"
-#: ../src/symbols.c:656
-msgid "Local"
-msgstr "本地的"
+#: ../src/symbols.c:656 ../src/symbols.c:667 ../src/symbols.c:781
+#: ../src/symbols.c:803
+msgid "Constants"
+msgstr "固定值"
-#: ../src/symbols.c:657
-msgid "Our"
-msgstr "我们的"
-
-#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777
-#: ../src/symbols.c:790 ../src/symbols.c:816
+#: ../src/symbols.c:664 ../src/symbols.c:762 ../src/symbols.c:776
+#: ../src/symbols.c:789 ../src/symbols.c:815
 msgid "Interfaces"
 msgstr "接口"
-#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711
-#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764
-#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853
+#: ../src/symbols.c:665 ../src/symbols.c:689 ../src/symbols.c:710
+#: ../src/symbols.c:722 ../src/symbols.c:731 ../src/symbols.c:763
+#: ../src/symbols.c:777 ../src/symbols.c:790 ../src/symbols.c:852
 msgid "Classes"
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    