[meld] Update Chinese (Taiwan) translation

[Translations User D-L <translations src gnome org>]

commit 16355d2ba9f292b8366849cd1ed6063ceb7e12d8
Author: Yi-Jyun Pan <pan93412 gmail com>
Date:   Sun May 24 17:10:37 2020 +0000

    Update Chinese (Taiwan) translation

 po/zh_TW.po | 2738 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1421 insertions(+), 1317 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 52ad10ca..ee90aa0d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,66 +8,43 @@
 # Tao Wang <dancefire gmail com>, 2010, 2013.
 # Wylmer Wang <wantinghard gmail com>, 2013.
 # Tom K. C. Chiu <babycaseny gmail com>, 2015.
-# 張修銘 <cges30901 gmail com>, 2015, 2018
+# 張修銘 <cges30901 gmail com>, 2015, 2018, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2018-08-17 21:12+0000\n"
-"PO-Revision-Date: 2018-08-18 20:19+0800\n"
-"Last-Translator: Hsiu-Ming Chang <cges30901 gmail com>\n"
+"POT-Creation-Date: 2020-04-13 22:02+0000\n"
+"PO-Revision-Date: 2020-05-25 01:10+0800\n"
+"Last-Translator: Yi-Jyun Pan <pan93412 gmail com>\n"
 "Language-Team: Babycaseny Gavèrnmènt\n"
 "Language: zh_TW\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.1.1\n"
+"X-Generator: Poedit 2.3.1\n"
 "X-Project-Style: gnome\n"
 "X-Source-Language: C\n"
 
-#: ../bin/meld:194
-msgid "Cannot import: "
-msgstr "無法匯入："
-
-#: ../bin/meld:197
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld 需要 %s 或以上的版本。"
-
-#: ../bin/meld:243
-#, c-format
-msgid ""
-"Couldn’t load Meld-specific CSS (%s)\n"
-"%s"
-msgstr ""
-"無法載入 Meld 特定的 CSS (%s)\n"
-"%s"
-
-#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1
+#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
+#: meld/resources/ui/appwindow.ui:9
 msgid "Meld"
 msgstr "Meld"
 
-#: ../data/org.gnome.meld.desktop.in.h:2
+#: data/org.gnome.meld.desktop.in.in:4
 msgid "Diff Viewer"
 msgstr "差異檢視程式"
 
-#: ../data/org.gnome.meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Meld 差異檢視程式"
-
-#: ../data/org.gnome.meld.desktop.in.h:4
-#: ../data/org.gnome.meld.appdata.xml.in.h:2
+#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12
 msgid "Compare and merge your files"
 msgstr "比對及合併您的檔案"
 
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: ../data/org.gnome.meld.desktop.in.h:6
+#: data/org.gnome.meld.desktop.in.in:7
 msgid "diff;merge;"
 msgstr "差異;合併;diff;merge;"
 
-#: ../data/org.gnome.meld.appdata.xml.in.h:3
+#: data/org.gnome.meld.appdata.xml.in.in:14
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
 "compare files, directories, and version controlled projects. It provides "
@@ -78,58 +55,42 @@ msgstr ""
 "版本控制的專案。它提供檔案和資料夾的雙向和三向比對，並支援許多版本控制系統，"
 "包括 Git、Mercurial、Bazaar 和 Subversion。"
 
-#: ../data/org.gnome.meld.appdata.xml.in.h:4
+#: data/org.gnome.meld.appdata.xml.in.in:21
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
 msgstr ""
 "Meld 可以幫助您查看代碼變更、理解修正檔，並可以減輕您在大型合併衝突中的痛苦。"
 
-#: ../data/org.gnome.meld.appdata.xml.in.h:5
+#: data/org.gnome.meld.appdata.xml.in.in:51
 msgid "The GNOME Project"
 msgstr "GNOME 專案"
 
-#: ../data/mime/org.gnome.meld.xml.in.h:1
+#: data/mime/org.gnome.meld.xml.in:4
 msgid "Meld comparison description"
 msgstr "Meld 比對描述"
 
-#: ../data/org.gnome.meld.gschema.xml.h:1
+#: data/org.gnome.meld.gschema.xml:37
 msgid "Default window width"
 msgstr "é è¨­è¦–çª—å¯¬åº¦"
 
-#: ../data/org.gnome.meld.gschema.xml.h:2
+#: data/org.gnome.meld.gschema.xml:41
 msgid "Default window height"
 msgstr "é è¨­è¦–çª—é«˜åº¦"
 
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: data/org.gnome.meld.gschema.xml:45
 msgid "Default window maximised state"
 msgstr "é è¨­è¦–çª—æœ€å¤§åŒ–ç‹€æ…‹"
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: data/org.gnome.meld.gschema.xml:49
 msgid "Default window fullscreen state"
 msgstr "é è¨­è¦–çª—å…¨èž¢å¹•ç‹€æ…‹"
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
-msgid "Show toolbar"
-msgstr "顯示工具列"
-
-#: ../data/org.gnome.meld.gschema.xml.h:6
-msgid "If true, the window toolbar is visible."
-msgstr "如果為 True，則顯示視窗工具列。"
-
-#: ../data/org.gnome.meld.gschema.xml.h:7
-msgid "Show statusbar"
-msgstr "顯示狀態列"
-
-#: ../data/org.gnome.meld.gschema.xml.h:8
-msgid "If true, the window statusbar is visible."
-msgstr "如果為 True，則顯示視窗狀態列。"
-
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: data/org.gnome.meld.gschema.xml:58
 msgid "Additional automatically detected text encodings"
 msgstr "額外自動偵測的文字編碼"
 
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: data/org.gnome.meld.gschema.xml:59
 msgid ""
 "Meld will use these text encodings to try to decode loaded text files before "
 "trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -140,66 +101,64 @@ msgstr ""
 "單中的編碼外，也會總是使用 UTF-8 å’Œç›®å‰çš„åœ°å€é è¨­ç·¨ç¢¼ã€‚ä¹Ÿå¯èƒ½å˜—è©¦å…¶ä»–ç·¨ç¢¼ï¼Œå–"
 "決於使用者的地區。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: data/org.gnome.meld.gschema.xml:66
 msgid "Width of an indentation step"
 msgstr "縮排的每級寬度"
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: data/org.gnome.meld.gschema.xml:67
 msgid "The number of spaces to use for a single indent step"
 msgstr "ç”¨æ–¼å–®ä¸€ç¸®æŽ’å±¤ç´šçš„ç©ºæ ¼æ•¸"
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: data/org.gnome.meld.gschema.xml:71
 msgid "Whether to indent using spaces or tabs"
 msgstr "è¦ä½¿ç”¨ç©ºæ ¼é‚„æ˜¯ tab 來縮排"
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: data/org.gnome.meld.gschema.xml:72
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr "如果為 Trueï¼Œæ–°çš„ç¸®æŽ’éƒ½å°‡ä½¿ç”¨ç©ºæ ¼è€Œä¸æ˜¯ tab。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
 msgid "Show line numbers"
 msgstr "顯示列號"
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: data/org.gnome.meld.gschema.xml:77
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr "如果為 True，列號會在檔案比對的側邊長條溝中顯示。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: data/org.gnome.meld.gschema.xml:81
 msgid "Highlight syntax"
 msgstr "語法標示"
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: data/org.gnome.meld.gschema.xml:82
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld’s own color "
 "highlighting, this is off by default."
 msgstr ""
 "是否在比對中標示語法。由於 Meld è‡ªèº«çš„è‰²å½©æ¨™ç¤ºï¼Œå› æ­¤é è¨­æƒ…æ³ä¸‹é€™æ˜¯é—œé–‰çš„ã€‚"
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: data/org.gnome.meld.gschema.xml:86
 msgid "Color scheme to use for syntax highlighting"
 msgstr "語法標示使用的配色方案"
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: data/org.gnome.meld.gschema.xml:87
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
 msgstr "GtkSourceView 用來判斷語法標示的顏色"
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
-msgid "Displayed whitespace"
-msgstr "要顯示的空白字元"
+#: data/org.gnome.meld.gschema.xml:91
+msgid "Draw whitespace"
+msgstr "繪製空白字元"
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: data/org.gnome.meld.gschema.xml:92
 msgid ""
-"Selector for individual whitespace character types to be shown. Possible "
-"values are 'space', 'tab', 'newline' and 'nbsp'."
-msgstr ""
-"要顯示的個別空白字元類型的選擇器。可能的值包括 'space'，'tab'，'newline' 和 "
-"'nbsp'。"
+"If true, whitespace characters will be drawn in comparisons even if they are "
+"not in a changed area."
+msgstr "如果為 True，即使不在變更區域也會比對中繪製空白字元。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: data/org.gnome.meld.gschema.xml:101
 msgid "Wrap mode"
 msgstr "換列模式"
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: data/org.gnome.meld.gschema.xml:102
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
@@ -208,60 +167,77 @@ msgstr ""
 "æª”æ¡ˆæ¯”å°ä¸­çš„åˆ—å°‡æ ¹æ“šé€™å€‹è¨­å®šæ›åˆ—ï¼Œå¯ä»¥æ˜¯å®Œå…¨ä¸æ›åˆ— ('none')，在任何字元換列 "
 "('char') 或僅在單字結尾處換列 ('word')。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
 msgid "Highlight current line"
 msgstr "標示目前的列"
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: data/org.gnome.meld.gschema.xml:110
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr "如果為 True，包含游標的列將在檔案比對中標示。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: data/org.gnome.meld.gschema.xml:114
 msgid "Use the system default monospace font"
 msgstr "ä½¿ç”¨ç³»çµ±é è¨­ç­‰å¯¬å­—åž‹"
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: data/org.gnome.meld.gschema.xml:115
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr "如果為 False，將使用 custom-font 而不是系統等寬字型。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: data/org.gnome.meld.gschema.xml:119
 msgid "Custom font"
 msgstr "使用自訂字型"
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: data/org.gnome.meld.gschema.xml:120
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr "要使用的自訂字型，以字串儲存並以 Pango 字型描述。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: data/org.gnome.meld.gschema.xml:126
+msgid "Show overview source map"
+msgstr "顯示概觀原始碼地圖"
+
+#: data/org.gnome.meld.gschema.xml:127
+msgid ""
+"If true, file comparisons will have paired source maps for compared files."
+msgstr "如果為 True，檔案比對將會有成對的原始碼地圖，用於比對檔案。"
+
+#: data/org.gnome.meld.gschema.xml:132
+msgid "Style of overview map"
+msgstr "概觀地圖的樣式"
+
+#: data/org.gnome.meld.gschema.xml:133
+msgid "Style options for how the overview map is displayed."
+msgstr "ç”¨æ–¼é¡¯ç¤ºæ¦‚è§€åœ°åœ–çš„æ¨£å¼é¸é …ã€‚"
+
+#: data/org.gnome.meld.gschema.xml:139
 msgid "Ignore blank lines when comparing files"
 msgstr "比對檔案時忽略空列"
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: data/org.gnome.meld.gschema.xml:140
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr "如果為 True，當標示檔案之間的變更時將修剪空列。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: data/org.gnome.meld.gschema.xml:147
 msgid "Use the system default editor"
 msgstr "ä½¿ç”¨ç³»çµ±é è¨­ç·¨è¼¯å™¨"
 
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: data/org.gnome.meld.gschema.xml:148
 msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
 msgstr ""
 "如果為 False，在外部開啟檔案時將使用 custom-editor-command 而不是系統編輯器。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: data/org.gnome.meld.gschema.xml:152
 msgid "The custom editor launch command"
 msgstr "自訂編輯器啟動指令"
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: data/org.gnome.meld.gschema.xml:153
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -269,31 +245,31 @@ msgstr ""
 "用於啟動自訂編輯器的指令。這裡支援一些有限的範本。目前「{file}」和「{line}」"
 "是被辨識的 token。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: data/org.gnome.meld.gschema.xml:159
 msgid "Columns to display"
 msgstr "要顯示的欄位"
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: data/org.gnome.meld.gschema.xml:160
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr "資料夾比對中的欄位名稱清單以及是否應該顯示它們。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25
+#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
 msgid "Ignore symbolic links"
 msgstr "忽略符號連結"
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: data/org.gnome.meld.gschema.xml:165
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr "如果為 True，資料夾比對在周遊資料夾樹時不跟隨符號連結。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: data/org.gnome.meld.gschema.xml:169
 msgid "Use shallow comparison"
 msgstr "使用粗淺比對"
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: data/org.gnome.meld.gschema.xml:170
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
@@ -302,11 +278,11 @@ msgstr ""
 "如果為 Trueï¼Œè³‡æ–™å¤¾æ¯”å°ä¸­åƒ…æ ¹æ“šå¤§å°å’Œ mtime 比對檔案，如果檔案大小和 mtime 符"
 "合則認為檔案相同，否則認為不相同。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: data/org.gnome.meld.gschema.xml:174
 msgid "File timestamp resolution"
 msgstr "檔案時間戳記精細度"
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: data/org.gnome.meld.gschema.xml:175
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they’re considered to have different mtimes. This "
@@ -316,11 +292,11 @@ msgstr ""
 "當基於 mtime 進行比對時，兩個檔案至少要差異到奈秒以上，才會被認為 mtime 有差"
 "異。這在比對具有不同時間戳記精細度的檔案系統之間的檔案時非常有用。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22
+#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
 msgid "Apply text filters during folder comparisons"
 msgstr "在資料夾比對時使用文字過濾器"
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: data/org.gnome.meld.gschema.xml:180
 msgid ""
 "If true, folder comparisons that compare file contents also apply active "
 "text filters and the blank line trimming option, and ignore newline "
@@ -329,19 +305,19 @@ msgstr ""
 "如果為 Trueï¼Œæ¯”å°æª”æ¡ˆå…§å®¹çš„è³‡æ–™å¤¾æ¯”å°ä¹Ÿæœƒä½¿ç”¨å•Ÿç”¨çš„æ–‡å­—éŽæ¿¾å™¨å’Œç©ºåˆ—ä¿®å‰ªé¸é …ï¼Œ"
 "並忽略換列字元差異。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: data/org.gnome.meld.gschema.xml:184
 msgid "File status filters"
 msgstr "檔案狀態過濾器"
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: data/org.gnome.meld.gschema.xml:185
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr "用於過濾資料夾比對中可見的檔案的狀態清單。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: data/org.gnome.meld.gschema.xml:191
 msgid "Show the version control console output"
 msgstr "顯示版本控制主控台輸出"
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: data/org.gnome.meld.gschema.xml:192
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
@@ -349,21 +325,21 @@ msgstr ""
 "如果為 True，主控台輸出部分將顯示在版本控制檢視中，顯示版本控制操作執行的指"
 "令。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: data/org.gnome.meld.gschema.xml:196
 msgid "Version control pane position"
 msgstr "ç‰ˆæœ¬æŽ§åˆ¶ç‹€æ…‹çª—æ ¼ä½ç½®"
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: data/org.gnome.meld.gschema.xml:197
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr "é€™æ˜¯ç•¶é¡¯ç¤ºä¸»æŽ§å°çª—æ ¼æ™‚ï¼Œä¸»ç‰ˆæœ¬æŽ§åˆ¶æ¨¹çš„é«˜åº¦ã€‚"
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: data/org.gnome.meld.gschema.xml:201
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "ä»¥å·¦å´ç‚ºæœ¬åœ°ï¼Œå³å´ç‚ºé ç«¯æ–¹å¼é¡¯ç¤ºç‰ˆæœ¬æ¯”å°"
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: data/org.gnome.meld.gschema.xml:202
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
@@ -372,11 +348,11 @@ msgstr ""
 "如果為 Trueï¼Œç‰ˆæœ¬æŽ§åˆ¶æ¯”å°å°‡ä½¿ç”¨å·¦å´ç‚ºæœ¬åœ°ï¼Œå³å´ç‚ºé ç«¯çš„é…ç½®ä¾†æ±ºå®šåœ¨çª—æ ¼ä¸­é¡¯ç¤º"
 "æª”æ¡ˆçš„é †åºã€‚å¦å‰‡ï¼Œä½¿ç”¨å·¦å´ç‚ºé ç«¯ï¼Œå³å´ç‚ºæœ¬åœ°çš„é…ç½®ã€‚"
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: data/org.gnome.meld.gschema.xml:206
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "åœ¨ä¸‰å‘ç‰ˆæœ¬æŽ§åˆ¶åˆä½µæ¯”å°çš„æª”æ¡ˆé †åº"
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: data/org.gnome.meld.gschema.xml:207
 msgid ""
 "Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
@@ -385,32 +361,32 @@ msgstr ""
 "æª”æ¡ˆé †åºçš„é¸æ“‡æœ‰é ç«¯/合併/本地和本地/合併/é ç«¯ã€‚æ­¤åå¥½è¨­å®šåƒ…å½±éŸ¿å¾žç‰ˆæœ¬æŽ§åˆ¶æª¢"
 "è¦–å•Ÿå‹•çš„ä¸‰å‘æ¯”å°ï¼Œå› æ­¤åƒ…ç”¨æ–¼ Meld 中的合併/衝突解決。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: data/org.gnome.meld.gschema.xml:211
 msgid "Show margin in commit message editor"
 msgstr "在提交訊息編輯器中顯示邊界"
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: data/org.gnome.meld.gschema.xml:212
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr ""
 "如果為 True，在版本控制提交訊息編輯器中會顯示指引，來顯示邊界所在的列。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: data/org.gnome.meld.gschema.xml:216
 msgid "Margin column in commit message editor"
 msgstr "提交訊息編輯器中的邊界列"
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: data/org.gnome.meld.gschema.xml:217
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
 msgstr "在版本控制提交訊息編輯器中顯示邊界的列。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: data/org.gnome.meld.gschema.xml:221
 msgid "Automatically hard-wrap commit messages"
 msgstr "提交時自動強制實體換列"
 
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: data/org.gnome.meld.gschema.xml:222
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
@@ -418,20 +394,20 @@ msgstr ""
 "如果為 True，版本控制提交訊息編輯器將在提交之前，在提交邊界實體換列（也就是插"
 "入斷列符號）。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: data/org.gnome.meld.gschema.xml:226
 msgid "Version control status filters"
 msgstr "版本控制狀態過濾器"
 
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: data/org.gnome.meld.gschema.xml:227
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr "用於在版本控制比對中過濾可見檔案的狀態清單。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:65
+#: data/org.gnome.meld.gschema.xml:241
 msgid "Filename-based filters"
 msgstr "基於檔案名稱的過濾器"
 
-#: ../data/org.gnome.meld.gschema.xml.h:66
+#: data/org.gnome.meld.gschema.xml:242
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -439,11 +415,11 @@ msgstr ""
 "é å…ˆå®šç¾©çš„åŸºæ–¼æª”æ¡ˆåç¨±çš„éŽæ¿¾å™¨æ¸…å–®ï¼Œå¦‚æžœå•Ÿç”¨ï¼Œå°‡å¾žè³‡æ–™å¤¾æ¯”å°ä¸­ç§»é™¤ç¬¦åˆçš„æª”"
 "案。"
 
-#: ../data/org.gnome.meld.gschema.xml.h:67
+#: data/org.gnome.meld.gschema.xml:256
 msgid "Text-based filters"
 msgstr "基於文字的過濾器"
 
-#: ../data/org.gnome.meld.gschema.xml.h:68
+#: data/org.gnome.meld.gschema.xml:257
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -452,417 +428,614 @@ msgstr ""
 "é å…ˆå®šç¾©çš„åŸºæ–¼æ–‡å­—çš„æ­£è¦è¡¨ç¤ºå¼éŽæ¿¾å™¨æ¸…å–®ï¼Œå¦‚æžœå•Ÿç”¨ï¼Œå°‡åœ¨æª”æ¡ˆæ¯”å°ä¸ä½¿ç”¨æ–‡å­—ã€‚"
 "文字仍將顯示，但不會對比對本身做出貢獻。"
 
-#: ../data/styles/meld-base.xml.h:1
-msgid "Meld base scheme"
-msgstr "Meld 基礎配色方案"
+#: data/styles/meld-base.style-scheme.xml.in:1
+msgid "Classic (Meld)"
+msgstr "經典（Meld）"
 
-#: ../data/styles/meld-base.xml.h:2
+#: data/styles/meld-base.style-scheme.xml.in:3
 msgid "Base color scheme for Meld highlighting"
 msgstr "用於 Meld 標示的基礎配色方案"
 
-#: ../data/styles/meld-dark.xml.h:1
+#: data/styles/meld-dark.style-scheme.xml.in:1
 msgid "Meld dark scheme"
 msgstr "Meld 暗色配色方案"
 
-#: ../data/styles/meld-dark.xml.h:2
+#: data/styles/meld-dark.style-scheme.xml.in:3
 msgid "Dark color scheme for Meld highlighting"
 msgstr "用於 Meld 標示的暗色配色方案"
 
-#: ../data/ui/application.ui.h:1
-msgid "About Meld"
-msgstr "關於 Meld"
+#: meld/resources/gtk/help-overlay.ui:14
+msgctxt "shortcut window"
+msgid "General"
+msgstr "一般"
 
-#: ../data/ui/application.ui.h:2
-msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
-msgstr ""
-"著作權 © 2002-2009 Stephen Kennedy\n"
-"著作權 © 2009-2017 Kai Willadsen"
+#: meld/resources/gtk/help-overlay.ui:19
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "新的比對"
 
-#: ../data/ui/application.ui.h:4
-msgid "Website"
-msgstr "網站"
+#: meld/resources/gtk/help-overlay.ui:26
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "關閉比對"
 
-#: ../data/ui/application.ui.h:5
-msgid "translator-credits"
-msgstr ""
-"Funda Wang <fundawang linux net cn>, 2004, 2005\n"
-"Woodman Tuen <wmtuen gmail com>\n"
-"Careone <careoneagain gmail com>, 2009\n"
-"arccos <boyermoore gmail com>, 2009\n"
-"Tao Wang <dancefire gmail com>, 2010, 2013\n"
-"Wylmer Wang <wantinghard gmail com>, 2013\n"
-"Tom K. C. Chiu <babycaseny gmail com>\n"
-"張修銘 <cges30901 gmail com>"
+#: meld/resources/gtk/help-overlay.ui:33
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "退出 Meld"
 
-#: ../data/ui/application.ui.h:6
-msgid "_Preferences"
-msgstr "偏好設定(_P)"
+#: meld/resources/gtk/help-overlay.ui:40
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "停止目前的動作"
 
-#: ../data/ui/application.ui.h:7
-msgid "_Help"
-msgstr "求助(_H)"
+#: meld/resources/gtk/help-overlay.ui:47
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "重新整理比對"
 
-#: ../data/ui/application.ui.h:8
-msgid "Keyboard Shortcuts"
-msgstr "鍵盤捷徑"
+#: meld/resources/gtk/help-overlay.ui:54
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "全螢幕"
 
-#: ../data/ui/application.ui.h:9
-msgid "_About"
-msgstr "關於(_A)"
+#: meld/resources/gtk/help-overlay.ui:63
+msgctxt "shortcut window"
+msgid "Panes"
+msgstr "çª—æ ¼"
 
-#: ../data/ui/application.ui.h:10
-msgid "_Quit"
-msgstr "退出(_Q)"
+#: meld/resources/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "ä¸Šä¸€å€‹æ¯”å°çª—æ ¼"
 
-#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "比對(_C)"
+#: meld/resources/gtk/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "ä¸‹ä¸€å€‹æ¯”å°çª—æ ¼"
 
-#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
-msgid "Compare selected files"
-msgstr "比對選取的檔案"
+#: meld/resources/gtk/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "變更"
 
-#: ../data/ui/dirdiff.ui.h:3
-msgid "Collapse Recursively"
-msgstr "遞迴摺疊"
+#: meld/resources/gtk/help-overlay.ui:89
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "跳到上一個變更"
 
-#: ../data/ui/dirdiff.ui.h:4
-msgid "Collapse selected folder and all subfolders"
-msgstr "摺疊選取的資料夾及所有子資料夾"
+#: meld/resources/gtk/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "跳到下一個變更"
 
-#: ../data/ui/dirdiff.ui.h:5
-msgid "Expand Recursively"
-msgstr "遞迴展開"
+#: meld/resources/gtk/help-overlay.ui:105
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "åˆ†é "
 
-#: ../data/ui/dirdiff.ui.h:6
-msgid "Expand selected folder and all subfolders"
-msgstr "展開選取的資料夾及所有子資料夾"
+#: meld/resources/gtk/help-overlay.ui:110
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "è·³åˆ°ä¸Šä¸€å€‹åˆ†é "
 
-#: ../data/ui/dirdiff.ui.h:7
-msgid "Copy to _Left"
-msgstr "複製到左側(_L)"
+#: meld/resources/gtk/help-overlay.ui:117
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "è·³åˆ°ä¸‹ä¸€å€‹åˆ†é "
 
-#: ../data/ui/dirdiff.ui.h:8
-msgid "Copy to left"
-msgstr "複製到左側"
+#: meld/resources/gtk/help-overlay.ui:124
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "åˆ‡æ›åˆ°åˆ†é "
 
-#: ../data/ui/dirdiff.ui.h:9
-msgid "Copy to _Right"
-msgstr "複製到右側(_R)"
+#: meld/resources/gtk/help-overlay.ui:131
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "å·¦ç§»åˆ†é "
 
-#: ../data/ui/dirdiff.ui.h:10
-msgid "Copy to right"
-msgstr "複製到右側"
+#: meld/resources/gtk/help-overlay.ui:138
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "å³ç§»åˆ†é "
 
-#: ../data/ui/dirdiff.ui.h:11
-msgid "Delete selected"
-msgstr "刪除所選內容"
+#: meld/resources/gtk/help-overlay.ui:147
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "編輯"
 
-#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1489
-msgid "Hide"
-msgstr "隱藏"
+#: meld/resources/gtk/help-overlay.ui:152
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "復原"
 
-#: ../data/ui/dirdiff.ui.h:13
-msgid "Hide selected"
-msgstr "隱藏所選內容"
+#: meld/resources/gtk/help-overlay.ui:159
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "重做"
 
-#: ../data/ui/dirdiff.ui.h:14
-msgid "Ignore Filename Case"
-msgstr "忽略檔案名稱大小寫"
+#: meld/resources/gtk/help-overlay.ui:166
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "剪下"
 
-#: ../data/ui/dirdiff.ui.h:15
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr "將除了大小寫不同、其他完全一致的檔案名稱視為相同"
+#: meld/resources/gtk/help-overlay.ui:173
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "複製"
 
-#: ../data/ui/dirdiff.ui.h:16
-msgid "Same"
-msgstr "相同"
+#: meld/resources/gtk/help-overlay.ui:180
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "貼上"
 
-#: ../data/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "顯示相同處"
+#: meld/resources/gtk/help-overlay.ui:187
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "尋找"
 
-#: ../data/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "新增"
+#: meld/resources/gtk/help-overlay.ui:194
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "尋找下一個"
 
-#: ../data/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "顯示新增處"
+#: meld/resources/gtk/help-overlay.ui:201
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "尋找上一個"
 
-#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
-msgid "Modified"
-msgstr "修改"
+#: meld/resources/gtk/help-overlay.ui:208
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "取代"
 
-#: ../data/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "顯示修改處"
+#: meld/resources/gtk/help-overlay.ui:217
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "檔案比對"
 
-#: ../data/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "過濾器"
+#: meld/resources/gtk/help-overlay.ui:222
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "儲存目前的檔案"
 
-#: ../data/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "設定啟用的過濾器"
+#: meld/resources/gtk/help-overlay.ui:229
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "儲存目前的檔案到新的路徑"
 
-#: ../data/ui/EditableList.ui.h:1
-msgid "Editable List"
-msgstr "可編輯的清單"
+#: meld/resources/gtk/help-overlay.ui:236
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "儲存比對中的所有檔案"
 
-#: ../data/ui/EditableList.ui.h:2
-msgid "Active"
-msgstr "啟用"
+#: meld/resources/gtk/help-overlay.ui:243
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "上一個衝突"
 
-#: ../data/ui/EditableList.ui.h:3
-msgid "Column Name"
-msgstr "欄位名稱"
+#: meld/resources/gtk/help-overlay.ui:250
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "下一個衝突"
 
-#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
-msgid "_Add"
-msgstr "åŠ å…¥(_A)"
+#: meld/resources/gtk/help-overlay.ui:257
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "推送變更到左側"
 
-#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:680
-msgid "_Remove"
-msgstr "移除(_R)"
+#: meld/resources/gtk/help-overlay.ui:264
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "推送變更到右側"
 
-#: ../data/ui/EditableList.ui.h:6
-msgid "Move item up"
-msgstr "ä¸Šç§»é …ç›®"
+#: meld/resources/gtk/help-overlay.ui:271
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "從左側拉取變更"
 
-#: ../data/ui/EditableList.ui.h:7
-msgid "Move _Up"
-msgstr "上移(_U)"
+#: meld/resources/gtk/help-overlay.ui:278
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "從右側拉取變更"
 
-#: ../data/ui/EditableList.ui.h:8
-msgid "Move item down"
-msgstr "ä¸‹ç§»é …ç›®"
+#: meld/resources/gtk/help-overlay.ui:285
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "從左側上方複製變更"
 
-#: ../data/ui/EditableList.ui.h:9
-msgid "Move _Down"
-msgstr "下移(_D)"
+#: meld/resources/gtk/help-overlay.ui:292
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "從左側下方複製變更"
 
-#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:407
-msgid "Name"
-msgstr "過濾器名稱"
+#: meld/resources/gtk/help-overlay.ui:299
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "從右側上方複製變更"
 
-#: ../data/ui/EditableList.ui.h:11
-msgid "Pattern"
-msgstr "比對式樣"
+#: meld/resources/gtk/help-overlay.ui:306
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "從右側下方複製變更"
 
-#: ../data/ui/EditableList.ui.h:12
-msgid "Add new filter"
-msgstr "åŠ å…¥æ–°éŽæ¿¾å™¨"
+#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:341
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "刪除變更"
 
-#: ../data/ui/EditableList.ui.h:13
-msgid "Remove selected filter"
-msgstr "移除選擇的過濾器"
+#: meld/resources/gtk/help-overlay.ui:322
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "資料夾比對"
 
-#: ../data/ui/encoding-selector.ui.h:1
-msgid "Search text encoding…"
-msgstr "搜尋文字編碼…"
+#: meld/resources/gtk/help-overlay.ui:327
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "複製到左側"
 
-#: ../data/ui/filediff.ui.h:1
-msgid "Format as Patch…"
-msgstr "æ ¼å¼åŒ–ç‚ºä¿®æ­£æª”â€¦"
+#: meld/resources/gtk/help-overlay.ui:334
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "複製到右側"
 
-#: ../data/ui/filediff.ui.h:2
-msgid "Create a patch using differences between files"
-msgstr "使用檔案之間的差異建立修正檔"
+#: meld/resources/gtk/help-overlay.ui:350
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "版本控制比對"
 
-#: ../data/ui/filediff.ui.h:3
-msgid "Save A_ll"
-msgstr "全部儲存(_L)"
+#: meld/resources/gtk/help-overlay.ui:355
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "提交至版本控制"
 
-#: ../data/ui/filediff.ui.h:4
-msgid "Save all files in the current comparison"
-msgstr "儲存目前比對中的所有檔案"
+#: meld/resources/gtk/help-overlay.ui:362
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "顯示/隱藏主控台輸出"
 
-#: ../data/ui/filediff.ui.h:5
-msgid "Revert files to their saved versions"
-msgstr "將檔案還原為儲存的版本"
+#: meld/resources/gtk/menus.ui:7
+msgid "Refresh"
+msgstr "重新整理"
 
-#: ../data/ui/filediff.ui.h:6
-msgid "Add Synchronization Point"
-msgstr "新增同步點"
+#: meld/resources/gtk/menus.ui:12
+msgid "Stop"
+msgstr "停止"
 
-#: ../data/ui/filediff.ui.h:7
-msgid "Add a synchronization point for changes between files"
-msgstr "åŠ å…¥ä¸€å€‹æª”æ¡ˆå·®ç•°åŒæ­¥é»ž"
+#: meld/resources/gtk/menus.ui:17
+msgid "Fullscreen"
+msgstr "全螢幕"
 
-#: ../data/ui/filediff.ui.h:8
-msgid "Clear Synchronization Points"
-msgstr "清除同步點"
+#: meld/resources/gtk/menus.ui:26
+msgid "Save As…"
+msgstr "另存為…"
 
-#: ../data/ui/filediff.ui.h:9
-msgid "Clear sychronization points for changes between files"
-msgstr "清除檔案差異同步點"
+#: meld/resources/gtk/menus.ui:30
+msgid "Save A_ll"
+msgstr "全部儲存(_L)"
 
-#: ../data/ui/filediff.ui.h:10
-msgid "Previous Conflict"
-msgstr "上一個衝突"
+#: meld/resources/gtk/menus.ui:34
+msgid "Revert files…"
+msgstr "還原檔案…"
 
-#: ../data/ui/filediff.ui.h:11
-msgid "Go to the previous conflict"
-msgstr "跳到上一個衝突"
+#: meld/resources/gtk/menus.ui:38
+msgid "Open Externally"
+msgstr "使用外部工具開啟"
 
-#: ../data/ui/filediff.ui.h:12
-msgid "Next Conflict"
-msgstr "下一個衝突"
+#: meld/resources/gtk/menus.ui:45
+msgid "_Find…"
+msgstr "尋找(_F)…"
 
-#: ../data/ui/filediff.ui.h:13
-msgid "Go to the next conflict"
+#: meld/resources/gtk/menus.ui:49
+msgid "_Replace…"
+msgstr "取代(_R)…"
+
+#: meld/resources/gtk/menus.ui:55
+msgid "View"
+msgstr "檢視"
+
+#: meld/resources/gtk/menus.ui:59
+msgid "Overview Map"
+msgstr "概觀地圖"
+
+#: meld/resources/gtk/menus.ui:63
+msgid "Version control console"
+msgstr "版本控制主控台"
+
+#: meld/resources/gtk/menus.ui:67
+msgid "Lock scrolling"
+msgstr "鎖定滾動"
+
+#: meld/resources/gtk/menus.ui:73
+msgid "Comparison"
+msgstr "比對"
+
+#: meld/resources/gtk/menus.ui:77
+msgid "Merge All from Left"
+msgstr "從左側合併所有變更"
+
+#: meld/resources/gtk/menus.ui:81
+msgid "Merge All from Right"
+msgstr "從右側合併所有變更"
+
+#: meld/resources/gtk/menus.ui:85
+msgid "Merge All"
+msgstr "全部合併"
+
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+msgid "Add Synchronization Point"
+msgstr "新增同步點"
+
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+msgid "Clear Synchronization Points"
+msgstr "清除同步點"
+
+#: meld/resources/gtk/menus.ui:103
+msgid "Format as Patch…"
+msgstr "æ ¼å¼åŒ–ç‚ºä¿®æ­£æª”â€¦"
+
+#: meld/resources/gtk/menus.ui:112
+msgid "_Preferences"
+msgstr "偏好設定(_P)"
+
+#: meld/resources/gtk/menus.ui:116
+msgid "Keyboard Shortcuts"
+msgstr "鍵盤捷徑"
+
+#: meld/resources/gtk/menus.ui:120
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: meld/resources/gtk/menus.ui:125
+msgid "_About Meld"
+msgstr "關於 Meld(_A)"
+
+#: meld/resources/gtk/menus.ui:138
+msgid "File status"
+msgstr "檔案狀態"
+
+#: meld/resources/gtk/menus.ui:140
+msgid "Same"
+msgstr "相同"
+
+#: meld/resources/gtk/menus.ui:144
+msgid "New"
+msgstr "新增"
+
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/vc/_vc.py:76
+msgid "Modified"
+msgstr "修改"
+
+#: meld/resources/gtk/menus.ui:158
+msgid "Ignore filename case"
+msgstr "忽略檔案名稱大小寫"
+
+#: meld/resources/gtk/menus.ui:171
+msgid "Normal"
+msgstr "正常"
+
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr "未版本控制"
+
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+msgid "Ignored"
+msgstr "已忽略"
+
+#: meld/resources/gtk/menus.ui:186
+msgid "Flatten folders"
+msgstr "將檔案合併顯示（不顯示資料夾）"
+
+#: meld/resources/ui/about-dialog.ui:8
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2019 Kai Willadsen"
+msgstr ""
+"著作權所有 © 2002-2009 Stephen Kennedy\n"
+"著作權所有 © 2009-2019 Kai Willadsen"
+
+#: meld/resources/ui/about-dialog.ui:14
+msgid "translator-credits"
+msgstr ""
+"Funda Wang <fundawang linux net cn>, 2004, 2005\n"
+"Woodman Tuen <wmtuen gmail com>\n"
+"Careone <careoneagain gmail com>, 2009\n"
+"arccos <boyermoore gmail com>, 2009\n"
+"Tao Wang <dancefire gmail com>, 2010, 2013\n"
+"Wylmer Wang <wantinghard gmail com>, 2013\n"
+"Tom K. C. Chiu <babycaseny gmail com>\n"
+"張修銘 <cges30901 gmail com>, 2015, 2018, 2019\n"
+"Yi-Jyun Pan <pan93412 gmail com>, 2020."
+
+#: meld/resources/ui/appwindow.ui:29
+msgid "Start a new comparison"
+msgstr "開始新的比對"
+
+#: meld/resources/ui/appwindow.ui:45
+msgid "Open a recent comparison"
+msgstr "開啟最近使用的比對"
+
+#: meld/resources/ui/appwindow.ui:73
+msgid "Go to the previous change"
+msgstr "跳到上一個變更"
+
+#: meld/resources/ui/appwindow.ui:93
+msgid "Go to the next change"
+msgstr "跳到下一個變更"
+
+#: meld/resources/ui/appwindow.ui:123
+msgid "Go to the previous conflict"
+msgstr "跳到上一個衝突"
+
+#: meld/resources/ui/appwindow.ui:143
+msgid "Go to the next conflict"
 msgstr "跳到下一個衝突"
 
-#: ../data/ui/filediff.ui.h:14
-msgid "Push to Left"
-msgstr "推送到左側"
+#: meld/resources/ui/appwindow.ui:191
+msgid "Version Filters"
+msgstr "版本過濾器"
 
-#: ../data/ui/filediff.ui.h:15
-msgid "Push current change to the left"
-msgstr "推送目前的變更到左側"
+#: meld/resources/ui/appwindow.ui:206 meld/resources/ui/preferences.ui:1456
+msgid "File Filters"
+msgstr "檔案過濾器"
 
-#: ../data/ui/filediff.ui.h:16
-msgid "Push to Right"
-msgstr "推送到右側"
+#: meld/resources/ui/appwindow.ui:221 meld/resources/ui/preferences.ui:1641
+msgid "Text Filters"
+msgstr "文字過濾器"
 
-#: ../data/ui/filediff.ui.h:17
-msgid "Push current change to the right"
-msgstr "推送目前的變更到右側"
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
+msgid "Active"
+msgstr "啟用"
 
-#: ../data/ui/filediff.ui.h:18
-msgid "Pull from Left"
-msgstr "從左側拉取"
+#: meld/resources/ui/column-list.ui:50
+msgid "Column Name"
+msgstr "欄位名稱"
 
-#: ../data/ui/filediff.ui.h:19
-msgid "Pull change from the left"
-msgstr "從左側拉取變更"
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
+msgid "_Remove"
+msgstr "移除(_R)"
 
-#: ../data/ui/filediff.ui.h:20
-msgid "Pull from Right"
-msgstr "從右側拉取"
+#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
+msgid "Move item up"
+msgstr "ä¸Šç§»é …ç›®"
 
-#: ../data/ui/filediff.ui.h:21
-msgid "Pull change from the right"
-msgstr "從右側拉取變更"
+#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
+msgid "Move _Up"
+msgstr "上移(_U)"
 
-#: ../data/ui/filediff.ui.h:22
-msgid "Copy Above Left"
-msgstr "複製左側上方"
+#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
+msgid "Move item down"
+msgstr "ä¸‹ç§»é …ç›®"
 
-#: ../data/ui/filediff.ui.h:23
-msgid "Copy change above the left chunk"
-msgstr "從左側塊上方複製變更"
+#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
+msgid "Move _Down"
+msgstr "下移(_D)"
 
-#: ../data/ui/filediff.ui.h:24
-msgid "Copy Below Left"
-msgstr "複製左側下方"
+#: meld/resources/ui/commit-dialog.ui:8
+msgid "Commit"
+msgstr "提交"
 
-#: ../data/ui/filediff.ui.h:25
-msgid "Copy change below the left chunk"
-msgstr "從左側塊下方複製變更"
+#: meld/resources/ui/commit-dialog.ui:36
+msgid "Commit Files"
+msgstr "提交檔案"
 
-#: ../data/ui/filediff.ui.h:26
-msgid "Copy Above Right"
-msgstr "複製右側上方"
+#: meld/resources/ui/commit-dialog.ui:117
+msgid "Log Message"
+msgstr "日誌訊息"
 
-#: ../data/ui/filediff.ui.h:27
-msgid "Copy change above the right chunk"
-msgstr "從右側塊上方複製變更"
+#: meld/resources/ui/commit-dialog.ui:181
+msgid "Previous logs:"
+msgstr "前一個日誌："
 
-#: ../data/ui/filediff.ui.h:28
-msgid "Copy Below Right"
-msgstr "複製右側下方"
+#: meld/resources/ui/commit-dialog.ui:259
+msgid "Co_mmit"
+msgstr "提交(_M)"
 
-#: ../data/ui/filediff.ui.h:29
-msgid "Copy change below the right chunk"
-msgstr "從右側塊下方複製變更"
+#: meld/resources/ui/dirdiff-actions.ui:20
+msgid "Copy to left"
+msgstr "複製到左側"
 
-#: ../data/ui/filediff.ui.h:30
-msgid "Delete"
-msgstr "刪除"
+#: meld/resources/ui/dirdiff-actions.ui:42
+msgid "Copy to right"
+msgstr "複製到右側"
 
-#: ../data/ui/filediff.ui.h:31
-msgid "Delete change"
-msgstr "刪除變更"
+#: meld/resources/ui/dirdiff-actions.ui:66
+msgid "Delete selected"
+msgstr "刪除所選內容"
 
-#: ../data/ui/filediff.ui.h:32
-msgid "Merge All from Left"
-msgstr "從左側合併所有變更"
+#: meld/resources/ui/dirdiff-menus.ui:7
+msgid "_Compare selected files"
+msgstr "比對選取的檔案(_C)"
 
-#: ../data/ui/filediff.ui.h:33
-msgid "Merge all non-conflicting changes from the left"
-msgstr "從左側合併所有非衝突的變更"
+#: meld/resources/ui/dirdiff-menus.ui:14
+msgid "Copy to _left"
+msgstr "複製到左側(_L)"
 
-#: ../data/ui/filediff.ui.h:34
-msgid "Merge All from Right"
-msgstr "從右側合併所有變更"
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Copy to _right"
+msgstr "複製到右側(_R)"
 
-#: ../data/ui/filediff.ui.h:35
-msgid "Merge all non-conflicting changes from the right"
-msgstr "從右側合併所有非衝突的變更"
+#: meld/resources/ui/dirdiff-menus.ui:22
+msgid "_Delete selected"
+msgstr "刪除所選內容(_D)"
 
-#: ../data/ui/filediff.ui.h:36
-msgid "Merge All"
-msgstr "全部合併"
+#: meld/resources/ui/dirdiff-menus.ui:29
+msgid "Collapse Recursively"
+msgstr "遞迴摺疊"
 
-#: ../data/ui/filediff.ui.h:37
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "å¾žå·¦å´å’Œå³å´çª—æ ¼åˆä½µæ‰€æœ‰éžè¡çªçš„è®Šæ›´"
+#: meld/resources/ui/dirdiff-menus.ui:33
+msgid "Expand Recursively"
+msgstr "遞迴展開"
 
-#: ../data/ui/filediff.ui.h:38
-msgid "Previous Pane"
-msgstr "ä¸Šä¸€å€‹çª—æ ¼"
+#: meld/resources/ui/dirdiff-menus.ui:40
+msgid "_Open Externally"
+msgstr "使用外部工具開啟(_O)"
 
-#: ../data/ui/filediff.ui.h:39
-msgid "Move keyboard focus to the previous document in this comparison"
-msgstr "將鍵盤焦點轉移到比對的上一個文件"
+#: meld/resources/ui/dirdiff-menus.ui:44
+msgid "_Copy File Paths"
+msgstr "複製檔案路徑(_C)"
 
-#: ../data/ui/filediff.ui.h:40
-msgid "Next Pane"
-msgstr "ä¸‹ä¸€å€‹çª—æ ¼"
+#: meld/resources/ui/encoding-selector.ui:31
+msgid "Search text encoding…"
+msgstr "搜尋文字編碼…"
 
-#: ../data/ui/filediff.ui.h:41
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr "將鍵盤焦點轉移到比對的下一個文件"
+#: meld/resources/ui/filediff-actions.ui:20
+msgid "Push current change to the left"
+msgstr "推送目前的變更到左側"
 
-#: ../data/ui/filediff.ui.h:42
-msgid "Lock Scrolling"
-msgstr "鎖定滾動"
+#: meld/resources/ui/filediff-actions.ui:42
+msgid "Push current change to the right"
+msgstr "推送目前的變更到右側"
 
-#: ../data/ui/filediff.ui.h:43
-msgid "Lock scrolling of all panes"
-msgstr "éŽ–å®šæ‰€æœ‰çª—æ ¼çš„æ»¾å‹•"
+#: meld/resources/ui/filediff-actions.ui:65
+msgid "Copy chunks"
+msgstr "複製區塊"
 
-#: ../data/ui/filediff.ui.h:44
-msgid "Save changes to documents before closing?"
-msgstr "在關閉前將變更儲存到文件嗎？"
+#: meld/resources/ui/filediff-actions.ui:87
+msgid "Delete change"
+msgstr "刪除變更"
 
-#: ../data/ui/filediff.ui.h:45
-msgid "If you don’t save, changes will be permanently lost."
-msgstr "如果您不儲存，變更將永久遺失。"
+#: meld/resources/ui/filediff-menus.ui:7
+msgid "Copy change above the left chunk"
+msgstr "從左側區塊上方複製變更"
 
-#: ../data/ui/filediff.ui.h:46
-msgid "Close _without Saving"
-msgstr "關閉但不儲存(_W)"
+#: meld/resources/ui/filediff-menus.ui:11
+msgid "Copy change below the left chunk"
+msgstr "從左側區塊下方複製變更"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/filediff.py:1598
-#: ../meld/iohelpers.py:50 ../meld/iohelpers.py:100
-msgid "_Cancel"
-msgstr "取消(_C)"
+#: meld/resources/ui/filediff-menus.ui:15
+msgid "Copy change above the right chunk"
+msgstr "從右側區塊上方複製變更"
 
-#: ../data/ui/filediff.ui.h:48
-msgid "_Save"
-msgstr "儲存(_S)"
+#: meld/resources/ui/filediff-menus.ui:19
+msgid "Copy change below the right chunk"
+msgstr "從右側區塊下方複製變更"
+
+#: meld/resources/ui/filediff-menus.ui:28
+msgid "_Undo"
+msgstr "復原(_U)"
+
+#: meld/resources/ui/filediff-menus.ui:32
+msgid "_Redo"
+msgstr "重做(_R)"
 
-#: ../data/ui/filediff.ui.h:49
+#: meld/resources/ui/filediff-menus.ui:39
+msgid "Cu_t"
+msgstr "剪下(_T)"
+
+#: meld/resources/ui/filediff-menus.ui:43
+msgid "_Copy"
+msgstr "複製(_C)"
+
+#: meld/resources/ui/filediff-menus.ui:47
+msgid "_Paste"
+msgstr "貼上(_P)"
+
+#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
+#: meld/resources/ui/filediff.ui:171
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -870,235 +1043,318 @@ msgstr ""
 "無法寫入此檔案。您可以點擊此處解鎖此檔案並強制變更，但是這些變更只能儲存到一"
 "個新檔案中。"
 
-#: ../data/ui/filediff.ui.h:50
+#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
+#: meld/resources/ui/filediff.ui:185
+msgid "Open file in this pane"
+msgstr "åœ¨æ­¤çª—æ ¼é–‹å•Ÿæª”æ¡ˆ"
+
+#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
+#: meld/resources/ui/filediff.ui:194
+msgid "Save file in this pane"
+msgstr "å„²å­˜æ­¤çª—æ ¼ä¸­çš„æª”æ¡ˆ"
+
+#: meld/resources/ui/filediff.ui:73
 msgid "File 3"
 msgstr "檔案 3"
 
-#: ../data/ui/filediff.ui.h:51
+#: meld/resources/ui/filediff.ui:142
 msgid "File 2"
 msgstr "檔案 2"
 
-#: ../data/ui/filediff.ui.h:52
+#: meld/resources/ui/filediff.ui:207
 msgid "File 1"
 msgstr "檔案 1"
 
-#: ../data/ui/filediff.ui.h:53
-msgid "Discard unsaved changes to documents?"
-msgstr "捨棄對文件未儲存的變更嗎？"
-
-#: ../data/ui/filediff.ui.h:54
-msgid "Changes made to the following documents will be permanently lost:"
-msgstr "對下列文件的變更將永久遺失："
-
-#: ../data/ui/filediff.ui.h:55
-msgid "_Discard"
-msgstr "捨棄(_D)"
-
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:101
-msgid "_Replace"
-msgstr "取代(_R)"
-
-#: ../data/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "全部取代(_A)"
+#. Create icon and filename CellRenderer
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
+#: meld/dirdiff.py:509
+msgid "Name"
+msgstr "過濾器名稱"
 
-#: ../data/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "上一個(_P)"
+#: meld/resources/ui/filter-list.ui:68
+msgid "Pattern"
+msgstr "比對式樣"
 
-#: ../data/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "下一個(_N)"
+#: meld/resources/ui/filter-list.ui:110
+msgid "Add new filter"
+msgstr "åŠ å…¥æ–°éŽæ¿¾å™¨"
 
-#: ../data/ui/findbar.ui.h:5
-msgid "Find:"
-msgstr "尋找："
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
+msgid "_Add"
+msgstr "åŠ å…¥(_A)"
 
-#: ../data/ui/findbar.ui.h:6
-msgid "Replace _with:"
-msgstr "取代成(_W)："
+#: meld/resources/ui/filter-list.ui:126
+msgid "Remove selected filter"
+msgstr "移除選擇的過濾器"
 
-#: ../data/ui/findbar.ui.h:7
+#: meld/resources/ui/findbar.ui:103
 msgid "_Match case"
 msgstr "符合大小寫(_M)"
 
-#: ../data/ui/findbar.ui.h:8
+#: meld/resources/ui/findbar.ui:119
 msgid "Who_le word"
 msgstr "完整單字(_L)"
 
-#: ../data/ui/findbar.ui.h:9
+#: meld/resources/ui/findbar.ui:135
 msgid "Regular e_xpression"
 msgstr "正規表示式(_X)"
 
-#: ../data/ui/findbar.ui.h:10
+#: meld/resources/ui/findbar.ui:175
 msgid "Wrapped"
 msgstr "自動換列"
 
-#: ../data/ui/language-selector.ui.h:1
+#: meld/resources/ui/findbar.ui:193
+msgid "Replace _All"
+msgstr "全部取代(_A)"
+
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1042 meld/iohelpers.py:115
+msgid "_Replace"
+msgstr "取代(_R)"
+
+#: meld/resources/ui/findbar.ui:226
+msgid "Switch between Find and Find-and-Replace"
+msgstr "在「尋找」和「尋找與取代」之間切換"
+
+#: meld/resources/ui/language-selector.ui:31
 msgid "Search highlight mode…"
 msgstr "搜尋標示模式…"
 
-#: ../data/ui/patch-dialog.ui.h:1
+#: meld/resources/ui/new-diff-tab.ui:119 meld/meldwindow.py:345
+#: meld/newdifftab.py:49
+msgid "New comparison"
+msgstr "新的比對"
+
+#: meld/resources/ui/new-diff-tab.ui:171
+msgid "File"
+msgstr "檔案"
+
+#: meld/resources/ui/new-diff-tab.ui:220
+msgid "Folder"
+msgstr "資料夾"
+
+#: meld/resources/ui/new-diff-tab.ui:269
+msgid "Version control"
+msgstr "版本控制"
+
+#: meld/resources/ui/new-diff-tab.ui:334 meld/resources/ui/new-diff-tab.ui:454
+msgid "_3-way comparison"
+msgstr "_3 向比對"
+
+#: meld/resources/ui/new-diff-tab.ui:353
+msgid "Select First File"
+msgstr "選擇第一個檔案"
+
+#: meld/resources/ui/new-diff-tab.ui:367
+msgid "Select Second File"
+msgstr "選擇第二個檔案"
+
+#: meld/resources/ui/new-diff-tab.ui:383
+msgid "Select Third File"
+msgstr "選擇第三個檔案"
+
+#: meld/resources/ui/new-diff-tab.ui:418
+msgid "Select First Folder"
+msgstr "選擇第一個資料夾"
+
+#: meld/resources/ui/new-diff-tab.ui:431
+msgid "Select Second Folder"
+msgstr "選擇第二個資料夾"
+
+#: meld/resources/ui/new-diff-tab.ui:445
+msgid "Select Third Folder"
+msgstr "選擇第三個資料夾"
+
+#: meld/resources/ui/new-diff-tab.ui:495
+msgid "Select A Version-Controlled Folder"
+msgstr "選擇版本控制資料夾"
+
+#: meld/resources/ui/new-diff-tab.ui:544
+msgid "_Blank comparison"
+msgstr "空白比對(_B)"
+
+#: meld/resources/ui/new-diff-tab.ui:561
+msgid "C_ompare"
+msgstr "比對(_O)"
+
+#: meld/resources/ui/notebook-label.ui:24
+msgid "Close Tab"
+msgstr "é—œé–‰åˆ†é "
+
+#: meld/resources/ui/patch-dialog.ui:9
 msgid "Format as Patch"
 msgstr "æ ¼å¼åŒ–ç‚ºä¿®æ­£æª”"
 
-#: ../data/ui/patch-dialog.ui.h:2
+#: meld/resources/ui/patch-dialog.ui:26
 msgid "Copy to Clipboard"
 msgstr "複製到剪貼薄"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152
+#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
 msgid "Save Patch"
 msgstr "儲存修正檔"
 
-#: ../data/ui/patch-dialog.ui.h:4
+#: meld/resources/ui/patch-dialog.ui:88
 msgid "Use differences between:"
 msgstr "使用兩者之不同："
 
-#: ../data/ui/patch-dialog.ui.h:5
+#: meld/resources/ui/patch-dialog.ui:105
 msgid "Left and middle panes"
 msgstr "å·¦å´å’Œä¸­é–“çª—æ ¼"
 
-#: ../data/ui/patch-dialog.ui.h:6
+#: meld/resources/ui/patch-dialog.ui:123
 msgid "Middle and right panes"
 msgstr "ä¸­é–“å’Œå³å´çª—æ ¼"
 
-#: ../data/ui/patch-dialog.ui.h:7
+#: meld/resources/ui/patch-dialog.ui:149
 msgid "_Reverse patch direction"
 msgstr "反轉修正方向(_R)"
 
-#: ../data/ui/preferences.ui.h:1
-msgid "Meld Preferences"
-msgstr "Meld 偏好設定"
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
+msgid "Preferences"
+msgstr "偏好設定"
 
-#: ../data/ui/preferences.ui.h:2
+#: meld/resources/ui/preferences.ui:75
 msgid "Font"
 msgstr "å­—åž‹"
 
-#: ../data/ui/preferences.ui.h:3
+#: meld/resources/ui/preferences.ui:112
 msgid "_Use the system fixed width font"
 msgstr "使用系統固定寬度字型(_U)"
 
-#: ../data/ui/preferences.ui.h:4
+#: meld/resources/ui/preferences.ui:136
 msgid "_Editor font:"
 msgstr "編輯器字型(_E)："
 
-#: ../data/ui/preferences.ui.h:5
+#. TRANSLATORS: This is the status bar label for a group of settings,
+#. such as text wrapping, show line numbers, whitespace, etc.
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:288
 msgid "Display"
 msgstr "顯示"
 
-#: ../data/ui/preferences.ui.h:6
+#: meld/resources/ui/preferences.ui:241
 msgid "_Tab width:"
 msgstr "Tab 寬度(_T)："
 
-#: ../data/ui/preferences.ui.h:7
+#: meld/resources/ui/preferences.ui:274
 msgid "_Insert spaces instead of tabs"
 msgstr "ç”¨ç©ºæ ¼æ›¿æ› Tab(_I)"
 
-#: ../data/ui/preferences.ui.h:8
+#: meld/resources/ui/preferences.ui:290
 msgid "Enable text _wrapping"
 msgstr "啟用文字自動換列(_W)"
 
-#: ../data/ui/preferences.ui.h:9
+#: meld/resources/ui/preferences.ui:312
 msgid "Do not _split words over two lines"
 msgstr "不要將一個單字拆成兩列(_S)"
 
-#: ../data/ui/preferences.ui.h:10
+#: meld/resources/ui/preferences.ui:333
 msgid "Highlight _current line"
 msgstr "標示目前的列(_C)"
 
-#: ../data/ui/preferences.ui.h:11
+#: meld/resources/ui/preferences.ui:349
 msgid "Show _line numbers"
 msgstr "顯示列號(_L)"
 
-#: ../data/ui/preferences.ui.h:12
+#: meld/resources/ui/preferences.ui:365
 msgid "Show w_hitespace"
 msgstr "顯示空白字元(_H)"
 
-#: ../data/ui/preferences.ui.h:13
+#: meld/resources/ui/preferences.ui:381
 msgid "Use s_yntax highlighting"
 msgstr "使用語法標示(_Y)"
 
-#: ../data/ui/preferences.ui.h:14
+#: meld/resources/ui/preferences.ui:404
 msgid "Syntax highlighting color scheme:"
 msgstr "語法標示功能的配色方案："
 
-#: ../data/ui/preferences.ui.h:15
+#: meld/resources/ui/preferences.ui:469
+msgid "Code Overview"
+msgstr "程式碼概觀"
+
+#: meld/resources/ui/preferences.ui:506
+msgid "Show overview map"
+msgstr "顯示概觀地圖"
+
+#: meld/resources/ui/preferences.ui:529
+msgid "Overview map style:"
+msgstr "概觀地圖樣式："
+
+#: meld/resources/ui/preferences.ui:596
 msgid "External Editor"
 msgstr "外部編輯器"
 
-#: ../data/ui/preferences.ui.h:16
+#: meld/resources/ui/preferences.ui:632
 msgid "Use _default system editor"
 msgstr "ä½¿ç”¨é è¨­ç³»çµ±ç·¨è¼¯å™¨(_D)"
 
-#: ../data/ui/preferences.ui.h:17
+#: meld/resources/ui/preferences.ui:655
 msgid "Edito_r command:"
 msgstr "編輯器指令(_R)："
 
-#: ../data/ui/preferences.ui.h:18
+#: meld/resources/ui/preferences.ui:711
 msgid "Editor"
 msgstr "編輯器"
 
-#: ../data/ui/preferences.ui.h:19
+#: meld/resources/ui/preferences.ui:732
 msgid "Shallow Comparison"
 msgstr "粗淺比對"
 
-#: ../data/ui/preferences.ui.h:20
+#: meld/resources/ui/preferences.ui:768
 msgid "C_ompare files based only on size and timestamp"
 msgstr "只按照大小和時間戳記比對檔案(_O)"
 
-#: ../data/ui/preferences.ui.h:21
+#: meld/resources/ui/preferences.ui:791
 msgid "_Timestamp resolution:"
 msgstr "時間戳精細度(_T)："
 
-#: ../data/ui/preferences.ui.h:23
+#: meld/resources/ui/preferences.ui:855
 msgid "Note: enabling text filters may make comparing large files much slower"
 msgstr "注意：啟用文字過濾器可能使比對大檔案大幅變慢"
 
-#: ../data/ui/preferences.ui.h:24
+#: meld/resources/ui/preferences.ui:904
 msgid "Symbolic Links"
 msgstr "符號連結"
 
-#: ../data/ui/preferences.ui.h:26
+#: meld/resources/ui/preferences.ui:972
 msgid "Visible Columns"
 msgstr "可見欄位"
 
-#: ../data/ui/preferences.ui.h:27
+#: meld/resources/ui/preferences.ui:1039
 msgid "Folder Comparisons"
 msgstr "資料夾比對"
 
-#: ../data/ui/preferences.ui.h:28
+#: meld/resources/ui/preferences.ui:1061
 msgid "Version Comparisons"
 msgstr "版本比對"
 
-#: ../data/ui/preferences.ui.h:29
+#: meld/resources/ui/preferences.ui:1104
 msgid "_Order when comparing file revisions:"
 msgstr "æ¯”å°æª”æ¡ˆä¿®è¨‚ç‰ˆæ™‚çš„é †åº(_O)："
 
-#: ../data/ui/preferences.ui.h:30
+#: meld/resources/ui/preferences.ui:1151
 msgid "Order when _merging files:"
 msgstr "åˆä½µæª”æ¡ˆæ™‚çš„é †åº(_M)："
 
-#: ../data/ui/preferences.ui.h:31
+#: meld/resources/ui/preferences.ui:1219
 msgid "Commit Messages"
 msgstr "提交訊息"
 
-#: ../data/ui/preferences.ui.h:32
+#: meld/resources/ui/preferences.ui:1260
 msgid "Show _right margin at:"
 msgstr "顯示右側邊界的位置(_R)："
 
-#: ../data/ui/preferences.ui.h:33
+#: meld/resources/ui/preferences.ui:1301
 msgid "Automatically _break lines at right margin on commit"
 msgstr "提交時自動在右側邊界處斷列(_B)"
 
-#: ../data/ui/preferences.ui.h:34
+#: meld/resources/ui/preferences.ui:1351
 msgid "Version Control"
 msgstr "版本控制"
 
-#: ../data/ui/preferences.ui.h:35
+#: meld/resources/ui/preferences.ui:1373
 msgid "Filename filters"
 msgstr "檔案名稱過濾器"
 
-#: ../data/ui/preferences.ui.h:36
+#: meld/resources/ui/preferences.ui:1411
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -1107,23 +1363,19 @@ msgstr ""
 "當進行資料夾比對時，您可以使用名稱把某些檔案及資料夾過濾掉。每個比對式樣都是 "
 "shell å½¢å¼çš„è¬ç”¨å­—å…ƒæ¸…å–®ï¼Œä»¥ç©ºæ ¼åˆ†é–‹ã€‚"
 
-#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105
-msgid "File Filters"
-msgstr "檔案過濾器"
-
-#: ../data/ui/preferences.ui.h:38
+#: meld/resources/ui/preferences.ui:1478
 msgid "Change trimming"
 msgstr "變更修剪"
 
-#: ../data/ui/preferences.ui.h:39
+#: meld/resources/ui/preferences.ui:1514
 msgid "Trim blank line differences from the start and end of changes"
 msgstr "å¾žè®Šæ›´çš„é–‹é ­å’Œçµå°¾ä¿®å‰ªç©ºåˆ—çš„å·®ç•°"
 
-#: ../data/ui/preferences.ui.h:40
+#: meld/resources/ui/preferences.ui:1558
 msgid "Text filters"
 msgstr "文字過濾器"
 
-#: ../data/ui/preferences.ui.h:41
+#: meld/resources/ui/preferences.ui:1596
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -1135,580 +1387,302 @@ msgstr ""
 "言的正規表示式，會在進行比對前以空字串取代符合的文字。如果表示式包含群組，那"
 "麼只有群組會被取代。請參閱幫助手冊以取得更多資訊。"
 
-#: ../data/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "文字過濾器"
-
-#: ../data/ui/preferences.ui.h:43
+#: meld/resources/ui/preferences.ui:1687
 msgid "Left is remote, right is local"
 msgstr "å·¦å´ç‚ºé ç«¯ï¼Œå³å´ç‚ºæœ¬åœ°"
 
-#: ../data/ui/preferences.ui.h:44
+#: meld/resources/ui/preferences.ui:1691
 msgid "Left is local, right is remote"
 msgstr "å·¦å´ç‚ºæœ¬åœ°ï¼Œå³å´ç‚ºé ç«¯"
 
-#: ../data/ui/preferences.ui.h:45
+#: meld/resources/ui/preferences.ui:1705
+msgid "Simple change map"
+msgstr "簡單變更地圖"
+
+#: meld/resources/ui/preferences.ui:1709
+msgid "Compact source map"
+msgstr "簡潔原始碼地圖"
+
+#: meld/resources/ui/preferences.ui:1713
+msgid "Full source map"
+msgstr "完整原始碼地圖"
+
+#: meld/resources/ui/preferences.ui:1727
 msgid "Remote, merge, local"
 msgstr "é ç«¯ã€åˆä½µã€æœ¬åœ°"
 
-#: ../data/ui/preferences.ui.h:46
+#: meld/resources/ui/preferences.ui:1731
 msgid "Local, merge, remote"
 msgstr "æœ¬åœ°ã€åˆä½µã€é ç«¯"
 
-#: ../data/ui/preferences.ui.h:47
+#: meld/resources/ui/preferences.ui:1753
 msgid "1ns (ext4)"
 msgstr "1奈秒 (ext4)"
 
-#: ../data/ui/preferences.ui.h:48
+#: meld/resources/ui/preferences.ui:1757
 msgid "100ns (NTFS)"
 msgstr "100奈秒 (NTFS)"
 
-#: ../data/ui/preferences.ui.h:49
+#: meld/resources/ui/preferences.ui:1761
 msgid "1s (ext2/ext3)"
 msgstr "1秒 (ext2/ext3)"
 
-#: ../data/ui/preferences.ui.h:50
+#: meld/resources/ui/preferences.ui:1765
 msgid "2s (VFAT)"
 msgstr "2秒 (VFAT標準)"
 
-#: ../data/ui/shortcuts.ui.h:1
-msgctxt "shortcut window"
-msgid "General"
-msgstr "一般"
-
-#: ../data/ui/shortcuts.ui.h:2
-msgctxt "shortcut window"
-msgid "New comparison"
-msgstr "新的比對"
-
-#: ../data/ui/shortcuts.ui.h:3
-msgctxt "shortcut window"
-msgid "Close a comparison"
-msgstr "關閉比對"
-
-#: ../data/ui/shortcuts.ui.h:4
-msgctxt "shortcut window"
-msgid "Quit Meld"
-msgstr "退出 Meld"
-
-#: ../data/ui/shortcuts.ui.h:5
-msgctxt "shortcut window"
-msgid "Stop the current action"
-msgstr "停止目前的動作"
-
-#: ../data/ui/shortcuts.ui.h:6
-msgctxt "shortcut window"
-msgid "Refresh comparison"
-msgstr "重新整理比對"
-
-#: ../data/ui/shortcuts.ui.h:7
-msgctxt "shortcut window"
-msgid "Fullscreen"
-msgstr "全螢幕"
-
-#: ../data/ui/shortcuts.ui.h:8
-msgctxt "shortcut window"
-msgid "Tabs"
-msgstr "åˆ†é "
-
-#: ../data/ui/shortcuts.ui.h:9
-msgctxt "shortcut window"
-msgid "Go to previous tab"
-msgstr "è·³åˆ°ä¸Šä¸€å€‹åˆ†é "
-
-#: ../data/ui/shortcuts.ui.h:10
-msgctxt "shortcut window"
-msgid "Go to next tab"
-msgstr "è·³åˆ°ä¸‹ä¸€å€‹åˆ†é "
-
-#: ../data/ui/shortcuts.ui.h:11
-msgctxt "shortcut window"
-msgid "Switch to tab"
-msgstr "åˆ‡æ›åˆ°åˆ†é "
-
-#: ../data/ui/shortcuts.ui.h:12
-msgctxt "shortcut window"
-msgid "Move tab left"
-msgstr "å·¦ç§»åˆ†é "
-
-#: ../data/ui/shortcuts.ui.h:13
-msgctxt "shortcut window"
-msgid "Move tab right"
-msgstr "å³ç§»åˆ†é "
-
-#: ../data/ui/shortcuts.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "變更"
-
-#: ../data/ui/shortcuts.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "跳到上一個變更"
-
-#: ../data/ui/shortcuts.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "跳到下一個變更"
-
-#: ../data/ui/shortcuts.ui.h:17
-msgctxt "shortcut window"
-msgid "Editing"
-msgstr "編輯"
-
-#: ../data/ui/shortcuts.ui.h:18
-msgctxt "shortcut window"
-msgid "Undo"
-msgstr "復原"
-
-#: ../data/ui/shortcuts.ui.h:19
-msgctxt "shortcut window"
-msgid "Redo"
-msgstr "重做"
-
-#: ../data/ui/shortcuts.ui.h:20
-msgctxt "shortcut window"
-msgid "Cut"
-msgstr "剪下"
-
-#: ../data/ui/shortcuts.ui.h:21
-msgctxt "shortcut window"
-msgid "Copy"
-msgstr "複製"
-
-#: ../data/ui/shortcuts.ui.h:22
-msgctxt "shortcut window"
-msgid "Paste"
-msgstr "貼上"
-
-#: ../data/ui/shortcuts.ui.h:23
-msgctxt "shortcut window"
-msgid "Find"
-msgstr "尋找"
-
-#: ../data/ui/shortcuts.ui.h:24
-msgctxt "shortcut window"
-msgid "Find Next"
-msgstr "尋找下一個"
-
-#: ../data/ui/shortcuts.ui.h:25
-msgctxt "shortcut window"
-msgid "Find Previous"
-msgstr "尋找上一個"
-
-#: ../data/ui/shortcuts.ui.h:26
-msgctxt "shortcut window"
-msgid "Replace"
-msgstr "取代"
-
-#: ../data/ui/shortcuts.ui.h:27
-msgctxt "shortcut window"
-msgid "File comparison"
-msgstr "檔案比對"
-
-#: ../data/ui/shortcuts.ui.h:28
-msgctxt "shortcut window"
-msgid "Save current file"
-msgstr "儲存目前的檔案"
-
-#: ../data/ui/shortcuts.ui.h:29
-msgctxt "shortcut window"
-msgid "Save current file to new path"
-msgstr "儲存目前的檔案到新的路徑"
-
-#: ../data/ui/shortcuts.ui.h:30
-msgctxt "shortcut window"
-msgid "Save all files in comparison"
-msgstr "儲存比對中的所有檔案"
-
-#: ../data/ui/shortcuts.ui.h:31
-msgctxt "shortcut window"
-msgid "Previous conflict"
-msgstr "上一個衝突"
-
-#: ../data/ui/shortcuts.ui.h:32
-msgctxt "shortcut window"
-msgid "Next conflict"
-msgstr "下一個衝突"
-
-#: ../data/ui/shortcuts.ui.h:33
-msgctxt "shortcut window"
-msgid "Push change to left"
-msgstr "推送變更到左側"
-
-#: ../data/ui/shortcuts.ui.h:34
-msgctxt "shortcut window"
-msgid "Push change to right"
-msgstr "推送變更到右側"
-
-#: ../data/ui/shortcuts.ui.h:35
-msgctxt "shortcut window"
-msgid "Pull change from left"
-msgstr "從左側拉取變更"
-
-#: ../data/ui/shortcuts.ui.h:36
-msgctxt "shortcut window"
-msgid "Pull change from right"
-msgstr "從右側拉取變更"
-
-#: ../data/ui/shortcuts.ui.h:37
-msgctxt "shortcut window"
-msgid "Copy change above left"
-msgstr "從左側上方複製變更"
-
-#: ../data/ui/shortcuts.ui.h:38
-msgctxt "shortcut window"
-msgid "Copy change below left"
-msgstr "從左側下方複製變更"
-
-#: ../data/ui/shortcuts.ui.h:39
-msgctxt "shortcut window"
-msgid "Copy change above right"
-msgstr "從右側上方複製變更"
-
-#: ../data/ui/shortcuts.ui.h:40
-msgctxt "shortcut window"
-msgid "Copy change below right"
-msgstr "從右側下方複製變更"
-
-#: ../data/ui/shortcuts.ui.h:41
-msgctxt "shortcut window"
-msgid "Delete change"
-msgstr "刪除變更"
-
-#: ../data/ui/shortcuts.ui.h:42
-msgctxt "shortcut window"
-msgid "Previous comparison pane"
-msgstr "ä¸Šä¸€å€‹æ¯”å°çª—æ ¼"
-
-#: ../data/ui/shortcuts.ui.h:43
-msgctxt "shortcut window"
-msgid "Next comparison pane"
-msgstr "ä¸‹ä¸€å€‹æ¯”å°çª—æ ¼"
-
-#: ../data/ui/shortcuts.ui.h:44
-msgctxt "shortcut window"
-msgid "Folder comparison"
-msgstr "資料夾比對"
+#: meld/resources/ui/push-dialog.ui:9
+msgid "Push local commits to remote?"
+msgstr "推送 (push) æœ¬åœ°æäº¤åˆ°é ç«¯ï¼Ÿ"
 
-#: ../data/ui/shortcuts.ui.h:45
-msgctxt "shortcut window"
-msgid "Copy to left"
-msgstr "複製到左側"
+#: meld/resources/ui/push-dialog.ui:10
+msgid "The commits to be pushed are determined by your version control system."
+msgstr "要推送的提交由您的版本控制系統決定。"
 
-#: ../data/ui/shortcuts.ui.h:46
-msgctxt "shortcut window"
-msgid "Copy to right"
-msgstr "複製到右側"
+#: meld/resources/ui/push-dialog.ui:38
+msgid "_Push commits"
+msgstr "推送提交(_P)"
 
-#: ../data/ui/shortcuts.ui.h:47
-msgctxt "shortcut window"
-msgid "Version control comparison"
-msgstr "版本控制比對"
+#: meld/resources/ui/recent-selector.ui:16
+msgid "Search recent comparisons…"
+msgstr "搜尋最近使用的比對…"
 
-#: ../data/ui/shortcuts.ui.h:48
-msgctxt "shortcut window"
-msgid "Commit to version control"
-msgstr "提交至版本控制"
+#: meld/resources/ui/revert-dialog.ui:9
+msgid "Discard unsaved changes to documents?"
+msgstr "捨棄對文件未儲存的變更嗎？"
 
-#: ../data/ui/shortcuts.ui.h:49
-msgctxt "shortcut window"
-msgid "Show/hide console output"
-msgstr "顯示/隱藏主控台輸出"
+#: meld/resources/ui/revert-dialog.ui:10
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr "對下列文件的變更將永久遺失："
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567
-#: ../meld/newdifftab.py:49
-msgid "New comparison"
-msgstr "新的比對"
+#: meld/resources/ui/revert-dialog.ui:39
+msgid "_Discard"
+msgstr "捨棄(_D)"
 
-#: ../data/ui/tab-placeholder.ui.h:2
-msgid "File comparison"
-msgstr "檔案比對"
+#: meld/resources/ui/save-confirm-dialog.ui:9
+msgid "Save changes to documents before closing?"
+msgstr "在關閉前將變更儲存到文件嗎？"
 
-#: ../data/ui/tab-placeholder.ui.h:3
-msgid "Directory comparison"
-msgstr "資料夾比對"
+#: meld/resources/ui/save-confirm-dialog.ui:10
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "如果您不儲存，變更將永久遺失。"
 
-#: ../data/ui/tab-placeholder.ui.h:4
-msgid "Version control view"
-msgstr "版本控制檢視"
+#: meld/resources/ui/save-confirm-dialog.ui:24
+msgid "Close _without Saving"
+msgstr "關閉但不儲存(_W)"
 
-#: ../data/ui/tab-placeholder.ui.h:5
-msgid "_3-way comparison"
-msgstr "_3 向比對"
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1041
+#: meld/iohelpers.py:56 meld/iohelpers.py:114
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: ../data/ui/tab-placeholder.ui.h:6
-msgid "Select Third File"
-msgstr "選擇第三個檔案"
+#: meld/resources/ui/save-confirm-dialog.ui:52
+msgid "_Save"
+msgstr "儲存(_S)"
 
-#: ../data/ui/tab-placeholder.ui.h:7
-msgid "Select Second File"
-msgstr "選擇第二個檔案"
+#: meld/resources/ui/statusbar-menu.ui:9
+msgid "Show whitespace"
+msgstr "顯示空白字元"
 
-#: ../data/ui/tab-placeholder.ui.h:8
-msgid "Select First File"
-msgstr "選擇第一個檔案"
+#: meld/resources/ui/statusbar-menu.ui:17
+msgid "Text wrapping"
+msgstr "文字自動換列"
 
-#: ../data/ui/tab-placeholder.ui.h:9
-msgid "Select First Folder"
-msgstr "選擇第一個資料夾"
+#: meld/resources/ui/vcview-menus.ui:7
+msgid "_Compare"
+msgstr "比對(_C)"
 
-#: ../data/ui/tab-placeholder.ui.h:10
-msgid "Select Second Folder"
-msgstr "選擇第二個資料夾"
+#: meld/resources/ui/vcview-menus.ui:11
+msgid "Co_mmit…"
+msgstr "提交(_M)…"
 
-#: ../data/ui/tab-placeholder.ui.h:11
-msgid "Select Third Folder"
-msgstr "選擇第三個資料夾"
+#: meld/resources/ui/vcview-menus.ui:15
+msgid "_Update"
+msgstr "æ›´æ–°(_U)"
 
-#: ../data/ui/tab-placeholder.ui.h:12
-msgid "Select A Version-Controlled Folder"
-msgstr "選擇版本控制資料夾"
+#: meld/resources/ui/vcview-menus.ui:30
+msgid "Re_vert"
+msgstr "還原(_V)"
 
-#: ../data/ui/tab-placeholder.ui.h:13
-msgid "_Blank comparison"
-msgstr "空白比對(_B)"
+#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+msgid "Delete"
+msgstr "刪除"
 
-#: ../data/ui/tab-placeholder.ui.h:14
-msgid "C_ompare"
-msgstr "比對(_O)"
+#: meld/resources/ui/vcview-menus.ui:41
+msgid "Mar_k as Resolved"
+msgstr "標記為「已解決」(_K)"
 
-#: ../data/ui/vcview.ui.h:3
-msgid "Co_mmit…"
-msgstr "提交(_M)…"
+#: meld/resources/ui/vcview.ui:73
+msgid "Commit…"
+msgstr "提交…"
 
-#: ../data/ui/vcview.ui.h:4
+#: meld/resources/ui/vcview.ui:74
 msgid "Commit changes to version control"
 msgstr "提交變更至版本控制"
 
-#: ../data/ui/vcview.ui.h:5
-msgid "_Update"
-msgstr "æ›´æ–°(_U)"
+#: meld/resources/ui/vcview.ui:86
+msgid "Update"
+msgstr "æ›´æ–°"
 
-#: ../data/ui/vcview.ui.h:6
+#: meld/resources/ui/vcview.ui:87
 msgid "Update working copy from version control"
 msgstr "從版本控制更新工作副本"
 
-#: ../data/ui/vcview.ui.h:7
-msgid "_Push"
-msgstr "推送(_P)"
+#: meld/resources/ui/vcview.ui:99
+msgid "Push"
+msgstr "推送"
 
-#: ../data/ui/vcview.ui.h:8
+#: meld/resources/ui/vcview.ui:100
 msgid "Push local changes to remote"
 msgstr "推送 (push) æœ¬åœ°è®Šæ›´è‡³é ç«¯"
 
-#: ../data/ui/vcview.ui.h:10
+#: meld/resources/ui/vcview.ui:112
+msgid "Add"
+msgstr "åŠ å…¥"
+
+#: meld/resources/ui/vcview.ui:113
 msgid "Add to version control"
 msgstr "新增到版本控制"
 
-#: ../data/ui/vcview.ui.h:12
-msgid "Remove from version control"
-msgstr "從版本控制中移除"
-
-#: ../data/ui/vcview.ui.h:13
-msgid "Mar_k as Resolved"
-msgstr "標記為「已解決」(_K)"
-
-#: ../data/ui/vcview.ui.h:14
-msgid "Mark as resolved in version control"
-msgstr "在版本控制中標記為「已解決」"
-
-#: ../data/ui/vcview.ui.h:15
-msgid "Re_vert"
-msgstr "還原(_V)"
-
-#: ../data/ui/vcview.ui.h:16
-msgid "Revert working copy to original state"
-msgstr "將工作副本還原為原始狀態"
-
-#: ../data/ui/vcview.ui.h:17
-msgid "Delete from working copy"
-msgstr "從工作副本刪除"
-
-#: ../data/ui/vcview.ui.h:18
-msgid "Console"
-msgstr "主控台"
-
-#: ../data/ui/vcview.ui.h:19
-msgid "Show or hide the version control console output pane"
-msgstr "é¡¯ç¤ºæˆ–éš±è—ç‰ˆæœ¬æŽ§åˆ¶ä¸»æŽ§å°è¼¸å‡ºçª—æ ¼"
-
-#: ../data/ui/vcview.ui.h:20
-msgid "_Flatten"
-msgstr "合併顯示(_F)"
-
-#: ../data/ui/vcview.ui.h:21
-msgid "Flatten directories"
-msgstr "將檔案合併顯示（不顯示資料夾）"
-
-#: ../data/ui/vcview.ui.h:22
-msgid "_Modified"
-msgstr "已修改(_M)"
+#: meld/resources/ui/vcview.ui:125
+msgid "Remove"
+msgstr "移除"
 
-#: ../data/ui/vcview.ui.h:23
-msgid "Show modified files"
-msgstr "顯示已修改檔案"
-
-#: ../data/ui/vcview.ui.h:24
-msgid "_Normal"
-msgstr "正常(_N)"
-
-#: ../data/ui/vcview.ui.h:25
-msgid "Show normal files"
-msgstr "顯示正常檔案"
-
-#: ../data/ui/vcview.ui.h:26
-msgid "Un_versioned"
-msgstr "未版本控制(_V)"
-
-#: ../data/ui/vcview.ui.h:27
-msgid "Show unversioned files"
-msgstr "é¡¯ç¤ºæœªåŠ å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„æª”æ¡ˆ"
-
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
-msgid "Ignored"
-msgstr "已忽略"
-
-#: ../data/ui/vcview.ui.h:29
-msgid "Show ignored files"
-msgstr "顯示已忽略檔案"
+#: meld/resources/ui/vcview.ui:126
+msgid "Remove from version control"
+msgstr "從版本控制中移除"
 
-#: ../data/ui/vcview.ui.h:30
-msgid "Commit"
-msgstr "提交"
+#: meld/resources/ui/vcview.ui:138
+msgid "Mark as Resolved"
+msgstr "標記為「已解決」"
 
-#: ../data/ui/vcview.ui.h:31
-msgid "Commit Files"
-msgstr "提交檔案"
+#: meld/resources/ui/vcview.ui:139
+msgid "Mark as resolved in version control"
+msgstr "在版本控制中標記為「已解決」"
 
-#: ../data/ui/vcview.ui.h:32
-msgid "Log Message"
-msgstr "日誌訊息"
+#: meld/resources/ui/vcview.ui:151
+msgid "Revert"
+msgstr "還原"
 
-#: ../data/ui/vcview.ui.h:33
-msgid "Previous logs:"
-msgstr "前一個日誌："
+#: meld/resources/ui/vcview.ui:152
+msgid "Revert working copy to original state"
+msgstr "將工作副本還原為原始狀態"
 
-#: ../data/ui/vcview.ui.h:34
-msgid "Co_mmit"
-msgstr "提交(_M)"
+#: meld/resources/ui/vcview.ui:165
+msgid "Delete from working copy"
+msgstr "從工作副本刪除"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331
+#: meld/resources/ui/vcview.ui:220 meld/vcview.py:411
 msgid "Location"
 msgstr "位置"
 
-#: ../data/ui/vcview.ui.h:37
+#: meld/resources/ui/vcview.ui:229
 msgid "Status"
 msgstr "狀態"
 
-#: ../data/ui/vcview.ui.h:38
+#: meld/resources/ui/vcview.ui:238
 msgid "Extra"
 msgstr "額外"
 
-#: ../data/ui/vcview.ui.h:39
+#: meld/resources/ui/vcview.ui:270
 msgid "Console output"
 msgstr "主控台輸出"
 
-#: ../data/ui/vcview.ui.h:40
-msgid "Push local commits to remote?"
-msgstr "推送 (push) æœ¬åœ°æäº¤åˆ°é ç«¯ï¼Ÿ"
-
-#: ../data/ui/vcview.ui.h:41
-msgid "The commits to be pushed are determined by your version control system."
-msgstr "要推送的提交由您的版本控制系統決定。"
+#: meld/actiongutter.py:247
+msgid "Copy _up"
+msgstr "複製到上邊(_U)"
 
-#: ../data/ui/vcview.ui.h:42
-msgid "_Push commits"
-msgstr "推送提交(_P)"
+#: meld/actiongutter.py:248
+msgid "Copy _down"
+msgstr "複製到下邊(_D)"
 
-#: ../meld/const.py:12
+#: meld/const.py:30
 msgid "UNIX (LF)"
 msgstr "UNIX (LF)"
 
-#: ../meld/const.py:13
+#: meld/const.py:31
 msgid "DOS/Windows (CR-LF)"
 msgstr "DOS/Windows (CR-LF)"
 
-#: ../meld/const.py:14
+#: meld/const.py:32
 msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:428 ../meld/preferences.py:82
+#: meld/dirdiff.py:530 meld/preferences.py:132
 msgid "Size"
 msgstr "大小"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:436 ../meld/preferences.py:83
+#: meld/dirdiff.py:538 meld/preferences.py:133
 msgid "Modification time"
 msgstr "修改時間"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:444 ../meld/preferences.py:84
+#: meld/dirdiff.py:546 meld/preferences.py:134
 msgid "Permissions"
 msgstr "權限"
 
-#: ../meld/dirdiff.py:575
-#, python-format
-msgid "Hide %s"
-msgstr "隱藏 %s"
-
-#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739
+#: meld/dirdiff.py:769 meld/dirdiff.py:792
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] 正在掃描 %s"
 
-#: ../meld/dirdiff.py:874
+#: meld/dirdiff.py:928
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] 完成"
 
-#: ../meld/dirdiff.py:882
+#: meld/dirdiff.py:935
 msgid "Folders have no differences"
 msgstr "資料夾沒有差異"
 
-#: ../meld/dirdiff.py:884
+#: meld/dirdiff.py:937
 msgid "Contents of scanned files in folders are identical."
 msgstr "資料夾裡掃描的檔案的內容是相同的。"
 
-#: ../meld/dirdiff.py:886
+#: meld/dirdiff.py:939
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr "資料夾裡掃描的檔案似乎是相同的，但是內容沒有被掃描。"
 
-#: ../meld/dirdiff.py:889
+#: meld/dirdiff.py:942
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "檔案過濾器正在使用中，所以並非所有檔案都被掃描。"
 
-#: ../meld/dirdiff.py:891
+#: meld/dirdiff.py:944
 msgid "Text filters are in use and may be masking content differences."
 msgstr "文字過濾器正在使用中，可能會屏蔽內容差異。"
 
-#: ../meld/dirdiff.py:909 ../meld/filediff.py:1491 ../meld/filediff.py:1521
-#: ../meld/filediff.py:1523 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: meld/dirdiff.py:960 meld/filediff.py:1829
+msgid "Hide"
+msgstr "隱藏"
+
+#: meld/dirdiff.py:962 meld/filediff.py:1831 meld/filediff.py:1861
+#: meld/filediff.py:1863 meld/ui/msgarea.py:108 meld/ui/msgarea.py:121
 msgid "Hi_de"
 msgstr "隱藏(_D)"
 
-#: ../meld/dirdiff.py:918
+#: meld/dirdiff.py:971
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "掃描此資料夾時出現多個錯誤"
 
-#: ../meld/dirdiff.py:919
+#: meld/dirdiff.py:972
 msgid "Files with invalid encodings found"
 msgstr "發現檔案使用的編碼不正確"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:921
+#: meld/dirdiff.py:974
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "某些檔案編碼不正確。名稱是這樣的："
 
-#: ../meld/dirdiff.py:923
+#: meld/dirdiff.py:976
 msgid "Files hidden by case insensitive comparison"
 msgstr "å› ä¸å€åˆ†å¤§å°å¯«çš„æ¯”å°è€Œéš±è—çš„æª”æ¡ˆ"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:925
+#: meld/dirdiff.py:978
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1716,17 +1690,17 @@ msgstr ""
 "您在區分大小寫的檔案系統上執行不區分大小寫的比對。此資料夾中的以下檔案是隱藏"
 "的："
 
-#: ../meld/dirdiff.py:936
+#: meld/dirdiff.py:989
 #, python-format
 msgid "“%s” hidden by “%s”"
 msgstr "「%s」被「%s」隱藏"
 
-#: ../meld/dirdiff.py:992
+#: meld/dirdiff.py:1045
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "取代「%s」資料夾？"
 
-#: ../meld/dirdiff.py:994
+#: meld/dirdiff.py:1047
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1735,11 +1709,11 @@ msgstr ""
 "在「%s」中，另一個相同名稱的資料夾已經存在。\n"
 "å¦‚æžœä½ å–ä»£å·²å­˜åœ¨çš„è³‡æ–™å¤¾ï¼Œè£¡é¢çš„æ‰€æœ‰æª”æ¡ˆéƒ½å°‡éºå¤±ã€‚"
 
-#: ../meld/dirdiff.py:1007
+#: meld/dirdiff.py:1060
 msgid "Error copying file"
 msgstr "複製檔案時發生錯誤"
 
-#: ../meld/dirdiff.py:1008
+#: meld/dirdiff.py:1061
 #, python-format
 msgid ""
 "Couldn’t copy %s\n"
@@ -1752,92 +1726,97 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703
+#: meld/dirdiff.py:1086 meld/vcview.py:759
 msgid "Error deleting {}"
 msgstr "刪除 {} 出錯"
 
-#: ../meld/dirdiff.py:1555
+#: meld/dirdiff.py:1579
 msgid "No folder"
 msgstr "無資料夾"
 
-#: ../meld/filediff.py:834
+#: meld/filediff.py:1119
 msgid "Comparison results will be inaccurate"
 msgstr "比對結果可能不準確"
 
-#: ../meld/filediff.py:836
+#: meld/filediff.py:1121
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr "一個過濾器變更了檔案的列數，這不被支援。比對結果可能不準確。"
 
-#: ../meld/filediff.py:893
+#: meld/filediff.py:1193
 msgid "Mark conflict as resolved?"
 msgstr "要把衝突標記為「已解決」嗎？"
 
-#: ../meld/filediff.py:895
+#: meld/filediff.py:1195
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "如果衝突已成功解決，您現在可以將其標記為已解決。"
 
-#: ../meld/filediff.py:897
+#: meld/filediff.py:1197
 msgid "Cancel"
 msgstr "取消"
 
-#: ../meld/filediff.py:898
+#: meld/filediff.py:1198
 msgid "Mark _Resolved"
 msgstr "標記為「已解決」(_R)"
 
-#: ../meld/filediff.py:1206
+#: meld/filediff.py:1523
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "開啟檔案「%s」時發生問題。"
 
-#: ../meld/filediff.py:1214
+#: meld/filediff.py:1531
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "檔案 %s 似乎是二進位檔案。"
 
-#: ../meld/filediff.py:1216
+#: meld/filediff.py:1533
 msgid "Do you want to open the file using the default application?"
 msgstr "ä½ è¦ä½¿ç”¨é è¨­ç¨‹å¼é–‹å•Ÿæª”æ¡ˆå—Žï¼Ÿ"
 
-#: ../meld/filediff.py:1218
+#: meld/filediff.py:1535
 msgid "Open"
 msgstr "é–‹å•Ÿ"
 
-#: ../meld/filediff.py:1234
+#: meld/filediff.py:1549
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] 正在合併檔案"
+
+#: meld/filediff.py:1563
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] 正在計算差異"
 
-#: ../meld/filediff.py:1295
+#: meld/filediff.py:1624
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "在碟上的 %s 檔案已變更"
 
-#: ../meld/filediff.py:1296
+#: meld/filediff.py:1625
 msgid "Do you want to reload the file?"
 msgstr "ä½ è¦é‡æ–°è¼‰å…¥è©²æª”æ¡ˆå—Žï¼Ÿ"
 
-#: ../meld/filediff.py:1298
+#: meld/filediff.py:1627
 msgid "_Reload"
 msgstr "重新載入(_R)"
 
-#: ../meld/filediff.py:1454
+#: meld/filediff.py:1794
 msgid "Files are identical"
 msgstr "檔案完全相同"
 
-#: ../meld/filediff.py:1467
+#: meld/filediff.py:1807
 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:1472
+#: meld/filediff.py:1812
 msgid "Files differ in line endings only"
 msgstr "檔案只有斷列字元有分別"
 
-#: ../meld/filediff.py:1474
+#: meld/filediff.py:1814
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1846,15 +1825,15 @@ msgstr ""
 "這些檔案只有斷列字元有分別：\n"
 "%s"
 
-#: ../meld/filediff.py:1494
+#: meld/filediff.py:1834
 msgid "Show without filters"
 msgstr "顯示不過濾的結果"
 
-#: ../meld/filediff.py:1516
+#: meld/filediff.py:1856
 msgid "Change highlighting incomplete"
 msgstr "變更標示不完整"
 
-#: ../meld/filediff.py:1517
+#: meld/filediff.py:1857
 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."
@@ -1862,77 +1841,60 @@ msgstr ""
 "æŸäº›è®Šæ›´æ²’æœ‰æ¨™ç¤ºï¼Œå› ç‚ºå¤ªå¤§ã€‚æ‚¨å¯ä»¥å¼·åˆ¶æ¨™ç¤ºé¡¯ç¤ºå¤§å¹…è®Šæ›´ï¼Œç›¡ç®¡é€™å¯èƒ½æœƒè®Šå¾—å¾ˆ"
 "慢。"
 
-#: ../meld/filediff.py:1525
+#: meld/filediff.py:1865
 msgid "Keep highlighting"
 msgstr "保持語法標示"
 
-#: ../meld/filediff.py:1527
+#: meld/filediff.py:1867
 msgid "_Keep highlighting"
 msgstr "保持語法標示(_K)"
 
-#: ../meld/filediff.py:1540
+#: meld/filediff.py:1880
 msgid "Saving failed"
 msgstr "儲存失敗"
 
-#: ../meld/filediff.py:1541
+#: meld/filediff.py:1881
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr "請考慮複製任何重要的變更到另一個程式或檔案，來避免資料遺失。"
 
-#: ../meld/filediff.py:1550
+#: meld/filediff.py:1890
 msgid "Save Left Pane As"
 msgstr "å·¦å´çª—æ ¼å¦å­˜ç‚º"
 
-#: ../meld/filediff.py:1552
+#: meld/filediff.py:1892
 msgid "Save Middle Pane As"
 msgstr "ä¸­é–“çª—æ ¼å¦å­˜ç‚º"
 
-#: ../meld/filediff.py:1554
+#: meld/filediff.py:1894
 msgid "Save Right Pane As"
 msgstr "å³å´çª—æ ¼å¦å­˜ç‚º"
 
-#: ../meld/filediff.py:1567
+#: meld/filediff.py:1905
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "在磁碟上的 %s 檔案在開啟之後已變更"
 
-#: ../meld/filediff.py:1569
+#: meld/filediff.py:1907
 msgid "If you save it, any external changes will be lost."
 msgstr "å¦‚æžœä½ å„²å­˜å®ƒï¼Œå¤–éƒ¨çš„è®Šæ›´å°‡éºå¤±ã€‚"
 
-#: ../meld/filediff.py:1572
+#: meld/filediff.py:1910
 msgid "Save Anyway"
 msgstr "依然儲存"
 
-#: ../meld/filediff.py:1573
+#: meld/filediff.py:1911
 msgid "Don’t Save"
 msgstr "不要儲存"
 
-#: ../meld/filediff.py:1599
-msgid "_Save as UTF-8"
-msgstr "以 UTF-8 編碼儲存(_S)"
-
-#: ../meld/filediff.py:1602
-#, python-format
-msgid "Couldn’t encode text as “%s”"
-msgstr "無法以「%s」編碼文字"
-
-#: ../meld/filediff.py:1604
-#, python-format
+#: meld/filediff.py:1953
 msgid ""
-"File “%s” contains characters that can’t be encoded using encoding “%s”.\n"
-"Would you like to save as UTF-8?"
-msgstr ""
-"「%s」檔案包含無法以「%s」編碼的字元。\n"
-"您是否要將其另存為 UTF-8？"
-
-#: ../meld/filediff.py:1644 ../meld/patchdialog.py:130
-#, python-format
-msgid "Could not save file %s."
-msgstr "無法儲存檔案 %s。"
+"File “{}” contains characters that can’t be encoded using its current "
+"encoding “{}”."
+msgstr "「{}」檔案包含無法以「{}」編碼的字元。"
 
-#: ../meld/filediff.py:1645 ../meld/patchdialog.py:131
+#: meld/filediff.py:1957 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1941,11 +1903,20 @@ msgstr ""
 "ç„¡æ³•å„²å­˜æª”æ¡ˆï¼Œå› ç‚ºï¼š\n"
 "%s"
 
-#: ../meld/filediff.py:2020
+#: meld/filediff.py:1961 meld/patchdialog.py:137
+#, python-format
+msgid "Could not save file %s."
+msgstr "無法儲存檔案 %s。"
+
+#: meld/filediff.py:2022
+msgid "Open File"
+msgstr "開啟檔案"
+
+#: meld/filediff.py:2376
 msgid "Live comparison updating disabled"
 msgstr "實時比對更新已停用"
 
-#: ../meld/filediff.py:2021
+#: meld/filediff.py:2377
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1954,45 +1925,32 @@ msgstr ""
 "同步點啟用時實時比對更新會停用。您仍然可以手動重新整理比對。實時更新會在同步"
 "點清除後恢復啟用。"
 
-#: ../meld/filemerge.py:37
-#, python-format
-msgid "[%s] Merging files"
-msgstr "[%s] 正在合併檔案"
-
-#: ../meld/gutterrendererchunk.py:216
-msgid "Copy _up"
-msgstr "複製到上邊(_U)"
-
-#: ../meld/gutterrendererchunk.py:217
-msgid "Copy _down"
-msgstr "複製到下邊(_D)"
-
-#: ../meld/iohelpers.py:35
+#: meld/iohelpers.py:41
 msgid "Deleting remote folders is not supported"
 msgstr "ä¸æ”¯æ´åˆªé™¤é ç«¯è³‡æ–™å¤¾"
 
-#: ../meld/iohelpers.py:37
+#: meld/iohelpers.py:43
 msgid "Not a file or directory"
 msgstr "不是檔案或資料夾"
 
-#: ../meld/iohelpers.py:41
+#: meld/iohelpers.py:47
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr "無法將「{}ã€ä¸Ÿåˆ°åžƒåœ¾ç­’ã€‚ä½ è¦ç«‹åˆ»åˆªé™¤å®ƒå—Žï¼Ÿ"
 
-#: ../meld/iohelpers.py:46
+#: meld/iohelpers.py:52
 msgid "This remote location does not support sending items to the trash."
 msgstr "é€™å€‹é ç«¯ä½ç½®ä¸æ”¯æ´å°‡é …ç›®ä¸Ÿåˆ°åžƒåœ¾ç­’ã€‚"
 
-#: ../meld/iohelpers.py:51
+#: meld/iohelpers.py:57
 msgid "_Delete Permanently"
 msgstr "永久刪除(_D)"
 
-#: ../meld/iohelpers.py:94
+#: meld/iohelpers.py:108
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "取代「%s」檔案？"
 
-#: ../meld/iohelpers.py:96
+#: meld/iohelpers.py:110
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -2001,312 +1959,124 @@ msgstr ""
 "「%s」中已有相同名稱的檔案。\n"
 "若您取代既有的檔案，其內容將會遺失。"
 
-#: ../meld/meldapp.py:179
+#: meld/meldapp.py:179
 msgid "wrong number of arguments supplied to --diff"
 msgstr "提供給 --diff 的參數個數錯誤"
 
-#: ../meld/meldapp.py:184
+#: meld/meldapp.py:184
 msgid "Start with an empty window"
 msgstr "啟動時開啟空白視窗"
 
-#: ../meld/meldapp.py:185 ../meld/meldapp.py:187
+#: meld/meldapp.py:185 meld/meldapp.py:187
 msgid "file"
 msgstr "檔案"
 
-#: ../meld/meldapp.py:185 ../meld/meldapp.py:189
+#: meld/meldapp.py:185 meld/meldapp.py:189
 msgid "folder"
 msgstr "資料夾"
 
-#: ../meld/meldapp.py:186
+#: meld/meldapp.py:186
 msgid "Start a version control comparison"
 msgstr "開始版本控制比對"
 
-#: ../meld/meldapp.py:188
+#: meld/meldapp.py:188
 msgid "Start a 2- or 3-way file comparison"
 msgstr "開始雙向或三向檔案比對"
 
-#: ../meld/meldapp.py:190
+#: meld/meldapp.py:190
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "開始雙向或三向資料夾比對"
 
-#: ../meld/meldapp.py:233
+#: meld/meldapp.py:233
 #, python-format
 msgid "Error: %s\n"
 msgstr "錯誤：%s\n"
 
-#: ../meld/meldapp.py:240
+#: meld/meldapp.py:240
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld 是一個檔案和資料夾比對工具。"
 
-#: ../meld/meldapp.py:244
+#: meld/meldapp.py:244
 msgid "Set label to use instead of file name"
 msgstr "設定標籤來代替檔名"
 
-#: ../meld/meldapp.py:247
+#: meld/meldapp.py:247
 msgid "Open a new tab in an already running instance"
 msgstr "åœ¨å·²ç¶“åŸ·è¡Œçš„å¯¦é«”ä¸­æ‰“é–‹ä¸€å€‹æ–°åˆ†é "
 
-#: ../meld/meldapp.py:250
+#: meld/meldapp.py:250
 msgid "Automatically compare all differing files on startup"
 msgstr "啟動時自動比對所有不同的檔案"
 
-#: ../meld/meldapp.py:253
+#: meld/meldapp.py:253
 msgid "Ignored for compatibility"
 msgstr "為相容性而忽略"
 
-#: ../meld/meldapp.py:257
+#: meld/meldapp.py:257
 msgid "Set the target file for saving a merge result"
 msgstr "設定用於儲存合併結果的目標檔案"
 
-#: ../meld/meldapp.py:260
+#: meld/meldapp.py:260
 msgid "Automatically merge files"
 msgstr "自動合併檔案"
 
-#: ../meld/meldapp.py:264
+#: meld/meldapp.py:264
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "從 Meld 比對檔案載入儲存的比對"
 
-#: ../meld/meldapp.py:268
+#: meld/meldapp.py:268
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "ç‚ºæä¾›çš„æª”æ¡ˆæˆ–è³‡æ–™å¤¾å‰µå»ºå·®ç•°åˆ†é "
 
-#: ../meld/meldapp.py:288
+#: meld/meldapp.py:288
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "參數過多 (需要 0-3 個，已有 %d 個)"
 
-#: ../meld/meldapp.py:291
+#: meld/meldapp.py:291
 msgid "can’t auto-merge less than 3 files"
 msgstr "少於 3 個檔案無法自動合併"
 
-#: ../meld/meldapp.py:293
+#: meld/meldapp.py:293
 msgid "can’t auto-merge directories"
 msgstr "無法自動合併資料夾"
 
-#: ../meld/meldapp.py:307
+#: meld/meldapp.py:308
 msgid "Error reading saved comparison file"
 msgstr "讀取已儲存比對檔案時發生錯誤"
 
-#: ../meld/meldapp.py:324
+#: meld/meldapp.py:325
 #, python-format
 msgid "invalid path or URI “%s”"
 msgstr "無效的路徑或 URI「%s」"
 
-#: ../meld/meldapp.py:330
+#: meld/meldapp.py:331
 msgid "remote folder “{}” not supported"
 msgstr "é ç«¯è³‡æ–™å¤¾ã€Œ{}」不支援"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:124
+#: meld/meldbuffer.py:114
 msgid "<unnamed>"
 msgstr "<無名>"
 
-#: ../meld/melddoc.py:68
+#: meld/melddoc.py:60
 msgid "untitled"
 msgstr "無題"
 
-#: ../meld/meldwindow.py:47
-msgid "_File"
-msgstr "檔案(_F)"
-
-#: ../meld/meldwindow.py:48
-msgid "_New Comparison…"
-msgstr "新的比對(_N)…"
-
-#: ../meld/meldwindow.py:49
-msgid "Start a new comparison"
-msgstr "開始新的比對"
-
-#: ../meld/meldwindow.py:52
-msgid "Save the current file"
-msgstr "儲存目前的檔案"
-
-#: ../meld/meldwindow.py:54
-msgid "Save As…"
-msgstr "另存為…"
-
-#: ../meld/meldwindow.py:55
-msgid "Save the current file with a different name"
-msgstr "以其他名稱儲存目前的檔案"
-
-#: ../meld/meldwindow.py:58
-msgid "Close the current file"
-msgstr "關閉目前的檔案"
-
-#: ../meld/meldwindow.py:61
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../meld/meldwindow.py:63
-msgid "Undo the last action"
-msgstr "復原上一次的動作"
-
-#: ../meld/meldwindow.py:66
-msgid "Redo the last undone action"
-msgstr "重做上一次復原的操作"
-
-#: ../meld/meldwindow.py:68
-msgid "Cut the selection"
-msgstr "剪下選取內容"
-
-#: ../meld/meldwindow.py:70
-msgid "Copy the selection"
-msgstr "複製選取內容"
-
-#: ../meld/meldwindow.py:72
-msgid "Paste the clipboard"
-msgstr "貼上剪貼簿內容"
-
-#: ../meld/meldwindow.py:74
-msgid "Find…"
-msgstr "尋找…"
-
-#: ../meld/meldwindow.py:74
-msgid "Search for text"
-msgstr "搜尋文字"
-
-#: ../meld/meldwindow.py:76
-msgid "Find Ne_xt"
-msgstr "尋找下一個(_X)"
-
-#: ../meld/meldwindow.py:77
-msgid "Search forwards for the same text"
-msgstr "向下尋找相同的文字"
-
-#: ../meld/meldwindow.py:79
-msgid "Find _Previous"
-msgstr "尋找上一個(_P)"
-
-#: ../meld/meldwindow.py:80
-msgid "Search backwards for the same text"
-msgstr "向上尋找相同的文字"
-
-#: ../meld/meldwindow.py:83
-msgid "_Replace…"
-msgstr "取代(_R)…"
-
-#: ../meld/meldwindow.py:84
-msgid "Find and replace text"
-msgstr "尋找並取代文字"
-
-#: ../meld/meldwindow.py:86
-msgid "Go to _Line"
-msgstr "跳到列(_L)"
-
-#: ../meld/meldwindow.py:87
-msgid "Go to a specific line"
-msgstr "跳到特定列"
-
-#: ../meld/meldwindow.py:90
-msgid "_Changes"
-msgstr "變更(_C)"
-
-#: ../meld/meldwindow.py:91
-msgid "Next Change"
-msgstr "下一個變更"
-
-#: ../meld/meldwindow.py:92
-msgid "Go to the next change"
-msgstr "跳到下一個變更"
-
-#: ../meld/meldwindow.py:94
-msgid "Previous Change"
-msgstr "上一個變更"
+#: meld/meldwindow.py:151
+msgid "Filename"
+msgstr "檔案名稱"
 
-#: ../meld/meldwindow.py:95
-msgid "Go to the previous change"
-msgstr "跳到上一個變更"
-
-#: ../meld/meldwindow.py:97
-msgid "Open Externally"
-msgstr "使用外部工具開啟"
-
-#: ../meld/meldwindow.py:98
-msgid "Open selected file or directory in the default external application"
-msgstr "ä½¿ç”¨é è¨­çš„å¤–éƒ¨ç¨‹å¼é–‹å•Ÿé¸å–çš„æª”æ¡ˆæˆ–è³‡æ–™å¤¾"
-
-#: ../meld/meldwindow.py:102
-msgid "_View"
-msgstr "檢視(_V)"
-
-#: ../meld/meldwindow.py:103
-msgid "File Status"
-msgstr "檔案狀態"
-
-#: ../meld/meldwindow.py:104
-msgid "Version Status"
-msgstr "版本狀態"
-
-#: ../meld/meldwindow.py:107
-msgid "Stop the current action"
-msgstr "停止目前的動作"
-
-#: ../meld/meldwindow.py:110
-msgid "Refresh the view"
-msgstr "重新整理檢視"
-
-#: ../meld/meldwindow.py:114
-msgid "Fullscreen"
-msgstr "全螢幕"
-
-#: ../meld/meldwindow.py:115
-msgid "View the comparison in fullscreen"
-msgstr "以全螢幕模式查看比對"
-
-#: ../meld/meldwindow.py:117
-msgid "_Toolbar"
-msgstr "工具列(_T)"
-
-#: ../meld/meldwindow.py:118
-msgid "Show or hide the toolbar"
-msgstr "顯示或隱藏工具列"
-
-#: ../meld/meldwindow.py:127
-msgid "Open Recent"
-msgstr "最近使用"
-
-#: ../meld/meldwindow.py:128
-msgid "Open recent files"
-msgstr "開啟最近使用的檔案"
-
-#: ../meld/meldwindow.py:150
-msgid "_Meld"
-msgstr "_Meld"
-
-#: ../meld/meldwindow.py:151
-msgid "Quit the program"
-msgstr "退出程式"
-
-#: ../meld/meldwindow.py:153
-msgid "Prefere_nces"
-msgstr "偏好設定(_N)"
-
-#: ../meld/meldwindow.py:154
-msgid "Configure the application"
-msgstr "設定程式"
-
-#: ../meld/meldwindow.py:156
-msgid "_Contents"
-msgstr "內容(_C)"
-
-#: ../meld/meldwindow.py:157
-msgid "Open the Meld manual"
-msgstr "打開 Meld 幫助手冊"
-
-#: ../meld/meldwindow.py:159
-msgid "About this application"
-msgstr "關於這個應用程式"
-
-#: ../meld/meldwindow.py:602
+#: meld/meldwindow.py:380
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "需要三個檔案來自動合併，已有：%r"
 
-#: ../meld/meldwindow.py:623
+#: meld/meldwindow.py:402
 msgid "Cannot compare a mixture of files and directories"
 msgstr "無法對檔案和資料夾混合比對"
 
-#: ../meld/misc.py:136
+#: meld/misc.py:150
 msgid ""
 "{}\n"
 "\n"
@@ -2318,243 +2088,577 @@ msgstr ""
 "Meld 執行時遭遇嚴重錯誤：\n"
 "<tt>{}</tt>"
 
-#: ../meld/misc.py:255
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
-msgstr "找不到 %s-%s 的配色方案詳細資料。這個安裝有問題"
-
-#: ../meld/misc.py:326
+#: meld/misc.py:201
 msgid "[None]"
 msgstr "[沒有]"
 
-#: ../meld/preferences.py:33
+#: meld/preferences.py:37 meld/preferences.py:129
 msgid "label"
 msgstr "標籤"
 
-#: ../meld/preferences.py:33
+#: meld/preferences.py:37 meld/preferences.py:129
 msgid "pattern"
 msgstr "式樣"
 
-#: ../meld/recent.py:105
+#: meld/recent.py:104
 msgid "Version control:"
 msgstr "版本控制："
 
-#: ../meld/ui/bufferselectors.py:32
+#: meld/style.py:90
+#, python-format
+msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+msgstr "找不到 %s-%s 的配色方案詳細資料。這個安裝有問題"
+
+#: meld/ui/bufferselectors.py:110
 #, python-brace-format
 msgid "{name} ({charset})"
 msgstr "{name} ({charset})"
 
-#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73
+#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
 msgid "Plain Text"
 msgstr "純文字"
 
-#: ../meld/ui/notebooklabel.py:63
-msgid "Close tab"
-msgstr "é—œé–‰åˆ†é "
+#: meld/ui/filechooser.py:68
+msgid "Autodetect Encoding"
+msgstr "自動偵測編碼"
+
+#: meld/ui/filechooser.py:71
+msgid "Current Locale ({})"
+msgstr "目前地區 ({})"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/ui/statusbar.py:124
+#: meld/ui/statusbar.py:123
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "第 %i 列，第 %i 字"
 
-#: ../meld/ui/statusbar.py:177
+#: meld/ui/statusbar.py:183
 msgid "Line you want to move the cursor to"
 msgstr "ä½ æƒ³è¦æ¸¸æ¨™ç§»å‹•åˆ°çš„åˆ—"
 
-#: ../meld/ui/vcdialogs.py:48
+#: meld/ui/vcdialogs.py:50
 msgid "No files will be committed"
 msgstr "沒有檔案會提交"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:92
+#: meld/vc/git.py:91
 #, python-format
 msgid "%s in %s"
 msgstr "%s，位於 %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:93 ../meld/vc/git.py:100
+#: meld/vc/git.py:92 meld/vc/git.py:99
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d é …æœªæŽ¨é€çš„æäº¤"
 
-#: ../meld/vc/git.py:95
+#: meld/vc/git.py:94
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d 個分支"
 
-#: ../meld/vc/git.py:334
+#: meld/vc/git.py:333
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "模式已從 %s 變更為 %s"
 
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
 msgid "Partially staged"
 msgstr "部分暫存"
 
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
 msgid "Staged"
 msgstr "æš«å­˜"
 
 #. Translators: This is the displayed name of a version control system
 #. when no version control system is actually found.
-#: ../meld/vc/_null.py:37
+#: meld/vc/_null.py:37
 msgid "None"
 msgstr "ç„¡"
 
-#: ../meld/vc/svn.py:203
+#: meld/vc/svn.py:203
 #, python-format
 msgid "Rev %s"
 msgstr "Rev %s"
 
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
 msgid "Merged"
 msgstr "已合併"
 
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
 msgid "Base"
 msgstr "基礎"
 
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
 msgid "Local"
 msgstr "本地"
 
-#: ../meld/vc/_vc.py:54
+#: meld/vc/_vc.py:54
 msgid "Remote"
 msgstr "é ç«¯"
 
-#: ../meld/vc/_vc.py:70
-msgid "Unversioned"
-msgstr "未版本控制"
-
-#: ../meld/vc/_vc.py:73
+#: meld/vc/_vc.py:73
 msgid "Error"
 msgstr "錯誤"
 
-#: ../meld/vc/_vc.py:75
+#: meld/vc/_vc.py:75
 msgid "Newly added"
 msgstr "已新增"
 
-#: ../meld/vc/_vc.py:77
+#: meld/vc/_vc.py:77
 msgid "Renamed"
 msgstr "已重新命名"
 
-#: ../meld/vc/_vc.py:78
+#: meld/vc/_vc.py:78
 msgid "Conflict"
 msgstr "衝突"
 
-#: ../meld/vc/_vc.py:79
+#: meld/vc/_vc.py:79
 msgid "Removed"
 msgstr "已移除"
 
-#: ../meld/vc/_vc.py:80
+#: meld/vc/_vc.py:80
 msgid "Missing"
 msgstr "æ¬ ç¼º"
 
-#: ../meld/vc/_vc.py:81
+#: meld/vc/_vc.py:81
 msgid "Not present"
 msgstr "沒有"
 
+#. Translators: This error message is shown when no
+#. repository of this type is found.
+#: meld/vcview.py:333
+#, python-format
+msgid "%(name)s (not found)"
+msgstr "%(name)s （找不到）"
+
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:248
+#: meld/vcview.py:337
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s（%(cmd)s 未安裝）"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:252
+#: meld/vcview.py:341
 #, python-format
-msgid "%(name)s (Invalid repository)"
-msgstr "%(name)s（無效的倉儲）"
+msgid "%(name)s (invalid repository)"
+msgstr "%(name)s （無效的倉儲）"
 
-#: ../meld/vcview.py:273
+#: meld/vcview.py:355
 msgid "No valid version control system found in this folder"
 msgstr "此資料夾中未找到有效的版本控制系統"
 
-#: ../meld/vcview.py:275
-msgid "Only one version control system found in this folder"
-msgstr "此資料夾中只找到一個版本控制系統"
-
-#: ../meld/vcview.py:277
+#: meld/vcview.py:357
 msgid "Choose which version control system to use"
 msgstr "選擇要使用的版本控制系統"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:331
+#: meld/vcview.py:411
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
-#: ../meld/vcview.py:338
+#: meld/vcview.py:418
 msgid "Scanning repository"
 msgstr "正在掃描倉儲"
 
-#: ../meld/vcview.py:367
+#: meld/vcview.py:447
 #, python-format
 msgid "Scanning %s"
 msgstr "正在掃描 %s"
 
-#: ../meld/vcview.py:406
+#: meld/vcview.py:486
 msgid "(Empty)"
 msgstr "（空白）"
 
-#: ../meld/vcview.py:450
+#: meld/vcview.py:533
 #, python-format
 msgid "%s — local"
 msgstr "%s — 本地"
 
-#: ../meld/vcview.py:451
+#: meld/vcview.py:534
 #, python-format
 msgid "%s — remote"
 msgstr "%s — é ç«¯"
 
-#: ../meld/vcview.py:459
+#: meld/vcview.py:542
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (æœ¬åœ°ã€åˆä½µã€é ç«¯)"
 
-#: ../meld/vcview.py:464
+#: meld/vcview.py:547
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (é ç«¯ã€åˆä½µã€æœ¬åœ°)"
 
-#: ../meld/vcview.py:475
+#: meld/vcview.py:558
 #, python-format
 msgid "%s — repository"
 msgstr "%s — 倉儲"
 
-#: ../meld/vcview.py:481
+#: meld/vcview.py:564
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (作業中、倉儲)"
 
-#: ../meld/vcview.py:485
+#: meld/vcview.py:568
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (倉儲、作業中)"
 
-#: ../meld/vcview.py:674
+#: meld/vcview.py:730
 msgid "Remove folder and all its files?"
 msgstr "移除資料夾及所有包含的檔案？"
 
-#: ../meld/vcview.py:676
+#: meld/vcview.py:732
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr "這將從版本控制中移除所有選取的檔案及資料夾，及選取資料夾中的所有檔案。"
 
-#: ../meld/vcview.py:785
+#: meld/vcview.py:845
 msgid "Clear"
 msgstr "清除"
 
+#~ msgid "Cannot import: "
+#~ msgstr "無法匯入："
+
+#~ msgid "Meld requires %s or higher."
+#~ msgstr "Meld 需要 %s 或以上的版本。"
+
+#~ msgid ""
+#~ "Couldn’t load Meld-specific CSS (%s)\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法載入 Meld 特定的 CSS (%s)\n"
+#~ "%s"
+
+#~ msgid "About Meld"
+#~ msgstr "關於 Meld"
+
+#~ msgid "Website"
+#~ msgstr "網站"
+
+#~ msgid "Meld Diff Viewer"
+#~ msgstr "Meld 差異檢視程式"
+
+#~ msgid "Displayed whitespace"
+#~ msgstr "要顯示的空白字元"
+
+#~ msgid ""
+#~ "Selector for individual whitespace character types to be shown. Possible "
+#~ "values are 'space', 'tab', 'newline' and 'nbsp'."
+#~ msgstr ""
+#~ "要顯示的個別空白字元類型的選擇器。可能的值包括 'space'，'tab'，'newline' "
+#~ "和 'nbsp'。"
+
+#~ msgid "Show toolbar"
+#~ msgstr "顯示工具列"
+
+#~ msgid "If true, the window toolbar is visible."
+#~ msgstr "如果為 True，則顯示視窗工具列。"
+
+#~ msgid "Show statusbar"
+#~ msgstr "顯示狀態列"
+
+#~ msgid "If true, the window statusbar is visible."
+#~ msgstr "如果為 True，則顯示視窗狀態列。"
+
+#~ msgid "Meld base scheme"
+#~ msgstr "Meld 基礎配色方案"
+
+#~ msgid "_About"
+#~ msgstr "關於(_A)"
+
+#~ msgid "_Quit"
+#~ msgstr "退出(_Q)"
+
+#~ msgid "Collapse selected folder and all subfolders"
+#~ msgstr "摺疊選取的資料夾及所有子資料夾"
+
+#~ msgid "Expand selected folder and all subfolders"
+#~ msgstr "展開選取的資料夾及所有子資料夾"
+
+#~ msgid "Copy to _Left"
+#~ msgstr "複製到左側(_L)"
+
+#~ msgid "Copy to _Right"
+#~ msgstr "複製到右側(_R)"
+
+#~ msgid "Hide selected"
+#~ msgstr "隱藏所選內容"
+
+#~ msgid ""
+#~ "Consider differently-cased filenames that are otherwise-identical to be "
+#~ "the same"
+#~ msgstr "將除了大小寫不同、其他完全一致的檔案名稱視為相同"
+
+#~ msgid "Show identical"
+#~ msgstr "顯示相同處"
+
+#~ msgid "Show new"
+#~ msgstr "顯示新增處"
+
+#~ msgid "Show modified"
+#~ msgstr "顯示修改處"
+
+#~ msgid "Filters"
+#~ msgstr "過濾器"
+
+#~ msgid "Set active filters"
+#~ msgstr "設定啟用的過濾器"
+
+#~ msgid "Editable List"
+#~ msgstr "可編輯的清單"
+
+#~ msgid "Create a patch using differences between files"
+#~ msgstr "使用檔案之間的差異建立修正檔"
+
+#~ msgid "Save all files in the current comparison"
+#~ msgstr "儲存目前比對中的所有檔案"
+
+#~ msgid "Revert files to their saved versions"
+#~ msgstr "將檔案還原為儲存的版本"
+
+#~ msgid "Add a synchronization point for changes between files"
+#~ msgstr "åŠ å…¥ä¸€å€‹æª”æ¡ˆå·®ç•°åŒæ­¥é»ž"
+
+#~ msgid "Clear sychronization points for changes between files"
+#~ msgstr "清除檔案差異同步點"
+
+#~ msgid "Previous Conflict"
+#~ msgstr "上一個衝突"
+
+#~ msgid "Next Conflict"
+#~ msgstr "下一個衝突"
+
+#~ msgid "Push to Left"
+#~ msgstr "推送到左側"
+
+#~ msgid "Push to Right"
+#~ msgstr "推送到右側"
+
+#~ msgid "Pull from Left"
+#~ msgstr "從左側拉取"
+
+#~ msgid "Pull change from the left"
+#~ msgstr "從左側拉取變更"
+
+#~ msgid "Pull from Right"
+#~ msgstr "從右側拉取"
+
+#~ msgid "Pull change from the right"
+#~ msgstr "從右側拉取變更"
+
+#~ msgid "Copy Above Left"
+#~ msgstr "複製左側上方"
+
+#~ msgid "Copy Below Left"
+#~ msgstr "複製左側下方"
+
+#~ msgid "Copy Above Right"
+#~ msgstr "複製右側上方"
+
+#~ msgid "Copy Below Right"
+#~ msgstr "複製右側下方"
+
+#~ msgid "Merge all non-conflicting changes from the left"
+#~ msgstr "從左側合併所有非衝突的變更"
+
+#~ msgid "Merge all non-conflicting changes from the right"
+#~ msgstr "從右側合併所有非衝突的變更"
+
+#~ msgid "Merge all non-conflicting changes from left and right panes"
+#~ msgstr "å¾žå·¦å´å’Œå³å´çª—æ ¼åˆä½µæ‰€æœ‰éžè¡çªçš„è®Šæ›´"
+
+#~ msgid "Previous Pane"
+#~ msgstr "ä¸Šä¸€å€‹çª—æ ¼"
+
+#~ msgid "Move keyboard focus to the previous document in this comparison"
+#~ msgstr "將鍵盤焦點轉移到比對的上一個文件"
+
+#~ msgid "Next Pane"
+#~ msgstr "ä¸‹ä¸€å€‹çª—æ ¼"
+
+#~ msgid "Move keyboard focus to the next document in this comparison"
+#~ msgstr "將鍵盤焦點轉移到比對的下一個文件"
+
+#~ msgid "Lock scrolling of all panes"
+#~ msgstr "éŽ–å®šæ‰€æœ‰çª—æ ¼çš„æ»¾å‹•"
+
+#~ msgid "_Previous"
+#~ msgstr "上一個(_P)"
+
+#~ msgid "_Next"
+#~ msgstr "下一個(_N)"
+
+#~ msgid "Find:"
+#~ msgstr "尋找："
+
+#~ msgid "Replace _with:"
+#~ msgstr "取代成(_W)："
+
+#~ msgid "Meld Preferences"
+#~ msgstr "Meld 偏好設定"
+
+#~ msgid "File comparison"
+#~ msgstr "檔案比對"
+
+#~ msgid "Directory comparison"
+#~ msgstr "資料夾比對"
+
+#~ msgid "Version control view"
+#~ msgstr "版本控制檢視"
+
+#~ msgid "Console"
+#~ msgstr "主控台"
+
+#~ msgid "Show or hide the version control console output pane"
+#~ msgstr "é¡¯ç¤ºæˆ–éš±è—ç‰ˆæœ¬æŽ§åˆ¶ä¸»æŽ§å°è¼¸å‡ºçª—æ ¼"
+
+#~ msgid "_Flatten"
+#~ msgstr "合併顯示(_F)"
+
+#~ msgid "_Modified"
+#~ msgstr "已修改(_M)"
+
+#~ msgid "Show modified files"
+#~ msgstr "顯示已修改檔案"
+
+#~ msgid "Show normal files"
+#~ msgstr "顯示正常檔案"
+
+#~ msgid "Un_versioned"
+#~ msgstr "未版本控制(_V)"
+
+#~ msgid "Show unversioned files"
+#~ msgstr "é¡¯ç¤ºæœªåŠ å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„æª”æ¡ˆ"
+
+#~ msgid "Show ignored files"
+#~ msgstr "顯示已忽略檔案"
+
+#~ msgid "Hide %s"
+#~ msgstr "隱藏 %s"
+
+#~ msgid "_Save as UTF-8"
+#~ msgstr "以 UTF-8 編碼儲存(_S)"
+
+#~ msgid "Couldn’t encode text as “%s”"
+#~ msgstr "無法以「%s」編碼文字"
+
+#~ msgid "_New Comparison…"
+#~ msgstr "新的比對(_N)…"
+
+#~ msgid "Save the current file"
+#~ msgstr "儲存目前的檔案"
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "以其他名稱儲存目前的檔案"
+
+#~ msgid "Close the current file"
+#~ msgstr "關閉目前的檔案"
+
+#~ msgid "_Edit"
+#~ msgstr "編輯(_E)"
+
+#~ msgid "Undo the last action"
+#~ msgstr "復原上一次的動作"
+
+#~ msgid "Redo the last undone action"
+#~ msgstr "重做上一次復原的操作"
+
+#~ msgid "Cut the selection"
+#~ msgstr "剪下選取內容"
+
+#~ msgid "Copy the selection"
+#~ msgstr "複製選取內容"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "貼上剪貼簿內容"
+
+#~ msgid "Search for text"
+#~ msgstr "搜尋文字"
+
+#~ msgid "Find Ne_xt"
+#~ msgstr "尋找下一個(_X)"
+
+#~ msgid "Search forwards for the same text"
+#~ msgstr "向下尋找相同的文字"
+
+#~ msgid "Find _Previous"
+#~ msgstr "尋找上一個(_P)"
+
+#~ msgid "Search backwards for the same text"
+#~ msgstr "向上尋找相同的文字"
+
+#~ msgid "Find and replace text"
+#~ msgstr "尋找並取代文字"
+
+#~ msgid "Go to _Line"
+#~ msgstr "跳到列(_L)"
+
+#~ msgid "Go to a specific line"
+#~ msgstr "跳到特定列"
+
+#~ msgid "_Changes"
+#~ msgstr "變更(_C)"
+
+#~ msgid "Next Change"
+#~ msgstr "下一個變更"
+
+#~ msgid "Previous Change"
+#~ msgstr "上一個變更"
+
+#~ msgid "Open selected file or directory in the default external application"
+#~ msgstr "ä½¿ç”¨é è¨­çš„å¤–éƒ¨ç¨‹å¼é–‹å•Ÿé¸å–çš„æª”æ¡ˆæˆ–è³‡æ–™å¤¾"
+
+#~ msgid "Stop the current action"
+#~ msgstr "停止目前的動作"
+
+#~ msgid "View the comparison in fullscreen"
+#~ msgstr "以全螢幕模式查看比對"
+
+#~ msgid "_Toolbar"
+#~ msgstr "工具列(_T)"
+
+#~ msgid "Show or hide the toolbar"
+#~ msgstr "顯示或隱藏工具列"
+
+#~ msgid "Open Recent"
+#~ msgstr "最近使用"
+
+#~ msgid "_Meld"
+#~ msgstr "_Meld"
+
+#~ msgid "Quit the program"
+#~ msgstr "退出程式"
+
+#~ msgid "Prefere_nces"
+#~ msgstr "偏好設定(_N)"
+
+#~ msgid "Configure the application"
+#~ msgstr "設定程式"
+
+#~ msgid "_Contents"
+#~ msgstr "內容(_C)"
+
+#~ msgid "Open the Meld manual"
+#~ msgstr "打開 Meld 幫助手冊"
+
+#~ msgid "About this application"
+#~ msgstr "關於這個應用程式"
+
+#~ msgid "Only one version control system found in this folder"
+#~ msgstr "此資料夾中只找到一個版本控制系統"
+
 #~ msgid "Meld does not support Python 3."
 #~ msgstr "Meld 並未支援 Python 3。"