GNOME.org
 

[meld] Update Chinese (China) translation

commit 68718f9fb5be41842facf8a8166d76e8e47157ac
Author: Boyuan Yang <073plan gmail com>
Date:   Wed Mar 16 12:17:52 2022 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 188 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 100 insertions(+), 88 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6d48853f..52d25835 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2022-01-08 23:40+0000\n"
-"PO-Revision-Date: 2022-01-13 15:33-0500\n"
+"POT-Creation-Date: 2022-03-15 12:52+0000\n"
+"PO-Revision-Date: 2022-03-16 08:17-0400\n"
 "Last-Translator: Boyuan Yang <073plan gmail com>\n"
 "Language-Team: Chinese - China <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 2.4.3\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
@@ -809,7 +809,7 @@ msgstr "相同"
 msgid "New"
 msgstr "新建"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "已修改"
@@ -818,19 +818,23 @@ msgstr "已修改"
 msgid "Ignore filename case"
 msgstr "忽略文件名大小写"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:162
+msgid "Normalize Unicode paths"
+msgstr ""
+
+#: meld/resources/gtk/menus.ui:175
 msgid "Normal"
 msgstr "正常"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "未版本控制"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "已忽略"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:190
 msgid "Flatten folders"
 msgstr "收合文件夹"
 
@@ -954,30 +958,38 @@ msgid "_Compare selected files"
 msgstr "比较选中的文件(_C)"
 
 #: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "标记选中的文件(_M)"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "与标记的文件比较(_W)"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
 msgid "Copy to _left"
 msgstr "复制到左侧(_L)"
 
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
 msgid "Copy to _right"
 msgstr "复制到右侧(_R)"
 
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
 msgid "_Delete selected"
 msgstr "删除选中项(_D)"
 
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
 msgid "Collapse Recursively"
 msgstr "逐项折叠"
 
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
 msgid "Expand Recursively"
 msgstr "逐项展开"
 
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
 msgid "_Open Externally"
 msgstr "使用外部工具打开(_O)"
 
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
 msgid "_Copy File Paths"
 msgstr "复制文件路径(_C)"
 
@@ -1095,7 +1107,7 @@ msgstr "文件 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:537
+#: meld/dirdiff.py:602
 msgid "Name"
 msgstr "名称"
 
@@ -1135,7 +1147,7 @@ msgstr "有换行"
 msgid "Replace _All"
 msgstr "全部替换(_A)"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "替换(_R)"
 
@@ -1515,12 +1527,12 @@ msgstr "如果您不保存，更改将永久丢失。"
 msgid "Close _without Saving"
 msgstr "关闭但不保存(_W)"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
 msgid "_Save"
 msgstr "保存(_S)"
 
@@ -1625,94 +1637,94 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:558 meld/preferences.py:132
+#: meld/dirdiff.py:623 meld/preferences.py:132
 msgid "Size"
 msgstr "大小"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:566 meld/preferences.py:133
+#: meld/dirdiff.py:631 meld/preferences.py:133
 msgid "Modification time"
 msgstr "修改时间"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:574 meld/preferences.py:134
+#: meld/dirdiff.py:639 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "修改时间（ISO）"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:582 meld/preferences.py:135
+#: meld/dirdiff.py:647 meld/preferences.py:135
 msgid "Permissions"
 msgstr "权限"
 
-#: meld/dirdiff.py:832
+#: meld/dirdiff.py:900
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (正在扫描…)"
 
-#: meld/dirdiff.py:864 meld/dirdiff.py:888
+#: meld/dirdiff.py:932 meld/dirdiff.py:964
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] 正在扫描 {folder}"
 
-#: meld/dirdiff.py:1028
+#: meld/dirdiff.py:1100
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] 完成"
 
-#: meld/dirdiff.py:1041
+#: meld/dirdiff.py:1113
 msgid "Folder {} is being compared to itself"
 msgstr "文件夹 {} 正与自己进行比较"
 
-#: meld/dirdiff.py:1047
+#: meld/dirdiff.py:1119
 msgid "Folders have no differences"
 msgstr "文件夹间没有差异"
 
-#: meld/dirdiff.py:1049
+#: meld/dirdiff.py:1121
 msgid "Contents of scanned files in folders are identical."
 msgstr "文件夹中的已扫描文件的内容相同。"
 
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1123
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr "文件夹中的已扫描文件似乎相同，但是内容尚未被扫描。"
 
-#: meld/dirdiff.py:1054
+#: meld/dirdiff.py:1126
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "文件过滤器正在使用中，因此并非所有文件都已被扫描。"
 
-#: meld/dirdiff.py:1056
+#: meld/dirdiff.py:1128
 msgid "Text filters are in use and may be masking content differences."
 msgstr "正在使用文本过滤器，可能会屏蔽文件之间的差异。"
 
-#: meld/dirdiff.py:1072 meld/filediff.py:1917
+#: meld/dirdiff.py:1144 meld/filediff.py:1919
 msgid "Hide"
 msgstr "隐藏"
 
-#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
+#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "隐藏(_D)"
 
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1155
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "扫描此文件夹时出现了多个错误"
 
-#: meld/dirdiff.py:1084
+#: meld/dirdiff.py:1156
 msgid "Files with invalid encodings found"
 msgstr "发现编码无效的文件"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1086
+#: meld/dirdiff.py:1158
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "某些文件编码不正确。名称是这样的："
 
-#: meld/dirdiff.py:1088
+#: meld/dirdiff.py:1160
 msgid "Files hidden by case insensitive comparison"
 msgstr "因不区分大小写比较而隐藏的文件"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1090
+#: meld/dirdiff.py:1162
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1720,17 +1732,17 @@ msgstr ""
 "您正在区分大小写的文件系统上运行不区分大小写的比较。此文件夹中的以下文件被隐"
 "藏："
 
-#: meld/dirdiff.py:1101
+#: meld/dirdiff.py:1173
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” 已被 “{second_file}”隐藏"
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1235
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "要替换文件夹“%s”吗？"
 
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1237
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1739,11 +1751,11 @@ msgstr ""
 "另一个同名的文件夹已存在于“%s”中。\n"
 "如果要替换已存在的文件夹，其中的所有文件都将丢失。"
 
-#: meld/dirdiff.py:1175
+#: meld/dirdiff.py:1250
 msgid "Error copying file"
 msgstr "复制文件时出错"
 
-#: meld/dirdiff.py:1176
+#: meld/dirdiff.py:1251
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1756,11 +1768,11 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1201 meld/vcview.py:764
+#: meld/dirdiff.py:1276 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "删除 {} 时出错"
 
-#: meld/dirdiff.py:1691
+#: meld/dirdiff.py:1819
 msgid "No folder"
 msgstr "没有文件夹"
 
@@ -1783,74 +1795,74 @@ msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "如果冲突已成功解决，可以现在将其标记为已解决。"
 
-#: meld/filediff.py:1227
+#: meld/filediff.py:1228
 msgid "Cancel"
 msgstr "取消"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1229
 msgid "Mark _Resolved"
 msgstr "标记为已解决(_R)"
 
-#: meld/filediff.py:1591
+#: meld/filediff.py:1593
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "打开文件“%s”时出现问题。"
 
-#: meld/filediff.py:1600
+#: meld/filediff.py:1602
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "文件 %s 似乎是二进制文件。"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1604
 msgid "Do you want to open the file using the default application?"
 msgstr "确定要使用默认程序打开文件吗？"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1606
 msgid "Open"
 msgstr "打开"
 
-#: meld/filediff.py:1626
+#: meld/filediff.py:1628
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] 合并文件"
 
-#: meld/filediff.py:1640
+#: meld/filediff.py:1642
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] 计算差异"
 
-#: meld/filediff.py:1700
+#: meld/filediff.py:1702
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "文件 %s 在磁盘上已更改"
 
-#: meld/filediff.py:1701
+#: meld/filediff.py:1703
 msgid "Do you want to reload the file?"
 msgstr "您想重新加载该文件吗？"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1705
 msgid "_Reload"
 msgstr "重新加载(_R)"
 
-#: meld/filediff.py:1873
+#: meld/filediff.py:1875
 msgid "File {} is being compared to itself"
 msgstr "文件 {} 正与自己进行比较"
 
-#: meld/filediff.py:1882
+#: meld/filediff.py:1884
 msgid "Files are identical"
 msgstr "文件完全相同"
 
-#: meld/filediff.py:1895
+#: meld/filediff.py:1897
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr "正在使用文本过滤器，可能会屏蔽文件之间的差异。您想比较未过滤的文件吗？"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1902
 msgid "Files differ in line endings only"
 msgstr "文件间仅行尾存在差异"
 
-#: meld/filediff.py:1902
+#: meld/filediff.py:1904
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1859,75 +1871,75 @@ msgstr ""
 "文件除了行尾均相同，差异细节：\n"
 "%s"
 
-#: meld/filediff.py:1922
+#: meld/filediff.py:1924
 msgid "Show without filters"
 msgstr "显示不过滤的结果"
 
-#: meld/filediff.py:1944
+#: meld/filediff.py:1946
 msgid "Change highlighting incomplete"
 msgstr "更改的高亮显示不完整"
 
-#: meld/filediff.py:1945
+#: meld/filediff.py:1947
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
 msgstr ""
 "某些更改由于太大没有被高亮。您可以强制高亮显示大幅的更改，尽管这可能很慢。"
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:1955
 msgid "Keep highlighting"
 msgstr "保持语法高亮"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1957
 msgid "_Keep highlighting"
 msgstr "保持语法高亮(_K)"
 
-#: meld/filediff.py:1968
+#: meld/filediff.py:1970
 msgid "Saving failed"
 msgstr "保存失败"
 
-#: meld/filediff.py:1969
+#: meld/filediff.py:1971
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr "请考虑将任何重要的更改复制到其他程序或文件中以避免数据丢失。"
 
-#: meld/filediff.py:1978
+#: meld/filediff.py:1980
 msgid "Save Left Pane As"
 msgstr "左侧窗格保存为"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:1982
 msgid "Save Middle Pane As"
 msgstr "中间窗格保存为"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:1984
 msgid "Save Right Pane As"
 msgstr "右侧窗格保存为"
 
-#: meld/filediff.py:1993
+#: meld/filediff.py:1995
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "文件 %s 打开后在磁盘上已更改"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:1997
 msgid "If you save it, any external changes will be lost."
 msgstr "如果您保存它，外部的更改将丢失。"
 
-#: meld/filediff.py:1998
+#: meld/filediff.py:2000
 msgid "Save Anyway"
 msgstr "依然保存"
 
-#: meld/filediff.py:1999
+#: meld/filediff.py:2001
 msgid "Don’t Save"
 msgstr "不保存"
 
-#: meld/filediff.py:2041
+#: meld/filediff.py:2043
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "文件“{}”包含了其当前编码“{}”无法编码的字符。"
 
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2047 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1936,16 +1948,16 @@ msgstr ""
 "由于以下原因无法保存文件：\n"
 "%s"
 
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2051 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "无法保存文件 %s。"
 
-#: meld/filediff.py:2450
+#: meld/filediff.py:2452
 msgid "Live comparison updating disabled"
 msgstr "实时比较更新已禁用"
 
-#: meld/filediff.py:2451
+#: meld/filediff.py:2453
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1970,16 +1982,16 @@ msgstr "无法将“{}”放入回收站。确定要立即删除它吗？"
 msgid "This remote location does not support sending items to the trash."
 msgstr "该远端位置不支持移动项目到回收站。"
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
 msgid "_Delete Permanently"
 msgstr "永久删除(_D)"
 
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "要替换文件“%s”吗？"
 
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2101,11 +2113,11 @@ msgstr "文件名"
 msgid "Need three files to auto-merge, got: %r"
 msgstr "需要三个文件以自动合并，已得到：%r"
 
-#: meld/meldwindow.py:403
+#: meld/meldwindow.py:411
 msgid "Cannot compare a mixture of files and directories"
 msgstr "无法对文件和目录混合比较"
 
-#: meld/misc.py:150
+#: meld/misc.py:154
 msgid ""
 "{}\n"
 "\n"
@@ -2117,7 +2129,7 @@ msgstr ""
 "Meld 在运行时遭遇严重错误：\n"
 "<tt>{}</tt>"
 
-#: meld/misc.py:201
+#: meld/misc.py:205
 msgid "[None]"
 msgstr "[无]"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]