[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: Mon, 18 Apr 2022 16:33:33 +0000 (UTC)
commit 5175bcb1099b1b237b1d7967278af114a145b1de
Author: Luming Zh <lumingzh qq com>
Date:   Mon Apr 18 16:33:31 2022 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 318 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 170 insertions(+), 148 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 52d25835..5f2e3662 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,21 +9,22 @@
 # Wylmer Wang <wantinghard gmail com>, 2013.
 # Whired Planck <fungdaat31 outlook com>, 2020-2021.
 # Dingzhong Chen <wsxy162 gmail com>, 2021.
+# lumingzh <lumingzh qq com>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\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"
+"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"
 "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: Poedit 2.4.3\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: Gtranslator 42.0\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
@@ -485,218 +486,223 @@ msgctxt "shortcut window"
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "交换左右窗格"
+
+#: meld/resources/gtk/help-overlay.ui:70
 msgctxt "shortcut window"
 msgid "Panes"
 msgstr "窗格"
 
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
 msgstr "上一个比较窗格"
 
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:82
 msgctxt "shortcut window"
 msgid "Next comparison pane"
 msgstr "下一个比较窗格"
 
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:91
 msgctxt "shortcut window"
 msgid "Changes"
 msgstr "更改"
 
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to previous change"
 msgstr "转到上一个更改"
 
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Go to next change"
 msgstr "转到下一个更改"
 
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:112
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "标签页"
 
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:117
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "转到上一个标签页"
 
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:124
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "转到下一个标签页"
 
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Switch to tab"
 msgstr "切换到标签页"
 
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "左移标签页"
 
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "右移标签页"
 
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "编辑"
 
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "撤消"
 
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "重做"
 
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "剪切"
 
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "复制"
 
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "粘贴"
 
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "查找"
 
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Next"
 msgstr "查找下一个"
 
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Find Previous"
 msgstr "查找上一个"
 
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:215
 msgctxt "shortcut window"
 msgid "Replace"
 msgstr "替换"
 
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "文件比较"
 
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file"
 msgstr "保存当前文件"
 
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
 msgid "Save current file to new path"
 msgstr "保存当前文件到新路径"
 
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
 msgstr "保存比较中的所有文件"
 
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Previous conflict"
 msgstr "上一个冲突"
 
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Next conflict"
 msgstr "下一个冲突"
 
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to left"
 msgstr "推送更改到左侧"
 
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Push change to right"
 msgstr "推送更改到右侧"
 
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from left"
 msgstr "从左侧拉取更改"
 
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Pull change from right"
 msgstr "从右侧拉取更改"
 
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change above left"
 msgstr "复制更改到左侧上方"
 
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change below left"
 msgstr "复制更改到左侧下方"
 
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change above right"
 msgstr "复制更改到右侧上方"
 
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Copy change below right"
 msgstr "复制更改到右侧下方"
 
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:320
+#: meld/resources/gtk/help-overlay.ui:348
 msgctxt "shortcut window"
 msgid "Delete change"
 msgstr "删除更改"
 
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:329
 msgctxt "shortcut window"
 msgid "Folder comparison"
 msgstr "文件夹比较"
 
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to left"
 msgstr "复制到左侧"
 
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Copy to right"
 msgstr "复制到右侧"
 
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:357
 msgctxt "shortcut window"
 msgid "Version control comparison"
 msgstr "版本控制比较"
 
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Commit to version control"
 msgstr "提交至版本控制"
 
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:369
 msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "显示/隐藏终端输出"
@@ -753,88 +759,84 @@ msgstr "版本控制终端"
 msgid "Lock scrolling"
 msgstr "锁定滚动"
 
-#: meld/resources/gtk/menus.ui:73
+#: meld/resources/gtk/menus.ui:74
+msgid "Swap left and right panes"
+msgstr "交换左右窗格"
+
+#: meld/resources/gtk/menus.ui:80
 msgid "Comparison"
 msgstr "比较"
 
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:84
 msgid "Merge All from Left"
 msgstr "合并左侧的全部更改"
 
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:88
 msgid "Merge All from Right"
 msgstr "合并右侧的全部更改"
 
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:92
 msgid "Merge All"
 msgstr "合并全部"
 
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "增加同步点"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "清除同步点"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:99
 msgid "Format as Patch…"
 msgstr "格式化为补丁…"
 
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:108
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:112
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
 
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:116
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:121
 msgid "_About Meld"
 msgstr "关于 Meld (_A)"
 
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:134
 msgid "File status"
 msgstr "文件状态"
 
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:136
 msgid "Same"
 msgstr "相同"
 
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:140
 msgid "New"
 msgstr "新建"
 
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167
 #: meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "已修改"
 
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:154
 msgid "Ignore filename case"
 msgstr "忽略文件名大小写"
 
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:158
 msgid "Normalize Unicode paths"
-msgstr ""
+msgstr "标准化万国码路径"
 
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:171
 msgid "Normal"
-msgstr "正常"
+msgstr "标准"
 
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "未版本控制"
 
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "已忽略"
 
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:186
 msgid "Flatten folders"
 msgstr "收合文件夹"
 
@@ -1107,7 +1109,7 @@ msgstr "文件 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:602
+#: meld/dirdiff.py:603
 msgid "Name"
 msgstr "名称"
 
@@ -1147,7 +1149,7 @@ msgstr "有换行"
 msgid "Replace _All"
 msgstr "全部替换(_A)"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
 msgid "_Replace"
 msgstr "替换(_R)"
 
@@ -1527,7 +1529,7 @@ msgstr "如果您不保存，更改将永久丢失。"
 msgid "Close _without Saving"
 msgstr "关闭但不保存(_W)"
 
-#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
 #: meld/iohelpers.py:56 meld/iohelpers.py:116
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -1637,94 +1639,94 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:623 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
 msgid "Size"
 msgstr "大小"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:631 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
 msgid "Modification time"
 msgstr "修改时间"
 
 #. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:639 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
 msgid "Modification time (ISO)"
 msgstr "修改时间（ISO）"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:647 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
 msgid "Permissions"
 msgstr "权限"
 
-#: meld/dirdiff.py:900
+#: meld/dirdiff.py:901
 #, python-brace-format
 msgid "{filename} (scanning…)"
 msgstr "{filename} (正在扫描…)"
 
-#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
 #, python-brace-format
 msgid "[{label}] Scanning {folder}"
 msgstr "[{label}] 正在扫描 {folder}"
 
-#: meld/dirdiff.py:1100
+#: meld/dirdiff.py:1101
 #, python-brace-format
 msgid "[{label}] Done"
 msgstr "[{label}] 完成"
 
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1114
 msgid "Folder {} is being compared to itself"
 msgstr "文件夹 {} 正与自己进行比较"
 
-#: meld/dirdiff.py:1119
+#: meld/dirdiff.py:1120
 msgid "Folders have no differences"
 msgstr "文件夹间没有差异"
 
-#: meld/dirdiff.py:1121
+#: meld/dirdiff.py:1122
 msgid "Contents of scanned files in folders are identical."
 msgstr "文件夹中的已扫描文件的内容相同。"
 
-#: meld/dirdiff.py:1123
+#: meld/dirdiff.py:1124
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr "文件夹中的已扫描文件似乎相同，但是内容尚未被扫描。"
 
-#: meld/dirdiff.py:1126
+#: meld/dirdiff.py:1127
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "文件过滤器正在使用中，因此并非所有文件都已被扫描。"
 
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1129
 msgid "Text filters are in use and may be masking content differences."
 msgstr "正在使用文本过滤器，可能会屏蔽文件之间的差异。"
 
-#: meld/dirdiff.py:1144 meld/filediff.py:1919
+#: meld/dirdiff.py:1145 meld/filediff.py:1982
 msgid "Hide"
 msgstr "隐藏"
 
-#: 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
+#: 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
 msgid "Hi_de"
 msgstr "隐藏(_D)"
 
-#: meld/dirdiff.py:1155
+#: meld/dirdiff.py:1156
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "扫描此文件夹时出现了多个错误"
 
-#: meld/dirdiff.py:1156
+#: meld/dirdiff.py:1157
 msgid "Files with invalid encodings found"
 msgstr "发现编码无效的文件"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1158
+#: meld/dirdiff.py:1159
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "某些文件编码不正确。名称是这样的："
 
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1161
 msgid "Files hidden by case insensitive comparison"
 msgstr "因不区分大小写比较而隐藏的文件"
 
 #. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1163
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1732,17 +1734,17 @@ msgstr ""
 "您正在区分大小写的文件系统上运行不区分大小写的比较。此文件夹中的以下文件被隐"
 "藏："
 
-#: meld/dirdiff.py:1173
+#: meld/dirdiff.py:1174
 #, python-brace-format
 msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "“{first_file}” 已被 “{second_file}”隐藏"
 
-#: meld/dirdiff.py:1235
+#: meld/dirdiff.py:1236
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "要替换文件夹“%s”吗？"
 
-#: meld/dirdiff.py:1237
+#: meld/dirdiff.py:1238
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1751,11 +1753,11 @@ msgstr ""
 "另一个同名的文件夹已存在于“%s”中。\n"
 "如果要替换已存在的文件夹，其中的所有文件都将丢失。"
 
-#: meld/dirdiff.py:1250
+#: meld/dirdiff.py:1251
 msgid "Error copying file"
 msgstr "复制文件时出错"
 
-#: meld/dirdiff.py:1251
+#: meld/dirdiff.py:1252
 #, python-brace-format
 msgid ""
 "Couldn’t copy {source}\n"
@@ -1768,101 +1770,121 @@ msgstr ""
 "\n"
 "{error}"
 
-#: meld/dirdiff.py:1276 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:764
 msgid "Error deleting {}"
 msgstr "删除 {} 时出错"
 
-#: meld/dirdiff.py:1819
+#: meld/dirdiff.py:1825
 msgid "No folder"
 msgstr "没有文件夹"
 
-#: meld/filediff.py:1149
+#: meld/filediff.py:1158
 msgid "Comparison results will be inaccurate"
 msgstr "比较结果将会不准确"
 
-#: meld/filediff.py:1151
+#: meld/filediff.py:1160
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr "过滤器更改了文件的行数，该行为不受支持。比较的结果将不准确。"
 
-#: meld/filediff.py:1223
+#: meld/filediff.py:1232
 msgid "Mark conflict as resolved?"
 msgstr "要标记冲突为“已解决”吗？"
 
-#: meld/filediff.py:1225
+#: meld/filediff.py:1234
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "如果冲突已成功解决，可以现在将其标记为已解决。"
 
-#: meld/filediff.py:1228
+#: meld/filediff.py:1237
 msgid "Cancel"
 msgstr "取消"
 
-#: meld/filediff.py:1229
+#: meld/filediff.py:1238
 msgid "Mark _Resolved"
 msgstr "标记为已解决(_R)"
 
-#: meld/filediff.py:1593
+#: meld/filediff.py:1429 meld/filediff.py:1445
+msgid "Add Synchronization Point"
+msgstr "增加同步点"
+
+#: meld/filediff.py:1433
+msgid "Remove Synchronization Point"
+msgstr "移除同步点"
+
+#: meld/filediff.py:1437
+msgid "Move Synchronization Point"
+msgstr "移动同步点"
+
+#: meld/filediff.py:1441
+msgid "Match Synchronization Point"
+msgstr "匹配同步点"
+
+#: meld/filediff.py:1465
+msgid "Clear Synchronization Points"
+msgstr "清除同步点"
+
+#: meld/filediff.py:1656
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "打开文件“%s”时出现问题。"
 
-#: meld/filediff.py:1602
+#: meld/filediff.py:1665
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "文件 %s 似乎是二进制文件。"
 
-#: meld/filediff.py:1604
+#: meld/filediff.py:1667
 msgid "Do you want to open the file using the default application?"
 msgstr "确定要使用默认程序打开文件吗？"
 
-#: meld/filediff.py:1606
+#: meld/filediff.py:1669
 msgid "Open"
 msgstr "打开"
 
-#: meld/filediff.py:1628
+#: meld/filediff.py:1691
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] 合并文件"
 
-#: meld/filediff.py:1642
+#: meld/filediff.py:1705
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] 计算差异"
 
-#: meld/filediff.py:1702
+#: meld/filediff.py:1765
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "文件 %s 在磁盘上已更改"
 
-#: meld/filediff.py:1703
+#: meld/filediff.py:1766
 msgid "Do you want to reload the file?"
 msgstr "您想重新加载该文件吗？"
 
-#: meld/filediff.py:1705
+#: meld/filediff.py:1768
 msgid "_Reload"
 msgstr "重新加载(_R)"
 
-#: meld/filediff.py:1875
+#: meld/filediff.py:1938
 msgid "File {} is being compared to itself"
 msgstr "文件 {} 正与自己进行比较"
 
-#: meld/filediff.py:1884
+#: meld/filediff.py:1947
 msgid "Files are identical"
 msgstr "文件完全相同"
 
-#: meld/filediff.py:1897
+#: meld/filediff.py:1960
 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:1902
+#: meld/filediff.py:1965
 msgid "Files differ in line endings only"
 msgstr "文件间仅行尾存在差异"
 
-#: meld/filediff.py:1904
+#: meld/filediff.py:1967
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1871,75 +1893,75 @@ msgstr ""
 "文件除了行尾均相同，差异细节：\n"
 "%s"
 
-#: meld/filediff.py:1924
+#: meld/filediff.py:1987
 msgid "Show without filters"
 msgstr "显示不过滤的结果"
 
-#: meld/filediff.py:1946
+#: meld/filediff.py:2009
 msgid "Change highlighting incomplete"
 msgstr "更改的高亮显示不完整"
 
-#: meld/filediff.py:1947
+#: meld/filediff.py:2010
 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:1955
+#: meld/filediff.py:2018
 msgid "Keep highlighting"
 msgstr "保持语法高亮"
 
-#: meld/filediff.py:1957
+#: meld/filediff.py:2020
 msgid "_Keep highlighting"
 msgstr "保持语法高亮(_K)"
 
-#: meld/filediff.py:1970
+#: meld/filediff.py:2033
 msgid "Saving failed"
 msgstr "保存失败"
 
-#: meld/filediff.py:1971
+#: meld/filediff.py:2034
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr "请考虑将任何重要的更改复制到其他程序或文件中以避免数据丢失。"
 
-#: meld/filediff.py:1980
+#: meld/filediff.py:2043
 msgid "Save Left Pane As"
 msgstr "左侧窗格保存为"
 
-#: meld/filediff.py:1982
+#: meld/filediff.py:2045
 msgid "Save Middle Pane As"
 msgstr "中间窗格保存为"
 
-#: meld/filediff.py:1984
+#: meld/filediff.py:2047
 msgid "Save Right Pane As"
 msgstr "右侧窗格保存为"
 
-#: meld/filediff.py:1995
+#: meld/filediff.py:2058
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "文件 %s 打开后在磁盘上已更改"
 
-#: meld/filediff.py:1997
+#: meld/filediff.py:2060
 msgid "If you save it, any external changes will be lost."
 msgstr "如果您保存它，外部的更改将丢失。"
 
-#: meld/filediff.py:2000
+#: meld/filediff.py:2063
 msgid "Save Anyway"
 msgstr "依然保存"
 
-#: meld/filediff.py:2001
+#: meld/filediff.py:2064
 msgid "Don’t Save"
 msgstr "不保存"
 
-#: meld/filediff.py:2043
+#: meld/filediff.py:2106
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
 msgstr "文件“{}”包含了其当前编码“{}”无法编码的字符。"
 
-#: meld/filediff.py:2047 meld/patchdialog.py:138
+#: meld/filediff.py:2110 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1948,16 +1970,16 @@ msgstr ""
 "由于以下原因无法保存文件：\n"
 "%s"
 
-#: meld/filediff.py:2051 meld/patchdialog.py:137
+#: meld/filediff.py:2114 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "无法保存文件 %s。"
 
-#: meld/filediff.py:2452
+#: meld/filediff.py:2524
 msgid "Live comparison updating disabled"
 msgstr "实时比较更新已禁用"
 
-#: meld/filediff.py:2453
+#: meld/filediff.py:2525
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]