[meld] Updated Chinese (Taiwan) translation

From: Damned-Lies <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Chinese (Taiwan) translation
Date: Fri, 13 Mar 2015 12:34:06 +0000 (UTC)
commit ed36aea0722374ccf27c26d3cceabb9fca4f0eb8
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Fri Mar 13 12:34:01 2015 +0000

    Updated Chinese (Taiwan) translation

 po/zh_TW.po | 2828 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 1963 insertions(+), 865 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e3db780..4273887 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,1164 +1,2262 @@
 # Traditional Chinese translation of meld.
 # Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the meld package.
 # Woodman Tuen <wmtuen gmail com>, 2005.
-# 
-# 
+# Funda Wang <fundawang linux net cn>, 2004, 2005.
+# Careone <careoneagain gmail com>, 2009.
+# arccos <boyermoore gmail com>, 2009.
+# 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
 msgid ""
 msgstr ""
-"Project-Id-Version: meld 0.9\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-26 20:03+0000\n"
-"PO-Revision-Date: 2005-06-25 20:32+0800\n"
-"Last-Translator: Woodman Tuen <wmtuen gmail com>\n"
-"Language-Team: Chinese/Traditional <zh-l10n linux org tw>\n"
+"Project-Id-Version: meld master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=meld&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-03-10 23:05+0000\n"
+"PO-Revision-Date: 2015-03-13 20:32+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 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 1.7.1\n"
+"X-Project-Style: gnome\n"
+"X-Source-Language: C\n"
 
-#: ../meld.desktop.in.h:1
-msgid "Compare and merge your files."
-msgstr "比較及合併您的檔案。"
+#: ../bin/meld:144
+msgid "Cannot import: "
+msgstr "無法匯入："
 
-#: ../meld.desktop.in.h:2
+#: ../bin/meld:147
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Meld 需要 %s 或以上的版本。"
+
+#: ../bin/meld:151
+msgid "Meld does not support Python 3."
+msgstr "Meld 並未支援 Python 3。"
+
+#: ../bin/meld:201
+#, c-format
+msgid ""
+"Couldn't load Meld-specific CSS (%s)\n"
+"%s"
+msgstr ""
+"無法載入與 Meld 的特定 CSS (%s)\n"
+"%s"
+
+#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "Meld"
+
+#: ../data/meld.desktop.in.h:2
+msgid "Diff Viewer"
+msgstr "Diff 檢視程式"
+
+#: ../data/meld.desktop.in.h:3
 msgid "Meld Diff Viewer"
-msgstr "Meld Diff 顯示程式"
+msgstr "Meld Diff 檢視程式"
 
-#. These are the possible states of files. Be sure to get the colons correct.
-#: ../cvsview.py:41
+#: ../data/meld.desktop.in.h:4
+msgid "Compare and merge your files"
+msgstr "比對及合併您的檔案"
+
+#: ../data/meld.appdata.xml.in.h:1
 msgid ""
-"Ignored:Non CVS:::Error::Newly added:Modified:<b>Conflict</b>:Removed:Missing"
-msgstr "已忽略:非 CVS:::錯誤::新加入:已修改:<b>衝突</b>:已移除:遺漏"
+"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
+"compare files, directories, and version controlled projects. It provides "
+"two- and three-way comparison of both files and directories, and supports "
+"many version control systems including Git, Mercurial, Bazaar and Subversion."
+msgstr ""
 
-#: ../cvsview.py:169
-#, python-format
+#: ../data/meld.appdata.xml.in.h:2
 msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
+"Meld helps you review code changes, understand patches, and makes enormous "
+"merge conflicts slightly less painful."
 msgstr ""
-"轉換為正規表示式時發生錯誤\n"
-"式樣是‘%s’\n"
-"錯誤是‘%s’"
 
-#: ../cvsview.py:353 ../svnview.py:292
-msgid "Name"
-msgstr "名稱"
+#: ../data/mime/meld.xml.in.h:1
+msgid "Meld comparison description"
+msgstr "Meld 比對描述"
 
-#: ../cvsview.py:370 ../svnview.py:309
-msgid "Location"
-msgstr "位置"
+#: ../data/org.gnome.meld.gschema.xml.h:1
+msgid "Default window size"
+msgstr "預設視窗大小"
 
-#: ../cvsview.py:371 ../svnview.py:310
-msgid "Status"
-msgstr "狀態"
+#: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window state"
+msgstr "預設視窗狀態"
 
-#: ../cvsview.py:372 ../svnview.py:311
-msgid "Rev"
-msgstr "修正版本"
+#: ../data/org.gnome.meld.gschema.xml.h:3
+msgid "Show toolbar"
+msgstr "顯示工具列"
 
-#: ../cvsview.py:373 ../svnview.py:312 ../glade2/cvsview.glade.h:21
-msgid "Tag"
-msgstr "標籤"
+#: ../data/org.gnome.meld.gschema.xml.h:4
+msgid "If true, the window toolbar is visible."
+msgstr "選取表示視窗會顯示工具列"
 
-#: ../cvsview.py:374 ../svnview.py:313
-msgid "Options"
-msgstr "選項"
+#: ../data/org.gnome.meld.gschema.xml.h:5
+msgid "Show statusbar"
+msgstr "顯示狀態列"
 
-#: ../cvsview.py:411 ../dirdiff.py:364 ../svnview.py:350
-#, python-format
-msgid "[%s] Scanning"
-msgstr "[%s] 正在掃描"
+#: ../data/org.gnome.meld.gschema.xml.h:6
+msgid "If true, the window statusbar is visible."
+msgstr "選取表示視窗會顯示狀態列"
 
-#: ../cvsview.py:438 ../dirdiff.py:373 ../svnview.py:377
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] 正在掃描 %s"
+#: ../data/org.gnome.meld.gschema.xml.h:7
+msgid "Automatically detected text encodings"
+msgstr "自動偵測到的文字編碼"
 
-#: ../cvsview.py:454 ../svnview.py:393
-msgid "(Empty)"
-msgstr "（空白）"
+#: ../data/org.gnome.meld.gschema.xml.h:8
+msgid ""
+"These text encodings will be automatically used (in order) to try to decode "
+"loaded text files."
+msgstr "這些文字編碼將自動（按順序）使用，以試圖解碼已經載入的文字檔案。"
 
-#: ../cvsview.py:490 ../svnview.py:429
-#, python-format
-msgid "[%s] Fetching differences"
-msgstr "[%s] 正在取得差異"
+#: ../data/org.gnome.meld.gschema.xml.h:9
+msgid "Width of an indentation step"
+msgstr "縮排的每步寬度"
 
-#: ../cvsview.py:497 ../svnview.py:437
-#, python-format
-msgid "[%s] Applying patch"
-msgstr "[%s]正在套用修正檔"
+#: ../data/org.gnome.meld.gschema.xml.h:10
+msgid "The number of spaces to use for a single indent step"
+msgstr ""
 
-#: ../cvsview.py:501 ../svnview.py:441
-msgid "No differences found."
-msgstr "沒有不同之處。"
+#: ../data/org.gnome.meld.gschema.xml.h:11
+msgid "Whether to indent using spaces or tabs"
+msgstr ""
 
-#: ../cvsview.py:575 ../svnview.py:515
-msgid "Select some files first."
-msgstr "先選取一些檔案。"
+#: ../data/org.gnome.meld.gschema.xml.h:12
+msgid "If true, any new indentation will use spaces instead of tabs."
+msgstr ""
 
-#: ../cvsview.py:596 ../dirdiff.py:552 ../svnview.py:536
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:13
+msgid "Show line numbers"
+msgstr "顯示列號"
+
+#: ../data/org.gnome.meld.gschema.xml.h:14
+msgid "If true, line numbers will be shown in the gutter of file comparisons."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:15
+msgid "Highlight syntax"
+msgstr "語法標明"
+
+#: ../data/org.gnome.meld.gschema.xml.h:16
 msgid ""
-"'%s' is a directory.\n"
-"Remove recusively?"
+"Whether to highlight syntax in comparisons. Because of Meld's own color "
+"highlighting, this is off by default."
 msgstr ""
-"‘%s’是一個目錄。\n"
-"迴遞地刪除它？"
 
-#: ../cvsview.py:601 ../dirdiff.py:559 ../svnview.py:541
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:17
+msgid "Color scheme to use for syntax highlighting"
+msgstr "使用語法標明功能"
+
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr "GtkSourceView 用來判斷語法標明的顏色"
+
+#: ../data/org.gnome.meld.gschema.xml.h:19
+msgid "Displayed whitespace"
+msgstr "空白字元會顯示"
+
+#: ../data/org.gnome.meld.gschema.xml.h:20
 msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
+"Selector for individual whitespace character types to be shown. Possible "
+"values are 'space', 'tab', 'newline' and 'nbsp'."
 msgstr ""
-"移除 %s 時發生錯誤\n"
-"\n"
-"%s，"
 
-#: ../dirdiff.py:253 ../dirdiff.py:268
-#, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr "式樣‘%s’轉換為正規表示式時發生錯誤"
+#: ../data/org.gnome.meld.gschema.xml.h:21
+msgid "Wrap mode"
+msgstr "換列模式"
 
-#: ../dirdiff.py:284
-#, python-format
-msgid "Hide %s"
-msgstr "隱藏 %s"
+#: ../data/org.gnome.meld.gschema.xml.h:22
+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 "
+"('word')."
+msgstr ""
 
-#: ../dirdiff.py:406
-#, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "‘%s’被‘%s’隱藏"
+#: ../data/org.gnome.meld.gschema.xml.h:23
+msgid "Highlight current line"
+msgstr "標明目前的列"
 
-#: ../dirdiff.py:412
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
-"You are running a case insensitive comparison on a case sensitive "
-"filesystem. Some files are not visible:\n"
-"%s"
+"If true, the line containing the cursor will be highlighted in file "
+"comparisons."
 msgstr ""
-"您在一個區分大小寫的檔案系統上運行不區分大小寫的比較。某些檔案可能會不能顯"
-"示：\n"
-"%s"
 
-#: ../dirdiff.py:481
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] 完成"
+#: ../data/org.gnome.meld.gschema.xml.h:25
+msgid "Use the system default monospace font"
+msgstr "使用系統預設等寬字型"
 
-#: ../dirdiff.py:527
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:26
 msgid ""
-"'%s' exists.\n"
-"Overwrite?"
+"If false, custom-font will be used instead of the system monospace font."
 msgstr ""
-"‘%s’已存在。\n"
-"覆寫它？"
 
-#: ../dirdiff.py:534
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:27
+msgid "Custom font"
+msgstr "使用自訂字型"
+
+#: ../data/org.gnome.meld.gschema.xml.h:28
 msgid ""
-"Error copying '%s' to '%s'\n"
-"\n"
-"%s."
+"The custom font to use, stored as a string and parsed as a Pango font "
+"description."
 msgstr ""
-"複製‘%s’至‘%s’時發生錯誤\n"
-"\n"
-"%s。"
 
-#: ../dirdiff.py:570
-#, python-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] "%i 秒"
+#: ../data/org.gnome.meld.gschema.xml.h:29
+msgid "Ignore blank lines when comparing files"
+msgstr "比較檔案時忽略空列"
 
-#: ../dirdiff.py:571
-#, python-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] "%i 分鐘"
+#: ../data/org.gnome.meld.gschema.xml.h:30
+msgid ""
+"If true, blank lines will be trimmed when highlighting changes between files."
+msgstr ""
 
-#: ../dirdiff.py:572
-#, python-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] "%i 小時"
+#: ../data/org.gnome.meld.gschema.xml.h:31
+msgid "Use the system default editor"
+msgstr "使用系統預設編輯器"
 
-#: ../dirdiff.py:573
-#, python-format
-msgid "%i day"
-msgid_plural "%i days"
-msgstr[0] "%i 日"
+#: ../data/org.gnome.meld.gschema.xml.h:32
+msgid ""
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
+msgstr ""
 
-#: ../dirdiff.py:574
-#, python-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i 週"
+#: ../data/org.gnome.meld.gschema.xml.h:33
+msgid "The custom editor launch command"
+msgstr ""
 
-#: ../dirdiff.py:575
-#, python-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i 月"
+#: ../data/org.gnome.meld.gschema.xml.h:34
+msgid ""
+"The command used to launch a custom editor. Some limited templating is "
+"supported here; at the moment '{file}' and '{line}' are recognised tokens."
+msgstr ""
 
-#: ../dirdiff.py:576
-#, python-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i 年"
+#: ../data/org.gnome.meld.gschema.xml.h:35
+msgid "Columns to display"
+msgstr "要顯示的欄位"
 
-#. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:224
-msgid "INS,OVR"
-msgstr "INS,OVR"
+#: ../data/org.gnome.meld.gschema.xml.h:36
+msgid ""
+"List of column names in folder comparison and whether they should be "
+"displayed."
+msgstr ""
 
-#. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:226
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "行  %i，列 %i"
+#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32
+msgid "Ignore symbolic links"
+msgstr "忽略符號連結"
 
-#: ../filediff.py:284
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
-"Regular expression '%s' changed the number of lines in the file. Comparison "
-"will be incorrect. See the user manual for more details."
+"If true, folder comparisons do not follow symbolic links when traversing the "
+"folder tree."
 msgstr ""
-"正規表示式‘%s’更改了檔案中的行數。比較會不正確。請參閱說明手冊以取得更多資"
-"訊。"
 
-#: ../filediff.py:529
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:39
+msgid "Use shallow comparison"
+msgstr "使用粗淺比對"
+
+#: ../data/org.gnome.meld.gschema.xml.h:40
 msgid ""
-"Regular expression error\n"
-"'%s'"
+"If true, folder comparisons compare files based solely on size and mtime, "
+"considering files to be identical if their size and mtime match, and "
+"different otherwise."
 msgstr ""
-"正規表示式錯誤\n"
-"‘%s’"
 
-#: ../filediff.py:541
-#, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "找不到正規表示式‘%s’。"
+#: ../data/org.gnome.meld.gschema.xml.h:41
+msgid "File timestamp resolution"
+msgstr "檔案時間戳記精細度"
 
-#: ../filediff.py:543
-#, python-format
-msgid "The text '%s' was not found."
-msgstr "找不到文字‘%s’。"
+#: ../data/org.gnome.meld.gschema.xml.h:42
+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 "
+"is useful when comparing files between filesystems with different timestamp "
+"resolution."
+msgstr ""
 
-#: ../filediff.py:582
-#, python-format
-msgid "[%s] Set num panes"
-msgstr "[%s] 設定數目窗格"
+#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+msgid "Apply text filters during folder comparisons"
+msgstr "在資料夾比對使用文字過濾器"
 
-#: ../filediff.py:589
-#, python-format
-msgid "[%s] Opening files"
-msgstr "[%s] 正在開啟檔案"
+#: ../data/org.gnome.meld.gschema.xml.h:44
+msgid ""
+"If true, folder comparisons that compare file contents also apply active "
+"text filters and the blank line trimming option, and ignore newline "
+"differences."
+msgstr ""
 
-#: ../filediff.py:606 ../filediff.py:620 ../filediff.py:636 ../filediff.py:643
-#, python-format
-msgid "Could not read from '%s'"
-msgstr "無法從‘%s’中讀取。"
+#: ../data/org.gnome.meld.gschema.xml.h:45
+msgid "File status filters"
+msgstr "檔案狀態過濾器"
 
-#: ../filediff.py:607 ../filediff.py:644
-msgid "The error was:"
-msgstr "錯誤是："
+#: ../data/org.gnome.meld.gschema.xml.h:46
+msgid "List of statuses used to filter visible files in folder comparison."
+msgstr ""
 
-#: ../filediff.py:612
-#, python-format
-msgid "[%s] Reading files"
-msgstr "[%s] 正在讀取檔案"
+#: ../data/org.gnome.meld.gschema.xml.h:47
+msgid "Show the version control console output"
+msgstr "選擇版本控制主控台輸出"
 
-#: ../filediff.py:621
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid ""
-"It contains ascii nulls.\n"
-"Perhaps it is a binary file."
+"If true, a console output section will be shown in version control views, "
+"showing the commands run for version control operations."
 msgstr ""
-"它含有 ascii 的 null 字元。\n"
-"可能這是一個二元碼檔。"
 
-#: ../filediff.py:637
-#, python-format
-msgid "I tried encodings %s."
-msgstr "已嘗試編碼 %s。"
+#: ../data/org.gnome.meld.gschema.xml.h:49
+msgid "Version control pane position"
+msgstr "版本控制狀態窗格位置"
 
-#: ../filediff.py:665
-#, python-format
-msgid "[%s] Computing differences"
-msgstr "[%s] 正在計算差異"
+#: ../data/org.gnome.meld.gschema.xml.h:50
+msgid ""
+"This is the height of the main version control tree when the console pane is "
+"shown."
+msgstr ""
 
-#: ../filediff.py:754
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:51
+msgid "Present version comparisons as left-local/right-remote"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+"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, "
+"a left-is-theirs, right-is-mine scheme is used."
 msgstr ""
-"“%s”已存在！\n"
-"覆寫它？"
 
-#: ../filediff.py:766
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:53
+msgid "Order for files in three-way version control merge comparisons"
+msgstr "在三方版本控制合併比對的文件次序"
+
+#: ../data/org.gnome.meld.gschema.xml.h:54
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"Choices for file order are remote/merged/local and local/merged/remote. This "
+"preference only affects three-way comparisons launched from the version "
+"control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
-"寫入 %s 時發生錯誤\n"
-"\n"
-"%s，"
 
-#: ../filediff.py:775
-#, python-format
-msgid "Choose a name for buffer %i."
-msgstr "選擇緩衝 %i 的名稱。"
+#: ../data/org.gnome.meld.gschema.xml.h:55
+msgid "Show margin in commit message editor"
+msgstr ""
 
-#: ../filediff.py:788
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+"If true, a guide will be displayed to show what column the margin is at in "
+"the version control commit message editor."
 msgstr ""
-"檔案‘%s’混合了不同的斷行字元。\n"
-"\n"
-"您要使用那一種？"
 
-#: ../filediff.py:804
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:57
+msgid "Margin column in commit message editor"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid ""
-"'%s' contains characters not encodable with '%s'\n"
-"Would you like to save as UTF-8?"
+"The column at which to show the margin in the version control commit message "
+"editor."
 msgstr ""
-"‘%s’包含無法以‘%s’編碼的字元\n"
-"您是否要將其另存為 UTF-8？"
 
-#. save as
-#: ../filediff.py:839
-msgid "Save patch as..."
-msgstr "另存修正檔為..."
+#: ../data/org.gnome.meld.gschema.xml.h:59
+msgid "Automatically hard-wrap commit messages"
+msgstr "提交時自動強制實體換列"
 
-#: ../filediff.py:893
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
-"Refreshing will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
+"If true, the version control commit message editor will hard-wrap (i.e., "
+"insert line breaks) at the commit margin before commit."
 msgstr ""
-"重新整理會放棄以下所作的變更：\n"
-"%s\n"
-"\n"
-"您將會無法復原這動作。"
 
-#: ../meld:57 ../meld:67 ../meld:77
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld 需要 %s 或以上的版本。"
+#: ../data/org.gnome.meld.gschema.xml.h:61
+msgid "Version control status filters"
+msgstr "版本控制狀態過濾器"
 
-#: ../meld:78
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
-"Due to incompatible API changes some functions may not operate as expected."
-msgstr "因為不兼容的 API 變更引致某些功能可能無法在預期下工作。"
+"List of statuses used to filter visible files in version control comparison."
+msgstr ""
 
-#: ../meldapp.py:294
-msgid "Line numbers are only available if you have gnome-python-desktop installed."
-msgstr "只有您在安裝 gnome-python-desktop 後才能顯示行數。"
+#: ../data/org.gnome.meld.gschema.xml.h:63
+msgid "Filename-based filters"
+msgstr "基於檔案名稱的過濾器"
 
-#: ../meldapp.py:298
+#: ../data/org.gnome.meld.gschema.xml.h:64
 msgid ""
-"Syntax highlighting is only available if you have gnome-python-desktop installed."
-msgstr "只有您在安裝 gnome-python-desktop 後才有語法標示功能。"
-
-#: ../meldapp.py:745
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "無法對檔案及目錄的混合作出比較。\n"
-
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: ../meldapp.py:798
+"List of predefined filename-based filters that, if active, will remove "
+"matching files from a folder comparison."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:65
+msgid "Text-based filters"
+msgstr "基於文字的過濾器"
+
+#: ../data/org.gnome.meld.gschema.xml.h:66
 msgid ""
-"Meld is a file and directory comparison tool. Usage:\n"
-"\n"
-"    meld                        Start with no windows open\n"
-"    meld <dir>                  Start with CVS browser in 'dir'\n"
-"    meld <file>                 Start with CVS diff of 'file'\n"
-"    meld <file> <file> [file]   Start with 2 or 3 way file comparison\n"
-"    meld <dir>  <dir>  [dir]    Start with 2 or 3 way directory comparison\n"
-"\n"
-"Options:\n"
-"    -h, --help                  Show this help text and exit\n"
-"    -v, --version               Display the version and exit\n"
-"\n"
-"For more information choose help -> contents.\n"
-"Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-"Discuss meld at http://mail.gnome.org/mailman/listinfo/meld-list\n";
+"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, "
+"but won't contribute to the comparison itself."
 msgstr ""
-"Meld 是檔案及目錄的比較工具，用法：\n"
-"\n"
-"    meld                        執行時不開啟任何視窗\n"
-"    meld <目錄>                  執行時在「目錄」開啟 CVS 瀏覽器\n"
-"    meld <檔案>                 執行時在以 CVS diff 開啟「檔案」\n"
-"    meld <檔案> <檔案> [檔案]   執行時在以 2 或 3 向方式比較檔案\n"
-"    meld <目錄>  <目錄>  [目錄]    執行時在以 2 或 3 向方式比較目錄\n"
-"\n"
-"選項：\n"
-"    -h, --help                  顯示這說明文字及離開\n"
-"    -v, --version               顯示版本資訊及離開\n"
-"\n"
-"選擇求助 -> 內容以取得更多資訊。\n"
-"在 http://bugzilla.gnome.org/buglist.cgi?product=meld 報告錯誤\n"
-"在 http://mail.gnome.org/mailman/listinfo/meld-list 討論 meld\n"
 
-#: ../meldapp.py:815
-#, python-format
+#: ../data/ui/application.ui.h:1
+msgid "About Meld"
+msgstr "有關 Meld"
+
+#: ../data/ui/application.ui.h:2
 msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2013 Kai Willadsen"
 msgstr ""
-"Meld·%s\n"
-"由 Stephen·Kennedy·編寫 <stevek gnome org>"
+"著作權 © 2002-2009 Stephen Kennedy\n"
+"著作權 © 2009-2013 Kai Willadsen"
 
-#: ../meldapp.py:871
-#, python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "參數的數目錯誤（得到 %i）"
+#: ../data/ui/application.ui.h:4
+msgid "Website"
+msgstr "網站"
 
-#: ../melddoc.py:45
-msgid "untitled"
-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>"
+
+#: ../data/ui/application.ui.h:6
+msgid "_Preferences"
+msgstr "偏好設定(_P)"
+
+#: ../data/ui/application.ui.h:7
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: ../data/ui/application.ui.h:8
+msgid "_About"
+msgstr "有關(_A)"
+
+#: ../data/ui/application.ui.h:9
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "比對(_C)"
+
+#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "比對選取的檔案"
+
+#: ../data/ui/dirdiff.ui.h:3
+msgid "Copy to _Left"
+msgstr "複製到左側(_L)"
+
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Copy to left"
+msgstr "複製到左側"
+
+#: ../data/ui/dirdiff.ui.h:5
+msgid "Copy to _Right"
+msgstr "複製到右側(_R)"
+
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Copy to right"
+msgstr "複製到右側"
+
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Delete selected"
+msgstr "刪除所選內容"
 
-#. no common path. empty names get changed to "[None]"
-#: ../misc.py:120
-msgid "[None]"
-msgstr "[沒有]"
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:876 ../meld/filediff.py:1460
+msgid "Hide"
+msgstr "隱藏"
 
-#: ../svnview.py:42
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Hide selected"
+msgstr "隱藏所選內容"
+
+#: ../data/ui/dirdiff.ui.h:10
+msgid "Ignore Filename Case"
+msgstr "忽略檔案名稱大小寫"
+
+#: ../data/ui/dirdiff.ui.h:11
 msgid ""
-"Ignored:Non SVN:::Error::Newly added:Modified:<b>Conflict</b>:Removed:Missing"
-msgstr "已忽略:非 SVN:::錯誤::新加入:已修改:<b>衝突</b>:已移除:遺漏"
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr "將除了大小寫不同、其他完全一致的文件名視為相同"
 
-#: ../glade2/cvsview.glade.h:1
-msgid "Add _Binary"
-msgstr "加入二元碼(_B)"
+#: ../data/ui/dirdiff.ui.h:12
+msgid "Same"
+msgstr "相同"
 
-#: ../glade2/cvsview.glade.h:2
-msgid "Add to CVS"
-msgstr "加入至 CVS"
+#: ../data/ui/dirdiff.ui.h:13
+msgid "Show identical"
+msgstr "顯示相同處"
 
-#: ../glade2/cvsview.glade.h:3
-msgid "CVS Log"
-msgstr "CVS 日誌"
+#: ../data/ui/dirdiff.ui.h:14
+msgid "New"
+msgstr "新增"
 
-#: ../glade2/cvsview.glade.h:4
-msgid "Commit"
-msgstr "提交"
+#: ../data/ui/dirdiff.ui.h:15
+msgid "Show new"
+msgstr "顯示新增處"
 
-#: ../glade2/cvsview.glade.h:5
-msgid "Commit Files"
-msgstr "提交檔案"
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:71
+msgid "Modified"
+msgstr "修改"
 
-#: ../glade2/cvsview.glade.h:6
-msgid "Date"
-msgstr "日期"
+#: ../data/ui/dirdiff.ui.h:17
+msgid "Show modified"
+msgstr "顯示修改處"
 
-#: ../glade2/cvsview.glade.h:7
-msgid "Delete locally"
-msgstr "在本地刪除"
+#: ../data/ui/dirdiff.ui.h:18
+msgid "Filters"
+msgstr "過濾器"
 
-#: ../glade2/cvsview.glade.h:8
-msgid "Diff Options"
-msgstr "Diff 選項"
+#: ../data/ui/dirdiff.ui.h:19
+msgid "Set active filters"
+msgstr "設定啟用的過濾器"
 
-#: ../glade2/cvsview.glade.h:9
-msgid "Diff selected"
-msgstr "將已選取的進行 Diff 比較"
+#: ../data/ui/EditableList.ui.h:1
+msgid "Editable List"
+msgstr "可編輯的列表"
 
-#: ../glade2/cvsview.glade.h:10
-msgid "Flatten directories"
-msgstr "將檔案合併顯示（不顯示目錄）"
+#: ../data/ui/EditableList.ui.h:2
+msgid "Active"
+msgstr "啟用"
 
-#: ../glade2/cvsview.glade.h:11
-msgid "Ignored"
-msgstr "已忽略"
+#: ../data/ui/EditableList.ui.h:3
+msgid "Column Name"
+msgstr "欄位名稱"
 
-#: ../glade2/cvsview.glade.h:12
-msgid "Local copy against other remote revision"
-msgstr "本地副本針對其它遠端修正版本"
+#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
+msgid "_Add"
+msgstr "加入(_A)"
 
-#: ../glade2/cvsview.glade.h:13
-msgid "Local copy against same remote revision"
-msgstr "本地副本針對相同的遠端修正版本"
+#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
+#: ../meld/vcview.py:747
+msgid "_Remove"
+msgstr "移除(_R)"
 
-#: ../glade2/cvsview.glade.h:14
-msgid "Log Message"
-msgstr "日誌訊息"
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item up"
+msgstr "上移項目"
 
-#: ../glade2/cvsview.glade.h:15
-msgid "Non _CVS"
-msgstr "非 _CVS"
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move _Up"
+msgstr "上移(_U)"
 
-#: ../glade2/cvsview.glade.h:16
-msgid "Previous Logs"
-msgstr "前一個日誌"
+#: ../data/ui/EditableList.ui.h:8
+msgid "Move item down"
+msgstr "下移項目"
 
-#: ../glade2/cvsview.glade.h:17
-msgid "Remove _Locally"
-msgstr "在本地移除(_L)"
+#: ../data/ui/EditableList.ui.h:9
+msgid "Move _Down"
+msgstr "下移(_D)"
 
-#: ../glade2/cvsview.glade.h:18
-msgid "Remove from CVS"
-msgstr "在 CVS 上移除"
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374
+#: ../meld/vcview.py:203
+msgid "Name"
+msgstr "過濾器名稱"
 
-#: ../glade2/cvsview.glade.h:19 ../glade2/dirdiff.glade.h:20
-msgid "Show modified"
-msgstr "顯示已修改檔案"
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "比對式樣"
 
-#: ../glade2/cvsview.glade.h:20
-msgid "Show non-CVS"
-msgstr "顯示非 CVS 的檔案"
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "加入新過濾器"
 
-#: ../glade2/cvsview.glade.h:22
-msgid "Update"
-msgstr "更新"
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "移除選擇的過濾器"
 
-#: ../glade2/cvsview.glade.h:23
-msgid "_Add"
-msgstr "加入(_A)"
+#: ../data/ui/filediff.ui.h:1
+msgid "Format as Patch..."
+msgstr "格式化為修正檔..."
 
-#: ../glade2/cvsview.glade.h:24
-msgid "_Commit"
-msgstr "提交(_C)"
+#: ../data/ui/filediff.ui.h:2
+msgid "Create a patch using differences between files"
+msgstr "使用檔案之前的差異創建修正檔"
 
-#: ../glade2/cvsview.glade.h:25 ../glade2/meldapp.glade.h:88
-msgid "_Diff"
-msgstr "_Diff"
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
+msgstr "全部儲存(_L)"
 
-#: ../glade2/cvsview.glade.h:26
-msgid "_Edit"
-msgstr "編輯(_E)"
+#: ../data/ui/filediff.ui.h:4
+msgid "Save all files in the current comparison"
+msgstr "保存目前比較中的所有檔案"
 
-#: ../glade2/cvsview.glade.h:27
-msgid "_Flatten"
-msgstr "合併顯示(_F)"
+#: ../data/ui/filediff.ui.h:5
+msgid "Revert files to their saved versions"
+msgstr "將檔案還原為儲存的版本"
 
-#: ../glade2/cvsview.glade.h:28
-msgid "_Modified"
-msgstr "已修改(_M)"
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr "新增同步點"
 
-#: ../glade2/cvsview.glade.h:29
-msgid "_Normal"
-msgstr "普通(_N)"
+#: ../data/ui/filediff.ui.h:7
+msgid "Add a synchronization point for changes between files"
+msgstr "加入一個檔案差異同步點"
 
-#: ../glade2/cvsview.glade.h:30
-msgid "_Remove"
-msgstr "移除(_R)"
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr "清除同步點"
 
-#: ../glade2/cvsview.glade.h:31
-msgid "_Update"
-msgstr "更新(_U)"
+#: ../data/ui/filediff.ui.h:9
+msgid "Clear sychronization points for changes between files"
+msgstr "清除檔案差異同步點"
 
-#: ../glade2/filediff.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">某些檔案已經修改。\n"
-"您要儲存那一個？</span>"
+#: ../data/ui/filediff.ui.h:10
+msgid "Previous Conflict"
+msgstr "上一個衝突"
 
-#: ../glade2/filediff.glade.h:3
-msgid "Copy All _Left"
-msgstr "全部複製到左邊(_A)"
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "跳到上一個衝突"
 
-#: ../glade2/filediff.glade.h:4
-msgid "Copy All _Right"
-msgstr "全部複製到右邊(_A)"
+#: ../data/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr "下一個衝突"
 
-#: ../glade2/filediff.glade.h:5
-msgid "Copy to Clipboard"
-msgstr "複製到剪貼薄"
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "跳到下一個衝突"
 
-#: ../glade2/filediff.glade.h:6
-msgid "Create Patch"
-msgstr "建立修正檔"
+#: ../data/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr "推送到左側"
 
-#: ../glade2/filediff.glade.h:7 ../glade2/dirdiff.glade.h:9
-msgid "Edit"
-msgstr "編輯"
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "推送目前的更改到左側"
 
-#: ../glade2/filediff.glade.h:8
-msgid "Find"
-msgstr "尋找"
+#: ../data/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr "推送到右側"
 
-#: ../glade2/filediff.glade.h:9
-msgid "Make Patch"
-msgstr "製作修正檔"
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "推送目前的更改到右側"
 
-#: ../glade2/filediff.glade.h:10
-msgid "Match _entire word only"
-msgstr "只符合整個字詞(_E)"
+#: ../data/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr "從左側拉取"
 
-#: ../glade2/filediff.glade.h:11
-msgid "Regular e_xpression"
-msgstr "正規表示式(_X)"
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "從左側拉取更改"
 
-#: ../glade2/filediff.glade.h:12
-msgid "Save modified files?"
-msgstr "儲存已修改檔案？"
+#: ../data/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr "從右側拉取"
 
-#: ../glade2/filediff.glade.h:13
-msgid "Search for:"
-msgstr "搜尋："
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "從右側拉取更改"
 
-#: ../glade2/filediff.glade.h:14
-msgid "_Match case"
-msgstr "符合大小寫(_M)"
+#: ../data/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr "複製左側上方"
 
-#: ../glade2/filediff.glade.h:15
-msgid "_Wrap around"
-msgstr "回到檔案開始部份再搜尋(_W)"
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "從左側塊上方複製更改"
 
-#: ../glade2/dirdiff.glade.h:1
-msgid "Case"
-msgstr "大小寫"
+#: ../data/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr "複製左側下方"
 
-#: ../glade2/dirdiff.glade.h:2
-msgid "Copy Left"
-msgstr "複製到左邊"
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "從左側塊下方複製更改"
 
-#: ../glade2/dirdiff.glade.h:3
-msgid "Copy Right"
-msgstr "複製到右邊"
+#: ../data/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr "複製右側上方"
 
-#: ../glade2/dirdiff.glade.h:4
-msgid "Copy left"
-msgstr "複製到左邊"
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "從右側塊上方複製更改"
 
-#: ../glade2/dirdiff.glade.h:5
-msgid "Copy right"
-msgstr "複製到右邊"
+#: ../data/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr "複製右側下方"
 
-#: ../glade2/dirdiff.glade.h:6
-msgid "Delete selected"
-msgstr "將已選取的刪除"
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "從右側塊下方複製更改"
 
-#: ../glade2/dirdiff.glade.h:7
-msgid "Diff"
-msgstr "Diff"
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "刪除"
 
-#: ../glade2/dirdiff.glade.h:8
-msgid "Diff selection"
-msgstr "Diff 選取"
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "刪除變更"
 
-#: ../glade2/dirdiff.glade.h:10
-msgid "Hide selected"
-msgstr "將已選取的隱藏"
+#: ../data/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr "從左側合併所有更改"
 
-#: ../glade2/dirdiff.glade.h:11
-msgid "Hide..."
-msgstr "隱藏..."
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
+msgstr "從左側合併所有非衝突的更改"
 
-#: ../glade2/dirdiff.glade.h:12
-msgid "Ignore case of entries"
-msgstr "忽略區分大小寫"
+#: ../data/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr "從右側合併所有更改"
 
-#: ../glade2/dirdiff.glade.h:13
-msgid "Launch _Comparison"
-msgstr "執行比較(_C)"
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr "從右側合併所有非衝突的更改"
 
-#: ../glade2/dirdiff.glade.h:14
-msgid "Left"
-msgstr "左邊"
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr "全部合併"
 
-#: ../glade2/dirdiff.glade.h:15
-msgid "Modified"
-msgstr "已修改"
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "從左側和右側窗口合併所有非衝突的更改"
 
-#: ../glade2/dirdiff.glade.h:16
-msgid "New"
-msgstr "新增"
+#: ../data/ui/filediff.ui.h:38
+msgid "Previous Pane"
+msgstr "上一個窗格"
 
-#: ../glade2/dirdiff.glade.h:17
-msgid "Right"
-msgstr "右邊"
+#: ../data/ui/filediff.ui.h:39
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr "將鍵盤焦點轉移到比較的上一個文檔"
 
-#: ../glade2/dirdiff.glade.h:18
-msgid "Same"
-msgstr "相同"
+#: ../data/ui/filediff.ui.h:40
+msgid "Next Pane"
+msgstr "下一個窗格"
 
-#: ../glade2/dirdiff.glade.h:19
-msgid "Show identical"
-msgstr "顯示相同的檔案"
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "將鍵盤焦點轉移到比較的下一個文檔"
 
-#: ../glade2/dirdiff.glade.h:21
-msgid "Show new"
-msgstr "顯示新的檔案"
+#: ../data/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr "鎖定滾動"
 
-#: ../glade2/dirdiff.glade.h:22
-msgid "_Delete Selected"
-msgstr "將已選取的刪除(_D)"
+#: ../data/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "鎖定所有窗格的滾動"
 
-#: ../glade2/meldapp.glade.h:1
-msgid "(gnome-default-editor)"
-msgstr "(gnome-default-editor)"
+#: ../data/ui/filediff.ui.h:44
+msgid "Save changes to documents before closing?"
+msgstr "在關閉前將變更儲存到文件？"
 
-#: ../glade2/meldapp.glade.h:2
-msgid "<b>Drawing Style</b>"
-msgstr "<b>描繪風格</b>"
+#: ../data/ui/filediff.ui.h:45
+msgid "If you don't save, changes will be permanently lost."
+msgstr "如果您不儲存，變更將永久遺失。"
 
-#: ../glade2/meldapp.glade.h:3
-msgid "<b>Edit Menu</b>"
-msgstr "<b>編輯選單</b>"
+#: ../data/ui/filediff.ui.h:46
+msgid "Close _without Saving"
+msgstr "關閉但不儲存(_W)"
 
-#: ../glade2/meldapp.glade.h:4
-msgid "<b>Font</b>"
-msgstr "<b>字型</b>"
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:967 ../meld/filediff.py:1629
+#: ../meld/filediff.py:1713 ../meld/filediff.py:1738
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: ../glade2/meldapp.glade.h:5
-msgid "<b>Global options</b>"
-msgstr "<b>全域選項</b>"
+#: ../data/ui/filediff.ui.h:48
+msgid "_Save"
+msgstr "儲存(_S)"
 
-#: ../glade2/meldapp.glade.h:6
-msgid "<b>Loading</b>"
-msgstr "<b>載入</b>"
+#: ../data/ui/filediff.ui.h:49
+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."
+msgstr ""
+"無法寫入此檔案。您可以點擊此處解鎖此檔案並強制寫入，否則這些更改只能儲存到一"
+"個新檔案中。"
 
-#: ../glade2/meldapp.glade.h:7
-msgid "<b>Misc</b>"
-msgstr "<b>其它</b>"
+#: ../data/ui/filediff.ui.h:50
+msgid "File 3"
+msgstr "檔案 3"
 
-#: ../glade2/meldapp.glade.h:8
-msgid "<b>Saving</b>"
-msgstr "<b>儲存</b>"
+#: ../data/ui/filediff.ui.h:51
+msgid "File 2"
+msgstr "檔案 2"
 
-#: ../glade2/meldapp.glade.h:9
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>工具列顯示</b>"
+#: ../data/ui/filediff.ui.h:52
+msgid "File 1"
+msgstr "檔案 1"
 
-#: ../glade2/meldapp.glade.h:10
-msgid "<b>Update Options</b>"
-msgstr "<b>更新選項</b>"
+#: ../data/ui/filediff.ui.h:53
+msgid "Revert unsaved changes to documents?"
+msgstr "還原對文件未儲存的更改？"
 
-#: ../glade2/meldapp.glade.h:11
-msgid "<b>Whitespace</b>"
-msgstr "<b>空格</b>"
+#: ../data/ui/filediff.ui.h:54
+msgid "Changes made to the following documents will be permanently lost:\n"
+msgstr "對下列文件的更改將永久遺失：\n"
 
-#: ../glade2/meldapp.glade.h:12
-msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:968 ../meld/filediff.py:1630
+msgid "_Replace"
+msgstr "取代(_R)"
 
-#: ../glade2/meldapp.glade.h:13
-msgid "<span weight=\"bold\" size=\"x-large\">Diff</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Diff</span>"
+#: ../data/ui/findbar.ui.h:2
+msgid "Replace _All"
+msgstr "全部取代(_A)"
 
-#: ../glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">顯示</span>"
+#: ../data/ui/findbar.ui.h:3
+msgid "_Previous"
+msgstr "上一個(_P)"
 
-#: ../glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">編輯器</span>"
+#: ../data/ui/findbar.ui.h:4
+msgid "_Next"
+msgstr "下一個(_N)"
 
-#: ../glade2/meldapp.glade.h:16
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">編碼</span>"
+#: ../data/ui/findbar.ui.h:5
+msgid "Find:"
+msgstr "尋找："
 
-#: ../glade2/meldapp.glade.h:17
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">檔案過濾器</span>"
+#: ../data/ui/findbar.ui.h:6
+msgid "Replace _with:"
+msgstr "取代成(_W)："
 
-#: ../glade2/meldapp.glade.h:18
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">文字過濾器</span>"
+#: ../data/ui/findbar.ui.h:7
+msgid "_Match case"
+msgstr "符合大小寫(_M)"
 
-#: ../glade2/meldapp.glade.h:19
-msgid "Automatically supply missing newline at end of file."
-msgstr "在檔案的最尾自動加入遺漏的新行。"
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "完整單字(_L)"
+
+#: ../data/ui/findbar.ui.h:9
+msgid "Regular e_xpression"
+msgstr "正規表示式(_X)"
 
-#: ../glade2/meldapp.glade.h:20
-msgid "CVS"
-msgstr "CVS"
+#: ../data/ui/findbar.ui.h:10
+msgid "Wrapped"
+msgstr "自動換列"
 
-#: ../glade2/meldapp.glade.h:21
-msgid "CVS Directory"
-msgstr "CVS 目錄"
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Format as Patch"
+msgstr "格式化為修正檔"
 
-#: ../glade2/meldapp.glade.h:22
-msgid "CVS binary"
-msgstr "CVS 二元碼"
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Copy to Clipboard"
+msgstr "複製到剪貼薄"
 
-#: ../glade2/meldapp.glade.h:23
-msgid "CVS view"
-msgstr "CVS 顯示"
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+msgid "Save Patch"
+msgstr "保存修正檔"
 
-#: ../glade2/meldapp.glade.h:24
-msgid "C_VS Browser"
-msgstr "C_VS 瀏覽器"
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Use differences between:"
+msgstr "使用兩者之不同："
 
-#: ../glade2/meldapp.glade.h:25
-msgid "Choose Files"
-msgstr "選擇檔案"
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Left and middle panes"
+msgstr "左側和中間窗格"
 
-#: ../glade2/meldapp.glade.h:26
-msgid ""
-"Choose how the central bar of the diff viewer is drawn. You may wish to "
-"choose a simpler mode if you find scrolling is slow."
-msgstr ""
-"選擇差異顯示程式中間的工作列的描繪模式。如果您覺得捲動時很慢您應選擇較簡單的"
-"模式。"
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Middle and right panes"
+msgstr "中間和右側窗格"
+
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "反轉修正方向(_R)"
+
+#: ../data/ui/preferences.ui.h:1
+msgid "Left is remote, right is local"
+msgstr "左側為遠端，右側為本地"
+
+#: ../data/ui/preferences.ui.h:2
+msgid "Left is local, right is remote"
+msgstr "左側為本地，右側為遠端"
+
+#: ../data/ui/preferences.ui.h:3
+msgid "Remote, merge, local"
+msgstr "遠端、合併、本地"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "Local, merge, remote"
+msgstr "本地、合併、遠端"
+
+#: ../data/ui/preferences.ui.h:5
+msgid "1ns (ext4)"
+msgstr "1奈秒 (ext4)"
+
+#: ../data/ui/preferences.ui.h:6
+msgid "100ns (NTFS)"
+msgstr "100奈秒 (NTFS)"
+
+#: ../data/ui/preferences.ui.h:7
+msgid "1s (ext2/ext3)"
+msgstr "1秒 (ext2/ext3)"
+
+#: ../data/ui/preferences.ui.h:8
+msgid "2s (VFAT)"
+msgstr "2秒 (VFAT標準)"
 
-#: ../glade2/meldapp.glade.h:27
-msgid "Copyright (C) 2002 Stephen Kennedy"
-msgstr "版權所有 © 2002 Stephen Kennedy"
+#: ../data/ui/preferences.ui.h:9
+msgid "Meld Preferences"
+msgstr "Meld 偏好設定"
 
-#: ../glade2/meldapp.glade.h:28
-msgid "Create missing directories (-d)"
-msgstr "建立遺失目錄 (-d)"
+#: ../data/ui/preferences.ui.h:10
+msgid "Font"
+msgstr "字型"
 
-#: ../glade2/meldapp.glade.h:29
-msgid "Curved : Filled Curves"
-msgstr "曲線：以曲線填滿"
+#: ../data/ui/preferences.ui.h:11
+msgid "_Use the system fixed width font"
+msgstr "使用系統固定寬度字型(_U)"
 
-#: ../glade2/meldapp.glade.h:30
-msgid "Custom command"
-msgstr "自訂指令"
+#: ../data/ui/preferences.ui.h:12
+msgid "_Editor font:"
+msgstr "編輯器字型(_E)："
 
-#: ../glade2/meldapp.glade.h:31
+#: ../data/ui/preferences.ui.h:13
 msgid "Display"
 msgstr "顯示"
 
-#: ../glade2/meldapp.glade.h:32
-msgid "Edit menu popup invokes"
-msgstr "彈出式編輯選單使用"
+#: ../data/ui/preferences.ui.h:14
+msgid "_Tab width:"
+msgstr "Tab 寬度(_T)："
 
-#: ../glade2/meldapp.glade.h:33
+#: ../data/ui/preferences.ui.h:15
+msgid "_Insert spaces instead of tabs"
+msgstr "用空格替換 Tab(_I)"
+
+#: ../data/ui/preferences.ui.h:16
+msgid "Enable text _wrapping"
+msgstr "啟用文件自動換列(_W)"
+
+#: ../data/ui/preferences.ui.h:17
+msgid "Do not _split words over two lines"
+msgstr "不要將一個詞拆成兩列(_S)"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Highlight _current line"
+msgstr "標明目前的列(_C)"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "Show _line numbers"
+msgstr "顯示列號(_L)"
+
+#: ../data/ui/preferences.ui.h:20
+msgid "Show w_hitespace"
+msgstr "顯示空白字元(_H)"
+
+#: ../data/ui/preferences.ui.h:21
+msgid "Use s_yntax highlighting"
+msgstr "使用語法標明(_Y)"
+
+#: ../data/ui/preferences.ui.h:22
+msgid "Syntax highlighting color scheme:"
+msgstr "語法標明功能的配色方案："
+
+#: ../data/ui/preferences.ui.h:23
+msgid "External Editor"
+msgstr "外部編輯器"
+
+#: ../data/ui/preferences.ui.h:24
+msgid "Use _default system editor"
+msgstr "使用預設系統編輯器(_D)"
+
+#: ../data/ui/preferences.ui.h:25
+msgid "Edito_r command:"
+msgstr "編輯器指令(_R)："
+
+#: ../data/ui/preferences.ui.h:26
 msgid "Editor"
 msgstr "編輯器"
 
-#: ../glade2/meldapp.glade.h:34
-msgid "Encoding"
-msgstr "編碼"
+#: ../data/ui/preferences.ui.h:27
+msgid "Shallow Comparison"
+msgstr "粗淺比較"
+
+#: ../data/ui/preferences.ui.h:28
+msgid "C_ompare files based only on size and timestamp"
+msgstr "只按照大小和時間戳記比對檔案(_O)"
+
+#: ../data/ui/preferences.ui.h:29
+msgid "_Timestamp resolution:"
+msgstr "時間戳精細度(_T)："
+
+#: ../data/ui/preferences.ui.h:31
+msgid "Symbolic Links"
+msgstr "符號連結"
+
+#: ../data/ui/preferences.ui.h:33
+msgid "Visible Columns"
+msgstr "可見欄位"
+
+#: ../data/ui/preferences.ui.h:34
+msgid "Folder Comparisons"
+msgstr "資料夾比對"
+
+#: ../data/ui/preferences.ui.h:35
+msgid "Version Comparisons"
+msgstr "版本比對"
+
+#: ../data/ui/preferences.ui.h:36
+msgid "_Order when comparing file revisions:"
+msgstr "比對檔案時的次序(_O)："
+
+#: ../data/ui/preferences.ui.h:37
+msgid "Order when _merging files:"
+msgstr "合併檔案時的次序："
+
+#: ../data/ui/preferences.ui.h:38
+msgid "Commit Messages"
+msgstr "提交訊息"
 
-#: ../glade2/meldapp.glade.h:35
+#: ../data/ui/preferences.ui.h:39
+msgid "Show _right margin at:"
+msgstr "顯示右側邊界的位置(_R)："
+
+#: ../data/ui/preferences.ui.h:40
+msgid "Automatically _break lines at right margin on commit"
+msgstr "提交時自動在右側邊界處斷列處理(_B)"
+
+#: ../data/ui/preferences.ui.h:41
+msgid "Version Control"
+msgstr "版本控制"
+
+#: ../data/ui/preferences.ui.h:42
+msgid "Filename filters"
+msgstr "檔案名稱過濾器"
+
+#: ../data/ui/preferences.ui.h:43
+msgid ""
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
+msgstr ""
+"當進行比對，您可以把某些檔案及資料夾過濾掉。每個比對式樣都是以空格分開，"
+"shell 形式的萬用字元。"
+
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103
 msgid "File Filters"
 msgstr "檔案過濾器"
 
-#: ../glade2/meldapp.glade.h:36
-msgid "Gnome Default"
-msgstr "Gnome 預設"
+#: ../data/ui/preferences.ui.h:45
+msgid "Change trimming"
+msgstr "更改修剪"
+
+#: ../data/ui/preferences.ui.h:46
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:47
+msgid "Text filters"
+msgstr "文字過濾器"
+
+#: ../data/ui/preferences.ui.h:48
+msgid ""
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
+msgstr ""
+"當進行檔案比對時，您可能要忽略某種形式的變更。在這裡每個比對式樣都是 python "
+"語言的正規表達式，用在進行比對前取代符合的字串。如果表達式包含群組，那麼只有"
+"群組會被取代。請參閱使用說明以取得更多資訊。"
+
+#: ../data/ui/preferences.ui.h:49
+msgid "Text Filters"
+msgstr "文字過濾器"
+
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:625
+msgid "New comparison"
+msgstr "新的比對"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+msgid "File comparison"
+msgstr "檔案比對"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+msgid "Directory comparison"
+msgstr "資料夾比對"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
+msgstr "版本控制檢視"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+msgid "_3-way comparison"
+msgstr "_3 向比對"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+msgid "Select Third File"
+msgstr "選擇第三個檔案"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+msgid "Select Second File"
+msgstr "選擇第二個檔案"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+msgid "Select First File"
+msgstr "選擇第一個檔案"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+msgid "Select First Folder"
+msgstr "選擇第一個資料夾"
+
+#: ../data/ui/tab-placeholder.ui.h:10
+msgid "Select Second Folder"
+msgstr "選擇第二個資料夾"
+
+#: ../data/ui/tab-placeholder.ui.h:11
+msgid "Select Third Folder"
+msgstr "選擇第三個資料夾"
+
+#: ../data/ui/tab-placeholder.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr "選擇版本控制資料夾"
+
+#: ../data/ui/tab-placeholder.ui.h:13
+msgid "_Blank comparison"
+msgstr "空白比對(_B)"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+msgid "C_ompare"
+msgstr "比對(_O)"
+
+#: ../data/ui/vcview.ui.h:3
+msgid "Co_mmit..."
+msgstr "提交(_M)..."
+
+#: ../data/ui/vcview.ui.h:4
+msgid "Commit changes to version control"
+msgstr "提交變更至版本控制"
+
+#: ../data/ui/vcview.ui.h:5
+msgid "_Update"
+msgstr "更新(_U)"
+
+#: ../data/ui/vcview.ui.h:6
+msgid "Update working copy from version control"
+msgstr "從版本控制更新工作副本"
+
+#: ../data/ui/vcview.ui.h:7
+msgid "_Push"
+msgstr "推送(_P)"
+
+#: ../data/ui/vcview.ui.h:8
+msgid "Push local changes to remote"
+msgstr "推送 (push) 本地更改至遠端"
+
+#: ../data/ui/vcview.ui.h:10
+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)"
+
+#: ../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:64
+msgid "Ignored"
+msgstr "已忽略"
+
+#: ../data/ui/vcview.ui.h:29
+msgid "Show ignored files"
+msgstr "顯示已忽略檔案"
+
+#: ../data/ui/vcview.ui.h:30
+msgid "Commit"
+msgstr "提交"
+
+#: ../data/ui/vcview.ui.h:31
+msgid "Commit Files"
+msgstr "提交檔案"
+
+#: ../data/ui/vcview.ui.h:32
+msgid "Log Message"
+msgstr "日誌訊息"
+
+#: ../data/ui/vcview.ui.h:33
+msgid "Previous logs:"
+msgstr "前一個日誌："
+
+#: ../data/ui/vcview.ui.h:34
+msgid "Co_mmit"
+msgstr "提交(_M)"
+
+#: ../data/ui/vcview.ui.h:35
+msgid "Console output"
+msgstr "主控台輸出"
 
-#: ../glade2/meldapp.glade.h:37
-msgid "Gnome default editor"
-msgstr "Gnome 預設編輯器"
+#: ../data/ui/vcview.ui.h:36
+msgid "Push local commits to remote?"
+msgstr "推送 (push) 本地提交到遠端？"
 
-#: ../glade2/meldapp.glade.h:38
-msgid "Icons Only"
-msgstr "只有圖示"
+#: ../data/ui/vcview.ui.h:37
+#, fuzzy
+msgid "The commits to be pushed are determined by your version control system."
+msgstr "要推送的提交由您的版本控制系統決定。"
 
-#: ../glade2/meldapp.glade.h:39
-msgid "Ignore .cvsrc (-f)"
-msgstr "忽略 .cvsrc (-f)"
+#: ../data/ui/vcview.ui.h:38
+msgid "_Push commits"
+msgstr "推送提交(_P)"
 
-#: ../glade2/meldapp.glade.h:40
-msgid "Ignore changes in amount of white space"
-msgstr "忽略空格數目的變更"
+#: ../meld/const.py:10
+msgid "UNIX (LF)"
+msgstr "UNIX (LF)"
 
-#: ../glade2/meldapp.glade.h:41
+#: ../meld/const.py:11
+msgid "DOS/Windows (CR-LF)"
+msgstr "DOS/Windows (CR-LF)"
+
+#: ../meld/const.py:12
+msgid "Mac OS (CR)"
+msgstr "Mac OS (CR)"
+
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
+msgid "Size"
+msgstr "大小"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
+msgid "Modification time"
+msgstr "修改時間"
+
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
+msgid "Permissions"
+msgstr "權限"
+
+#: ../meld/dirdiff.py:558
+#, python-format
+msgid "Hide %s"
+msgstr "隱藏 %s"
+
+#: ../meld/dirdiff.py:688 ../meld/dirdiff.py:710
+#, python-format
+msgid "[%s] Scanning %s"
+msgstr "[%s] 正在掃描 %s"
+
+#: ../meld/dirdiff.py:843
+#, python-format
+msgid "[%s] Done"
+msgstr "[%s] 完成"
+
+#: ../meld/dirdiff.py:851
+msgid "Folders have no differences"
+msgstr "資料夾沒有差異"
+
+#: ../meld/dirdiff.py:853
+msgid "Contents of scanned files in folders are identical."
+msgstr ""
+
+#: ../meld/dirdiff.py:855
 msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
-msgstr "忽略大小寫的變更；大小寫視為相同。"
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:42
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr "忽略只是增加或減少空行的變更"
+#: ../meld/dirdiff.py:858
+msgid "File filters are in use, so not all files have been scanned."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:43
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "忽略增加或減少空行的變更"
+#: ../meld/dirdiff.py:860
+msgid "Text filters are in use and may be masking content differences."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:44
-msgid "Internal editor"
-msgstr "內部編輯器"
+#: ../meld/dirdiff.py:878 ../meld/dirdiff.py:931 ../meld/filediff.py:1115
+#: ../meld/filediff.py:1267 ../meld/filediff.py:1462 ../meld/filediff.py:1492
+#: ../meld/filediff.py:1494
+msgid "Hi_de"
+msgstr "隱藏(_D)"
 
-#: ../glade2/meldapp.glade.h:45
-msgid "Line Wrapping "
-msgstr "換行"
+#: ../meld/dirdiff.py:888
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "掃描此資料夾時出現多個錯誤"
 
-#: ../glade2/meldapp.glade.h:46
-msgid "Locate CVS binary : Meld"
-msgstr "尋找 CVS 二元碼檔：Meld"
+#: ../meld/dirdiff.py:889
+msgid "Files with invalid encodings found"
+msgstr "發現檔案使用的編碼不正確"
 
-#: ../glade2/meldapp.glade.h:47
-msgid "Meld"
-msgstr "Meld"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:891
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr "某些檔案編碼不正確。名稱是這樣的："
 
-#: ../glade2/meldapp.glade.h:48
-msgid "Mine"
-msgstr "我的版本"
+#: ../meld/dirdiff.py:893
+msgid "Files hidden by case insensitive comparison"
+msgstr "因比對區分大小寫而隱藏的文件"
 
-#: ../glade2/meldapp.glade.h:49
-msgid "My Directory"
-msgstr "我的目錄"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:895
+msgid ""
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
+msgstr ""
+"您在區分大小寫的檔案系統上運行不區分大小寫的比對。此資料夾中的以下檔案是隱藏"
+"的："
 
-#: ../glade2/meldapp.glade.h:50
-msgid "My File"
-msgstr "我的檔案"
+#: ../meld/dirdiff.py:906
+#, python-format
+msgid "'%s' hidden by '%s'"
+msgstr "「%s」被「%s」隱藏"
 
-#: ../glade2/meldapp.glade.h:51
-msgid "New..."
-msgstr "新增..."
+#: ../meld/dirdiff.py:971
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "取代「%s」資料夾？"
 
-#: ../glade2/meldapp.glade.h:52
-msgid "Original"
-msgstr "原始版本"
+#: ../meld/dirdiff.py:973
+#, python-format
+msgid ""
+"Another folder with the same name already exists in “%s”.\n"
+"If you replace the existing folder, all files in it will be lost."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:53
-msgid "Original Directory"
-msgstr "原始目錄"
+#: ../meld/dirdiff.py:986
+msgid "Error copying file"
+msgstr "複製檔案時發生錯誤"
 
-#: ../glade2/meldapp.glade.h:54
-msgid "Original File"
-msgstr "原始檔案"
+#: ../meld/dirdiff.py:987
+#, python-format
+msgid ""
+"Couldn't copy %s\n"
+"to %s.\n"
+"\n"
+"%s"
+msgstr ""
+"無法複製 %s\n"
+"到 %s。\n"
+"\n"
+"%s"
 
-#: ../glade2/meldapp.glade.h:55
-msgid "Other"
-msgstr "其它版本"
+#: ../meld/dirdiff.py:1010
+#, python-format
+msgid "Error deleting %s"
+msgstr "刪除 %s 出錯"
 
-#: ../glade2/meldapp.glade.h:56
-msgid "Other Directory"
-msgstr "其它目錄"
+#: ../meld/dirdiff.py:1515
+msgid "No folder"
+msgstr "無資料夾"
 
-#: ../glade2/meldapp.glade.h:57
-msgid "Other File"
-msgstr "其它檔案"
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:406
+msgid "INS"
+msgstr "INS"
 
-#: ../glade2/meldapp.glade.h:58
-msgid "Preferences : Meld"
-msgstr "偏好設定：Meld"
+#: ../meld/filediff.py:406
+msgid "OVR"
+msgstr "OVR"
 
-#: ../glade2/meldapp.glade.h:59
-msgid "Prune empty directories (-P)"
-msgstr "刪除空的目錄 (-P)"
+#. Abbreviation for line, column so that it will fit in the status bar
+#: ../meld/filediff.py:408
+#, python-format
+msgid "Ln %i, Col %i"
+msgstr "列  %i，行 %i"
 
-#: ../glade2/meldapp.glade.h:60
-msgid "Quiet mode (-q)"
-msgstr "寂靜模式 (-q)"
+#: ../meld/filediff.py:821
+msgid "Comparison results will be inaccurate"
+msgstr "比較結果可能不準確"
 
-#: ../glade2/meldapp.glade.h:61
-msgid "Report _Bug"
-msgstr "報告錯誤(_B)"
+#: ../meld/filediff.py:823
+#, python-format
+msgid ""
+"Filter “%s” changed the number of lines in the file, which is unsupported. "
+"The comparison will not be accurate."
+msgstr "「%s」過濾器更改了檔案的列數，但還尚未支援。比較結果可能不準確。"
 
-#: ../glade2/meldapp.glade.h:62
-msgid "SVN Directory"
-msgstr "SVN 目錄"
+#: ../meld/filediff.py:894
+msgid "Mark conflict as resolved?"
+msgstr "要把衝突標記為「已解決」嗎？"
 
-#: ../glade2/meldapp.glade.h:63
-msgid "SVN view"
-msgstr "SVN 顯示"
+#: ../meld/filediff.py:896
+msgid ""
+"If the conflict was resolved successfully, you may mark it as resolved now."
+msgstr "如果衝突已成功解決，您現在可以將其標記為已解決。"
 
-#: ../glade2/meldapp.glade.h:64
-msgid "Save in UTF-8 encoding"
-msgstr "以 UTF-8 編碼儲存"
+#: ../meld/filediff.py:898
+msgid "Cancel"
+msgstr "取消"
 
-#: ../glade2/meldapp.glade.h:65
-msgid "Save in the files original encoding"
-msgstr "以檔案的原始編碼儲存"
+#: ../meld/filediff.py:899
+msgid "Mark _Resolved"
+msgstr "標記為「已解決」(_R)"
 
-#: ../glade2/meldapp.glade.h:66
-msgid "Show line numbers"
-msgstr "顯示行號"
+#: ../meld/filediff.py:1102
+#, python-format
+msgid "[%s] Set num panes"
+msgstr "[%s] 設定數目窗格"
 
-#: ../glade2/meldapp.glade.h:67
-msgid "Simple : Lines only"
-msgstr "簡單：只顯示行"
+#: ../meld/filediff.py:1109
+#, python-format
+msgid "[%s] Opening files"
+msgstr "[%s] 正在開啟檔案"
 
-#: ../glade2/meldapp.glade.h:68
-msgid "Solid : Filled Quadilaterals"
-msgstr "四邊型：以四邊型填滿"
+#: ../meld/filediff.py:1132 ../meld/filediff.py:1142 ../meld/filediff.py:1155
+#: ../meld/filediff.py:1161
+msgid "Could not read file"
+msgstr "無法讀取檔案"
 
-#: ../glade2/meldapp.glade.h:69
-msgid "Tab width"
-msgstr "Tab 的寬度"
+#: ../meld/filediff.py:1133
+#, python-format
+msgid "[%s] Reading files"
+msgstr "[%s] 正在讀取檔案"
 
-#: ../glade2/meldapp.glade.h:70
-msgid "Text Beside Icons"
-msgstr "文字在圖示旁"
+#: ../meld/filediff.py:1143
+#, python-format
+msgid "%s appears to be a binary file."
+msgstr "%s 似乎是二進位檔案。"
 
-#: ../glade2/meldapp.glade.h:71
-msgid "Text Filters"
-msgstr "文字過濾器"
+#: ../meld/filediff.py:1156
+#, python-format
+msgid "%s is not in encodings: %s"
+msgstr "%s 不是使用 %s 進行編碼的。"
 
-#: ../glade2/meldapp.glade.h:72
-msgid "Text Only"
-msgstr "只有文字"
+#: ../meld/filediff.py:1194
+#, python-format
+msgid "[%s] Computing differences"
+msgstr "[%s] 正在計算差異"
 
-#: ../glade2/meldapp.glade.h:73
-msgid "Text Under Icons"
-msgstr "文字在圖示下"
+#: ../meld/filediff.py:1262
+#, python-format
+msgid "File %s has changed on disk"
+msgstr "在碟上的%s檔案已變更"
 
-#: ../glade2/meldapp.glade.h:74
-msgid "Three way directory"
-msgstr "三向目錄比較"
+#: ../meld/filediff.py:1263
+msgid "Do you want to reload the file?"
+msgstr "你要重新讀取該檔案嗎？"
 
-#: ../glade2/meldapp.glade.h:75
-msgid "Three way file"
-msgstr "三向檔案比較"
+#: ../meld/filediff.py:1266
+msgid "_Reload"
+msgstr "重新讀取(_R)"
 
-#: ../glade2/meldapp.glade.h:76
-msgid "Two way directory"
-msgstr "雙向目錄比較"
+#: ../meld/filediff.py:1425
+msgid "Files are identical"
+msgstr "檔案完全相同"
 
-#: ../glade2/meldapp.glade.h:77
-msgid "Two way file"
-msgstr "雙向檔案比較"
+#: ../meld/filediff.py:1438
+msgid ""
+"Text filters are being used, and may be masking differences between files. "
+"Would you like to compare the unfiltered files?"
+msgstr "正在使用文字過濾器，可能會屏蔽文件之間的不同。您想比較未過濾的文件嗎？"
 
-#: ../glade2/meldapp.glade.h:78
-msgid "Use Compression (-z)"
-msgstr "使用壓縮 (-z)"
+#: ../meld/filediff.py:1443
+msgid "Files differ in line endings only"
+msgstr "檔案只有斷列字元有分別"
 
-#: ../glade2/meldapp.glade.h:79
-msgid "Use GNOME monospace font."
-msgstr "使用 GNOME monospace 字型。"
+#: ../meld/filediff.py:1445
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"這些檔案只有斷列字元有分別：\n"
+"%s"
+
+#: ../meld/filediff.py:1465
+msgid "Show without filters"
+msgstr "顯示不過濾的結果"
+
+#: ../meld/filediff.py:1487
+msgid "Change highlighting incomplete"
+msgstr "更改標明不完整"
 
-#: ../glade2/meldapp.glade.h:80
-msgid "Use custom font."
-msgstr "使用自訂字型。"
+#: ../meld/filediff.py:1488
+msgid ""
+"Some changes were not highlighted because they were too large. You can force "
+"Meld to take longer to highlight larger changes, though this may be slow."
+msgstr ""
+"某些更改沒有標明，因為太大。您可以強制標明顯示大幅更改，盡管這可能會變得很"
+"慢。"
 
-#: ../glade2/meldapp.glade.h:81
-msgid "Use syntax highlighting"
-msgstr "使用語法標示功能"
+#: ../meld/filediff.py:1496
+msgid "Keep highlighting"
+msgstr "保持語法標明"
 
-#: ../glade2/meldapp.glade.h:82
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "載入時解碼的次序。（如：utf8, iso8859）"
+#: ../meld/filediff.py:1498
+msgid "_Keep highlighting"
+msgstr "保持語法標明(_K)"
 
-#: ../glade2/meldapp.glade.h:83
+#: ../meld/filediff.py:1633
+#, python-format
+msgid "Replace file “%s”?"
+msgstr "取代「%s」檔案？"
+
+#: ../meld/filediff.py:1635
+#, python-format
 msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"separated by spaces."
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
-"當進行比較，您可以把某些檔案及資料夾過濾掉。每個式樣都是以空格分開，shell 形"
-"式的萬用字元。"
+"「%s」中已有相同名稱的檔案。\n"
+"若您取代既有的檔案，其內容將會流失。"
+
+#: ../meld/filediff.py:1653
+#, python-format
+msgid "Could not save file %s."
+msgstr "無法儲存檔案 %s。"
 
-#: ../glade2/meldapp.glade.h:84
+#: ../meld/filediff.py:1654
+#, python-format
 msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
+"Couldn't save file due to:\n"
+"%s"
 msgstr ""
-"當進行檔案比較時，您可能要忽略某種形式的變更。在這裡每個樣式都是 python 語言"
-"的正規表達式，用在進行比較前取代匹配的字串。如果表達式包含群組，那麼只有群組"
-"會被取代。請參閱使用說明以取得更多資訊。"
+"無法儲存檔案，因為：\n"
+"%s"
+
+#: ../meld/filediff.py:1666
+msgid "Save Left Pane As"
+msgstr "左側窗格另存為"
+
+#: ../meld/filediff.py:1668
+msgid "Save Middle Pane As"
+msgstr "中間窗格另存為"
+
+#: ../meld/filediff.py:1670
+msgid "Save Right Pane As"
+msgstr "右側窗格另存為"
+
+#: ../meld/filediff.py:1684
+#, python-format
+msgid "File %s has changed on disk since it was opened"
+msgstr "在磁碟上的 %s 檔案在開啟之後已變更"
+
+#: ../meld/filediff.py:1686
+msgid "If you save it, any external changes will be lost."
+msgstr "如果你儲存它，外部的更改將遺失。"
+
+#: ../meld/filediff.py:1689
+msgid "Save Anyway"
+msgstr "依然儲存"
+
+#: ../meld/filediff.py:1690
+msgid "Don't Save"
+msgstr "不要儲存"
+
+#: ../meld/filediff.py:1716
+msgid "Inconsistent line endings found"
+msgstr "檔案使用了多種斷列字元"
+
+#: ../meld/filediff.py:1718
+#, python-format
+msgid ""
+"'%s' contains a mixture of line endings. Select the line ending format to "
+"use."
+msgstr "「%s」檔案混合了不同的斷列字元使用。請選擇要統一使用的斷列字元。"
+
+#: ../meld/filediff.py:1739
+msgid "_Save as UTF-8"
+msgstr "以 UTF-8 編碼儲存(_S)"
+
+#: ../meld/filediff.py:1742
+#, python-format
+msgid "Couldn't encode text as “%s”"
+msgstr "無法以「%s」編碼文字"
+
+#: ../meld/filediff.py:1744
+#, python-format
+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:2096
+msgid "Live comparison updating disabled"
+msgstr "實時比較更新已禁用"
+
+#: ../meld/filediff.py:2097
+msgid ""
+"Live updating of comparisons is disabled when synchronization points are "
+"active. You can still manually refresh the comparison, and live updates will "
+"resume when synchronization points are cleared."
+msgstr ""
+"同步點活動時實時比較更新會禁用。您仍然可以手動刷新比較。實時更新會在同步點清"
+"除後恢覆啟用。"
+
+#: ../meld/filemerge.py:48
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] 正在合併檔案"
+
+#: ../meld/gutterrendererchunk.py:93
+msgid "Copy _up"
+msgstr "複製到上邊(_U)"
+
+#: ../meld/gutterrendererchunk.py:94
+msgid "Copy _down"
+msgstr "複製到下邊(_D)"
+
+#: ../meld/meldapp.py:170
+msgid "wrong number of arguments supplied to --diff"
+msgstr "提供給 --diff 的參數個數錯誤"
+
+#: ../meld/meldapp.py:175
+msgid "Start with an empty window"
+msgstr "啟動時開啟空白視窗"
+
+#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+msgid "file"
+msgstr "檔案"
+
+#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+msgid "folder"
+msgstr "資料夾"
+
+#: ../meld/meldapp.py:177
+msgid "Start a version control comparison"
+msgstr "開始版本控制比較"
+
+#: ../meld/meldapp.py:179
+msgid "Start a 2- or 3-way file comparison"
+msgstr "開始雙向或三向檔案比較"
 
-#: ../glade2/meldapp.glade.h:85
-msgid "Whitespace is significant"
-msgstr "空格是有意義的"
+#: ../meld/meldapp.py:181
+msgid "Start a 2- or 3-way folder comparison"
+msgstr "開始雙向或三向資料夾比較"
 
-#: ../glade2/meldapp.glade.h:86
-msgid "_Character"
-msgstr "字元(_C)"
+#: ../meld/meldapp.py:224
+#, python-format
+msgid "Error: %s\n"
+msgstr "錯誤：%s\n"
+
+#: ../meld/meldapp.py:231
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld 是一個檔案和資料夾比較工具。"
+
+#: ../meld/meldapp.py:235
+msgid "Set label to use instead of file name"
+msgstr "設置標籤來代替檔名"
+
+#: ../meld/meldapp.py:238
+msgid "Open a new tab in an already running instance"
+msgstr "在已經運行的實體中打開一個新分頁"
+
+#: ../meld/meldapp.py:241
+msgid "Automatically compare all differing files on startup"
+msgstr "啟動時自動比較所有不同的檔案"
+
+#: ../meld/meldapp.py:244
+msgid "Ignored for compatibility"
+msgstr "為相容性而忽略"
+
+#: ../meld/meldapp.py:248
+msgid "Set the target file for saving a merge result"
+msgstr "設置用於保存合並結果的目標文件"
+
+#: ../meld/meldapp.py:251
+msgid "Automatically merge files"
+msgstr "自動合併檔案"
+
+#: ../meld/meldapp.py:255
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr "從 Meld 比較檔案載入儲存的比較"
+
+#: ../meld/meldapp.py:259
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "為提供的文件或資料夾創建 diff 分頁"
+
+#: ../meld/meldapp.py:279
+#, python-format
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "參數過多 (需要 0-3 個，已有 %d 個)"
+
+#: ../meld/meldapp.py:282
+msgid "can't auto-merge less than 3 files"
+msgstr "少於 3 個檔案無法自動合併"
+
+#: ../meld/meldapp.py:284
+msgid "can't auto-merge directories"
+msgstr "無法自動合併資料夾"
+
+#: ../meld/meldapp.py:298
+msgid "Error reading saved comparison file"
+msgstr "讀取已儲存比對檔案時發生錯誤"
+
+#: ../meld/meldapp.py:326
+#, python-format
+msgid "invalid path or URI \"%s\""
+msgstr "無效的路徑或 URI「%s」"
+
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:137
+msgid "<unnamed>"
+msgstr "<無名>"
+
+#: ../meld/melddoc.py:78 ../meld/melddoc.py:79
+msgid "untitled"
+msgstr "無題"
+
+#: ../meld/meldwindow.py:48
+msgid "_File"
+msgstr "檔案(_F)"
+
+#: ../meld/meldwindow.py:49
+msgid "_New Comparison..."
+msgstr "新的比對(_N)..."
+
+#: ../meld/meldwindow.py:50
+msgid "Start a new comparison"
+msgstr "開始新的比對"
+
+#: ../meld/meldwindow.py:53
+msgid "Save the current file"
+msgstr "儲存目前的檔案"
+
+#: ../meld/meldwindow.py:55
+msgid "Save As..."
+msgstr "另存為..."
+
+#: ../meld/meldwindow.py:56
+msgid "Save the current file with a different name"
+msgstr "以其他名稱儲存目前的檔案"
+
+#: ../meld/meldwindow.py:59
+msgid "Close the current file"
+msgstr "關閉目前的檔案"
+
+#: ../meld/meldwindow.py:62
+msgid "_Edit"
+msgstr "編輯(_E)"
+
+#: ../meld/meldwindow.py:64
+msgid "Undo the last action"
+msgstr "復原上一次的動作"
+
+#: ../meld/meldwindow.py:67
+msgid "Redo the last undone action"
+msgstr "重做最後撤消的操作"
+
+#: ../meld/meldwindow.py:69
+msgid "Cut the selection"
+msgstr "剪下選取內容"
+
+#: ../meld/meldwindow.py:71
+msgid "Copy the selection"
+msgstr "複製選取內容"
+
+#: ../meld/meldwindow.py:73
+msgid "Paste the clipboard"
+msgstr "貼上剪貼簿內容"
+
+#: ../meld/meldwindow.py:75
+msgid "Find..."
+msgstr "尋找..."
+
+#: ../meld/meldwindow.py:75
+msgid "Search for text"
+msgstr "搜尋文字"
+
+#: ../meld/meldwindow.py:77
+msgid "Find Ne_xt"
+msgstr "尋找下一個(_X)"
+
+#: ../meld/meldwindow.py:78
+msgid "Search forwards for the same text"
+msgstr "向下尋找相同的文字"
+
+#: ../meld/meldwindow.py:80
+msgid "Find _Previous"
+msgstr "尋找上一個(_P)"
 
-#: ../glade2/meldapp.glade.h:87
+#: ../meld/meldwindow.py:81
+msgid "Search backwards for the same text"
+msgstr "向上尋找相同的文字"
+
+#: ../meld/meldwindow.py:84
+msgid "_Replace..."
+msgstr "取代(_R)..."
+
+#: ../meld/meldwindow.py:85
+msgid "Find and replace text"
+msgstr "尋找並取代文字"
+
+#: ../meld/meldwindow.py:88
+msgid "_Changes"
+msgstr "變更(_C)"
+
+#: ../meld/meldwindow.py:89
+msgid "Next Change"
+msgstr "下一個變更"
+
+#: ../meld/meldwindow.py:90
+msgid "Go to the next change"
+msgstr "跳到下一個變更"
+
+#: ../meld/meldwindow.py:92
+msgid "Previous Change"
+msgstr "上一個變更"
+
+#: ../meld/meldwindow.py:93
+msgid "Go to the previous change"
+msgstr "前往上一個變更"
+
+#: ../meld/meldwindow.py:95
+msgid "Open Externally"
+msgstr "使用外部工具開啟"
+
+#: ../meld/meldwindow.py:96
+msgid "Open selected file or directory in the default external application"
+msgstr "使用預設的外部程式開啟選取的檔案或目錄"
+
+#: ../meld/meldwindow.py:100
+msgid "_View"
+msgstr "檢視(_V)"
+
+#: ../meld/meldwindow.py:101
+msgid "File Status"
+msgstr "檔案狀態"
+
+#: ../meld/meldwindow.py:102
+msgid "Version Status"
+msgstr "版本狀態"
+
+#: ../meld/meldwindow.py:105
+msgid "Stop the current action"
+msgstr "停止目前的動作"
+
+#: ../meld/meldwindow.py:108
+msgid "Refresh the view"
+msgstr "重整檢視"
+
+#: ../meld/meldwindow.py:111
+msgid "_Tabs"
+msgstr "分頁(_T)"
+
+#: ../meld/meldwindow.py:112
+msgid "_Previous Tab"
+msgstr "上一分頁(_P)"
+
+#: ../meld/meldwindow.py:113
+msgid "Activate previous tab"
+msgstr "啟用上一分頁"
+
+#: ../meld/meldwindow.py:115
+msgid "_Next Tab"
+msgstr "下一分頁(_N)"
+
+#: ../meld/meldwindow.py:116
+msgid "Activate next tab"
+msgstr "啟用下一分頁"
+
+#: ../meld/meldwindow.py:119
+msgid "Move Tab _Left"
+msgstr "左移分頁(_L)"
+
+#: ../meld/meldwindow.py:120
+msgid "Move current tab to left"
+msgstr "將目前的分頁移到左側"
+
+#: ../meld/meldwindow.py:123
+msgid "Move Tab _Right"
+msgstr "右移分頁(_R)"
+
+#: ../meld/meldwindow.py:124
+msgid "Move current tab to right"
+msgstr "將目前的分頁移到右側"
+
+#: ../meld/meldwindow.py:128
+msgid "Fullscreen"
+msgstr "全螢幕"
+
+#: ../meld/meldwindow.py:129
+msgid "View the comparison in fullscreen"
+msgstr "以全螢幕模式查看比較"
+
+#: ../meld/meldwindow.py:131
+msgid "_Toolbar"
+msgstr "工具列(_T)"
+
+#: ../meld/meldwindow.py:132
+msgid "Show or hide the toolbar"
+msgstr "顯示或隱藏工具列"
+
+#: ../meld/meldwindow.py:141
+msgid "Open Recent"
+msgstr "最近使用"
+
+#: ../meld/meldwindow.py:142
+msgid "Open recent files"
+msgstr "打開最近使用的檔案"
+
+#: ../meld/meldwindow.py:164
+msgid "_Meld"
+msgstr "_Meld"
+
+#: ../meld/meldwindow.py:165
+msgid "Quit the program"
+msgstr "退出程式"
+
+#: ../meld/meldwindow.py:167
+msgid "Prefere_nces"
+msgstr "偏好設定(_N)"
+
+#: ../meld/meldwindow.py:168
+msgid "Configure the application"
+msgstr "設定程式"
+
+#: ../meld/meldwindow.py:170
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../glade2/meldapp.glade.h:89
-msgid "_Directory Comparison"
-msgstr "目錄比較(_D)"
+#: ../meld/meldwindow.py:171
+msgid "Open the Meld manual"
+msgstr "打開 Meld 幫助手冊"
 
-#: ../glade2/meldapp.glade.h:90
-msgid "_Down"
-msgstr "往下(_D)"
+#: ../meld/meldwindow.py:173
+msgid "About this application"
+msgstr "關於這個應用程式"
 
-#: ../glade2/meldapp.glade.h:91
-msgid "_File Comparison"
-msgstr "檔案比較(_F)"
+#: ../meld/meldwindow.py:548
+msgid "Switch to this tab"
+msgstr "切換到此分頁"
 
-#: ../glade2/meldapp.glade.h:92
-msgid "_Logo"
-msgstr "標誌(_L)"
+#: ../meld/meldwindow.py:659
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr "需要三個檔案來自動合併，已有：%r"
 
-#: ../glade2/meldapp.glade.h:93
-msgid "_New..."
-msgstr "新增(_N)..."
+#: ../meld/meldwindow.py:673
+msgid "Cannot compare a mixture of files and directories"
+msgstr "無法對文件和目錄混合比較"
 
-#: ../glade2/meldapp.glade.h:94
-msgid "_None"
-msgstr "沒有(_N)"
+#. no common path. empty names get changed to "[None]"
+#: ../meld/misc.py:178
+msgid "[None]"
+msgstr "[沒有]"
 
-#: ../glade2/meldapp.glade.h:95
-msgid "_SVN Browser"
-msgstr "_SVN 瀏覽器"
+#: ../meld/preferences.py:33
+msgid "label"
+msgstr "標籤"
 
-#: ../glade2/meldapp.glade.h:96
-msgid "_Save"
-msgstr "儲存(_S)"
+#: ../meld/preferences.py:33
+msgid "pattern"
+msgstr "式樣"
 
-#: ../glade2/meldapp.glade.h:97
-msgid "_Three Way Compare"
-msgstr "三向比較(_T)"
+#: ../meld/recent.py:114
+msgid "Version control:"
+msgstr "版本控制："
 
-#: ../glade2/meldapp.glade.h:98
-msgid "_Up"
-msgstr "往上(_U)"
+#: ../meld/ui/notebooklabel.py:65
+msgid "Close tab"
+msgstr "關閉分頁"
 
-#: ../glade2/meldapp.glade.h:99
-msgid "_Word"
-msgstr "字詞(_W)"
+#: ../meld/ui/vcdialogs.py:61
+msgid "No files will be committed"
+msgstr "沒有檔案會提交"
 
-#: ../glade2/meldapp.glade.h:100
-msgid "http://meld.sourceforge.net";
-msgstr "http://meld.sourceforge.net";
+#. Translators: First %s is replaced by translated "%d unpushed
+#. commits", second %s is replaced by translated "%d branches"
+#: ../meld/vc/git.py:129
+#, python-format
+msgid "%s in %s"
+msgstr "%s，位於 %s"
 
-#: ../glade2/meldapp.glade.h:101
-msgid "utf8 iso8859"
-msgstr "utf8 iso8859"
+#. Translators: These messages cover the case where there is
+#. only one branch, and are not part of another message.
+#: ../meld/vc/git.py:130 ../meld/vc/git.py:137
+#, python-format
+msgid "%d unpushed commit"
+msgid_plural "%d unpushed commits"
+msgstr[0] "%d 項未推送的提交"
 
-#~ msgid ""
-#~ "second,seconds:minute,minutes:hour,hours:day,days:week,weeks:month,months:"
-#~ "year,years"
-#~ msgstr "秒，秒：分，分：時，時：日，日：週，週：月，月：年，年"
+#: ../meld/vc/git.py:132
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] "%d 個分支"
+
+#: ../meld/vc/git.py:360
+#, python-format
+msgid "Mode changed from %s to %s"
+msgstr "模式已從 %s 更改為 %s"
+
+#: ../meld/vc/_vc.py:47
+msgid "Merged"
+msgstr "已合併"
+
+#: ../meld/vc/_vc.py:47
+msgid "Base"
+msgstr "基礎"
+
+#: ../meld/vc/_vc.py:47
+msgid "Local"
+msgstr "本地"
+
+#: ../meld/vc/_vc.py:47
+msgid "Remote"
+msgstr "遠端"
+
+#: ../meld/vc/_vc.py:65
+msgid "Unversioned"
+msgstr "未版本控制"
+
+#: ../meld/vc/_vc.py:68
+msgid "Error"
+msgstr "錯誤"
+
+#: ../meld/vc/_vc.py:70
+msgid "Newly added"
+msgstr "已新增"
+
+#: ../meld/vc/_vc.py:72
+msgid "Renamed"
+msgstr "已改名"
+
+#: ../meld/vc/_vc.py:73
+msgid "Conflict"
+msgstr "衝突"
+
+#: ../meld/vc/_vc.py:74
+msgid "Removed"
+msgstr "已移除"
+
+#: ../meld/vc/_vc.py:75
+msgid "Missing"
+msgstr "欠缺"
+
+#: ../meld/vc/_vc.py:76
+msgid "Not present"
+msgstr "沒有"
+
+#: ../meld/vcview.py:233 ../meld/vcview.py:417
+msgid "Location"
+msgstr "位置"
+
+#: ../meld/vcview.py:234
+msgid "Status"
+msgstr "狀態"
+
+#: ../meld/vcview.py:235
+msgid "Revision"
+msgstr "修訂"
+
+#: ../meld/vcview.py:236
+msgid "Options"
+msgstr "選項"
+
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:324
+#, python-format
+msgid "%s not installed"
+msgstr "%s 未安裝"
+
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:328
+msgid "Invalid repository"
+msgstr "無效的倉儲"
+
+#: ../meld/vcview.py:337
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../meld/vcview.py:339 ../meld/vcview.py:347
+msgid "None"
+msgstr "無"
+
+#: ../meld/vcview.py:358
+msgid "No valid version control system found in this folder"
+msgstr "此資料夾中未找到有效的版本控制系統"
+
+#: ../meld/vcview.py:360
+msgid "Only one version control system found in this folder"
+msgstr "此資料夾中只找到一個版本控制系統"
+
+#: ../meld/vcview.py:362
+msgid "Choose which version control system to use"
+msgstr "選擇要使用的版本控制系統"
+
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:417
+#, python-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#, python-format
+msgid "Scanning %s"
+msgstr "正在掃描 %s"
+
+#: ../meld/vcview.py:479
+msgid "(Empty)"
+msgstr "（空白）"
+
+#: ../meld/vcview.py:522
+#, python-format
+msgid "%s — local"
+msgstr "%s — 本地"
+
+#: ../meld/vcview.py:523
+#, python-format
+msgid "%s — remote"
+msgstr "%s — 遠端"
+
+#: ../meld/vcview.py:531
+#, python-format
+msgid "%s (local, merge, remote)"
+msgstr "%s (本地、合併、遠端)"
+
+#: ../meld/vcview.py:536
+#, python-format
+msgid "%s (remote, merge, local)"
+msgstr "%s (遠端、合併、本地)"
+
+#: ../meld/vcview.py:547
+#, python-format
+msgid "%s — repository"
+msgstr "%s — 倉儲"
+
+#: ../meld/vcview.py:553
+#, python-format
+msgid "%s (working, repository)"
+msgstr "%s (作業中、倉儲)"
+
+#: ../meld/vcview.py:557
+#, python-format
+msgid "%s (repository, working)"
+msgstr "%s (倉儲、作業中)"
+
+#: ../meld/vcview.py:741
+msgid "Remove folder and all its files?"
+msgstr "移除資料夾及所有包含的檔案？"
+
+#: ../meld/vcview.py:743
+msgid ""
+"This will remove all selected files and folders, and all files within any "
+"selected folders, from version control."
+msgstr "這將從版本控制中移除所有選中的文件及資料夾，及選中資料夾中的所有文件。"
+
+#: ../meld/vcview.py:777
+#, python-format
+msgid "Error removing %s"
+msgstr "移除 %s 時發生錯誤"
+
+#~ msgid "Copy _Left"
+#~ msgstr "複製到左側(_L)"
+
+#~ msgid "Copy _Right"
+#~ msgstr "複製到右側(_R)"
 
 #~ msgid ""
-#~ "Could not open '%s' for reading.\n"
-#~ "\n"
-#~ "The error was:\n"
-#~ "%s"
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
 #~ msgstr ""
-#~ "無法開啟‘%s’來閱讀。\n"
-#~ "\n"
-#~ "錯誤是：\n"
-#~ "%s"
+#~ "‘%s’已存在。\n"
+#~ "覆寫它？"
 
-#~ msgid "Meld requires a recent version of pygtk."
-#~ msgstr "Meld 需要 pygtk 最近的版本。"
+#~ msgid "%i second"
+#~ msgid_plural "%i seconds"
+#~ msgstr[0] "%i 秒"
 
-#~ msgid "pygtk-%s or higher is recommended."
-#~ msgstr "推薦使用高於版本 %s 的 pygtk"
+#~ msgid "%i minute"
+#~ msgid_plural "%i minutes"
+#~ msgstr[0] "%i 分钟"
 
-#~ msgid "Meld works best with pygtk-%s or higher. (found %s)"
-#~ msgstr "Meld 最好是在 pygtk %s 或以上的版本上工作（找到 %s）"
+#~ msgid "%i hour"
+#~ msgid_plural "%i hours"
+#~ msgstr[0] "%i 小时"
 
-#~ msgid "folder"
-#~ msgstr "資料夾"
+#~ msgid "%i day"
+#~ msgid_plural "%i days"
+#~ msgstr[0] "%i 天"
 
-#~ msgid "file"
-#~ msgstr "檔案"
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i 周"
 
-#~ msgid "nonexistant"
-#~ msgstr "不存在"
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i 月"
 
-#~ msgid " spaces."
-#~ msgstr " 個空格。"
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i 年"
 
-#~ msgid "Tabs equivalent to "
-#~ msgstr "一個 Tab 相等於 "
+#~ msgid "Clear manual change sychronization points"
+#~ msgstr "清除手動更改同步點"
+
+#~ msgid "Cycle Through Documents"
+#~ msgstr "在文件間循環"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "「%s」已存在！\n"
+#~ "覆盖文件？"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "寫入 %s 時發生錯誤\n"
+#~ "\n"
+#~ "%s，"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]