[meld] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 08918d096ba35787612c22c9d3e826d4b9215e9b
Author: Tao Wang <dancefire gmail com>
Date:   Sun Jul 25 19:09:26 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po |  740 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 414 insertions(+), 326 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0db8b17..5d12690 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,14 +5,16 @@
 # Funda Wang <fundawang linux net cn>, 2004, 2005.
 # Careone <careoneagain gmail com>, 2009.
 # arccos <boyermoore gmail com>, 2009.
+# Tao Wang <dancefire gmail com>, 2010.
+#
 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-11-01 23:07+0000\n"
-"PO-Revision-Date: 2009-11-17 12:41+0800\n"
-"Last-Translator: arccos <boyermoore gmail com>\n"
+"POT-Creation-Date: 2010-07-01 22:40+0000\n"
+"PO-Revision-Date: 2010-07-25 19:08+0800\n"
+"Last-Translator: Tao Wang <dancefire 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"
@@ -33,6 +35,14 @@ msgid "Compare and merge your files"
 msgstr "æ¯?è¾?å??å??并æ?¨ç??æ??件"
 
 #: ../data/meld.desktop.in.h:2
+msgid "Diff Viewer"
+msgstr "å·®å¼?æ?¥ç??å?¨"
+
+#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.glade.h:4
+msgid "Meld"
+msgstr "Meld"
+
+#: ../data/meld.desktop.in.h:4
 msgid "Meld Diff Viewer"
 msgstr "Meld Diff å·®å¼?æ?¥ç??å?¨"
 
@@ -48,7 +58,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr "����贴�"
 
-#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:171
+#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:180
 msgid "Create Patch"
 msgstr "å??建补ä¸?"
 
@@ -92,7 +102,7 @@ msgstr "��个(_N)"
 msgid "_Previous"
 msgstr "��个(_P)"
 
-#: ../data/ui/findbar.glade.h:8 ../meld/meldapp.py:442
+#: ../data/ui/findbar.glade.h:8 ../meld/meldapp.py:154
 msgid "_Replace"
 msgstr "æ?¿æ?¢(_R)"
 
@@ -101,150 +111,138 @@ msgid "_Search for"
 msgstr "æ??ç´¢(_S)"
 
 #: ../data/ui/meldapp.glade.h:1
-msgid "<b>Edit Menu</b>"
-msgstr "<b>ç¼?è¾?è??å??</b>"
+msgid "Choose Files"
+msgstr "é??æ?©æ??件"
 
 #: ../data/ui/meldapp.glade.h:2
-msgid "<b>Font</b>"
-msgstr "<b>å­?ä½?</b>"
+msgid "Copyright © 2002-2009 Stephen Kennedy"
+msgstr "ç??æ??æ??æ?? © 2002-2009 Stephen Kennedy"
 
 #: ../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>"
+msgid "Directory"
+msgstr "��"
 
 #: ../data/ui/meldapp.glade.h:5
-msgid "Automatically supply missing newline at end of file"
-msgstr "è?ªå?¨è¡¥é½?æ??件æ?«å°¾ä¸¢å¤±ç??æ?¢è¡?符"
+msgid "Mine"
+msgstr "æ??ç??"
 
 #: ../data/ui/meldapp.glade.h:6
-msgid "Choose Files"
-msgstr "é??æ?©æ??件"
+msgid "Original"
+msgstr "å??件"
 
 #: ../data/ui/meldapp.glade.h:7
-msgid "Copyright © 2002-2009 Stephen Kennedy"
-msgstr "ç??æ??æ??æ?? © 2002-2009 Stephen Kennedy"
+msgid "Other"
+msgstr "��"
 
 #: ../data/ui/meldapp.glade.h:8
-msgid "Custom command"
-msgstr "����令"
+msgid "Three way directory"
+msgstr "ä¸?å??ç?®å½?"
 
 #: ../data/ui/meldapp.glade.h:9
-msgid "Directory"
-msgstr "��"
+msgid "Three way file"
+msgstr "ä¸?å??æ??件"
 
 #: ../data/ui/meldapp.glade.h:10
-msgid "Edit files with:"
-msgstr "ç¼?è¾?æ??件ç??ç¨?åº?ï¼?"
+msgid "Two way directory"
+msgstr "两å??ç?®å½?"
 
 #: ../data/ui/meldapp.glade.h:11
-msgid "Editor"
-msgstr "ç¼?è¾?å?¨"
+msgid "Two way file"
+msgstr "两å??æ??件"
 
 #: ../data/ui/meldapp.glade.h:12
-msgid "Encoding"
-msgstr "æ??å­?ç¼?ç ?"
+msgid "Version control view"
+msgstr "ç??æ?¬æ?§å?¶æ?¥ç??"
 
 #: ../data/ui/meldapp.glade.h:13
-msgid "File Filters"
-msgstr "æ??件è¿?滤å?¨"
+msgid "_Directory Comparison"
+msgstr "����(_D)"
 
 #: ../data/ui/meldapp.glade.h:14
-msgid "Gnome default editor"
-msgstr "Gnome �认���"
+msgid "_File Comparison"
+msgstr "æ??件æ¯?è¾?(_F)"
 
 #: ../data/ui/meldapp.glade.h:15
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "忽ç?¥å¤?空è¡?æ??å°?空è¡?ç??å·®å¼?"
+msgid "_Three Way Compare"
+msgstr "ä¸?å??æ¯?è¾?(_T)"
 
 #: ../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 "å??é?¨ç¼?è¾?å?¨"
+msgid "_Version Control Browser"
+msgstr "ç??æ?¬æ?§å?¶æµ?è§?å?¨(_V)"
 
-#: ../data/ui/meldapp.glade.h:19
-msgid "Line Wrapping "
-msgstr "��"
+#: ../data/ui/preferences.glade.h:1
+msgid "<b>Display</b>"
+msgstr "<b>�示</b>"
 
-#: ../data/ui/meldapp.glade.h:20
-msgid "Meld"
-msgstr "Meld"
+#: ../data/ui/preferences.glade.h:2
+msgid "<b>External editor</b>"
+msgstr "<b>�����</b>"
 
-#: ../data/ui/meldapp.glade.h:21
-msgid "Mine"
-msgstr "æ??ç??"
+#: ../data/ui/preferences.glade.h:3
+msgid "<b>Font</b>"
+msgstr "<b>å­?ä½?</b>"
 
-#: ../data/ui/meldapp.glade.h:22
-msgid "Original"
-msgstr "å??件"
+#: ../data/ui/preferences.glade.h:4
+msgid "<b>Loading</b>"
+msgstr "<b>载�</b>"
 
-#: ../data/ui/meldapp.glade.h:23
-msgid "Other"
-msgstr "��"
+#: ../data/ui/preferences.glade.h:5
+msgid "Do not _split words over two lines"
+msgstr "ä¸?è¦?å°?ä¸?个è¯?æ??æ??两è¡?(_S)"
 
-#: ../data/ui/meldapp.glade.h:24
-msgid "Preferences : Meld"
-msgstr "é¦?é??项ï¼?Meld"
+#: ../data/ui/preferences.glade.h:6
+msgid "Edito_r command:"
+msgstr "���令(_R)�"
 
-#: ../data/ui/meldapp.glade.h:25
-msgid "Show line numbers"
-msgstr "�示��"
+#: ../data/ui/preferences.glade.h:7
+msgid "Editor"
+msgstr "ç¼?è¾?å?¨"
 
-#: ../data/ui/meldapp.glade.h:26
-msgid "Tab width"
-msgstr "�表符宽度"
+#: ../data/ui/preferences.glade.h:8
+msgid "Enable text _wrapping"
+msgstr "å?¯ç?¨æ??æ?¬è?ªå?¨æ?¢è¡?(_W)"
 
-#: ../data/ui/meldapp.glade.h:27
-msgid "Text Filters"
-msgstr "æ??å­?è¿?滤å?¨"
+#: ../data/ui/preferences.glade.h:9
+msgid "Encoding"
+msgstr "æ??å­?ç¼?ç ?"
 
-#: ../data/ui/meldapp.glade.h:28
-msgid "Three way directory"
-msgstr "ä¸?å??ç?®å½?"
+#: ../data/ui/preferences.glade.h:10
+msgid "File Filters"
+msgstr "æ??件è¿?滤å?¨"
 
-#: ../data/ui/meldapp.glade.h:29
-msgid "Three way file"
-msgstr "ä¸?å??æ??件"
+#: ../data/ui/preferences.glade.h:11
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "忽ç?¥å¤?空è¡?æ??å°?空è¡?ç??å·®å¼?"
 
-#: ../data/ui/meldapp.glade.h:30
-msgid "Two way directory"
-msgstr "两å??ç?®å½?"
+#: ../data/ui/preferences.glade.h:12
+msgid "Ignore symbolic links"
+msgstr "忽�符���"
 
-#: ../data/ui/meldapp.glade.h:31
-msgid "Two way file"
-msgstr "两å??æ??件"
+#: ../data/ui/preferences.glade.h:13
+msgid "Meld Preferences"
+msgstr "Meld é¦?é??项"
 
-#: ../data/ui/meldapp.glade.h:32
-msgid "Use GNOME monospace font"
-msgstr "使� GNOME �宽��"
+#: ../data/ui/preferences.glade.h:14
+msgid "Show _line numbers"
+msgstr "�示��(_L)"
 
-#: ../data/ui/meldapp.glade.h:33
-msgid "Use custom font"
-msgstr "使������"
+#: ../data/ui/preferences.glade.h:15
+msgid "Text Filters"
+msgstr "æ??å­?è¿?滤å?¨"
 
-#: ../data/ui/meldapp.glade.h:34
-msgid "Use syntax highlighting"
-msgstr "使�语��亮"
+#: ../data/ui/preferences.glade.h:16
+msgid "Use _default system editor"
+msgstr "使��认系����(_D)"
 
-#: ../data/ui/meldapp.glade.h:35
-msgid "Version control view"
-msgstr "ç??æ?¬æ?§å?¶æ?¥ç??"
+#: ../data/ui/preferences.glade.h:17
+msgid "Use s_yntax highlighting"
+msgstr "使�语��亮(_Y)"
 
-#: ../data/ui/meldapp.glade.h:36
+#: ../data/ui/preferences.glade.h:18
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
 msgstr "è½½å?¥æ?¶ï¼?æ??此顺åº?å°?è¯?ç¼?ç ?ã??(å¦? utf8ï¼?gb2312ï¼?gbkï¼?gb18030)"
 
-#: ../data/ui/meldapp.glade.h:37
+#: ../data/ui/preferences.glade.h:19
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -253,7 +251,7 @@ msgstr ""
 "è¿?è¡?ç?®å½?æ¯?è¾?æ?¶ï¼?æ?¨å?¯ä»¥æ??å??称è¿?滤æ??件å??ç?®å½?ã??æ¯?ç§?模å¼?é?½æ?¯ä¸?个ç?¨ç©ºæ ¼é??å¼?ç?? "
 "Shellæ?¯æ??ç??é??é??符ç??å??表ã??"
 
-#: ../data/ui/meldapp.glade.h:38
+#: ../data/ui/preferences.glade.h:20
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -265,33 +263,25 @@ msgstr ""
 "å??表达å¼?ï¼?å?¨å¼?å§?æ¯?è¾?å??ï¼?ç?¨ç©ºå­?符串æ?¥æ?¿æ?¢å?¹é??ç??æ??å­?ã??å¦?æ??表达å¼?å??å?«â??groupâ??,å?ª"
 "æ??â??groupâ??被æ?¿æ?¢ã??æ?´å¤?ä¿¡æ?¯è¯·æ?¥ç??ç?¨æ?·æ??å??ã??"
 
-#: ../data/ui/meldapp.glade.h:39
-msgid "_Character"
-msgstr "�符(_C)"
+#: ../data/ui/preferences.glade.h:21
+msgid "_Automatically supply missing newline at end of file"
+msgstr "è?ªå?¨è¡¥é½?æ??件æ?«å°¾ç¼ºå¤±ç??æ?¢è¡?符(_A)"
 
-#: ../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/preferences.glade.h:22
+msgid "_Editor font:"
+msgstr "�����(_E)�"
 
-#: ../data/ui/meldapp.glade.h:43
-msgid "_Three Way Compare"
-msgstr "ä¸?å??æ¯?è¾?(_T)"
+#: ../data/ui/preferences.glade.h:23
+msgid "_Insert spaces instead of tabs"
+msgstr "ç?¨ç©ºæ ¼æ?¿æ?¢å?¶è¡¨ç¬¦(_I)"
 
-#: ../data/ui/meldapp.glade.h:44
-msgid "_Version Control Browser"
-msgstr "ç??æ?¬æ?§å?¶æµ?è§?å?¨(_V)"
+#: ../data/ui/preferences.glade.h:24
+msgid "_Tab width:"
+msgstr "�表符宽度(_T)�"
 
-#: ../data/ui/meldapp.glade.h:45
-msgid "_Word"
-msgstr "å­?(_W)"
+#: ../data/ui/preferences.glade.h:25
+msgid "_Use the system fixed width font"
+msgstr "使�系���宽度��(_U)"
 
 #: ../data/ui/vcview.glade.h:1
 msgid "Commit Files"
@@ -341,7 +331,7 @@ msgstr "æ¯?è¾?é??中ç??"
 msgid "Left"
 msgstr "左侧"
 
-#: ../meld/dirdiff.py:185 ../meld/filediff.py:172
+#: ../meld/dirdiff.py:185
 msgid "Copy To Left"
 msgstr "���左侧"
 
@@ -349,7 +339,7 @@ msgstr "���左侧"
 msgid "Right"
 msgstr "�侧"
 
-#: ../meld/dirdiff.py:186 ../meld/filediff.py:173
+#: ../meld/dirdiff.py:186
 msgid "Copy To Right"
 msgstr "����侧"
 
@@ -357,7 +347,7 @@ msgstr "����侧"
 msgid "Delete selected"
 msgstr "å? é?¤é??中ç??"
 
-#: ../meld/dirdiff.py:188 ../meld/filediff.py:659
+#: ../meld/dirdiff.py:188 ../meld/filediff.py:841
 msgid "Hide"
 msgstr "é??è??"
 
@@ -365,7 +355,7 @@ msgstr "é??è??"
 msgid "Hide selected"
 msgstr "é??è??é??中ç??"
 
-#: ../meld/dirdiff.py:190 ../meld/filediff.py:170 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:190 ../meld/filediff.py:179 ../meld/vcview.py:126
 msgid "Open selected"
 msgstr "æ??å¼?é??中ç??"
 
@@ -419,8 +409,8 @@ msgstr "å°?æ ¼å¼?â??%sâ??转æ?¢ä¸ºæ­£å??表达å¼?å?ºé??"
 msgid "Hide %s"
 msgstr "é??è?? %s"
 
-#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:272
-#: ../meld/vcview.py:300
+#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:276
+#: ../meld/vcview.py:304
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] æ­£å?¨æ?«æ?? %s"
@@ -465,7 +455,7 @@ msgstr ""
 "\n"
 "%sã??"
 
-#: ../meld/dirdiff.py:587 ../meld/vcview.py:464
+#: ../meld/dirdiff.py:587 ../meld/vcview.py:463
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -474,7 +464,7 @@ msgstr ""
 "â??%sâ??æ?¯ä¸?个ç?®å½?ã??\n"
 "é??å½?å? é?¤è¯¥ç?®å½?ä¸?ç??å­?ç?®å½?å??ï¼?"
 
-#: ../meld/dirdiff.py:594 ../meld/vcview.py:469
+#: ../meld/dirdiff.py:594 ../meld/vcview.py:468
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -527,30 +517,91 @@ msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i å¹´"
 
-#: ../meld/filediff.py:171
+#: ../meld/filediff.py:180
 msgid "Create a patch"
 msgstr "å??建ä¸?个补ä¸?"
 
-#: ../meld/filediff.py:172
-msgid "Copy all changes from right pane to left pane"
-msgstr "å¤?å?¶å?³è¾¹çª?å?£ç??æ??æ??æ?´æ?¹å?°å·¦è¾¹çª?å?£"
+#: ../meld/filediff.py:181
+msgid "Push to left"
+msgstr "���左侧"
+
+#: ../meld/filediff.py:181
+msgid "Push current change to the left"
+msgstr "å¤?å?¶å½?å??ç??æ?´æ?¹å?°å·¦ä¾§"
+
+#: ../meld/filediff.py:182
+msgid "Push to right"
+msgstr "����侧"
+
+#: ../meld/filediff.py:182
+msgid "Push current change to the right"
+msgstr "å¤?å?¶å½?å??ç??æ?´æ?¹å?°å?³ä¾§"
+
+#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
+#: ../meld/filediff.py:184
+msgid "Pull from left"
+msgstr "�左侧��"
+
+#: ../meld/filediff.py:184
+msgid "Pull change from the left"
+msgstr "�左侧����"
+
+#: ../meld/filediff.py:185
+msgid "Pull from right"
+msgstr "��侧��"
+
+#: ../meld/filediff.py:185
+msgid "Pull change from the right"
+msgstr "��侧����"
+
+#: ../meld/filediff.py:186
+msgid "Delete"
+msgstr "å? é?¤"
+
+#: ../meld/filediff.py:186
+msgid "Delete change"
+msgstr "å? é?¤æ?´æ?¹"
+
+#: ../meld/filediff.py:187
+msgid "Merge all changes from left"
+msgstr "ä»?左侧å??并æ??æ??ç??æ?´æ?¹"
+
+#: ../meld/filediff.py:187
+msgid "Merge all non-conflicting changes from the left"
+msgstr "ä»?左侧å??并æ??æ??é??å?²çª?ç??æ?´æ?¹"
 
-#: ../meld/filediff.py:173
-msgid "Copy all changes from left pane to right pane"
-msgstr "å¤?å?¶å·¦è¾¹çª?å?£ç??æ??æ??æ?´æ?¹å?°å?³è¾¹çª?å?£"
+#: ../meld/filediff.py:188
+msgid "Merge all changes from right"
+msgstr "ä»?å?³ä¾§å??并æ??æ??ç??æ?´æ?¹"
 
-#. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../meld/filediff.py:226
-msgid "INS,OVR"
-msgstr "æ??å?¥ï¼?è¦?ç??"
+#: ../meld/filediff.py:188
+msgid "Merge all non-conflicting changes from the right"
+msgstr "ä»?å?³ä¾§å??并æ??æ??é??å?²çª?ç??æ?´æ?¹"
+
+#: ../meld/filediff.py:189
+msgid "Merge all non-conflicting"
+msgstr "å??并æ??æ??é??å?²çª?ç??æ?´æ?¹"
+
+#: ../meld/filediff.py:189
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "ä»?左侧å??å?³ä¾§çª?å?£å??并æ??æ??é??å?²çª?ç??æ?´æ?¹"
+
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:258
+msgid "INS"
+msgstr "æ??å?¥"
+
+#: ../meld/filediff.py:258
+msgid "OVR"
+msgstr "è¦?ç??"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:260
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "%i è¡?ï¼?%i å??"
 
-#: ../meld/filediff.py:291
+#: ../meld/filediff.py:433
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -560,57 +611,54 @@ msgstr ""
 "å??ã??"
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:384
+#: ../meld/filediff.py:530
 msgid "<unnamed>"
 msgstr "<æ?ªå?½å??>"
 
-#: ../meld/filediff.py:565
+#: ../meld/filediff.py:706
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] 设å®?ç¼?å?·çª?æ ¼"
 
-#: ../meld/filediff.py:571
+#: ../meld/filediff.py:712
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] æ??å¼?æ??件"
 
-#: ../meld/filediff.py:578 ../meld/filediff.py:663
+#: ../meld/filediff.py:718 ../meld/filediff.py:845
 msgid "Hi_de"
 msgstr "é??è??(_D)"
 
-#: ../meld/filediff.py:599 ../meld/filediff.py:610 ../meld/filediff.py:623
-#: ../meld/filediff.py:629
-#, fuzzy
-#| msgid "Could not read from '%s'"
+#: ../meld/filediff.py:739 ../meld/filediff.py:750 ../meld/filediff.py:763
+#: ../meld/filediff.py:769
 msgid "Could not read file"
-msgstr "æ? æ³?读å??以ä¸?å??容ï¼?â??%sâ??"
+msgstr "æ? æ³?读å??æ??件"
 
-#: ../meld/filediff.py:602
+#: ../meld/filediff.py:742
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] 读å??æ??件"
 
-#: ../meld/filediff.py:611
+#: ../meld/filediff.py:751
 #, python-format
 msgid "%s appears to be a binary file."
-msgstr ""
+msgstr "%s ç??èµ·æ?¥æ?¯äº?è¿?å?¶æ??件ã??"
 
-#: ../meld/filediff.py:624
-#, fuzzy, python-format
-#| msgid "I tried encodings %s."
+#: ../meld/filediff.py:764
+#, python-format
 msgid "%s is not in encodings: %s"
-msgstr "æ£?æµ?è¿?æ??å­?ç¼?ç ? %sã??"
+msgstr "%s ä¸?æ?¯ä½¿ç?¨ %s è¿?è¡?ç¼?ç ?ç??ã??"
 
-#: ../meld/filediff.py:647
+#: ../meld/filediff.py:790 ../meld/filemerge.py:70
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] 计�差�"
 
-#: ../meld/filediff.py:658
+#: ../meld/filediff.py:839
 msgid "Files are identical"
 msgstr "æ??件å®?å?¨ç?¸å??"
 
-#: ../meld/filediff.py:802
+#: ../meld/filediff.py:973
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -619,7 +667,7 @@ msgstr ""
 "â??%sâ??å·²å­?å?¨ï¼?\n"
 "è¦?ç??æ??件ï¼?"
 
-#: ../meld/filediff.py:815
+#: ../meld/filediff.py:986
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -630,12 +678,12 @@ msgstr ""
 "\n"
 "%sã??"
 
-#: ../meld/filediff.py:824
+#: ../meld/filediff.py:995
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "为ç¼?å?²å?º %i é??æ?©ä¸?个å??称ã??"
 
-#: ../meld/filediff.py:838
+#: ../meld/filediff.py:1009
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -646,7 +694,7 @@ msgstr ""
 "\n"
 "æ?¨æ?³ç?¨å?ªç§?æ ¼å¼?ï¼?"
 
-#: ../meld/filediff.py:854
+#: ../meld/filediff.py:1025
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -656,11 +704,11 @@ msgstr ""
 "è¦?å?¦å­?为 UTF-8 æ ¼å¼?å??ï¼?"
 
 #. save as
-#: ../meld/filediff.py:892
+#: ../meld/filediff.py:1062
 msgid "Save patch as..."
 msgstr "补���为..."
 
-#: ../meld/filediff.py:950
+#: ../meld/filediff.py:1109
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -673,315 +721,247 @@ msgstr ""
 "\n"
 "æ?¨æ? æ³?æ?¤æ¶?此次æ??ä½?ã??"
 
-#: ../meld/meldapp.py:150
-msgid "label"
-msgstr "æ ?ç­¾"
-
-#: ../meld/meldapp.py:150
-msgid "pattern"
-msgstr "模�"
-
-#: ../meld/meldapp.py:218
-msgid "Only available if you have gnome-python-desktop installed"
-msgstr "ä»?å?¨å®?è£? gnome-python-desktop å??æ??æ??æ??"
-
-#. file filters
-#. text filters
-#: ../meld/meldapp.py:228 ../meld/meldapp.py:233 ../meld/vcview.py:163
-msgid "Name"
-msgstr "è¿?滤å?¨å??称"
-
-#: ../meld/meldapp.py:228 ../meld/meldapp.py:233
-msgid "Active"
-msgstr "��"
-
-#: ../meld/meldapp.py:228
-msgid "Pattern"
-msgstr "模�"
-
-#: ../meld/meldapp.py:233
-msgid "Regex"
-msgstr "æ­£å??语æ³?"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../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
-#: ../meld/meldapp.py:342
+#: ../meld/filemerge.py:78
 #, 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
-#: ../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
-#: ../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
-#: ../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
-#: ../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
-#: ../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
-#: ../meld/meldapp.py:354
-msgid "All whitespace\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
-#: ../meld/meldapp.py:356
-msgid "Leading whitespace\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
-#: ../meld/meldapp.py:358
-msgid "Script comment\t0\t#.*"
-msgstr "è??æ?¬æ³¨é?? \t0\t#.*"
+msgid "[%s] Merging files"
+msgstr "[%s] å??并æ??件"
 
-#: ../meld/meldapp.py:427
+#: ../meld/meldapp.py:139
 msgid "_File"
 msgstr "æ??件(_F)"
 
-#: ../meld/meldapp.py:428
+#: ../meld/meldapp.py:140
 msgid "_New..."
 msgstr "�建(_N)..."
 
-#: ../meld/meldapp.py:428
+#: ../meld/meldapp.py:140
 msgid "Start a new comparison"
 msgstr "å¼?å§?æ?°ç??æ¯?è¾?"
 
-#: ../meld/meldapp.py:429
+#: ../meld/meldapp.py:141
 msgid "Save the current file"
 msgstr "ä¿?å­?å½?å??æ??件"
 
-#: ../meld/meldapp.py:431
+#: ../meld/meldapp.py:143
 msgid "Close the current file"
 msgstr "å?³é?­å½?å??æ??件"
 
-#: ../meld/meldapp.py:432
+#: ../meld/meldapp.py:144
 msgid "Quit the program"
 msgstr "é??å?ºç¨?åº?"
 
-#: ../meld/meldapp.py:434
+#: ../meld/meldapp.py:146
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../meld/meldapp.py:435
+#: ../meld/meldapp.py:147
 msgid "Undo the last action"
 msgstr "æ?¤æ¶?æ??å??ç??æ??ä½?"
 
-#: ../meld/meldapp.py:436
+#: ../meld/meldapp.py:148
 msgid "Redo the last undone action"
 msgstr "é??å??æ??å??æ?¤æ¶?ç??æ??ä½?"
 
-#: ../meld/meldapp.py:437
+#: ../meld/meldapp.py:149
 msgid "Cut the selection"
 msgstr "å?ªå??é??中ç??å??容"
 
-#: ../meld/meldapp.py:438
+#: ../meld/meldapp.py:150
 msgid "Copy the selection"
 msgstr "å¤?å?¶é??中ç??å??容"
 
-#: ../meld/meldapp.py:439
+#: ../meld/meldapp.py:151
 msgid "Paste the clipboard"
 msgstr "�贴�贴�"
 
-#: ../meld/meldapp.py:440
+#: ../meld/meldapp.py:152
 msgid "Search for text"
 msgstr "æ??ç´¢æ??å­?"
 
-#: ../meld/meldapp.py:441
+#: ../meld/meldapp.py:153
 msgid "Find Ne_xt"
 msgstr "����个(_X)"
 
-#: ../meld/meldapp.py:441
+#: ../meld/meldapp.py:153
 msgid "Search forwards for the same text"
 msgstr "继续å??å??æ??ç´¢ç?¸å??ç??æ??å­?"
 
-#: ../meld/meldapp.py:442
+#: ../meld/meldapp.py:154
 msgid "Find and replace text"
 msgstr "æ?¥æ?¾å¹¶æ?¿æ?¢æ??å­?"
 
-#: ../meld/meldapp.py:443
-msgid "Go to the next difference"
-msgstr "转���个差�"
-
-#: ../meld/meldapp.py:444
-msgid "Go to the previous difference"
-msgstr "转���个差�"
-
-#: ../meld/meldapp.py:445
+#: ../meld/meldapp.py:155
 msgid "Prefere_nces"
 msgstr "é¦?é??项(_N)"
 
-#: ../meld/meldapp.py:445
+#: ../meld/meldapp.py:155
 msgid "Configure the application"
 msgstr "��设置"
 
-#: ../meld/meldapp.py:447
+#: ../meld/meldapp.py:157
+msgid "_Changes"
+msgstr "æ?´æ?¹(_C)"
+
+#: ../meld/meldapp.py:158
+msgid "Next change"
+msgstr "��个��"
+
+#: ../meld/meldapp.py:158
+msgid "Go to the next change"
+msgstr "转���个��"
+
+#: ../meld/meldapp.py:159
+msgid "Previous change"
+msgstr "��个��"
+
+#: ../meld/meldapp.py:159
+msgid "Go to the previous change"
+msgstr "转���个��"
+
+#: ../meld/meldapp.py:161
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../meld/meldapp.py:448
+#: ../meld/meldapp.py:162
 msgid "File status"
 msgstr "æ??件ç?¶æ??"
 
-#: ../meld/meldapp.py:449
+#: ../meld/meldapp.py:163
 msgid "Version status"
 msgstr "ç??æ?¬ç?¶æ??"
 
-#: ../meld/meldapp.py:450
+#: ../meld/meldapp.py:164
 msgid "File filters"
 msgstr "æ??件è¿?滤å?¨"
 
-#: ../meld/meldapp.py:451
+#: ../meld/meldapp.py:165
 msgid "Stop the current action"
 msgstr "å??æ­¢å½?å??æ??ä½?"
 
-#: ../meld/meldapp.py:452
+#: ../meld/meldapp.py:166
 msgid "Refresh the view"
 msgstr "����"
 
-#: ../meld/meldapp.py:453
+#: ../meld/meldapp.py:167
 msgid "Reload"
 msgstr "é??æ?°è½½å?¥"
 
-#: ../meld/meldapp.py:453
+#: ../meld/meldapp.py:167
 msgid "Reload the comparison"
 msgstr "é??æ?°è½½å?¥æ¯?è¾?"
 
-#: ../meld/meldapp.py:455
+#: ../meld/meldapp.py:169
 msgid "_Help"
 msgstr "帮�(_H)"
 
-#: ../meld/meldapp.py:456
+#: ../meld/meldapp.py:170
 msgid "_Contents"
 msgstr "å??容(_C)"
 
-#: ../meld/meldapp.py:456
+#: ../meld/meldapp.py:170
 msgid "Open the Meld manual"
 msgstr "æ??å¼? Meld 帮å?©æ??å??"
 
-#: ../meld/meldapp.py:457
+#: ../meld/meldapp.py:171
 msgid "Report _Bug"
 msgstr "æ?¥å??é??误(_B)"
 
-#: ../meld/meldapp.py:457
+#: ../meld/meldapp.py:171
 msgid "Report a bug in Meld"
 msgstr "æ?¥å?? Meld 中ç??é??误"
 
-#: ../meld/meldapp.py:458
+#: ../meld/meldapp.py:172
 msgid "About this program"
 msgstr "�����"
 
-#: ../meld/meldapp.py:461
+#: ../meld/meldapp.py:175
 msgid "Full Screen"
 msgstr "��"
 
-#: ../meld/meldapp.py:461
+#: ../meld/meldapp.py:175
 msgid "View the comparison in full screen"
 msgstr "以å?¨å±?模å¼?æ?¥ç??æ¯?è¾?"
 
-#: ../meld/meldapp.py:462
+#: ../meld/meldapp.py:176
 msgid "_Toolbar"
 msgstr "å·¥å?·æ ?(_T)"
 
-#: ../meld/meldapp.py:462
+#: ../meld/meldapp.py:176
 msgid "Show or hide the toolbar"
 msgstr "æ?¾ç¤ºæ??é??è??å·¥å?·æ ?"
 
-#: ../meld/meldapp.py:463
+#: ../meld/meldapp.py:177
 msgid "_Statusbar"
 msgstr "ç?¶æ??æ ?(_S)"
 
-#: ../meld/meldapp.py:463
+#: ../meld/meldapp.py:177
 msgid "Show or hide the statusbar"
 msgstr "æ?¾ç¤ºæ??é??è??ç?¶æ??æ ?"
 
 #. exit at first non found directory + file
-#: ../meld/meldapp.py:804
+#: ../meld/meldapp.py:533
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "æ? æ³?对æ??件å??ç?®å½?ç??æ··å??è¿?è¡?æ¯?è¾?ã??\n"
 
-#: ../meld/meldapp.py:858
+#: ../meld/meldapp.py:587
 msgid "wrong number of arguments supplied to --diff"
 msgstr "æ??ä¾?ç»? --diff ç??å??æ?°ä¸ªæ?°é??误ã??"
 
-#: ../meld/meldapp.py:862
+#: ../meld/meldapp.py:591
 msgid "Start with an empty window"
 msgstr "å?¯å?¨æ?¶æ??å¼?空ç?½çª?å?£"
 
-#: ../meld/meldapp.py:863 ../meld/meldapp.py:864 ../meld/meldapp.py:866
+#: ../meld/meldapp.py:592 ../meld/meldapp.py:593 ../meld/meldapp.py:595
 msgid "file"
 msgstr "æ??件"
 
-#: ../meld/meldapp.py:863 ../meld/meldapp.py:865 ../meld/meldapp.py:866
+#: ../meld/meldapp.py:592 ../meld/meldapp.py:594 ../meld/meldapp.py:595
 msgid "dir"
 msgstr "��"
 
-#: ../meld/meldapp.py:863
+#: ../meld/meldapp.py:592
 msgid "Start a version control comparison"
 msgstr "å¼?å§?ç??æ?¬æ?§å?¶æ¯?è¾?"
 
-#: ../meld/meldapp.py:864
-#, fuzzy
-#| msgid "Start with 2 or 3 way file comparison"
+#: ../meld/meldapp.py:593
 msgid "Start a 2- or 3-way file comparison"
-msgstr "å?¯å?¨ä¸¤å??æ??ä¸?å??æ??件æ¯?è¾?"
+msgstr "å¼?å§?两å??æ??ä¸?å??æ??件æ¯?è¾?"
 
-#: ../meld/meldapp.py:865
-#, fuzzy
-#| msgid "Start with 2 or 3 way directory comparison"
+#: ../meld/meldapp.py:594
 msgid "Start a 2- or 3-way directory comparison"
-msgstr "å?¯å?¨ä¸¤å??æ??ä¸?å??ç?®å½?æ¯?è¾?"
+msgstr "å¼?å§?两å??æ??ä¸?å??ç?®å½?æ¯?è¾?"
 
-#: ../meld/meldapp.py:866
+#: ../meld/meldapp.py:595
 msgid "Start a comparison between file and dir/file"
 msgstr "å?¨æ??件å??æ??件夹/æ??件ä¹?é?´å¼?å§?æ¯?è¾?"
 
-#: ../meld/meldapp.py:872
+#: ../meld/meldapp.py:601
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld æ?¯ä¸?个æ??件å??ç?®å½?æ¯?è¾?å·¥å?·ã??"
 
-#: ../meld/meldapp.py:875
+#: ../meld/meldapp.py:604
 msgid "Set label to use instead of file name"
 msgstr "设置æ ?ç­¾æ?¥ä»£æ?¿æ??件å??"
 
-#: ../meld/meldapp.py:877
+#: ../meld/meldapp.py:606
 msgid "Automatically compare all differing files on startup"
 msgstr "å?¯å?¨æ?¶è?ªå?¨æ¯?è¾?æ??æ??ä¸?å??ç??æ??件"
 
-#: ../meld/meldapp.py:878 ../meld/meldapp.py:879 ../meld/meldapp.py:880
-#: ../meld/meldapp.py:881
+#: ../meld/meldapp.py:607 ../meld/meldapp.py:608 ../meld/meldapp.py:609
+#: ../meld/meldapp.py:610
 msgid "Ignored for compatibility"
 msgstr "为ä¿?æ??å?¼å®¹æ?§è??忽ç?¥"
 
-#: ../meld/meldapp.py:884
+#: ../meld/meldapp.py:613
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr "为æ??件æ??ç?®å½?å??建 diff 表ï¼?æ??å¤?æ?¯æ??ä¸?个æ??件æ??ç?®å½?"
 
-#: ../meld/meldapp.py:887
+#: ../meld/meldapp.py:616
 #, python-format
-msgid "too many arguments (wanted 0-3, got %d)"
-msgstr "å??æ?°è¿?å¤?(é??è¦? 0-3 个ï¼?å¾?å?°äº? %d  个)"
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr "å??æ?°è¿?å¤?(é??è¦? 0-4 个ï¼?ä½?å¾?å?°äº? %d  个)"
 
-#: ../meld/melddoc.py:46
+#: ../meld/melddoc.py:47
 msgid "untitled"
 msgstr "æ? æ ?é¢?"
 
@@ -990,6 +970,87 @@ msgstr "æ? æ ?é¢?"
 msgid "[None]"
 msgstr "[æ? ]"
 
+#: ../meld/preferences.py:81
+msgid "label"
+msgstr "æ ?ç­¾"
+
+#: ../meld/preferences.py:81
+msgid "pattern"
+msgstr "模�"
+
+#: ../meld/preferences.py:143
+msgid "Only available if you have gnome-python-desktop installed"
+msgstr "ä»?å?¨å®?è£? gnome-python-desktop å??æ??æ??æ??"
+
+#. file filters
+#. text filters
+#: ../meld/preferences.py:166 ../meld/preferences.py:171 ../meld/vcview.py:163
+msgid "Name"
+msgstr "è¿?滤å?¨å??称"
+
+#: ../meld/preferences.py:166 ../meld/preferences.py:171
+msgid "Active"
+msgstr "��"
+
+#: ../meld/preferences.py:166
+msgid "Pattern"
+msgstr "模�"
+
+#: ../meld/preferences.py:171
+msgid "Regex"
+msgstr "æ­£å??语æ³?"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:268
+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
+#: ../meld/preferences.py:270
+#, 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
+#: ../meld/preferences.py:272
+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
+#: ../meld/preferences.py:274
+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
+#: ../meld/preferences.py:276
+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
+#: ../meld/preferences.py:278
+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
+#: ../meld/preferences.py:280
+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
+#: ../meld/preferences.py:282
+msgid "All whitespace\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
+#: ../meld/preferences.py:284
+msgid "Leading whitespace\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
+#: ../meld/preferences.py:286
+msgid "Script comment\t0\t#.*"
+msgstr "è??æ?¬æ³¨é?? \t0\t#.*"
+
 #: ../meld/vcview.py:127
 msgid "_Commit"
 msgstr "æ??交(_C)"
@@ -1111,29 +1172,29 @@ msgstr "é??æ?©ä¸?个ç??æ?¬æ?§å?¶"
 msgid "Only one Version Control in this directory"
 msgstr "æ­¤ç?®å½?中å?ªæ??ä¸?个ç??æ?¬æ?§å?¶æ??件"
 
-#: ../meld/vcview.py:316
+#: ../meld/vcview.py:320
 msgid "(Empty)"
 msgstr "(空)"
 
-#: ../meld/vcview.py:349
+#: ../meld/vcview.py:353
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] è?·å??å·®å¼?"
 
-#: ../meld/vcview.py:356
+#: ../meld/vcview.py:360
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] ��补�"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:364
 msgid "No differences found."
 msgstr "没æ??å??ç?°å·®å¼?ã??"
 
-#: ../meld/vcview.py:439
+#: ../meld/vcview.py:438
 msgid "Select some files first."
 msgstr "ä¼?å??é??æ?©æ??äº?æ??件ã??"
 
-#: ../meld/vcview.py:505
+#: ../meld/vcview.py:504
 #, python-format
 msgid ""
 "\n"
@@ -1235,6 +1296,33 @@ msgstr ""
 "模å¼?为â??%sâ??\n"
 "é??误为â??%sâ??"
 
+#~ msgid "<b>Edit Menu</b>"
+#~ msgstr "<b>ç¼?è¾?è??å??</b>"
+
+#~ msgid "Edit files with:"
+#~ msgstr "ç¼?è¾?æ??件ç??ç¨?åº?ï¼?"
+
+#~ msgid "Line Wrapping "
+#~ msgstr "��"
+
+#~ msgid "Preferences : Meld"
+#~ msgstr "é¦?é??项ï¼?Meld"
+
+#~ msgid "Use GNOME monospace font"
+#~ msgstr "使� GNOME �宽��"
+
+#~ msgid "Use custom font"
+#~ msgstr "使������"
+
+#~ msgid "_Character"
+#~ msgstr "�符(_C)"
+
+#~ msgid "_None"
+#~ msgstr "æ? (_N)"
+
+#~ msgid "_Word"
+#~ msgstr "å­?(_W)"
+
 #~ msgid "The error was:"
 #~ msgstr "é??误ï¼?"