[geany/geany] d124f5: Merge pull request #529 from xhacker/zh_CN

Branch: refs/heads/master Author: Frank Lanitz frank@frank.uvena.de Committer: Frank Lanitz frank@frank.uvena.de Date: Wed, 24 Jun 2015 08:30:35 UTC Commit: d124f563759e6dfd133bf37d61dc74344f773806 https://github.com/geany/geany/commit/d124f563759e6dfd133bf37d61dc74344f7738...

Log Message: ----------- Merge pull request #529 from xhacker/zh_CN

Update Simplified Chinese translation

Modified Paths: -------------- po/zh_CN.po

Modified: po/zh_CN.po 156 lines changed, 73 insertions(+), 83 deletions(-) =================================================================== @@ -10,15 +10,15 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-20 11:22+0200\n" -"PO-Revision-Date: 2014-03-31 17:37-0800\n" +"POT-Creation-Date: 2015-06-24 02:36+0000\n" +"PO-Revision-Date: 2015-06-23 23:08-0800\n" "Last-Translator: Xhacker Liu liu.dongyuan@gmail.com\n" "Language-Team: Chinese (simplified) i18n-zh@googlegroups.com\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.4\n" +"X-Generator: Poedit 1.8.1\n" "Plural-Forms: nplurals=1; plural=0;\n"

#: ../geany.desktop.in.h:1 ../data/geany.glade.h:338 @@ -1058,9 +1058,8 @@ msgid "Open new documents from the command-line" msgstr "从命令行打开新文档"

#: ../data/geany.glade.h:230 -#, fuzzy msgid "Create a new file for each command-line filename that doesn't exist" -msgstr "当命令行中的文件名不存在时打开一个新文档。" +msgstr "为命令行中每一个不存在的文件名新建一个文件"

#: ../data/geany.glade.h:231 msgid "Default end of line characters:" @@ -1515,7 +1514,7 @@ msgstr "不使用用于显示程序的退出状态的简单运行脚本。" msgid "<b>Terminal</b>" msgstr "<b>终端</b>"

-#: ../data/geany.glade.h:334 ../src/prefs.c:1619 ../src/vte.c:308 +#: ../data/geany.glade.h:334 ../src/prefs.c:1619 ../src/vte.c:320 msgid "Terminal" msgstr "虚拟终端"

@@ -1861,18 +1860,16 @@ msgid "Set Line E_ndings" msgstr "设置换行符(_N)"

#: ../data/geany.glade.h:421 -#, fuzzy msgid "Convert and Set to _CR/LF (Windows)" -msgstr "转换并设置为 _CR/LF (Win)" +msgstr "转换并设置为 _CR/LF (Windows)"

#: ../data/geany.glade.h:422 msgid "Convert and Set to _LF (Unix)" msgstr "转换并设置为 _LF (Unix)"

#: ../data/geany.glade.h:423 -#, fuzzy msgid "Convert and Set to CR (Classic _Mac)" -msgstr "转换并设置为 CR (_Mac)" +msgstr "转换并设置为 CR (早期 _Mac)"

#: ../data/geany.glade.h:424 ../src/keybindings.c:586 msgid "_Clone" @@ -1931,7 +1928,7 @@ msgid "_Apply Default Indentation" msgstr "使用默认缩进(_A)"

#. build the code -#: ../data/geany.glade.h:438 ../src/build.c:2371 ../src/build.c:2648 +#: ../data/geany.glade.h:438 ../src/build.c:2389 ../src/build.c:2666 msgid "_Build" msgstr "生成(_B)"

@@ -2233,9 +2230,9 @@ msgid "Process failed (%s)" msgstr "进程失败 (%s)"

#: ../src/build.c:813 -#, fuzzy, c-format +#, c-format msgid "Invalid working directory "%s"" -msgstr "改变工作路径到“%s”失败" +msgstr "无效的工作路径“%s”"

#: ../src/build.c:838 #, c-format @@ -2246,7 +2243,7 @@ msgstr "执行 %s 失败 (启动脚本无法创建：%s)" msgid "" "File not executed because the terminal may contain some input (press Ctrl+C " "or Enter to clear it)." -msgstr "" +msgstr "因为终端中可能含有一些输入，没有执行文件（按 Ctrl+C 或回车键清除）。"

#: ../src/build.c:1020 msgid "Compilation failed." @@ -2273,7 +2270,7 @@ msgid "_Previous Error" msgstr "前一个错误(_P)"

#. arguments -#: ../src/build.c:1293 ../src/build.c:2688 +#: ../src/build.c:1293 ../src/build.c:2706 msgid "_Set Build Commands" msgstr "设置生成命令(_S)"

@@ -2302,91 +2299,90 @@ msgstr "进程无法停止 (%s)。" msgid "No more build errors." msgstr "没有生成错误。"

-#: ../src/build.c:1738 ../src/build.c:1740 +#: ../src/build.c:1752 ../src/build.c:1754 msgid "Set menu item label" msgstr "设置菜单项的标签"

-#: ../src/build.c:1765 ../src/symbols.c:682 ../src/tools.c:397 +#: ../src/build.c:1779 ../src/symbols.c:682 ../src/tools.c:397 msgid "Label" msgstr "标签"

#. command column, holding status and command display -#: ../src/build.c:1766 ../src/symbols.c:677 ../src/tools.c:382 +#: ../src/build.c:1780 ../src/symbols.c:677 ../src/tools.c:382 msgid "Command" msgstr "命令"

-#: ../src/build.c:1767 +#: ../src/build.c:1781 msgid "Working directory" msgstr "工作目录"

-#: ../src/build.c:1768 +#: ../src/build.c:1782 msgid "Reset" msgstr "重置"

-#: ../src/build.c:1815 +#: ../src/build.c:1833 msgid "Click to set menu item label" msgstr "点击设置菜单项标签"

-#: ../src/build.c:1899 ../src/build.c:1901 +#: ../src/build.c:1917 ../src/build.c:1919 #, c-format msgid "%s commands" msgstr "%s命令"

-#: ../src/build.c:1901 +#: ../src/build.c:1919 msgid "No filetype" msgstr "无文件类型"

-#: ../src/build.c:1910 ../src/build.c:1945 +#: ../src/build.c:1928 ../src/build.c:1963 msgid "Error regular expression:" msgstr "错误正则表达式："

-#: ../src/build.c:1938 +#: ../src/build.c:1956 msgid "Independent commands" msgstr "文件类型无关命令"

-#: ../src/build.c:1970 +#: ../src/build.c:1988 msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "附注：第 2 项会打开一个对话框，并将输入的文本追加到命令中。"

-#: ../src/build.c:1979 +#: ../src/build.c:1997 msgid "Execute commands" msgstr "执行命令"

-#: ../src/build.c:1991 -#, fuzzy +#: ../src/build.c:2009 msgid "" "%d, %e, %f, %p, %l are substituted in command and directory fields, see " "manual for details." -msgstr "命令和目录字段中的 %d、%e、%f、%p 将被替代，详见手册。" +msgstr "命令和目录字段中的 %d、%e、%f、%p 和 %l 将被替代，详见手册。"

-#: ../src/build.c:2149 +#: ../src/build.c:2167 msgid "Set Build Commands" msgstr "设置生成命令"

-#: ../src/build.c:2364 +#: ../src/build.c:2382 msgid "_Compile" msgstr "编译(_C)"

-#: ../src/build.c:2378 ../src/build.c:2408 ../src/build.c:2616 +#: ../src/build.c:2396 ../src/build.c:2426 ../src/build.c:2634 msgid "_Execute" msgstr "执行(_E)"

#. build the code with make custom -#: ../src/build.c:2423 ../src/build.c:2614 ../src/build.c:2668 +#: ../src/build.c:2441 ../src/build.c:2632 ../src/build.c:2686 msgid "Make Custom _Target..." msgstr "生成自定义目标...(_T)"

#. build the code with make object -#: ../src/build.c:2425 ../src/build.c:2615 ../src/build.c:2676 +#: ../src/build.c:2443 ../src/build.c:2633 ../src/build.c:2694 msgid "Make _Object" msgstr "生成目标文件(_O)"

-#: ../src/build.c:2427 ../src/build.c:2613 +#: ../src/build.c:2445 ../src/build.c:2631 msgid "_Make" msgstr "生成(_M)"

#. build the code with make all -#: ../src/build.c:2660 +#: ../src/build.c:2678 msgid "_Make All" msgstr "生成全部(_M)"

@@ -2430,19 +2426,16 @@ msgid "Detect from file" msgstr "根据文件探测"

#: ../src/dialogs.c:225 -#, fuzzy msgid "Programming Languages" -msgstr "编程语言(_P)" +msgstr "编程语言"

#: ../src/dialogs.c:227 -#, fuzzy msgid "Scripting Languages" -msgstr "脚本语言(_S)" +msgstr "脚本语言"

#: ../src/dialogs.c:229 -#, fuzzy msgid "Markup Languages" -msgstr "标记语言(_M)" +msgstr "标记语言"

#: ../src/dialogs.c:307 msgid "_More Options" @@ -2488,7 +2481,6 @@ msgid "Open File" msgstr "打开文件"

#: ../src/dialogs.c:380 -#, fuzzy msgctxt "Open dialog action" msgid "_View" msgstr "查看(_V)" @@ -2663,9 +2655,8 @@ msgid "Any unsaved changes will be lost." msgstr "未保存的修改将会丢失。"

#: ../src/document.c:1574 -#, fuzzy msgid "Undo history will be lost." -msgstr "未保存的修改将会丢失。" +msgstr "撤销历史将会丢失。"

#: ../src/document.c:1575 #, c-format @@ -2713,16 +2704,13 @@ msgid "Failed to close file '%s': fclose() failed: %s" msgstr "无法关闭文件“%s”：fclose() 失败：%s"

#: ../src/document.c:1981 ../src/document.c:3512 -#, fuzzy msgid "_Overwrite" -msgstr "覆盖？" +msgstr "覆盖(_O)"

#: ../src/document.c:1983 ../src/document.c:3515 -#, fuzzy, c-format +#, c-format msgid "The file '%s' on the disk is more recent than the current buffer." -msgstr "" -"磁盘中的文件“%s”\n" -"比当前编辑的新。" +msgstr "磁盘中的文件“%s”比当前编辑的新。"

#: ../src/document.c:1991 ../src/document.c:3564 msgid "Try to resave the file?" @@ -2736,7 +2724,7 @@ msgstr "没有在磁盘上找到文件“%s”！" #: ../src/document.c:2055 #, c-format msgid "Cannot save read-only document '%s'!" -msgstr "" +msgstr "无法保存只读文件“%s”！"

#: ../src/document.c:2123 #, c-format @@ -3746,7 +3734,7 @@ msgstr "无法找到文件“%s” - 尝试当前文档路径。"

#: ../src/msgwindow.c:1109 msgid "The document has been closed." -msgstr "" +msgstr "文件已关闭。"

#: ../src/notebook.c:199 msgid "Switch to Document" @@ -3770,6 +3758,9 @@ msgid "" "Author(s):\t%s\n" "Filename:\t%s" msgstr "" +"版本：\t%s\n" +"作者：\t%s\n" +"文件名：\t%s"

#: ../src/plugins.c:1037 msgid "No plugins available." @@ -3937,7 +3928,7 @@ msgstr "项目"

#: ../src/project.c:135 msgid "Move the current documents into the new project's session?" -msgstr "" +msgstr "移动当前文档到新项目中？"

#: ../src/project.c:153 msgid "New Project" @@ -3948,16 +3939,15 @@ msgid "C_reate" msgstr "创建(_R)"

#: ../src/project.c:176 -#, fuzzy msgid "Project name" -msgstr "项目" +msgstr "项目名"

#: ../src/project.c:188 #, c-format msgid "" "Path of the file representing the project and storing its settings. It " "should normally have the "%s" extension." -msgstr "" +msgstr "存储项目结构和设置的文件路径。通常有“%s”扩展名。"

#: ../src/project.c:212 ../src/project.c:484 msgid "Choose Project Base Path" @@ -4077,7 +4067,7 @@ msgstr "替换 \\、\t、\n、\r 和 \uXXXX (Unicode字符串) 为对应

#: ../src/search.c:322 msgid "Use multi-_line matching" -msgstr "" +msgstr "使用多行匹配(_L)"

#: ../src/search.c:327 msgid "" @@ -4086,6 +4076,8 @@ msgid "" "newline characters are part of the input and can be captured as normal " "characters by the pattern." msgstr "" +"使用整个文本而非逐行进行正则表达式匹配，允许跨越多行的匹配。在这个模式中，换" +"行符将作为输入的一部分，可以作为正常字符被捕获。"

#: ../src/search.c:340 msgid "Search _backwards" @@ -4290,31 +4282,33 @@ msgstr "" "Geany 尝试访问以另一用户身份运行的另一实例的 Unix Domain socket。\n" "这是一个致命错误，Geany 即将退出。"

+#. TL note: from glib #: ../src/spawn.c:122 #, c-format msgid "Text was empty (or contained only whitespace)" -msgstr "" +msgstr "文件为空 (或仅包含空格)"

+#. TL note: from glib #: ../src/spawn.c:137 ../src/spawn.c:183 #, c-format msgid "Text ended before matching quote was found for %c. (The text was '%s')" -msgstr "" +msgstr "已找到匹配的引号 %c 之前的文本。（文本为“%s”）"

#: ../src/spawn.c:145 ../src/spawn.c:159 #, c-format msgid "A quoted Windows program name must be entirely inside the quotes" -msgstr "" +msgstr "被引号包含的 Windows 程序必须整个包含于引号中"

#. or SPAWN error? #: ../src/spawn.c:235 -#, fuzzy, c-format +#, c-format msgid "Program '%s' not found" -msgstr "命令未找到" +msgstr "程序“%s”未找到"

#: ../src/spawn.c:272 -#, fuzzy, c-format +#, c-format msgid "TerminateProcess() failed: %s" -msgstr "进程失败 (%s)" +msgstr "TerminateProcess() 失败：%s"

#: ../src/stash.c:1150 msgid "Name" @@ -5081,9 +5075,8 @@ msgid "Select File" msgstr "选择文件"

#: ../src/ui_utils.c:2152 -#, fuzzy msgid "_Filetype Configuration" -msgstr "重新载入设置(_R)" +msgstr "文件类型设置(_F)"

#: ../src/ui_utils.c:2189 msgid "Save All" @@ -5108,14 +5101,12 @@ msgid "" msgstr "无法启动设定的浏览器。请修改设置或输入另一个。"

#: ../src/utils.c:374 -#, fuzzy msgid "Windows (CRLF)" -msgstr "Win (CRLF)" +msgstr "Windows (CRLF)"

#: ../src/utils.c:375 -#, fuzzy msgid "Classic Mac (CR)" -msgstr "Mac (CR)" +msgstr "早期 Mac (CR)"

#: ../src/utils.c:376 msgid "Unix (LF)" @@ -5123,38 +5114,38 @@ msgstr "Unix (LF)"

#: ../src/utils.c:385 msgid "CRLF" -msgstr "" +msgstr "CRLF"

#: ../src/utils.c:386 msgid "CR" -msgstr "" +msgstr "CR"

#: ../src/utils.c:387 msgid "LF" -msgstr "" +msgstr "LF"

-#: ../src/vte.c:477 +#: ../src/vte.c:489 #, c-format msgid "invalid VTE library "%s": missing symbol "%s"" msgstr "无效的 VTE 库 "%s"：缺少符号 "%s""

-#: ../src/vte.c:626 +#: ../src/vte.c:638 msgid "_Set Path From Document" msgstr "根据文档设置路径(_S)"

-#: ../src/vte.c:631 +#: ../src/vte.c:643 msgid "_Restart Terminal" msgstr "重启虚拟终端(_R)"

-#: ../src/vte.c:654 +#: ../src/vte.c:666 msgid "_Input Methods" msgstr "输入法(_I)"

-#: ../src/vte.c:747 +#: ../src/vte.c:759 msgid "" "Directory not changed because the terminal may contain some input (press Ctrl" "+C or Enter to clear it)." -msgstr "" +msgstr "未切换目录，因为终端可能包含一些输入（按 Ctrl+C 或回车键清除）。"

#: ../src/win32.c:208 msgid "Geany project files" @@ -5447,9 +5438,8 @@ msgid "Could not execute configured external command '%s' (%s)." msgstr "无法执行设置的外部命令“%s” (%s)。"

#: ../plugins/filebrowser.c:651 -#, fuzzy msgid "Open in _Geany" -msgstr "打开文件" +msgstr "用 _Geany 打开"

#: ../plugins/filebrowser.c:657 msgid "Open _Externally"

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).