[meld] Update Chinese (China) translation

From: Translations User D-L <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Update Chinese (China) translation
Date: Tue, 13 Sep 2022 17:46:10 +0000 (UTC)
commit 1d2d2ab1e655eac7b28c57e26d9f8e3e6c500513
Author: Boyuan Yang <073plan gmail com>
Date:   Tue Sep 13 17:46:09 2022 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 371 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 196 insertions(+), 175 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5f2e3662..f6a3f60d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,16 +15,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2022-04-09 23:19+0000\n"
-"PO-Revision-Date: 2022-04-18 19:13+0800\n"
-"Last-Translator: lumingzh <lumingzh qq com>\n"
+"POT-Creation-Date: 2022-09-10 19:02+0000\n"
+"PO-Revision-Date: 2022-09-13 13:45-0400\n"
+"Last-Translator: Boyuan Yang <073plan gmail com>\n"
 "Language-Team: Chinese - China <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"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: Gtranslator 42.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.1.1\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
@@ -483,370 +483,375 @@ msgstr "刷新比较"
 
 #: meld/resources/gtk/help-overlay.ui:54
 msgctxt "shortcut window"
+msgid "Open externally"
+msgstr "使用外部工具打开"
+
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: meld/resources/gtk/help-overlay.ui:61
+#: meld/resources/gtk/help-overlay.ui:68
 msgctxt "shortcut window"
 msgid "Swap left and right panes"
 msgstr "交换左右窗格"
 
-#: meld/resources/gtk/help-overlay.ui:70
+#: meld/resources/gtk/help-overlay.ui:77
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "窗格"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "上一个比较窗格"
 
-#: meld/resources/gtk/help-overlay.ui:82
+#: meld/resources/gtk/help-overlay.ui:89
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "下一个比较窗格"
 
-#: meld/resources/gtk/help-overlay.ui:91
+#: meld/resources/gtk/help-overlay.ui:98
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "更改"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "转到上一个更改"
 
-#: meld/resources/gtk/help-overlay.ui:103
+#: meld/resources/gtk/help-overlay.ui:110
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "转到下一个更改"
 
-#: meld/resources/gtk/help-overlay.ui:112
+#: meld/resources/gtk/help-overlay.ui:119
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "标签页"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "转到上一个标签页"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "转到下一个标签页"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "切换到标签页"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "左移标签页"
 
-#: meld/resources/gtk/help-overlay.ui:145
+#: meld/resources/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "右移标签页"
 
-#: meld/resources/gtk/help-overlay.ui:154
+#: meld/resources/gtk/help-overlay.ui:161
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "编辑"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "撤消"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "重做"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "剪切"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "复制"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "粘贴"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "查找"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "查找下一个"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "查找上一个"
 
-#: meld/resources/gtk/help-overlay.ui:215
+#: meld/resources/gtk/help-overlay.ui:222
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "替换"
 
-#: meld/resources/gtk/help-overlay.ui:224
+#: meld/resources/gtk/help-overlay.ui:231
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "文件比较"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "保存当前文件"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "保存当前文件到新路径"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "保存比较中的所有文件"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "上一个冲突"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "下一个冲突"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "推送更改到左侧"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "推送更改到右侧"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "从左侧拉取更改"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "从右侧拉取更改"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "复制更改到左侧上方"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "复制更改到左侧下方"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "复制更改到右侧上方"
 
-#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:320
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "复制更改到右侧下方"
 
-#: meld/resources/gtk/help-overlay.ui:320
-#: meld/resources/gtk/help-overlay.ui:348
+#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:355
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "删除更改"
 
-#: meld/resources/gtk/help-overlay.ui:329
+#: meld/resources/gtk/help-overlay.ui:336
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "文件夹比较"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "复制到左侧"
 
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "复制到右侧"
 
-#: meld/resources/gtk/help-overlay.ui:357
+#: meld/resources/gtk/help-overlay.ui:364
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "版本控制比较"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "提交至版本控制"
 
-#: meld/resources/gtk/help-overlay.ui:369
+#: meld/resources/gtk/help-overlay.ui:376
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "显示/隐藏终端输出"
 
 #: meld/resources/gtk/menus.ui:7
-msgid "Refresh"
-msgstr "刷新"
-
-#: meld/resources/gtk/menus.ui:12
-msgid "Stop"
-msgstr "停止"
-
-#: meld/resources/gtk/menus.ui:17
-msgid "Fullscreen"
-msgstr "全屏"
-
-#: meld/resources/gtk/menus.ui:26
 msgid "Save As…"
 msgstr "另存为…"
 
-#: meld/resources/gtk/menus.ui:30
+#: meld/resources/gtk/menus.ui:11
 msgid "Save A_ll"
 msgstr "全部保存(_L)"
 
-#: meld/resources/gtk/menus.ui:34
+#: meld/resources/gtk/menus.ui:15
 msgid "Revert files…"
 msgstr "还原文件…"
 
-#: meld/resources/gtk/menus.ui:38
+#: meld/resources/gtk/menus.ui:19
 msgid "Open Externally"
 msgstr "使用外部工具打开"
 
-#: meld/resources/gtk/menus.ui:45
+#: meld/resources/gtk/menus.ui:26
+msgid "Refresh Comparison"
+msgstr "刷新比较"
+
+#: meld/resources/gtk/menus.ui:33
 msgid "_Find…"
 msgstr "查找(_F)…"
 
-#: meld/resources/gtk/menus.ui:49
+#: meld/resources/gtk/menus.ui:37
 msgid "_Replace…"
 msgstr "替换(_R)…"
 
-#: meld/resources/gtk/menus.ui:55
+#: meld/resources/gtk/menus.ui:43
 msgid "View"
 msgstr "查看"
 
-#: meld/resources/gtk/menus.ui:59
+#: meld/resources/gtk/menus.ui:47
+msgid "Fullscreen"
+msgstr "全屏"
+
+#: meld/resources/gtk/menus.ui:52
 msgid "Overview Map"
 msgstr "总览图"
 
-#: meld/resources/gtk/menus.ui:63
+#: meld/resources/gtk/menus.ui:56
 msgid "Version control console"
 msgstr "版本控制终端"
 
-#: meld/resources/gtk/menus.ui:67
+#: meld/resources/gtk/menus.ui:60
 msgid "Lock scrolling"
 msgstr "锁定滚动"
 
-#: meld/resources/gtk/menus.ui:74
+#: meld/resources/gtk/menus.ui:67
 msgid "Swap left and right panes"
 msgstr "交换左右窗格"
 
-#: meld/resources/gtk/menus.ui:80
+#: meld/resources/gtk/menus.ui:73
 msgid "Comparison"
 msgstr "比较"
 
-#: meld/resources/gtk/menus.ui:84
+#: meld/resources/gtk/menus.ui:75
+msgid "Stop"
+msgstr "停止"
+
+#: meld/resources/gtk/menus.ui:81
 msgid "Merge All from Left"
 msgstr "合并左侧的全部更改"
 
-#: meld/resources/gtk/menus.ui:88
+#: meld/resources/gtk/menus.ui:85
 msgid "Merge All from Right"
 msgstr "合并右侧的全部更改"
 
-#: meld/resources/gtk/menus.ui:92
+#: meld/resources/gtk/menus.ui:89
 msgid "Merge All"
 msgstr "合并全部"
 
-#: meld/resources/gtk/menus.ui:99
+#: meld/resources/gtk/menus.ui:96
 msgid "Format as Patch…"
 msgstr "格式化为补丁…"
 
-#: meld/resources/gtk/menus.ui:108
+#: meld/resources/gtk/menus.ui:105
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:109
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:113
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: meld/resources/gtk/menus.ui:121
+#: meld/resources/gtk/menus.ui:118
 msgid "_About Meld"
 msgstr "关于 Meld (_A)"
 
-#: meld/resources/gtk/menus.ui:134
+#: meld/resources/gtk/menus.ui:131
 msgid "File status"
 msgstr "文件状态"
 
-#: meld/resources/gtk/menus.ui:136
+#: meld/resources/gtk/menus.ui:133
 msgid "Same"
 msgstr "相同"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:137
 msgid "New"
 msgstr "新建"
 
-#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
-#: meld/vc/_vc.py:76
+#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164
+#: meld/vc/_vc.py:77
 msgid "Modified"
 msgstr "已修改"
 
-#: meld/resources/gtk/menus.ui:154
+#: meld/resources/gtk/menus.ui:151
 msgid "Ignore filename case"
 msgstr "忽略文件名大小写"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:155
 msgid "Normalize Unicode paths"
 msgstr "标准化万国码路径"
 
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:168
 msgid "Normal"
 msgstr "标准"
 
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71
 msgid "Unversioned"
 msgstr "未版本控制"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70
 msgid "Ignored"
 msgstr "已忽略"
 
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:183
 msgid "Flatten folders"
 msgstr "收合文件夹"
 
 #: meld/resources/ui/about-dialog.ui:8
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2021 Kai Willadsen"
+"Copyright © 2009-2022 Kai Willadsen"
 msgstr ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2021 Kai Willadsen"
+"版权所有 © 2002-2009 Stephen Kennedy\n"
+"版权所有 © 2009-2022 Kai Willadsen"
 
 #: meld/resources/ui/about-dialog.ui:14
 msgid "translator-credits"
@@ -903,7 +908,7 @@ msgid "Column Name"
 msgstr "列名称"
 
 #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -1618,11 +1623,11 @@ msgstr "额外"
 msgid "Console output"
 msgstr "终端输出"
 
-#: meld/actiongutter.py:247
+#: meld/actiongutter.py:254
 msgid "Copy _up"
 msgstr "复制上方(_U)"
 
-#: meld/actiongutter.py:248
+#: meld/actiongutter.py:255
 msgid "Copy _down"
 msgstr "复制下方(_D)"
 
@@ -1699,12 +1704,12 @@ msgstr "文件过滤器正在使用中，因此并非所有文件都已被扫描
 msgid "Text filters are in use and may be masking content differences."
 msgstr "正在使用文本过滤器，可能会屏蔽文件之间的差异。"
 
-#: meld/dirdiff.py:1145 meld/filediff.py:1982
+#: meld/dirdiff.py:1145 meld/filediff.py:1997
 msgid "Hide"
 msgstr "隐藏"
 
-#: meld/dirdiff.py:1147 meld/filediff.py:1984 meld/filediff.py:2014
-#: meld/filediff.py:2016 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029
+#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "隐藏(_D)"
 
@@ -1770,7 +1775,7 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1277 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:768
 msgid "Error deleting {}"
 msgstr "删除 {} 时出错"
 
@@ -1778,113 +1783,121 @@ msgstr "删除 {} 时出错"
 msgid "No folder"
 msgstr "没有文件夹"
 
-#: meld/filediff.py:1158
+#: meld/dirdiff.py:1838
+msgid "Folder comparison:"
+msgstr "文件夹比较："
+
+#: meld/filediff.py:1168
 msgid "Comparison results will be inaccurate"
 msgstr "比较结果将会不准确"
 
-#: meld/filediff.py:1160
+#: meld/filediff.py:1170
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr "过滤器更改了文件的行数，该行为不受支持。比较的结果将不准确。"
 
-#: meld/filediff.py:1232
+#: meld/filediff.py:1242
 msgid "Mark conflict as resolved?"
 msgstr "要标记冲突为“已解决”吗？"
 
-#: meld/filediff.py:1234
+#: meld/filediff.py:1244
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "如果冲突已成功解决，可以现在将其标记为已解决。"
 
-#: meld/filediff.py:1237
+#: meld/filediff.py:1247
 msgid "Cancel"
 msgstr "取消"
 
-#: meld/filediff.py:1238
+#: meld/filediff.py:1248
 msgid "Mark _Resolved"
 msgstr "标记为已解决(_R)"
 
-#: meld/filediff.py:1429 meld/filediff.py:1445
+#: meld/filediff.py:1439 meld/filediff.py:1455
 msgid "Add Synchronization Point"
 msgstr "增加同步点"
 
-#: meld/filediff.py:1433
+#: meld/filediff.py:1443
 msgid "Remove Synchronization Point"
 msgstr "移除同步点"
 
-#: meld/filediff.py:1437
+#: meld/filediff.py:1447
 msgid "Move Synchronization Point"
 msgstr "移动同步点"
 
-#: meld/filediff.py:1441
+#: meld/filediff.py:1451
 msgid "Match Synchronization Point"
 msgstr "匹配同步点"
 
-#: meld/filediff.py:1465
+#: meld/filediff.py:1475
 msgid "Clear Synchronization Points"
 msgstr "清除同步点"
 
-#: meld/filediff.py:1656
+#: meld/filediff.py:1535
+msgid "File comparison:"
+msgstr "文件比较："
+
+#: meld/filediff.py:1671
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "打开文件“%s”时出现问题。"
 
-#: meld/filediff.py:1665
+#: meld/filediff.py:1680
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "文件 %s 似乎是二进制文件。"
 
-#: meld/filediff.py:1667
+#: meld/filediff.py:1682
 msgid "Do you want to open the file using the default application?"
 msgstr "确定要使用默认程序打开文件吗？"
 
-#: meld/filediff.py:1669
+#: meld/filediff.py:1684
 msgid "Open"
 msgstr "打开"
 
-#: meld/filediff.py:1691
+#: meld/filediff.py:1706
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] 合并文件"
 
-#: meld/filediff.py:1705
+#: meld/filediff.py:1720
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] 计算差异"
 
-#: meld/filediff.py:1765
+#: meld/filediff.py:1780
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "文件 %s 在磁盘上已更改"
 
-#: meld/filediff.py:1766
+#: meld/filediff.py:1781
 msgid "Do you want to reload the file?"
 msgstr "您想重新加载该文件吗？"
 
-#: meld/filediff.py:1768
+#: meld/filediff.py:1783
 msgid "_Reload"
 msgstr "重新加载(_R)"
 
-#: meld/filediff.py:1938
+#: meld/filediff.py:1953
 msgid "File {} is being compared to itself"
 msgstr "文件 {} 正与自己进行比较"
 
-#: meld/filediff.py:1947
+#: meld/filediff.py:1962
 msgid "Files are identical"
 msgstr "文件完全相同"
 
-#: meld/filediff.py:1960
+#: meld/filediff.py:1975
 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:1965
+#: meld/filediff.py:1980
 msgid "Files differ in line endings only"
 msgstr "文件间仅行尾存在差异"
 
-#: meld/filediff.py:1967
+#: meld/filediff.py:1982
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1893,75 +1906,75 @@ msgstr ""
 "文件除了行尾均相同，差异细节：\n"
 "%s"
 
-#: meld/filediff.py:1987
+#: meld/filediff.py:2002
 msgid "Show without filters"
 msgstr "显示不过滤的结果"
 
-#: meld/filediff.py:2009
+#: meld/filediff.py:2024
 msgid "Change highlighting incomplete"
 msgstr "更改的高亮显示不完整"
 
-#: meld/filediff.py:2010
+#: meld/filediff.py:2025
 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:2018
+#: meld/filediff.py:2033
 msgid "Keep highlighting"
 msgstr "保持语法高亮"
 
-#: meld/filediff.py:2020
+#: meld/filediff.py:2035
 msgid "_Keep highlighting"
 msgstr "保持语法高亮(_K)"
 
-#: meld/filediff.py:2033
+#: meld/filediff.py:2048
 msgid "Saving failed"
 msgstr "保存失败"
 
-#: meld/filediff.py:2034
+#: meld/filediff.py:2049
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr "请考虑将任何重要的更改复制到其他程序或文件中以避免数据丢失。"
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2058
 msgid "Save Left Pane As"
 msgstr "左侧窗格保存为"
 
-#: meld/filediff.py:2045
+#: meld/filediff.py:2060
 msgid "Save Middle Pane As"
 msgstr "中间窗格保存为"
 
-#: meld/filediff.py:2047
+#: meld/filediff.py:2062
 msgid "Save Right Pane As"
 msgstr "右侧窗格保存为"
 
-#: meld/filediff.py:2058
+#: meld/filediff.py:2073
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "文件 %s 打开后在磁盘上已更改"
 
-#: meld/filediff.py:2060
+#: meld/filediff.py:2075
 msgid "If you save it, any external changes will be lost."
 msgstr "如果您保存它，外部的更改将丢失。"
 
-#: meld/filediff.py:2063
+#: meld/filediff.py:2078
 msgid "Save Anyway"
 msgstr "依然保存"
 
-#: meld/filediff.py:2064
+#: meld/filediff.py:2079
 msgid "Don’t Save"
 msgstr "不保存"
 
-#: meld/filediff.py:2106
+#: meld/filediff.py:2121
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "文件“{}”包含了其当前编码“{}”无法编码的字符。"
 
-#: meld/filediff.py:2110 meld/patchdialog.py:138
+#: meld/filediff.py:2125 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1970,16 +1983,16 @@ msgstr ""
 "由于以下原因无法保存文件：\n"
 "%s"
 
-#: meld/filediff.py:2114 meld/patchdialog.py:137
+#: meld/filediff.py:2129 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "无法保存文件 %s。"
 
-#: meld/filediff.py:2524
+#: meld/filediff.py:2539
 msgid "Live comparison updating disabled"
 msgstr "实时比较更新已禁用"
 
-#: meld/filediff.py:2525
+#: meld/filediff.py:2540
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2242,51 +2255,51 @@ msgstr "无"
 msgid "Rev %s"
 msgstr "版本 %s"
 
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
 msgid "Merged"
 msgstr "已合并"
 
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
 msgid "Base"
 msgstr "基线"
 
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
 msgid "Local"
 msgstr "本地"
 
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
 msgid "Remote"
 msgstr "远端"
 
-#: meld/vc/_vc.py:73
+#: meld/vc/_vc.py:74
 msgid "Error"
 msgstr "错误"
 
-#: meld/vc/_vc.py:75
+#: meld/vc/_vc.py:76
 msgid "Newly added"
 msgstr "新增"
 
-#: meld/vc/_vc.py:77
+#: meld/vc/_vc.py:78
 msgid "Renamed"
 msgstr "已重命名"
 
-#: meld/vc/_vc.py:78
+#: meld/vc/_vc.py:79
 msgid "Conflict"
 msgstr "冲突"
 
-#: meld/vc/_vc.py:79
+#: meld/vc/_vc.py:80
 msgid "Removed"
 msgstr "已移除"
 
-#: meld/vc/_vc.py:80
+#: meld/vc/_vc.py:81
 msgid "Missing"
 msgstr "缺失"
 
-#: meld/vc/_vc.py:81
+#: meld/vc/_vc.py:82
 msgid "Not present"
 msgstr "不存在"
 
-#: meld/vc/_vc.py:82
+#: meld/vc/_vc.py:83
 msgid "Scanning…"
 msgstr "正在扫描……"
 
@@ -2319,77 +2332,85 @@ msgstr "此文件夹中未找到有效的版本控制系统"
 msgid "Choose which version control system to use"
 msgstr "选择要使用的版本控制系统"
 
-#. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:412
+#. TRANSLATORS: This is the name of the version control
+#. system being used, e.g., "Git" or "Subversion"
+#: meld/vcview.py:414
 #, python-brace-format
-msgid "Location: {path}"
-msgstr "位置：{path}"
+msgid "{vc} comparison:"
+msgstr "{vc} 比较："
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: meld/vcview.py:419
+#: meld/vcview.py:423
 msgid "Scanning repository"
 msgstr "正在扫描仓库"
 
-#: meld/vcview.py:448
+#: meld/vcview.py:452
 #, python-format
 msgid "Scanning %s"
 msgstr "正在扫描 %s"
 
-#: meld/vcview.py:487
+#: meld/vcview.py:491
 msgid "(Empty)"
 msgstr "（空）"
 
-#: meld/vcview.py:535
+#: meld/vcview.py:539
 #, python-format
 msgid "%s — local"
 msgstr "%s — 本地"
 
-#: meld/vcview.py:536
+#: meld/vcview.py:540
 #, python-format
 msgid "%s — remote"
 msgstr "%s — 远端"
 
-#: meld/vcview.py:544
+#: meld/vcview.py:548
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s（本地，合并，远端）"
 
-#: meld/vcview.py:549
+#: meld/vcview.py:553
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s（远端，合并，本地）"
 
-#: meld/vcview.py:560
+#: meld/vcview.py:564
 #, python-format
 msgid "%s — repository"
 msgstr "%s — 仓库"
 
-#: meld/vcview.py:566
+#: meld/vcview.py:570
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s（工作区，仓库）"
 
-#: meld/vcview.py:570
+#: meld/vcview.py:574
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s（仓库，工作区）"
 
-#: meld/vcview.py:735
+#: meld/vcview.py:739
 msgid "Remove folder and all its files?"
 msgstr "移除文件夹及其所有文件？"
 
-#: meld/vcview.py:737
+#: meld/vcview.py:741
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr ""
 "这将从版本控制中移除所有选中的文件及文件夹，以及选中文件夹中的所有文件。"
 
-#: meld/vcview.py:850
+#: meld/vcview.py:854
 msgid "Clear"
 msgstr "清除"
 
+#~ msgid "Refresh"
+#~ msgstr "刷新"
+
+#, python-brace-format
+#~ msgid "Location: {path}"
+#~ msgstr "位置：{path}"
+
 #~ msgid "_Update"
 #~ msgstr "更新(_U)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]