[meld] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 4053975431259f66a8238ead07ac1193df0dca5c
Author: arccos <boyermoore gmail com>
Date:   Tue Nov 17 12:41:42 2009 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 1187 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 606 insertions(+), 581 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 949c027..a7f5bc7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,122 +4,433 @@
 #
 # Funda Wang <fundawang linux net cn>, 2004, 2005.
 # Careone <careoneagain gmail com>, 2009.
-#
+# arccos <boyermoore gmail com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&component=general\n"
-"POT-Creation-Date: 2009-08-20 20:08+0000\n"
-"PO-Revision-Date: 2009-08-27 14:43+0800\n"
-"Last-Translator: Careone <careoneagain gmail com>\n"
+"POT-Creation-Date: 2009-11-01 23:07+0000\n"
+"PO-Revision-Date: 2009-11-17 12:41+0800\n"
+"Last-Translator: arccos <boyermoore gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation lists linux net cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../dirdiff.py:173 ../vcview.py:125
+#: ../bin/meld:77
+msgid "Cannot import: "
+msgstr "æ? æ³?导å?¥ï¼?"
+
+#: ../bin/meld:80
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Meld è¦?æ±? %s æ??æ?´é«?ç??æ?¬ã??"
+
+#: ../data/meld.desktop.in.h:1
+msgid "Compare and merge your files"
+msgstr "æ¯?è¾?å??å??并æ?¨ç??æ??件"
+
+#: ../data/meld.desktop.in.h:2
+msgid "Meld Diff Viewer"
+msgstr "Meld Diff å·®å¼?æ?¥ç??å?¨"
+
+#: ../data/ui/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.glade.h:3
+msgid "Copy to Clipboard"
+msgstr "����贴�"
+
+#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:171
+msgid "Create Patch"
+msgstr "å??建补ä¸?"
+
+#: ../data/ui/filediff.glade.h:5
+msgid "Save modified files?"
+msgstr "ä¿?å­?已修æ?¹ç??æ??件ï¼?"
+
+#: ../data/ui/filediff.glade.h:6
+msgid "_Discard Changes"
+msgstr "丢���(_D)"
+
+#: ../data/ui/filediff.glade.h:7
+msgid "_Save Selected"
+msgstr "ä¿?å­?é??中ç??(_S)"
+
+#: ../data/ui/findbar.glade.h:1
+msgid "Regular E_xpression"
+msgstr "æ­£å??表达å¼?(_X)"
+
+#: ../data/ui/findbar.glade.h:2
+msgid "Replace _All"
+msgstr "����(_A)"
+
+#: ../data/ui/findbar.glade.h:3
+msgid "Replace _With"
+msgstr "��为(_W)"
+
+#: ../data/ui/findbar.glade.h:4
+msgid "Who_le word"
+msgstr "å?¹é??æ?´ä¸ªå??è¯?(_L)"
+
+#: ../data/ui/findbar.glade.h:5
+msgid "_Match Case"
+msgstr "å?ºå??大å°?å??(_M)"
+
+#: ../data/ui/findbar.glade.h:6
+msgid "_Next"
+msgstr "��个(_N)"
+
+#: ../data/ui/findbar.glade.h:7
+msgid "_Previous"
+msgstr "��个(_P)"
+
+#: ../data/ui/findbar.glade.h:8 ../meld/meldapp.py:442
+msgid "_Replace"
+msgstr "æ?¿æ?¢(_R)"
+
+#: ../data/ui/findbar.glade.h:9
+msgid "_Search for"
+msgstr "æ??ç´¢(_S)"
+
+#: ../data/ui/meldapp.glade.h:1
+msgid "<b>Edit Menu</b>"
+msgstr "<b>ç¼?è¾?è??å??</b>"
+
+#: ../data/ui/meldapp.glade.h:2
+msgid "<b>Font</b>"
+msgstr "<b>å­?ä½?</b>"
+
+#: ../data/ui/meldapp.glade.h:3
+msgid "<b>Loading</b>"
+msgstr "<b>载�</b>"
+
+#: ../data/ui/meldapp.glade.h:4
+msgid "<b>Misc</b>"
+msgstr "<b>æ??项</b>"
+
+#: ../data/ui/meldapp.glade.h:5
+msgid "Automatically supply missing newline at end of file"
+msgstr "è?ªå?¨è¡¥é½?æ??件æ?«å°¾ä¸¢å¤±ç??æ?¢è¡?符"
+
+#: ../data/ui/meldapp.glade.h:6
+msgid "Choose Files"
+msgstr "é??æ?©æ??件"
+
+#: ../data/ui/meldapp.glade.h:7
+msgid "Copyright © 2002-2009 Stephen Kennedy"
+msgstr "ç??æ??æ??æ?? © 2002-2009 Stephen Kennedy"
+
+#: ../data/ui/meldapp.glade.h:8
+msgid "Custom command"
+msgstr "����令"
+
+#: ../data/ui/meldapp.glade.h:9
+msgid "Directory"
+msgstr "��"
+
+#: ../data/ui/meldapp.glade.h:10
+msgid "Edit files with:"
+msgstr "ç¼?è¾?æ??件ç??ç¨?åº?ï¼?"
+
+#: ../data/ui/meldapp.glade.h:11
+msgid "Editor"
+msgstr "ç¼?è¾?å?¨"
+
+#: ../data/ui/meldapp.glade.h:12
+msgid "Encoding"
+msgstr "æ??å­?ç¼?ç ?"
+
+#: ../data/ui/meldapp.glade.h:13
+msgid "File Filters"
+msgstr "æ??件è¿?滤å?¨"
+
+#: ../data/ui/meldapp.glade.h:14
+msgid "Gnome default editor"
+msgstr "Gnome �认���"
+
+#: ../data/ui/meldapp.glade.h:15
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "忽ç?¥å¤?空è¡?æ??å°?空è¡?ç??å·®å¼?"
+
+#: ../data/ui/meldapp.glade.h:16
+msgid "Ignore symbolic links"
+msgstr "忽�符���"
+
+#: ../data/ui/meldapp.glade.h:17
+msgid "Insert spaces instead of tabs"
+msgstr "ç?¨ç©ºæ ¼æ?¿æ?¢å?¶è¡¨ç¬¦"
+
+#: ../data/ui/meldapp.glade.h:18
+msgid "Internal editor"
+msgstr "å??é?¨ç¼?è¾?å?¨"
+
+#: ../data/ui/meldapp.glade.h:19
+msgid "Line Wrapping "
+msgstr "��"
+
+#: ../data/ui/meldapp.glade.h:20
+msgid "Meld"
+msgstr "Meld"
+
+#: ../data/ui/meldapp.glade.h:21
+msgid "Mine"
+msgstr "æ??ç??"
+
+#: ../data/ui/meldapp.glade.h:22
+msgid "Original"
+msgstr "å??件"
+
+#: ../data/ui/meldapp.glade.h:23
+msgid "Other"
+msgstr "��"
+
+#: ../data/ui/meldapp.glade.h:24
+msgid "Preferences : Meld"
+msgstr "é¦?é??项ï¼?Meld"
+
+#: ../data/ui/meldapp.glade.h:25
+msgid "Show line numbers"
+msgstr "�示��"
+
+#: ../data/ui/meldapp.glade.h:26
+msgid "Tab width"
+msgstr "�表符宽度"
+
+#: ../data/ui/meldapp.glade.h:27
+msgid "Text Filters"
+msgstr "æ??å­?è¿?滤å?¨"
+
+#: ../data/ui/meldapp.glade.h:28
+msgid "Three way directory"
+msgstr "ä¸?å??ç?®å½?"
+
+#: ../data/ui/meldapp.glade.h:29
+msgid "Three way file"
+msgstr "ä¸?å??æ??件"
+
+#: ../data/ui/meldapp.glade.h:30
+msgid "Two way directory"
+msgstr "两å??ç?®å½?"
+
+#: ../data/ui/meldapp.glade.h:31
+msgid "Two way file"
+msgstr "两å??æ??件"
+
+#: ../data/ui/meldapp.glade.h:32
+msgid "Use GNOME monospace font"
+msgstr "使� GNOME �宽��"
+
+#: ../data/ui/meldapp.glade.h:33
+msgid "Use custom font"
+msgstr "使������"
+
+#: ../data/ui/meldapp.glade.h:34
+msgid "Use syntax highlighting"
+msgstr "使�语��亮"
+
+#: ../data/ui/meldapp.glade.h:35
+msgid "Version control view"
+msgstr "ç??æ?¬æ?§å?¶æ?¥ç??"
+
+#: ../data/ui/meldapp.glade.h:36
+msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+msgstr "è½½å?¥æ?¶ï¼?æ??此顺åº?å°?è¯?ç¼?ç ?ã??(å¦? utf8ï¼?gb2312ï¼?gbkï¼?gb18030)"
+
+#: ../data/ui/meldapp.glade.h:37
+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/meldapp.glade.h:38
+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 æ­£"
+"å??表达å¼?ï¼?å?¨å¼?å§?æ¯?è¾?å??ï¼?ç?¨ç©ºå­?符串æ?¥æ?¿æ?¢å?¹é??ç??æ??å­?ã??å¦?æ??表达å¼?å??å?«â??groupâ??,å?ª"
+"æ??â??groupâ??被æ?¿æ?¢ã??æ?´å¤?ä¿¡æ?¯è¯·æ?¥ç??ç?¨æ?·æ??å??ã??"
+
+#: ../data/ui/meldapp.glade.h:39
+msgid "_Character"
+msgstr "�符(_C)"
+
+#: ../data/ui/meldapp.glade.h:40
+msgid "_Directory Comparison"
+msgstr "����(_D)"
+
+#: ../data/ui/meldapp.glade.h:41
+msgid "_File Comparison"
+msgstr "æ??件æ¯?è¾?(_F)"
+
+#: ../data/ui/meldapp.glade.h:42
+msgid "_None"
+msgstr "æ? (_N)"
+
+#: ../data/ui/meldapp.glade.h:43
+msgid "_Three Way Compare"
+msgstr "ä¸?å??æ¯?è¾?(_T)"
+
+#: ../data/ui/meldapp.glade.h:44
+msgid "_Version Control Browser"
+msgstr "ç??æ?¬æ?§å?¶æµ?è§?å?¨(_V)"
+
+#: ../data/ui/meldapp.glade.h:45
+msgid "_Word"
+msgstr "å­?(_W)"
+
+#: ../data/ui/vcview.glade.h:1
+msgid "Commit Files"
+msgstr "æ??交æ??件"
+
+#: ../data/ui/vcview.glade.h:2
+msgid "Compare Options"
+msgstr "æ¯?è¾?é??项"
+
+#: ../data/ui/vcview.glade.h:3
+msgid "Date"
+msgstr "æ?¥æ??"
+
+#: ../data/ui/vcview.glade.h:4
+msgid "Local copy against other remote revision"
+msgstr "é??对å?¶å®?è¿?ç¨?æ ¡è®¢ç??æ?¬å?°å?¯æ?¬"
+
+#: ../data/ui/vcview.glade.h:5
+msgid "Local copy against same remote revision"
+msgstr "é??对ç?¸å??ç??è¿?ç¨?修订ç??æ?¬å?°å?¯æ?¬"
+
+#: ../data/ui/vcview.glade.h:6
+msgid "Log Message"
+msgstr "��信�"
+
+#: ../data/ui/vcview.glade.h:7
+msgid "Previous Logs"
+msgstr "ä¸?次ç??æ?¥å¿?"
+
+#: ../data/ui/vcview.glade.h:8 ../meld/vcview.py:183
+msgid "Tag"
+msgstr "æ ?ç­¾"
+
+#: ../data/ui/vcview.glade.h:9
+msgid "VC Log"
+msgstr "VC ��"
+
+#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
 msgid "_Compare"
 msgstr "��(_C)"
 
-#: ../dirdiff.py:173 ../vcview.py:125
+#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
 msgid "Compare selected"
 msgstr "æ¯?è¾?é??中ç??"
 
-#: ../dirdiff.py:174
+#: ../meld/dirdiff.py:185
 msgid "Left"
 msgstr "左侧"
 
-#: ../dirdiff.py:174 ../filediff.py:168
+#: ../meld/dirdiff.py:185 ../meld/filediff.py:172
 msgid "Copy To Left"
 msgstr "���左侧"
 
-#: ../dirdiff.py:175
+#: ../meld/dirdiff.py:186
 msgid "Right"
 msgstr "�侧"
 
-#: ../dirdiff.py:175 ../filediff.py:169
+#: ../meld/dirdiff.py:186 ../meld/filediff.py:173
 msgid "Copy To Right"
 msgstr "����侧"
 
-#: ../dirdiff.py:176
+#: ../meld/dirdiff.py:187
 msgid "Delete selected"
 msgstr "å? é?¤é??中ç??"
 
-#: ../dirdiff.py:177 ../filediff.py:644
+#: ../meld/dirdiff.py:188 ../meld/filediff.py:659
 msgid "Hide"
 msgstr "é??è??"
 
-#: ../dirdiff.py:177
+#: ../meld/dirdiff.py:188
 msgid "Hide selected"
 msgstr "é??è??é??中ç??"
 
-#: ../dirdiff.py:179 ../filediff.py:166 ../vcview.py:126
+#: ../meld/dirdiff.py:190 ../meld/filediff.py:170 ../meld/vcview.py:126
 msgid "Open selected"
 msgstr "æ??å¼?é??中ç??"
 
-#: ../dirdiff.py:183
+#: ../meld/dirdiff.py:194
 msgid "Case"
-msgstr "å??å?«"
+msgstr "大å°?å??"
 
-#: ../dirdiff.py:183
+#: ../meld/dirdiff.py:194
 msgid "Ignore case of entries"
-msgstr "忽ç?¥å??å?«ç??æ??å?µ"
+msgstr "忽ç?¥æ?¡ç?®ç??大å°?å??"
 
-#: ../dirdiff.py:184
+#: ../meld/dirdiff.py:195
 msgid "Same"
 msgstr "ç?¸å??"
 
-#: ../dirdiff.py:184
+#: ../meld/dirdiff.py:195
 msgid "Show identical"
 msgstr "æ?¾ç¤ºå®?å?¨ç?¸å??ç??"
 
-#: ../dirdiff.py:185
+#: ../meld/dirdiff.py:196
 msgid "New"
 msgstr "�建"
 
-#: ../dirdiff.py:185
+#: ../meld/dirdiff.py:196
 msgid "Show new"
 msgstr "æ?¾ç¤ºæ?°å»ºç??"
 
-#: ../dirdiff.py:186
+#: ../meld/dirdiff.py:197
 msgid "Modified"
 msgstr "已修�"
 
-#: ../dirdiff.py:186 ../vcview.py:139
+#: ../meld/dirdiff.py:197 ../meld/vcview.py:139
 msgid "Show modified"
 msgstr "æ?¾ç¤ºå·²ä¿®æ?¹ç??"
 
-#: ../dirdiff.py:188
+#: ../meld/dirdiff.py:199
 msgid "Filters"
 msgstr "�滤�"
 
-#: ../dirdiff.py:188
+#: ../meld/dirdiff.py:199
 msgid "Set active filters"
 msgstr "设å®?å?¯ç?¨ç??è¿?滤å?¨"
 
-#: ../dirdiff.py:241 ../dirdiff.py:287
+#: ../meld/dirdiff.py:252 ../meld/dirdiff.py:298
 #, python-format
 msgid "Error converting pattern '%s' to regular expression"
 msgstr "å°?æ ¼å¼?â??%sâ??转æ?¢ä¸ºæ­£å??表达å¼?å?ºé??"
 
-#: ../dirdiff.py:298
+#: ../meld/dirdiff.py:309
 #, python-format
 msgid "Hide %s"
 msgstr "é??è?? %s"
 
-#: ../dirdiff.py:383 ../dirdiff.py:393 ../vcview.py:272 ../vcview.py:300
+#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:272
+#: ../meld/vcview.py:300
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] æ­£å?¨æ?«æ?? %s"
 
-#: ../dirdiff.py:422
+#: ../meld/dirdiff.py:433
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' å·²æ??â??%sâ??é??è??"
 
-#: ../dirdiff.py:428
+#: ../meld/dirdiff.py:439
 #, python-format
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
@@ -129,12 +440,12 @@ msgstr ""
 "æ?¨æ­£å?¨å?ºå??大å°?å??ç??æ??件系ç»?ä¸?è¿?è¡?ä¸?å?ºå??大å°?å??ç??æ¯?è¾?ã??æ??äº?æ??件ä¸?å?¯è§?ï¼?\n"
 "%s"
 
-#: ../dirdiff.py:505
+#: ../meld/dirdiff.py:516
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] å®?æ??"
 
-#: ../dirdiff.py:551
+#: ../meld/dirdiff.py:562
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -143,7 +454,7 @@ msgstr ""
 "â??%sâ??å·²å­?å?¨ã??\n"
 "è¦?ç??æ??件?"
 
-#: ../dirdiff.py:558
+#: ../meld/dirdiff.py:569
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -154,7 +465,7 @@ msgstr ""
 "\n"
 "%sã??"
 
-#: ../dirdiff.py:576 ../vcview.py:464
+#: ../meld/dirdiff.py:587 ../meld/vcview.py:464
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -163,7 +474,7 @@ msgstr ""
 "â??%sâ??æ?¯ä¸?个ç?®å½?ã??\n"
 "é??å½?å? é?¤è¯¥ç?®å½?ä¸?ç??å­?ç?®å½?å??ï¼?"
 
-#: ../dirdiff.py:583 ../vcview.py:469
+#: ../meld/dirdiff.py:594 ../meld/vcview.py:469
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -174,139 +485,132 @@ msgstr ""
 "\n"
 "%sã??"
 
-#: ../dirdiff.py:594
+#: ../meld/dirdiff.py:606
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i �"
 
-#: ../dirdiff.py:595
+#: ../meld/dirdiff.py:607
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i å??é??"
 
-#: ../dirdiff.py:596
+#: ../meld/dirdiff.py:608
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i å°?æ?¶"
 
-#: ../dirdiff.py:597
+#: ../meld/dirdiff.py:609
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i 天"
 
-#: ../dirdiff.py:598
+#: ../meld/dirdiff.py:610
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i å?¨"
 
-#: ../dirdiff.py:599
+#: ../meld/dirdiff.py:611
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i æ??"
 
-#: ../dirdiff.py:600
+#: ../meld/dirdiff.py:612
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i å¹´"
 
-#: ../filediff.py:167 ../glade2/filediff.glade.h:4
-msgid "Create Patch"
-msgstr "å??建补ä¸?"
-
-#: ../filediff.py:167
+#: ../meld/filediff.py:171
 msgid "Create a patch"
 msgstr "å??建ä¸?个补ä¸?"
 
-#: ../filediff.py:168
+#: ../meld/filediff.py:172
 msgid "Copy all changes from right pane to left pane"
 msgstr "å¤?å?¶å?³è¾¹çª?å?£ç??æ??æ??æ?´æ?¹å?°å·¦è¾¹çª?å?£"
 
-#: ../filediff.py:169
+#: ../meld/filediff.py:173
 msgid "Copy all changes from left pane to right pane"
 msgstr "å¤?å?¶å·¦è¾¹çª?å?£ç??æ??æ??æ?´æ?¹å?°å?³è¾¹çª?å?£"
 
 #. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:222
+#: ../meld/filediff.py:226
 msgid "INS,OVR"
 msgstr "æ??å?¥ï¼?è¦?ç??"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:224
+#: ../meld/filediff.py:228
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "%i è¡?ï¼?%i å??"
 
-#: ../filediff.py:281
+#: ../meld/filediff.py:291
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
 "will be incorrect. See the user manual for more details."
 msgstr ""
-"æ­£å??表达å¼?â??%sâ??å?¨æ??件中ç??è¡?å?·å·²æ?¹å??ã??æ¯?è¾?ç??ç»?æ??ä¸?符å??ã??æ?¥ç??ç?¨æ?·æ??å??æ?¥è?·å¾?æ?´å¤?ä¿¡æ?¯ã??"
+"æ­£å??表达å¼?â??%sâ??å?¨æ??件中ç??è¡?å?·å·²æ?¹å??ã??æ¯?è¾?ç??ç»?æ??ä¸?符å??ã??æ?´å¤?ç»?è??请æ?¥ç??ç?¨æ?·æ??"
+"å??ã??"
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../filediff.py:378
+#: ../meld/filediff.py:384
 msgid "<unnamed>"
 msgstr "<æ?ªå?½å??>"
 
-#: ../filediff.py:551
+#: ../meld/filediff.py:565
 #, python-format
 msgid "[%s] Set num panes"
-msgstr "[%s] 设�����"
+msgstr "[%s] 设å®?ç¼?å?·çª?æ ¼"
 
-#: ../filediff.py:557
+#: ../meld/filediff.py:571
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] æ??å¼?æ??件"
 
-#: ../filediff.py:575 ../filediff.py:589 ../filediff.py:605 ../filediff.py:612
-#, python-format
-msgid "Could not read from '%s'"
-msgstr "ä¸?è?½è¯»å??以ä¸?å??容ï¼?â??%sâ??"
+#: ../meld/filediff.py:578 ../meld/filediff.py:663
+msgid "Hi_de"
+msgstr "é??è??(_D)"
 
-#: ../filediff.py:576 ../filediff.py:613
-msgid "The error was:"
-msgstr "é??误ï¼?"
+#: ../meld/filediff.py:599 ../meld/filediff.py:610 ../meld/filediff.py:623
+#: ../meld/filediff.py:629
+#, fuzzy
+#| msgid "Could not read from '%s'"
+msgid "Could not read file"
+msgstr "æ? æ³?读å??以ä¸?å??容ï¼?â??%sâ??"
 
-#: ../filediff.py:581
+#: ../meld/filediff.py:602
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] 读å??æ??件"
 
-#: ../filediff.py:590
-msgid ""
-"It contains ascii nulls.\n"
-"Perhaps it is a binary file."
+#: ../meld/filediff.py:611
+#, python-format
+msgid "%s appears to be a binary file."
 msgstr ""
-"å??å?« ASCII 空å­?符ã??\n"
-"å?¯è?½è¿?æ?¯ä¸?个äº?è¿?å?¶æ??件ã??"
 
-#: ../filediff.py:606
-#, python-format
-msgid "I tried encodings %s."
-msgstr "æ??æ£?æµ?è¿?ç??æ??å­?ç¼?ç ? %sã??"
+#: ../meld/filediff.py:624
+#, fuzzy, python-format
+#| msgid "I tried encodings %s."
+msgid "%s is not in encodings: %s"
+msgstr "æ£?æµ?è¿?æ??å­?ç¼?ç ? %sã??"
 
-#: ../filediff.py:633
+#: ../meld/filediff.py:647
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] 计�差�"
 
-#: ../filediff.py:643
+#: ../meld/filediff.py:658
 msgid "Files are identical"
 msgstr "æ??件å®?å?¨ç?¸å??"
 
-#: ../filediff.py:648
-msgid "Hi_de"
-msgstr "é??è??(_D)"
-
-#: ../filediff.py:788
+#: ../meld/filediff.py:802
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -315,7 +619,7 @@ msgstr ""
 "â??%sâ??å·²å­?å?¨ï¼?\n"
 "è¦?ç??æ??件ï¼?"
 
-#: ../filediff.py:801
+#: ../meld/filediff.py:815
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -326,12 +630,12 @@ msgstr ""
 "\n"
 "%sã??"
 
-#: ../filediff.py:810
+#: ../meld/filediff.py:824
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "为ç¼?å?²å?º %i é??æ?©ä¸?个å??称ã??"
 
-#: ../filediff.py:824
+#: ../meld/filediff.py:838
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -342,21 +646,21 @@ msgstr ""
 "\n"
 "æ?¨æ?³ç?¨å?ªç§?æ ¼å¼?ï¼?"
 
-#: ../filediff.py:840
+#: ../meld/filediff.py:854
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
 "Would you like to save as UTF-8?"
 msgstr ""
-"â??%sâ??å??å?«æ? æ³?ç?¨â??%sâ??表示ç??å­?符\n"
-"è¦?å?¦å­?为 UTF-8 æ??å­?ç¼?ç ?æ ¼å¼?å??ï¼?"
+"â??%sâ??å??å?«æ? æ³?ç?¨â??%sâ??ç¼?ç ?ç??å­?符\n"
+"è¦?å?¦å­?为 UTF-8 æ ¼å¼?å??ï¼?"
 
 #. save as
-#: ../filediff.py:880
+#: ../meld/filediff.py:892
 msgid "Save patch as..."
-msgstr "��补�为..."
+msgstr "补���为..."
 
-#: ../filediff.py:938
+#: ../meld/filediff.py:950
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -364,807 +668,472 @@ msgid ""
 "\n"
 "You cannot undo this operation."
 msgstr ""
-"é??æ?°è½½å?¥å°?æ?¾å¼?以ä¸?æ??件中ç??æ?´æ?¹ï¼?\n"
+"é??æ?°è½½å?¥å°?丢å¼?以ä¸?æ??件中ç??æ?´æ?¹ï¼?\n"
 "%s\n"
 "\n"
 "æ?¨æ? æ³?æ?¤æ¶?此次æ??ä½?ã??"
 
-#: ../findbar.py:119
-#, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"æ­£å??表达å¼?é??误\n"
-"â??%sâ??"
-
-#: ../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>"
-
-#: ../glade2/filediff.glade.h:3
-msgid "Copy to Clipboard"
-msgstr "����贴�"
-
-#: ../glade2/filediff.glade.h:5
-msgid "Save modified files?"
-msgstr "ä¿?å­?已修æ?¹ç??æ??件ï¼?"
-
-#: ../glade2/filediff.glade.h:6
-msgid "_Discard Changes"
-msgstr "丢���(_D)"
-
-#: ../glade2/filediff.glade.h:7
-msgid "_Save Selected"
-msgstr "ä¿?å­?é??中ç??(_S)"
-
-#: ../glade2/findbar.glade.h:1
-msgid "Regular E_xpression"
-msgstr "æ­£å??表达å¼?(_X)"
-
-#: ../glade2/findbar.glade.h:2
-msgid "Replace _All"
-msgstr "����(_A)"
-
-#: ../glade2/findbar.glade.h:3
-msgid "Replace _With"
-msgstr "��为(_W)"
-
-#: ../glade2/findbar.glade.h:4
-msgid "Who_le word"
-msgstr "å?¹é??æ?´ä¸ªå??è¯?(_L)"
-
-#: ../glade2/findbar.glade.h:5
-msgid "_Match Case"
-msgstr "å?¹é??å??å?«ç??(_M)"
-
-#: ../glade2/findbar.glade.h:6
-msgid "_Next"
-msgstr "��个(_N)"
-
-#: ../glade2/findbar.glade.h:7
-msgid "_Previous"
-msgstr "��个(_P)"
-
-#: ../glade2/findbar.glade.h:8 ../meldapp.py:443
-msgid "_Replace"
-msgstr "æ?¿æ?¢(_R)"
-
-#: ../glade2/findbar.glade.h:9
-msgid "_Search for"
-msgstr "æ??ç´¢(_S)"
-
-#: ../glade2/meldapp.glade.h:1
-msgid "<b>Edit Menu</b>"
-msgstr "<b>ç¼?è¾?è??å??</b>"
-
-#: ../glade2/meldapp.glade.h:2
-msgid "<b>Font</b>"
-msgstr "<b>å­?ä½?</b>"
-
-#: ../glade2/meldapp.glade.h:3
-msgid "<b>Loading</b>"
-msgstr "<b>载�</b>"
-
-#: ../glade2/meldapp.glade.h:4
-msgid "<b>Misc</b>"
-msgstr "<b>æ??项</b>"
-
-#: ../glade2/meldapp.glade.h:5
-msgid "Automatically supply missing newline at end of file"
-msgstr "è?ªå?¨è¡¥é½?æ??件æ?«å°¾ä¸¢å¤±ç??æ?¢è¡?符"
-
-#: ../glade2/meldapp.glade.h:6
-msgid "Choose Files"
-msgstr "é??æ?©æ??件"
-
-#: ../glade2/meldapp.glade.h:7
-msgid "Copyright © 2002-2009 Stephen Kennedy"
-msgstr "ç??æ??æ??æ?? © 2002-2009 Stephen Kennedy"
-
-#: ../glade2/meldapp.glade.h:8
-msgid "Custom command"
-msgstr "����令"
-
-#: ../glade2/meldapp.glade.h:9
-msgid "Directory"
-msgstr "��"
-
-#: ../glade2/meldapp.glade.h:10
-msgid "Edit files with:"
-msgstr "ç¼?è¾?æ??件ç??ç¨?åº?ï¼?"
-
-#: ../glade2/meldapp.glade.h:11
-msgid "Editor"
-msgstr "ç¼?è¾?å?¨"
-
-#: ../glade2/meldapp.glade.h:12
-msgid "Encoding"
-msgstr "æ??å­?ç¼?ç ?"
-
-#: ../glade2/meldapp.glade.h:13
-msgid "File Filters"
-msgstr "æ??件è¿?滤å?¨"
-
-#: ../glade2/meldapp.glade.h:14
-msgid "Gnome default editor"
-msgstr "Gnome �认���"
-
-#: ../glade2/meldapp.glade.h:15
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "忽ç?¥å¤?空è¡?/å°?空è¡?ç??å·®å¼?"
-
-#: ../glade2/meldapp.glade.h:16
-msgid "Ignore symbolic links"
-msgstr "忽�符���"
-
-#: ../glade2/meldapp.glade.h:17
-msgid "Insert spaces instead of tabs"
-msgstr "ç?¨ç©ºæ ¼æ?¿æ?¢å?¶è¡¨ç¬¦"
-
-#: ../glade2/meldapp.glade.h:18
-msgid "Internal editor"
-msgstr "å??é?¨ç¼?è¾?å?¨"
-
-#: ../glade2/meldapp.glade.h:19
-msgid "Line Wrapping "
-msgstr "��"
-
-#: ../glade2/meldapp.glade.h:20
-msgid "Meld"
-msgstr "Meld"
-
-#: ../glade2/meldapp.glade.h:21
-msgid "Mine"
-msgstr "æ??ç??"
-
-#: ../glade2/meldapp.glade.h:22
-msgid "Original"
-msgstr "å??件"
-
-#: ../glade2/meldapp.glade.h:23
-msgid "Other"
-msgstr "��"
-
-#: ../glade2/meldapp.glade.h:24
-msgid "Preferences : Meld"
-msgstr "é¦?é??项ï¼?Meld"
-
-#: ../glade2/meldapp.glade.h:25
-msgid "Show line numbers"
-msgstr "�示��"
-
-#: ../glade2/meldapp.glade.h:26
-msgid "Tab width"
-msgstr "�表符宽度"
-
-#: ../glade2/meldapp.glade.h:27
-msgid "Text Filters"
-msgstr "æ??å­?è¿?滤å?¨"
-
-#: ../glade2/meldapp.glade.h:28
-msgid "Three way directory"
-msgstr "ä¸?å??ç?®å½?"
-
-#: ../glade2/meldapp.glade.h:29
-msgid "Three way file"
-msgstr "ä¸?å??æ??件"
-
-#: ../glade2/meldapp.glade.h:30
-msgid "Two way directory"
-msgstr "两å??ç?®å½?"
-
-#: ../glade2/meldapp.glade.h:31
-msgid "Two way file"
-msgstr "两å??æ??件"
-
-#: ../glade2/meldapp.glade.h:32
-msgid "Use GNOME monospace font"
-msgstr "使� GNOME �宽��"
-
-#: ../glade2/meldapp.glade.h:33
-msgid "Use custom font"
-msgstr "使������"
-
-#: ../glade2/meldapp.glade.h:34
-msgid "Use syntax highlighting"
-msgstr "使�语��亮"
-
-#: ../glade2/meldapp.glade.h:35
-msgid "Version control view"
-msgstr "ç??æ?¬æ?§å?¶æ?¥ç??"
-
-#: ../glade2/meldapp.glade.h:36
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "è½½å?¥æ?¶ï¼?æ??此顺åº?å°?è¯?ç¼?ç ?ã??(å¦? utf8ï¼?gb2312ï¼?gbkï¼?gb18030)"
-
-#: ../glade2/meldapp.glade.h:37
-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"
-"æ?¯æ??ç??é??é??符ã??"
-
-#: ../glade2/meldapp.glade.h:38
-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 表达"
-"å¼?ï¼?å?¨å¼?å§?æ¯?è¾?å??ï¼?ç?¨ç©ºå­?符串æ?¥æ?¿æ?¢æ??å®?ç??æ??å­?ã??å¦?æ??表达å¼?å??å?«â??groupâ??,å?ª"
-"æ??â??groupâ??被æ?¿æ?¢ã??æ?´å¤?ä¿¡æ?¯è¯·æ?¥ç??ç?¨æ?·æ??å??ã??"
-
-#: ../glade2/meldapp.glade.h:39
-msgid "_Character"
-msgstr "�符(_C)"
-
-#: ../glade2/meldapp.glade.h:40
-msgid "_Directory Comparison"
-msgstr "����(_D)"
-
-#: ../glade2/meldapp.glade.h:41
-msgid "_File Comparison"
-msgstr "æ??件æ¯?è¾?(_F)"
-
-#: ../glade2/meldapp.glade.h:42
-msgid "_None"
-msgstr "æ? (_N)"
-
-#: ../glade2/meldapp.glade.h:43
-msgid "_Three Way Compare"
-msgstr "ä¸?å??æ¯?è¾?(_T)"
-
-#: ../glade2/meldapp.glade.h:44
-msgid "_Version Control Browser"
-msgstr "ç??æ?¬æ?§å?¶æµ?è§?å?¨(_V)"
-
-#: ../glade2/meldapp.glade.h:45
-msgid "_Word"
-msgstr "å­?(_W)"
-
-#: ../glade2/vcview.glade.h:1
-msgid "Commit Files"
-msgstr "æ??交æ??件"
-
-#: ../glade2/vcview.glade.h:2
-msgid "Compare Options"
-msgstr "æ¯?è¾?é??项"
-
-#: ../glade2/vcview.glade.h:3
-msgid "Date"
-msgstr "æ?¥æ??"
-
-#: ../glade2/vcview.glade.h:4
-msgid "Local copy against other remote revision"
-msgstr "æ?¬å?°å?¯æ?¬é??对å?¶å®?è¿?ç¨?æ ¡è®¢"
-
-#: ../glade2/vcview.glade.h:5
-msgid "Local copy against same remote revision"
-msgstr "æ?¬å?°ç??å?¯æ?¬é??对ç?¸å??ç??è¿?ç¨?修订"
-
-#: ../glade2/vcview.glade.h:6
-msgid "Log Message"
-msgstr "��信�"
-
-#: ../glade2/vcview.glade.h:7
-msgid "Previous Logs"
-msgstr "ä¸?次ç??æ?¥å¿?"
-
-#: ../glade2/vcview.glade.h:8 ../vcview.py:183
-msgid "Tag"
-msgstr "æ ?ç­¾"
-
-#: ../glade2/vcview.glade.h:9
-msgid "VC Log"
-msgstr "VC ��"
-
-#: ../historyentry.py:248
-msgid "_Browse..."
-msgstr "��(_B)..."
-
-#: ../historyentry.py:256
-msgid "Path"
-msgstr "路�"
-
-#: ../historyentry.py:257
-msgid "Path to file"
-msgstr "æ??件路å¾?"
-
-#: ../historyentry.py:258
-msgid "Pop up a file selector to choose a file"
-msgstr "å¼¹å?ºæ??件é??æ?©å?¨æ?¥é??æ?©ä¸?个æ??件"
-
-#: ../historyentry.py:379
-msgid "Select directory"
-msgstr "é??æ?©ç?®å½?"
-
-#: ../historyentry.py:383
-msgid "Select file"
-msgstr "é??æ?©æ??件"
-
-#: ../meld:47
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld è¦?æ±? %s æ??æ?´é«?ç??æ?¬ã??"
-
-#: ../meld:64 ../meld:71
-msgid "Cannot import: "
-msgstr "æ? æ³?导å?¥ï¼?"
-
-#: ../meld.desktop.in.h:1
-msgid "Compare and merge your files"
-msgstr "æ¯?è¾?å??å??并æ?¨ç??æ??件"
-
-#: ../meld.desktop.in.h:2
-msgid "Meld Diff Viewer"
-msgstr "Meld Diff å·®å¼?æ?¥ç??å?¨"
-
-#: ../meldapp.py:151
+#: ../meld/meldapp.py:150
 msgid "label"
 msgstr "æ ?ç­¾"
 
-#: ../meldapp.py:151
+#: ../meld/meldapp.py:150
 msgid "pattern"
-msgstr "æ ¼å¼?"
+msgstr "模�"
 
-#: ../meldapp.py:219
+#: ../meld/meldapp.py:218
 msgid "Only available if you have gnome-python-desktop installed"
-msgstr "å?ªæ??å®?è£? gnome-python-desktop å??æ??æ??æ??"
+msgstr "ä»?å?¨å®?è£? gnome-python-desktop å??æ??æ??æ??"
 
 #. file filters
 #. text filters
-#: ../meldapp.py:229 ../meldapp.py:234 ../vcview.py:163
+#: ../meld/meldapp.py:228 ../meld/meldapp.py:233 ../meld/vcview.py:163
 msgid "Name"
-msgstr "å??称"
+msgstr "è¿?滤å?¨å??称"
 
-#: ../meldapp.py:229 ../meldapp.py:234
+#: ../meld/meldapp.py:228 ../meld/meldapp.py:233
 msgid "Active"
 msgstr "��"
 
-#: ../meldapp.py:229
+#: ../meld/meldapp.py:228
 msgid "Pattern"
-msgstr "æ ¼å¼?"
+msgstr "模�"
 
-#: ../meldapp.py:234
+#: ../meld/meldapp.py:233
 msgid "Regex"
-msgstr "语�"
+msgstr "æ­£å??语æ³?"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:341
+#: ../meld/meldapp.py:340
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "�份 \t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:343
+#: ../meld/meldapp.py:342
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "ç??æ?¬æ?§å?¶ \t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:345
+#: ../meld/meldapp.py:344
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 msgstr "��� \t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:347
+#: ../meld/meldapp.py:346
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgstr "��� \t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:349
+#: ../meld/meldapp.py:348
 msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 msgstr "CVS ��� \t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:351
+#: ../meld/meldapp.py:350
 msgid "C++ comment\t0\t//.*\n"
 msgstr "C++ 注é?? \t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:353
+#: ../meld/meldapp.py:352
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "C 注é?? \t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:355
+#: ../meld/meldapp.py:354
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
-msgstr "æ??æ??å??ä½?ç??ç©ºæ ¼ \t0\t[ \\t\\r\\f\\v]*\n"
+msgstr "æ??æ??空ç?½å­?符 \t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:357
+#: ../meld/meldapp.py:356
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
-msgstr "å¼?头ç??å¤?ä¸ªç©ºæ ¼ \t0\t^[ \\t\\r\\f\\v]*\n"
+msgstr "�头空��符 \t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:359
+#: ../meld/meldapp.py:358
 msgid "Script comment\t0\t#.*"
 msgstr "è??æ?¬æ³¨é?? \t0\t#.*"
 
-#: ../meldapp.py:428
+#: ../meld/meldapp.py:427
 msgid "_File"
 msgstr "æ??件(_F)"
 
-#: ../meldapp.py:429
+#: ../meld/meldapp.py:428
 msgid "_New..."
 msgstr "�建(_N)..."
 
-#: ../meldapp.py:429
+#: ../meld/meldapp.py:428
 msgid "Start a new comparison"
 msgstr "å¼?å§?æ?°ç??æ¯?è¾?"
 
-#: ../meldapp.py:430
+#: ../meld/meldapp.py:429
 msgid "Save the current file"
 msgstr "ä¿?å­?å½?å??æ??件"
 
-#: ../meldapp.py:432
+#: ../meld/meldapp.py:431
 msgid "Close the current file"
 msgstr "å?³é?­å½?å??æ??件"
 
-#: ../meldapp.py:433
+#: ../meld/meldapp.py:432
 msgid "Quit the program"
 msgstr "é??å?ºç¨?åº?"
 
-#: ../meldapp.py:435
+#: ../meld/meldapp.py:434
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../meldapp.py:436
+#: ../meld/meldapp.py:435
 msgid "Undo the last action"
 msgstr "æ?¤æ¶?æ??å??ç??æ??ä½?"
 
-#: ../meldapp.py:437
+#: ../meld/meldapp.py:436
 msgid "Redo the last undone action"
 msgstr "é??å??æ??å??æ?¤æ¶?ç??æ??ä½?"
 
-#: ../meldapp.py:438
+#: ../meld/meldapp.py:437
 msgid "Cut the selection"
 msgstr "å?ªå??é??中ç??å??容"
 
-#: ../meldapp.py:439
+#: ../meld/meldapp.py:438
 msgid "Copy the selection"
 msgstr "å¤?å?¶é??中ç??å??容"
 
-#: ../meldapp.py:440
+#: ../meld/meldapp.py:439
 msgid "Paste the clipboard"
 msgstr "�贴�贴�"
 
-#: ../meldapp.py:441
+#: ../meld/meldapp.py:440
 msgid "Search for text"
 msgstr "æ??ç´¢æ??å­?"
 
-#: ../meldapp.py:442
+#: ../meld/meldapp.py:441
 msgid "Find Ne_xt"
 msgstr "����个(_X)"
 
-#: ../meldapp.py:442
+#: ../meld/meldapp.py:441
 msgid "Search forwards for the same text"
 msgstr "继续å??å??æ??ç´¢ç?¸å??ç??æ??å­?"
 
-#: ../meldapp.py:443
+#: ../meld/meldapp.py:442
 msgid "Find and replace text"
 msgstr "æ?¥æ?¾å¹¶æ?¿æ?¢æ??å­?"
 
-#: ../meldapp.py:444
+#: ../meld/meldapp.py:443
 msgid "Go to the next difference"
 msgstr "转���个差�"
 
-#: ../meldapp.py:445
+#: ../meld/meldapp.py:444
 msgid "Go to the previous difference"
 msgstr "转���个差�"
 
-#: ../meldapp.py:446
+#: ../meld/meldapp.py:445
 msgid "Prefere_nces"
 msgstr "é¦?é??项(_N)"
 
-#: ../meldapp.py:446
+#: ../meld/meldapp.py:445
 msgid "Configure the application"
 msgstr "��设置"
 
-#: ../meldapp.py:448
+#: ../meld/meldapp.py:447
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../meldapp.py:449
+#: ../meld/meldapp.py:448
 msgid "File status"
 msgstr "æ??件ç?¶æ??"
 
-#: ../meldapp.py:450
+#: ../meld/meldapp.py:449
 msgid "Version status"
 msgstr "ç??æ?¬ç?¶æ??"
 
-#: ../meldapp.py:451
+#: ../meld/meldapp.py:450
 msgid "File filters"
 msgstr "æ??件è¿?滤å?¨"
 
-#: ../meldapp.py:452
+#: ../meld/meldapp.py:451
 msgid "Stop the current action"
 msgstr "å??æ­¢å½?å??æ??ä½?"
 
-#: ../meldapp.py:453
+#: ../meld/meldapp.py:452
 msgid "Refresh the view"
 msgstr "����"
 
-#: ../meldapp.py:454
+#: ../meld/meldapp.py:453
 msgid "Reload"
 msgstr "é??æ?°è½½å?¥"
 
-#: ../meldapp.py:454
+#: ../meld/meldapp.py:453
 msgid "Reload the comparison"
 msgstr "é??æ?°è½½å?¥æ¯?è¾?"
 
-#: ../meldapp.py:456
+#: ../meld/meldapp.py:455
 msgid "_Help"
 msgstr "帮�(_H)"
 
-#: ../meldapp.py:457
+#: ../meld/meldapp.py:456
 msgid "_Contents"
 msgstr "å??容(_C)"
 
-#: ../meldapp.py:457
+#: ../meld/meldapp.py:456
 msgid "Open the Meld manual"
 msgstr "æ??å¼? Meld 帮å?©æ??å??"
 
-#: ../meldapp.py:458
+#: ../meld/meldapp.py:457
 msgid "Report _Bug"
 msgstr "æ?¥å??é??误(_B)"
 
-#: ../meldapp.py:458
+#: ../meld/meldapp.py:457
 msgid "Report a bug in Meld"
-msgstr "æ?¥å?? Meld 缺é?·"
+msgstr "æ?¥å?? Meld 中ç??é??误"
 
-#: ../meldapp.py:459
+#: ../meld/meldapp.py:458
 msgid "About this program"
 msgstr "�����"
 
-#: ../meldapp.py:462
+#: ../meld/meldapp.py:461
 msgid "Full Screen"
 msgstr "��"
 
-#: ../meldapp.py:462
+#: ../meld/meldapp.py:461
 msgid "View the comparison in full screen"
 msgstr "以å?¨å±?模å¼?æ?¥ç??æ¯?è¾?"
 
-#: ../meldapp.py:463
+#: ../meld/meldapp.py:462
 msgid "_Toolbar"
 msgstr "å·¥å?·æ ?(_T)"
 
-#: ../meldapp.py:463
+#: ../meld/meldapp.py:462
 msgid "Show or hide the toolbar"
 msgstr "æ?¾ç¤ºæ??é??è??å·¥å?·æ ?"
 
-#: ../meldapp.py:464
+#: ../meld/meldapp.py:463
 msgid "_Statusbar"
 msgstr "ç?¶æ??æ ?(_S)"
 
-#: ../meldapp.py:464
+#: ../meld/meldapp.py:463
 msgid "Show or hide the statusbar"
 msgstr "æ?¾ç¤ºæ??é??è??ç?¶æ??æ ?"
 
-#: ../meldapp.py:795
+#. exit at first non found directory + file
+#: ../meld/meldapp.py:804
 msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "æ? æ³?对混å??ç??æ??件å??ç?®å½?è¿?è¡?æ¯?è¾?ã??\n"
+msgstr "æ? æ³?对æ??件å??ç?®å½?ç??æ··å??è¿?è¡?æ¯?è¾?ã??\n"
+
+#: ../meld/meldapp.py:858
+msgid "wrong number of arguments supplied to --diff"
+msgstr "æ??ä¾?ç»? --diff ç??å??æ?°ä¸ªæ?°é??误ã??"
 
-#: ../meldapp.py:838 ../meldapp.py:846
+#: ../meld/meldapp.py:862
+msgid "Start with an empty window"
+msgstr "å?¯å?¨æ?¶æ??å¼?空ç?½çª?å?£"
+
+#: ../meld/meldapp.py:863 ../meld/meldapp.py:864 ../meld/meldapp.py:866
 msgid "file"
 msgstr "æ??件"
 
-#: ../meldapp.py:839 ../meldapp.py:845
+#: ../meld/meldapp.py:863 ../meld/meldapp.py:865 ../meld/meldapp.py:866
 msgid "dir"
 msgstr "��"
 
-#: ../meldapp.py:844
-msgid "Start with no window open"
-msgstr "å?¯å?¨æ?¶ä¸?æ??å¼?çª?å?£"
-
-#: ../meldapp.py:845
-#, python-format
-msgid "Start with Version Control browser in '%s'"
-msgstr "ç?¨ç??æ?¬æ?§å?¶æµ?è§?å?¨æ??å¼?â??%sâ??"
-
-#: ../meldapp.py:846
-#, python-format
-msgid "Start with Version Control diff of '%s'"
-msgstr "ç?¨ç??æ?¬æ?§å?¶æµ?è§?å?¨æ¯?è¾?â??%sâ??ç??å·®å¼?"
+#: ../meld/meldapp.py:863
+msgid "Start a version control comparison"
+msgstr "å¼?å§?ç??æ?¬æ?§å?¶æ¯?è¾?"
 
-#: ../meldapp.py:847
-msgid "Start with 2 or 3 way file comparison"
+#: ../meld/meldapp.py:864
+#, fuzzy
+#| msgid "Start with 2 or 3 way file comparison"
+msgid "Start a 2- or 3-way file comparison"
 msgstr "å?¯å?¨ä¸¤å??æ??ä¸?å??æ??件æ¯?è¾?"
 
-#: ../meldapp.py:848
-msgid "Start with 2 or 3 way directory comparison"
+#: ../meld/meldapp.py:865
+#, fuzzy
+#| msgid "Start with 2 or 3 way directory comparison"
+msgid "Start a 2- or 3-way directory comparison"
 msgstr "å?¯å?¨ä¸¤å??æ??ä¸?å??ç?®å½?æ¯?è¾?"
 
-#: ../meldapp.py:855
+#: ../meld/meldapp.py:866
+msgid "Start a comparison between file and dir/file"
+msgstr "å?¨æ??件å??æ??件夹/æ??件ä¹?é?´å¼?å§?æ¯?è¾?"
+
+#: ../meld/meldapp.py:872
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld æ?¯ä¸?个æ??件å??ç?®å½?æ¯?è¾?å·¥å?·ã??"
 
-#: ../meldapp.py:858
+#: ../meld/meldapp.py:875
 msgid "Set label to use instead of file name"
 msgstr "设置æ ?ç­¾æ?¥ä»£æ?¿æ??件å??"
 
-#: ../meldapp.py:860
+#: ../meld/meldapp.py:877
 msgid "Automatically compare all differing files on startup"
-msgstr "å?¯å?¨æ?¶è?ªå?¨æ¯?è¾?æ??æ??è¦?æ¯?è¾?ç??æ??件"
+msgstr "å?¯å?¨æ?¶è?ªå?¨æ¯?è¾?æ??æ??ä¸?å??ç??æ??件"
 
-#: ../meldapp.py:861 ../meldapp.py:862 ../meldapp.py:863 ../meldapp.py:864
+#: ../meld/meldapp.py:878 ../meld/meldapp.py:879 ../meld/meldapp.py:880
+#: ../meld/meldapp.py:881
 msgid "Ignored for compatibility"
-msgstr "忽ç?¥ä¸?è?´ç??"
+msgstr "为ä¿?æ??å?¼å®¹æ?§è??忽ç?¥"
 
-#: ../meldapp.py:867
+#: ../meld/meldapp.py:884
 msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "æ?°å»ºä¸?个 diff æ ?ç­¾æ?¥æ?¯æ?? ä¸?å??æ??件æ??ç?®å½?ã??"
+msgstr "为æ??件æ??ç?®å½?å??建 diff 表ï¼?æ??å¤?æ?¯æ??ä¸?个æ??件æ??ç?®å½?"
 
-#: ../meldapp.py:871
-msgid "Invalid number of arguments supplied for --diff."
-msgstr "æ??ä¾?ç»? --diff å??æ?°ç??æ?°å­?æ? æ??ã??"
-
-#: ../meldapp.py:874
+#: ../meld/meldapp.py:887
 #, python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "å??æ?°æ?°å­?é??误 (è°?ç?¨ %i)"
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "å??æ?°è¿?å¤?(é??è¦? 0-3 个ï¼?å¾?å?°äº? %d  个)"
 
-#: ../melddoc.py:46
+#: ../meld/melddoc.py:46
 msgid "untitled"
 msgstr "æ? æ ?é¢?"
 
 #. no common path. empty names get changed to "[None]"
-#: ../misc.py:190
+#: ../meld/misc.py:189
 msgid "[None]"
 msgstr "[æ? ]"
 
-#: ../vcview.py:127
+#: ../meld/vcview.py:127
 msgid "_Commit"
 msgstr "æ??交(_C)"
 
-#: ../vcview.py:127
+#: ../meld/vcview.py:127
 msgid "Commit"
 msgstr "æ??交"
 
 #. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../vcview.py:128
+#: ../meld/vcview.py:128
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
-#: ../vcview.py:128
+#: ../meld/vcview.py:128
 msgid "Update"
 msgstr "æ?´æ?°"
 
 #. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../vcview.py:129
+#: ../meld/vcview.py:129
 msgid "_Add"
 msgstr "æ·»å? (_A)"
 
-#: ../vcview.py:129
+#: ../meld/vcview.py:129
 msgid "Add to VC"
 msgstr "æ·»å? å?° CV"
 
 #. FIXME: popup used to use gtk.STOCK_ADD
-#: ../vcview.py:130
+#: ../meld/vcview.py:130
 msgid "Add _Binary"
 msgstr "æ·»å? äº?è¿?å?¶(_B)"
 
-#: ../vcview.py:130
+#: ../meld/vcview.py:130
 msgid "Add binary to VC"
 msgstr "æ·»å? äº?è¿?å?¶å?° VC"
 
 #. FIXME: stock is inconsistent with other VC actions
-#: ../vcview.py:131
+#: ../meld/vcview.py:131
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../vcview.py:131
+#: ../meld/vcview.py:131
 msgid "Remove from VC"
-msgstr "ä»? CV å? é?¤"
+msgstr "ä»? VC å? é?¤"
 
 #. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../vcview.py:132
+#: ../meld/vcview.py:132
 msgid "_Resolved"
 msgstr "å·²å¤?ç??(_R)"
 
-#: ../vcview.py:132
+#: ../meld/vcview.py:132
 msgid "Mark as resolved for VC"
 msgstr "å?¨ VC 中æ ?记为â??å·²å¤?ç??â??"
 
-#: ../vcview.py:133
+#: ../meld/vcview.py:133
 msgid "Revert to original"
 msgstr "转æ?¢ä¸ºå??件"
 
-#: ../vcview.py:134
+#: ../meld/vcview.py:134
 msgid "Delete locally"
 msgstr "ä»?æ?¬å?°å? é?¤"
 
-#: ../vcview.py:138
+#: ../meld/vcview.py:138
 msgid "_Flatten"
 msgstr "å±?å¼?(_F)"
 
-#: ../vcview.py:138
+#: ../meld/vcview.py:138
 msgid "Flatten directories"
 msgstr "����"
 
-#: ../vcview.py:139
+#: ../meld/vcview.py:139
 msgid "_Modified"
 msgstr "已修�(_M)"
 
-#: ../vcview.py:140
+#: ../meld/vcview.py:140
 msgid "_Normal"
 msgstr "正常(_N)"
 
-#: ../vcview.py:140
+#: ../meld/vcview.py:140
 msgid "Show normal"
 msgstr "æ?¾ç¤ºæ­£å¸¸ç??"
 
-#: ../vcview.py:141
+#: ../meld/vcview.py:141
 msgid "Non _VC"
 msgstr "é?? _VC"
 
-#: ../vcview.py:141
+#: ../meld/vcview.py:141
 msgid "Show unversioned files"
-msgstr "æ?¾ç¤ºç??æ?¬ä¸?详ç??æ??件"
+msgstr "æ?¾ç¤ºæ? ç??æ?¬æ??件"
 
-#: ../vcview.py:142
+#: ../meld/vcview.py:142
 msgid "Ignored"
 msgstr "已忽ç?¥ç??"
 
-#: ../vcview.py:142
+#: ../meld/vcview.py:142
 msgid "Show ignored files"
-msgstr "æ?¾ç¤ºå·²å¿½ç?¥ç??æ??件"
+msgstr "æ?¾ç¤ºå·²å¿½ç?¥æ??件"
 
-#: ../vcview.py:180
+#: ../meld/vcview.py:180
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../vcview.py:181
+#: ../meld/vcview.py:181
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../vcview.py:182
+#: ../meld/vcview.py:182
 msgid "Rev"
 msgstr "修订ç??æ?¬"
 
-#: ../vcview.py:184
+#: ../meld/vcview.py:184
 msgid "Options"
 msgstr "é??项"
 
-#: ../vcview.py:230
+#: ../meld/vcview.py:230
 msgid "Choose one Version Control"
 msgstr "é??æ?©ä¸?个ç??æ?¬æ?§å?¶"
 
-#: ../vcview.py:231
+#: ../meld/vcview.py:231
 msgid "Only one Version Control in this directory"
-msgstr "å?¨è¿?个ç?®å½?å?ªæ??ä¸?个ç??æ?¬æ?§å?¶"
+msgstr "æ­¤ç?®å½?中å?ªæ??ä¸?个ç??æ?¬æ?§å?¶æ??件"
 
-#: ../vcview.py:316
+#: ../meld/vcview.py:316
 msgid "(Empty)"
 msgstr "(空)"
 
-#: ../vcview.py:349
+#: ../meld/vcview.py:349
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] è?·å??å·®å¼?"
 
-#: ../vcview.py:356
+#: ../meld/vcview.py:356
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] ��补�"
 
-#: ../vcview.py:360
+#: ../meld/vcview.py:360
 msgid "No differences found."
 msgstr "没æ??å??ç?°å·®å¼?ã??"
 
-#: ../vcview.py:439
+#: ../meld/vcview.py:439
 msgid "Select some files first."
-msgstr "ä¼?å??é??æ?©æ??件ã??"
+msgstr "ä¼?å??é??æ?©æ??äº?æ??件ã??"
 
-#: ../vcview.py:505
+#: ../meld/vcview.py:505
 #, python-format
 msgid ""
 "\n"
@@ -1193,7 +1162,7 @@ msgstr ""
 "\n"
 "                   è°?ç?¨ patch å?½ä»¤å¤±è´¥ã??\n"
 "                    \n"
-"                    å?¯è?½æ?¯å?¢å?¢è¿?没æ??å®?è£? GNU patchï¼?\n"
+"                    å?¯è?½æ?¨è¿?没æ??å®?è£? GNU patchï¼?\n"
 "                    æ??è??æ?¨ä½¿ç?¨ç??æ?¯ä¸?个æ?ªç»?è¿?æµ?è¯?ç?? %s ç??æ?¬ã??\n"
 "                    \n"
 "                    请å??é??ç?µå­?é?®ä»¶å?°è¿?é??æ?¥å??é??误ï¼?\n"
@@ -1211,20 +1180,76 @@ msgstr ""
 "                    X.Y.Z æ?¯æ?¨å®?é??使ç?¨ç??æº?æ?§å?¶è½¯ä»¶ç??ç??æ?¬å?·ã??\n"
 "                    "
 
+#: ../meld/ui/findbar.py:119
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"æ­£å??表达å¼?é??误\n"
+"â??%sâ??"
+
+#: ../meld/ui/historyentry.py:248
+msgid "_Browse..."
+msgstr "��(_B)..."
+
+#: ../meld/ui/historyentry.py:256
+msgid "Path"
+msgstr "路�"
+
+#: ../meld/ui/historyentry.py:257
+msgid "Path to file"
+msgstr "æ??件路å¾?"
+
+#: ../meld/ui/historyentry.py:258
+msgid "Pop up a file selector to choose a file"
+msgstr "å¼¹å?ºæ??件é??æ?©å?¨æ?¥é??æ?©ä¸?个æ??件"
+
+#: ../meld/ui/historyentry.py:379
+msgid "Select directory"
+msgstr "é??æ?©ç?®å½?"
+
+#: ../meld/ui/historyentry.py:383
+msgid "Select file"
+msgstr "é??æ?©æ??件"
+
+#: ../meld/ui/notebooklabel.py:61
+msgid "Close tab"
+msgstr "å?³é?­æ ?ç­¾"
+
 #. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:40
+#: ../meld/vc/_vc.py:40
 msgid ""
 "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
 "Missing"
 msgstr "忽ç?¥ï¼?ç??æ?¬ä¸?详:::é??误::æ?°æ·»å? :已修æ?¹:<b>å?²çª?</b>:å·²å? é?¤:丢失"
 
-#: ../vc/cvs.py:151
+#: ../meld/vc/cvs.py:151
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
 "The pattern was '%s'\n"
 "The error was '%s'"
 msgstr ""
-"转æ?¢ä¸ºæ­£å??表达å¼?å?ºé??\n"
-"ç±»å??æ?¯â??%sâ??\n"
-"é??误æ?¯â??%sâ??"
+"转æ?¢ä¸ºæ­£å??表达å¼?æ?¶å?ºé??\n"
+"模å¼?为â??%sâ??\n"
+"é??误为â??%sâ??"
+
+#~ msgid "The error was:"
+#~ msgstr "é??误ï¼?"
+
+#~ msgid ""
+#~ "It contains ascii nulls.\n"
+#~ "Perhaps it is a binary file."
+#~ msgstr ""
+#~ "å??å?« ASCII 空å­?符ã??\n"
+#~ "å?¯è?½è¿?æ?¯ä¸?个äº?è¿?å?¶æ??件ã??"
+
+#~ msgid "Start with Version Control browser in '%s'"
+#~ msgstr "ç?¨ç??æ?¬æ?§å?¶æµ?è§?å?¨æ??å¼?â??%sâ??"
+
+#~ msgid "Start with Version Control diff of '%s'"
+#~ msgstr "ç?¨ç??æ?¬æ?§å?¶æµ?è§?å?¨æ¯?è¾?â??%sâ??ç??å·®å¼?"
+
+#~ msgid "Wrong number of arguments (Got %i)"
+#~ msgstr "å??æ?°æ?°å­?é??误 (è°?ç?¨ %i)"