[meld] Updated Simplified Chinese translation.
- From: Aron Xu <aronxu src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [meld] Updated Simplified Chinese translation.
- Date: Thu, 27 Aug 2009 09:50:47 +0000 (UTC)
commit 52b63331819c2335b1980aeeb24b853b7370ba32
Author: Careone <careoneagain gmail com>
Date: Thu Aug 27 17:46:58 2009 +0800
Updated Simplified Chinese translation.
po/zh_CN.po | 1750 +++++++++++++++++++++++++++++------------------------------
1 files changed, 862 insertions(+), 888 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8a3a53e..949c027 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,133 +1,125 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Simplified Chinese translation of meld.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the meld package.
+#
# Funda Wang <fundawang linux net cn>, 2004, 2005.
+# Careone <careoneagain gmail com>, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: meld HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-18 04:01+0000\n"
-"PO-Revision-Date: 2005-06-18 03:35+0800\n"
-"Last-Translator: Funda Wang <fundawang linux net cn>\n"
-"Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
+"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"
+"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"
-#: ../meld.desktop.in.h:1
-msgid "Compare and merge your files."
-msgstr "æ¯?è¾?并å??并æ?¨ç??æ??件ã??"
+#: ../dirdiff.py:173 ../vcview.py:125
+msgid "_Compare"
+msgstr "��(_C)"
-#: ../meld.desktop.in.h:2
-msgid "Meld Diff Viewer"
-msgstr "Meld å·®å¼?æ?¥ç??å?¨"
+#: ../dirdiff.py:173 ../vcview.py:125
+msgid "Compare selected"
+msgstr "æ¯?è¾?é??ä¸ç??"
-#: ../cvsview.py:40
-msgid ""
-"Ignored:Non CVS:::Error::Newly added:Modified:<b>Conflict</b>:Removed:Missing"
-msgstr ""
+#: ../dirdiff.py:174
+msgid "Left"
+msgstr "左侧"
-#: ../cvsview.py:168
-#, python-format
-msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
-msgstr ""
+#: ../dirdiff.py:174 ../filediff.py:168
+msgid "Copy To Left"
+msgstr "���左侧"
-#: ../cvsview.py:352 ../svnview.py:292
-msgid "Name"
-msgstr "å??称"
+#: ../dirdiff.py:175
+msgid "Right"
+msgstr "�侧"
-#: ../cvsview.py:369 ../svnview.py:309
-msgid "Location"
-msgstr "ä½?ç½®"
+#: ../dirdiff.py:175 ../filediff.py:169
+msgid "Copy To Right"
+msgstr "����侧"
-#: ../cvsview.py:370 ../svnview.py:310
-msgid "Status"
-msgstr "ç?¶æ??"
+#: ../dirdiff.py:176
+msgid "Delete selected"
+msgstr "å? é?¤é??ä¸ç??"
-#: ../cvsview.py:371 ../svnview.py:311
-msgid "Rev"
-msgstr "ç??æ?¬"
+#: ../dirdiff.py:177 ../filediff.py:644
+msgid "Hide"
+msgstr "é??è??"
-#: ../cvsview.py:372 ../svnview.py:312 ../glade2/cvsview.glade.h:21
-msgid "Tag"
-msgstr "æ ?ç¾"
+#: ../dirdiff.py:177
+msgid "Hide selected"
+msgstr "é??è??é??ä¸ç??"
-#: ../cvsview.py:373 ../svnview.py:313
-msgid "Options"
-msgstr "é??项"
+#: ../dirdiff.py:179 ../filediff.py:166 ../vcview.py:126
+msgid "Open selected"
+msgstr "æ??å¼?é??ä¸ç??"
-#: ../cvsview.py:410 ../dirdiff.py:364 ../svnview.py:350
-#, python-format
-msgid "[%s] Scanning"
-msgstr "[%s] æ£æ?«æ??"
+#: ../dirdiff.py:183
+msgid "Case"
+msgstr "å??å?«"
-#: ../cvsview.py:437 ../dirdiff.py:373 ../svnview.py:377
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] æ£æ?«æ?? %s"
+#: ../dirdiff.py:183
+msgid "Ignore case of entries"
+msgstr "忽ç?¥å??å?«ç??æ??å?µ"
-#: ../cvsview.py:453 ../svnview.py:393
-msgid "(Empty)"
-msgstr "(空)"
+#: ../dirdiff.py:184
+msgid "Same"
+msgstr "ç?¸å??"
-#: ../cvsview.py:489 ../svnview.py:429
-#, python-format
-msgid "[%s] Fetching differences"
-msgstr "[%s] æ£è?·å??å·®å¼?"
+#: ../dirdiff.py:184
+msgid "Show identical"
+msgstr "æ?¾ç¤ºå®?å?¨ç?¸å??ç??"
-#: ../cvsview.py:496 ../svnview.py:437
-#, python-format
-msgid "[%s] Applying patch"
-msgstr "[%s] æ£åº?ç?¨è¡¥ä¸?"
+#: ../dirdiff.py:185
+msgid "New"
+msgstr "�建"
-#: ../cvsview.py:500 ../svnview.py:441
-msgid "No differences found."
-msgstr "æ?ªå??ç?°å·®å¼?ã??"
+#: ../dirdiff.py:185
+msgid "Show new"
+msgstr "æ?¾ç¤ºæ?°å»ºç??"
-#: ../cvsview.py:574 ../svnview.py:515
-msgid "Select some files first."
-msgstr "å??é??æ?©ä¸?äº?æ??件ã??"
+#: ../dirdiff.py:186
+msgid "Modified"
+msgstr "已修�"
-#: ../cvsview.py:595 ../dirdiff.py:552 ../svnview.py:536
-#, python-format
-msgid ""
-"'%s' is a directory.\n"
-"Remove recusively?"
-msgstr ""
-"â??%sâ??æ?¯ä¸ªç?®å½?ã??\n"
-"é??å½?å? é?¤å??ï¼?"
+#: ../dirdiff.py:186 ../vcview.py:139
+msgid "Show modified"
+msgstr "æ?¾ç¤ºå·²ä¿®æ?¹ç??"
-#: ../cvsview.py:600 ../dirdiff.py:559 ../svnview.py:541
-#, python-format
-msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
-msgstr ""
-"å? é?¤ %s å?ºé??\n"
-"\n"
-"%s"
+#: ../dirdiff.py:188
+msgid "Filters"
+msgstr "�滤�"
-#: ../dirdiff.py:253 ../dirdiff.py:268
+#: ../dirdiff.py:188
+msgid "Set active filters"
+msgstr "设å®?å?¯ç?¨ç??è¿?滤å?¨"
+
+#: ../dirdiff.py:241 ../dirdiff.py:287
#, python-format
msgid "Error converting pattern '%s' to regular expression"
-msgstr "å°?模å¼?â??%sâ??转æ?¢ä¸ºæ£å??表达å¼?å?ºé??"
+msgstr "å°?æ ¼å¼?â??%sâ??转æ?¢ä¸ºæ£å??表达å¼?å?ºé??"
-#: ../dirdiff.py:284
+#: ../dirdiff.py:298
#, python-format
msgid "Hide %s"
msgstr "é??è?? %s"
-#: ../dirdiff.py:406
+#: ../dirdiff.py:383 ../dirdiff.py:393 ../vcview.py:272 ../vcview.py:300
+#, python-format
+msgid "[%s] Scanning %s"
+msgstr "[%s] æ£å?¨æ?«æ?? %s"
+
+#: ../dirdiff.py:422
#, python-format
msgid "'%s' hidden by '%s'"
-msgstr "â??%sâ??被â??%sâ??æ??é??è??"
+msgstr "'%s' å·²æ??â??%sâ??é??è??"
-#: ../dirdiff.py:412
+#: ../dirdiff.py:428
#, python-format
msgid ""
"You are running a case insensitive comparison on a case sensitive "
@@ -137,47 +129,119 @@ msgstr ""
"æ?¨æ£å?¨å?ºå??大å°?å??ç??æ??件系ç»?ä¸?è¿?è¡?ä¸?å?ºå??大å°?å??ç??æ¯?è¾?ã??æ??äº?æ??件ä¸?å?¯è§?ï¼?\n"
"%s"
-#: ../dirdiff.py:481
+#: ../dirdiff.py:505
#, python-format
msgid "[%s] Done"
msgstr "[%s] å®?æ??"
-#: ../dirdiff.py:527
+#: ../dirdiff.py:551
#, python-format
msgid ""
"'%s' exists.\n"
"Overwrite?"
msgstr ""
"â??%sâ??å·²å?å?¨ã??\n"
-"è¦?ç??å??ï¼?"
+"è¦?ç??æ??件?"
-#: ../dirdiff.py:534
+#: ../dirdiff.py:558
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
"\n"
"%s."
msgstr ""
-"å°?â??%sâ??å¤?å?¶å?°â??%sâ??å?ºé??\n"
+"å¤?å?¶â??%sâ??å?°â??%sâ??å?ºé??\n"
"\n"
"%sã??"
-#. singular,plural
-#: ../dirdiff.py:570
+#: ../dirdiff.py:576 ../vcview.py:464
+#, python-format
+msgid ""
+"'%s' is a directory.\n"
+"Remove recursively?"
+msgstr ""
+"â??%sâ??æ?¯ä¸?个ç?®å½?ã??\n"
+"é??å½?å? é?¤è¯¥ç?®å½?ä¸?ç??å?ç?®å½?å??ï¼?"
+
+#: ../dirdiff.py:583 ../vcview.py:469
+#, python-format
msgid ""
-"second,seconds:minute,minutes:hour,hours:day,days:week,weeks:month,months:"
-"year,years"
+"Error removing %s\n"
+"\n"
+"%s."
msgstr ""
+"å? é?¤â??%sâ??æ?¶å?ºé??\n"
+"\n"
+"%sã??"
+
+#: ../dirdiff.py:594
+#, python-format
+msgid "%i second"
+msgid_plural "%i seconds"
+msgstr[0] "%i �"
+
+#: ../dirdiff.py:595
+#, python-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] "%i å??é??"
+
+#: ../dirdiff.py:596
+#, python-format
+msgid "%i hour"
+msgid_plural "%i hours"
+msgstr[0] "%i å°?æ?¶"
+
+#: ../dirdiff.py:597
+#, python-format
+msgid "%i day"
+msgid_plural "%i days"
+msgstr[0] "%i 天"
-#: ../filediff.py:223
+#: ../dirdiff.py:598
+#, python-format
+msgid "%i week"
+msgid_plural "%i weeks"
+msgstr[0] "%i å?¨"
+
+#: ../dirdiff.py:599
+#, python-format
+msgid "%i month"
+msgid_plural "%i months"
+msgstr[0] "%i æ??"
+
+#: ../dirdiff.py:600
+#, 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
+msgid "Create a patch"
+msgstr "å??建ä¸?个补ä¸?"
+
+#: ../filediff.py:168
+msgid "Copy all changes from right pane to left pane"
+msgstr "å¤?å?¶å?³è¾¹çª?å?£ç??æ??æ??æ?´æ?¹å?°å·¦è¾¹çª?å?£"
+
+#: ../filediff.py:169
+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
msgid "INS,OVR"
-msgstr "æ??å?¥,è¦?ç??"
+msgstr "æ??å?¥ï¼?è¦?ç??"
-#. insert/overwrite
+#. Abbreviation for line, column so that it will fit in the status bar
#: ../filediff.py:224
#, python-format
msgid "Ln %i, Col %i"
-msgstr "è¡?å?· %iï¼?å??å?· %i"
+msgstr "%i è¡?ï¼?%i å??"
#: ../filediff.py:281
#, python-format
@@ -185,1072 +249,982 @@ 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â??å?¨æ??件ä¸ç??è¡?å?·å·²æ?¹å??ã??æ¯?è¾?ç??ç»?æ??ä¸?符å??ã??æ?¥ç??ç?¨æ?·æ??å??æ?¥è?·å¾?æ?´å¤?ä¿¡æ?¯ã??"
-#: ../filediff.py:526
-#, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr "æ£å??表达å¼?é??误\nâ??%sâ??"
+#. TRANSLATORS: this is the name of a new file which has not yet been saved
+#: ../filediff.py:378
+msgid "<unnamed>"
+msgstr "<æ?ªå?½å??>"
-#: ../filediff.py:538
-#, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "æ£å??表达å¼?â??%sâ??æ?ªæ?¾å?°ã??"
-
-#: ../filediff.py:540
-#, python-format
-msgid "The text '%s' was not found."
-msgstr "æ??æ?¬â??%sâ??æ?ªæ?¾å?°ã??"
-
-#: ../filediff.py:579
+#: ../filediff.py:551
#, python-format
msgid "[%s] Set num panes"
-msgstr ""
+msgstr "[%s] 设�����"
-#: ../filediff.py:586
+#: ../filediff.py:557
#, python-format
msgid "[%s] Opening files"
-msgstr "[%s] æ£æ??å¼?æ??件"
+msgstr "[%s] æ??å¼?æ??件"
-#: ../filediff.py:602
+#: ../filediff.py:575 ../filediff.py:589 ../filediff.py:605 ../filediff.py:612
#, python-format
-msgid ""
-"Could not open '%s' for reading.\n"
-"\n"
-"The error was:\n"
-"%s"
-msgstr ""
-"æ? æ³?æ??å¼?â??%sâ??读å??ã??\n"
-"\n"
-"é??误为ï¼?\n"
-"%s"
+msgid "Could not read from '%s'"
+msgstr "ä¸?è?½è¯»å??以ä¸?å??容ï¼?â??%sâ??"
-#: ../filediff.py:606
+#: ../filediff.py:576 ../filediff.py:613
+msgid "The error was:"
+msgstr "é??误ï¼?"
+
+#: ../filediff.py:581
#, python-format
msgid "[%s] Reading files"
-msgstr "[%s] æ£è¯»å??æ??件"
+msgstr "[%s] 读å??æ??件"
-#: ../filediff.py:621
-#, python-format
+#: ../filediff.py:590
msgid ""
-"Could not read from '%s'.\n"
-"\n"
-"I tried encodings %s."
+"It contains ascii nulls.\n"
+"Perhaps it is a binary file."
msgstr ""
-"æ? æ³?ä»?â??%sâ??读å??ã??\n"
-"\n"
-"è¯?ç?¨äº? %s ç¼?ç ?ã??"
+"å??å?« ASCII 空å?符ã??\n"
+"å?¯è?½è¿?æ?¯ä¸?个äº?è¿?å?¶æ??件ã??"
-#: ../filediff.py:626
+#: ../filediff.py:606
#, python-format
-msgid ""
-"Could not read from '%s'.\n"
-"\n"
-"The error was:\n"
-"%s"
-msgstr ""
-"æ? æ³?ä»?â??%sâ??读å??ã??\n"
-"\n"
-"é??误为ï¼?\n"
-"%s"
+msgid "I tried encodings %s."
+msgstr "æ??æ£?æµ?è¿?ç??æ??å?ç¼?ç ? %sã??"
-#: ../filediff.py:646
+#: ../filediff.py:633
#, python-format
msgid "[%s] Computing differences"
-msgstr "[%s] æ£å?¨è®¡ç®?å·®å¼?"
+msgstr "[%s] 计�差�"
+
+#: ../filediff.py:643
+msgid "Files are identical"
+msgstr "æ??件å®?å?¨ç?¸å??"
-#: ../filediff.py:735
+#: ../filediff.py:648
+msgid "Hi_de"
+msgstr "é??è??(_D)"
+
+#: ../filediff.py:788
#, python-format
msgid ""
"\"%s\" exists!\n"
"Overwrite?"
-msgstr "â??%sâ??å·²å?å?¨ï¼?\nè¦?ç??å??ï¼?"
+msgstr ""
+"â??%sâ??å·²å?å?¨ï¼?\n"
+"è¦?ç??æ??件ï¼?"
-#: ../filediff.py:747
+#: ../filediff.py:801
#, python-format
msgid ""
"Error writing to %s\n"
"\n"
"%s."
-msgstr "å??å?¥ %s å?ºé??\n\n%sã??"
+msgstr ""
+"å??å?¥å?°â??%sâ??æ?¶å?ºé??\n"
+"\n"
+"%sã??"
-#: ../filediff.py:756
+#: ../filediff.py:810
#, python-format
msgid "Choose a name for buffer %i."
msgstr "为ç¼?å?²å?º %i é??æ?©ä¸?个å??称ã??"
-#: ../filediff.py:769
+#: ../filediff.py:824
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
"\n"
"Which format would you like to use?"
-msgstr "æ??件â??%sâ??å??å?«ä¸?å??ç??è¡?ç»?æ??符ã??\n\næ?¨æ?³è¦?使ç?¨ä½?ç§?æ ¼å¼?ï¼?"
+msgstr ""
+"æ??件â??%sâ??å??å?«ä¸?å??ç??è¡?ç»?æ??符ã??\n"
+"\n"
+"æ?¨æ?³ç?¨å?ªç§?æ ¼å¼?ï¼?"
-#: ../filediff.py:785
+#: ../filediff.py:840
#, 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:820
+#: ../filediff.py:880
msgid "Save patch as..."
-msgstr "è¡¥ä¸?å?¦å?为..."
+msgstr "å?¦å?è¡¥ä¸?为..."
-#: ../filediff.py:874
+#: ../filediff.py:938
#, python-format
msgid ""
-"Refreshing will discard changes in:\n"
+"Reloading will discard changes in:\n"
"%s\n"
"\n"
"You cannot undo this operation."
-msgstr "å?·æ?°å°?丢å¼?以ä¸?æ??件ä¸ç??æ?´æ?¹ï¼?\n%s\n\næ?¨æ? æ³?æ?¤æ¶?æ¤æ??ä½?ã??"
-
-#: ../meld:50
-#, c-format
-msgid "Meld requires python%s or higher."
-msgstr "Meld é??è¦? python %s æ??æ?´é«?ç??æ?¬ã??"
-
-#: ../meld:60
-msgid "Meld requires a recent version of pygtk."
-msgstr "Meld é??è¦? pygtk ç??æ??æ?°ç??æ?¬ã??"
-
-#: ../meld:61
-#, c-format
-msgid "pygtk-%s or higher is recommended."
-msgstr ""
-
-#: ../meld:71
-#, c-format
-msgid "Meld works best with pygtk-%s or higher. (found %s)"
-msgstr "Meld å?¨ pygtk %s æ??æ?´é«?ç??æ?¬ä¸å·¥ä½?è¾?好ã??(æ?¾å?°äº? %s)"
-
-#: ../meld:72
-msgid ""
-"Due to incompatible API changes some functions may not operate as expected."
-msgstr ""
-"ç?±äº? API ä¸?å?¼å®¹ï¼?æ??äº?å?½æ?°å?¯è?½æ? æ³?æ??设计é¢?æ??å·¥ä½?ã??"
-
-#: ../meldapp.py:294
-msgid "Line numbers are only available if you have gnome-python-desktop installed."
-msgstr "ä»?å½?æ?¨å®?è£?äº? gnome-python-desktop æ?¶è¡?å?·æ??å?¯ç?¨ã??"
-
-#: ../meldapp.py:298
-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"
-
-#: ../meldapp.py:747
-msgid "folder"
-msgstr "æ??件夹"
-
-#: ../meldapp.py:748
-msgid "file"
-msgstr "æ??件"
-
-#: ../meldapp.py:749
-msgid "nonexistant"
msgstr ""
-
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: ../meldapp.py:804
-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"
+"%s\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";
-msgstr ""
+"æ?¨æ? æ³?æ?¤æ¶?æ¤æ¬¡æ??ä½?ã??"
-#: ../meldapp.py:821
+#: ../findbar.py:119
#, python-format
msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
-msgstr ""
-"Meld %s\n"
-"ç?± Stephen Kennedy <stevek gnome org> ç¼?å??"
-
-#: ../meldapp.py:877
-#, python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "å??æ?°ä¸ªæ?°ä¸?对(å?± %i 个)"
-
-#: ../melddoc.py:45
-msgid "untitled"
-msgstr "æ? æ ?é¢?"
-
-#. no common path. empty names get changed to "[None]"
-#: ../misc.py:120
-msgid "[None]"
-msgstr "[æ? ]"
-
-#: ../svnview.py:42
-msgid ""
-"Ignored:Non SVN:::Error::Newly added:Modified:<b>Conflict</b>:Removed:Missing"
-msgstr ""
-
-#: ../glade2/cvsview.glade.h:1
-msgid "Add _Binary"
-msgstr "æ·»å? äº?è¿?å?¶(_B)"
-
-#: ../glade2/cvsview.glade.h:2
-msgid "Add to CVS"
-msgstr "æ·»å? å?° CVS"
-
-#: ../glade2/cvsview.glade.h:3
-msgid "CVS Log"
-msgstr "CVS ��"
-
-#: ../glade2/cvsview.glade.h:4
-msgid "Commit"
-msgstr "æ??交"
-
-#: ../glade2/cvsview.glade.h:5
-msgid "Commit Files"
-msgstr "æ??交æ??件"
-
-#: ../glade2/cvsview.glade.h:6
-msgid "Date"
-msgstr "æ?¥æ??"
-
-#: ../glade2/cvsview.glade.h:7
-msgid "Delete locally"
-msgstr "æ?¬å?°å? é?¤"
-
-#: ../glade2/cvsview.glade.h:8
-msgid "Diff Options"
-msgstr "å·®å¼?é??项"
-
-#: ../glade2/cvsview.glade.h:9
-msgid "Diff selected"
-msgstr "å·®å¼?æ??é??"
-
-#: ../glade2/cvsview.glade.h:10
-msgid "Flatten directories"
-msgstr ""
-
-#: ../glade2/cvsview.glade.h:11
-msgid "Ignored"
-msgstr "忽ç?¥ç??"
-
-#: ../glade2/cvsview.glade.h:12
-msgid "Local copy against other remote revision"
-msgstr ""
-
-#: ../glade2/cvsview.glade.h:13
-msgid "Local copy against same remote revision"
-msgstr ""
-
-#: ../glade2/cvsview.glade.h:14
-msgid "Log Message"
-msgstr "����"
-
-#: ../glade2/cvsview.glade.h:15
-msgid "Non _CVS"
-msgstr "é?? _CVS"
-
-#: ../glade2/cvsview.glade.h:16
-msgid "Previous Logs"
-msgstr "�个��"
-
-#: ../glade2/cvsview.glade.h:17
-msgid "Remove _Locally"
-msgstr "æ?¬å?°å? é?¤(_L)"
-
-#: ../glade2/cvsview.glade.h:18
-msgid "Remove from CVS"
-msgstr "ä»? CVS ä¸å? é?¤"
-
-#: ../glade2/cvsview.glade.h:19 ../glade2/dirdiff.glade.h:20
-msgid "Show modified"
-msgstr "æ?¾ç¤ºä¿®æ?¹ç??æ??件"
-
-#: ../glade2/cvsview.glade.h:20
-msgid "Show non-CVS"
-msgstr "æ?¾ç¤ºé?? CVS"
-
-#: ../glade2/cvsview.glade.h:22
-msgid "Update"
-msgstr "æ?´æ?°"
-
-#: ../glade2/cvsview.glade.h:23
-msgid "_Add"
-msgstr "æ·»å? (_A)"
-
-#: ../glade2/cvsview.glade.h:24
-msgid "_Commit"
-msgstr "æ??交(_C)"
-
-#: ../glade2/cvsview.glade.h:25 ../glade2/meldapp.glade.h:89
-msgid "_Diff"
-msgstr "_Diff"
-
-#: ../glade2/cvsview.glade.h:26
-msgid "_Edit"
-msgstr "ç¼?è¾?(_E)"
-
-#: ../glade2/cvsview.glade.h:27
-msgid "_Flatten"
+"Regular expression error\n"
+"'%s'"
msgstr ""
-
-#: ../glade2/cvsview.glade.h:28
-msgid "_Modified"
-msgstr "已修�(_M)"
-
-#: ../glade2/cvsview.glade.h:29
-msgid "_Normal"
-msgstr "æ?®é??(_N)"
-
-#: ../glade2/cvsview.glade.h:30
-msgid "_Remove"
-msgstr "å? é?¤(_R)"
-
-#: ../glade2/cvsview.glade.h:31
-msgid "_Update"
-msgstr "æ?´æ?°(_U)"
+"æ£å??表达å¼?é??误\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>"
+"<span weight=\"bold\" size=\"larger\">æ??äº?æ??件已ç»?ä¿®æ?¹è¿?ã??\n"
+"æ?¨æ?³è¦?ä¿?å?å?ªå? 个æ??件ï¼?</span>"
#: ../glade2/filediff.glade.h:3
-msgid "Copy All _Left"
-msgstr "左侧����(_L)"
-
-#: ../glade2/filediff.glade.h:4
-msgid "Copy All _Right"
-msgstr "�侧����(_R)"
-
-#: ../glade2/filediff.glade.h:5
msgid "Copy to Clipboard"
msgstr "����贴�"
-#: ../glade2/filediff.glade.h:6
-msgid "Create Patch"
-msgstr "å??建补ä¸?"
-
-#: ../glade2/filediff.glade.h:7 ../glade2/dirdiff.glade.h:9
-msgid "Edit"
-msgstr "ç¼?è¾?"
-
-#: ../glade2/filediff.glade.h:8
-msgid "Find"
-msgstr "��"
-
-#: ../glade2/filediff.glade.h:9
-msgid "Make Patch"
-msgstr "��补�"
-
-#: ../glade2/filediff.glade.h:10
-msgid "Match _entire word only"
-msgstr "å?ªå?¹é??æ?´ä¸ªå??è¯?(_E)"
-
-#: ../glade2/filediff.glade.h:11
-msgid "Regular e_xpression"
-msgstr "æ£å??表达å¼?(_X)"
-
-#: ../glade2/filediff.glade.h:12
+#: ../glade2/filediff.glade.h:5
msgid "Save modified files?"
-msgstr "ä¿?å?ä¿®æ?¹è¿?ç??æ??件å??ï¼?"
-
-#: ../glade2/filediff.glade.h:13
-msgid "Search for:"
-msgstr "æ??ç´¢ï¼?"
-
-#: ../glade2/filediff.glade.h:14
-msgid "_Match case"
-msgstr "å?ºå??大å°?å??(_M)"
-
-#: ../glade2/filediff.glade.h:15
-msgid "_Wrap around"
-msgstr "��(_W)"
-
-#: ../glade2/dirdiff.glade.h:1
-msgid "Case"
-msgstr "大å°?å??"
-
-#: ../glade2/dirdiff.glade.h:2
-msgid "Copy Left"
-msgstr "��左侧"
+msgstr "ä¿?å?已修æ?¹ç??æ??件ï¼?"
-#: ../glade2/dirdiff.glade.h:3
-msgid "Copy Right"
-msgstr "���侧"
-
-#: ../glade2/dirdiff.glade.h:4
-msgid "Copy left"
-msgstr "��左侧"
-
-#: ../glade2/dirdiff.glade.h:5
-msgid "Copy right"
-msgstr "���侧"
-
-#: ../glade2/dirdiff.glade.h:6
-msgid "Delete selected"
-msgstr "å? é?¤æ??é??"
-
-#: ../glade2/dirdiff.glade.h:7
-msgid "Diff"
-msgstr "差�"
-
-#: ../glade2/dirdiff.glade.h:8
-msgid "Diff selection"
-msgstr "å·®å¼?æ??é??"
-
-#: ../glade2/dirdiff.glade.h:10
-msgid "Hide selected"
-msgstr "é??è??æ??é??"
+#: ../glade2/filediff.glade.h:6
+msgid "_Discard Changes"
+msgstr "丢���(_D)"
-#: ../glade2/dirdiff.glade.h:11
-msgid "Hide..."
-msgstr "é??è??..."
+#: ../glade2/filediff.glade.h:7
+msgid "_Save Selected"
+msgstr "ä¿?å?é??ä¸ç??(_S)"
-#: ../glade2/dirdiff.glade.h:12
-msgid "Ignore case of entries"
-msgstr ""
+#: ../glade2/findbar.glade.h:1
+msgid "Regular E_xpression"
+msgstr "æ£å??表达å¼?(_X)"
-#: ../glade2/dirdiff.glade.h:13
-msgid "Launch _Comparison"
-msgstr "����(_C)"
+#: ../glade2/findbar.glade.h:2
+msgid "Replace _All"
+msgstr "����(_A)"
-#: ../glade2/dirdiff.glade.h:14
-msgid "Left"
-msgstr "左侧"
+#: ../glade2/findbar.glade.h:3
+msgid "Replace _With"
+msgstr "��为(_W)"
-#: ../glade2/dirdiff.glade.h:15
-msgid "Modified"
-msgstr "修�"
+#: ../glade2/findbar.glade.h:4
+msgid "Who_le word"
+msgstr "å?¹é??æ?´ä¸ªå??è¯?(_L)"
-#: ../glade2/dirdiff.glade.h:16
-msgid "New"
-msgstr "��"
+#: ../glade2/findbar.glade.h:5
+msgid "_Match Case"
+msgstr "å?¹é??å??å?«ç??(_M)"
-#: ../glade2/dirdiff.glade.h:17
-msgid "Right"
-msgstr "�侧"
-
-#: ../glade2/dirdiff.glade.h:18
-msgid "Same"
-msgstr "ç?¸å??"
+#: ../glade2/findbar.glade.h:6
+msgid "_Next"
+msgstr "��个(_N)"
-#: ../glade2/dirdiff.glade.h:19
-msgid "Show identical"
-msgstr "æ?¾ç¤ºç?¸å??ç??æ??件"
+#: ../glade2/findbar.glade.h:7
+msgid "_Previous"
+msgstr "��个(_P)"
-#: ../glade2/dirdiff.glade.h:21
-msgid "Show new"
-msgstr "æ?¾ç¤ºæ?°æ??件"
+#: ../glade2/findbar.glade.h:8 ../meldapp.py:443
+msgid "_Replace"
+msgstr "æ?¿æ?¢(_R)"
-#: ../glade2/dirdiff.glade.h:22
-msgid "_Delete Selected"
-msgstr "å? é?¤æ??é??(_D)"
+#: ../glade2/findbar.glade.h:9
+msgid "_Search for"
+msgstr "æ??ç´¢(_S)"
#: ../glade2/meldapp.glade.h:1
-msgid " spaces."
-msgstr " ç©ºæ ¼ã??"
+msgid "<b>Edit Menu</b>"
+msgstr "<b>ç¼?è¾?è??å??</b>"
#: ../glade2/meldapp.glade.h:2
-msgid "(gnome-default-editor)"
-msgstr "(gnome-default-editor)"
+msgid "<b>Font</b>"
+msgstr "<b>å?ä½?</b>"
#: ../glade2/meldapp.glade.h:3
-msgid "<b>Drawing Style</b>"
-msgstr "<b>ç»?å?¶æ ·å¼?</b>"
+msgid "<b>Loading</b>"
+msgstr "<b>载�</b>"
#: ../glade2/meldapp.glade.h:4
-msgid "<b>Edit Menu</b>"
-msgstr "<b>ç¼?è¾?è??å??</b>"
+msgid "<b>Misc</b>"
+msgstr "<b>æ??项</b>"
#: ../glade2/meldapp.glade.h:5
-msgid "<b>Font</b>"
-msgstr "<b>å?ä½?</b>"
+msgid "Automatically supply missing newline at end of file"
+msgstr "è?ªå?¨è¡¥é½?æ??件æ?«å°¾ä¸¢å¤±ç??æ?¢è¡?符"
#: ../glade2/meldapp.glade.h:6
-msgid "<b>Global options</b>"
-msgstr "<b>å?¨å±?é??项</b>"
+msgid "Choose Files"
+msgstr "é??æ?©æ??件"
#: ../glade2/meldapp.glade.h:7
-msgid "<b>Loading</b>"
-msgstr "<b>��</b>"
+msgid "Copyright © 2002-2009 Stephen Kennedy"
+msgstr "ç??æ??æ??æ?? © 2002-2009 Stephen Kennedy"
#: ../glade2/meldapp.glade.h:8
-msgid "<b>Misc</b>"
-msgstr "<b>æ??ç±»</b>"
+msgid "Custom command"
+msgstr "����令"
#: ../glade2/meldapp.glade.h:9
-msgid "<b>Saving</b>"
-msgstr "<b>ä¿?å?</b>"
+msgid "Directory"
+msgstr "��"
#: ../glade2/meldapp.glade.h:10
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>å·¥å?·æ ?å¤?è§?</b>"
+msgid "Edit files with:"
+msgstr "ç¼?è¾?æ??件ç??ç¨?åº?ï¼?"
#: ../glade2/meldapp.glade.h:11
-msgid "<b>Update Options</b>"
-msgstr "<b>æ?´æ?°é??项</b>"
+msgid "Editor"
+msgstr "ç¼?è¾?å?¨"
#: ../glade2/meldapp.glade.h:12
-msgid "<b>Whitespace</b>"
-msgstr "<b>空�</b>"
+msgid "Encoding"
+msgstr "æ??å?ç¼?ç ?"
#: ../glade2/meldapp.glade.h:13
-msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
+msgid "File Filters"
+msgstr "æ??件è¿?滤å?¨"
#: ../glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">Diff</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Diff</span>"
+msgid "Gnome default editor"
+msgstr "Gnome �认���"
#: ../glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">�示</span>"
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "忽ç?¥å¤?空è¡?/å°?空è¡?ç??å·®å¼?"
#: ../glade2/meldapp.glade.h:16
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ç¼?è¾?å?¨</span>"
+msgid "Ignore symbolic links"
+msgstr "忽�符���"
#: ../glade2/meldapp.glade.h:17
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ç¼?ç ?</span>"
+msgid "Insert spaces instead of tabs"
+msgstr "ç?¨ç©ºæ ¼æ?¿æ?¢å?¶è¡¨ç¬¦"
#: ../glade2/meldapp.glade.h:18
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">æ??件è¿?滤</span>"
+msgid "Internal editor"
+msgstr "å??é?¨ç¼?è¾?å?¨"
#: ../glade2/meldapp.glade.h:19
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">æ??æ?¬è¿?滤</span>"
+msgid "Line Wrapping "
+msgstr "��"
#: ../glade2/meldapp.glade.h:20
-msgid "Automatically supply missing newline at end of file."
-msgstr ""
+msgid "Meld"
+msgstr "Meld"
#: ../glade2/meldapp.glade.h:21
-msgid "CVS"
-msgstr "CVS"
+msgid "Mine"
+msgstr "æ??ç??"
#: ../glade2/meldapp.glade.h:22
-msgid "CVS Directory"
-msgstr "CVS ��"
+msgid "Original"
+msgstr "å??件"
#: ../glade2/meldapp.glade.h:23
-msgid "CVS binary"
-msgstr "CVS ���"
+msgid "Other"
+msgstr "��"
#: ../glade2/meldapp.glade.h:24
-msgid "CVS view"
-msgstr "CVS æ?¥ç??"
+msgid "Preferences : Meld"
+msgstr "é¦?é??项ï¼?Meld"
#: ../glade2/meldapp.glade.h:25
-msgid "C_VS Browser"
-msgstr "CVS ���(_V)"
+msgid "Show line numbers"
+msgstr "�示��"
#: ../glade2/meldapp.glade.h:26
-msgid "Choose Files"
-msgstr "é??æ?©æ??件"
+msgid "Tab width"
+msgstr "�表符宽度"
#: ../glade2/meldapp.glade.h:27
-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 ""
+msgid "Text Filters"
+msgstr "æ??å?è¿?滤å?¨"
#: ../glade2/meldapp.glade.h:28
-msgid "Copyright (C) 2002 Stephen Kennedy"
-msgstr ""
+msgid "Three way directory"
+msgstr "ä¸?å??ç?®å½?"
#: ../glade2/meldapp.glade.h:29
-msgid "Create missing directories (-d)"
-msgstr ""
+msgid "Three way file"
+msgstr "ä¸?å??æ??件"
#: ../glade2/meldapp.glade.h:30
-msgid "Curved : Filled Curves"
-msgstr ""
+msgid "Two way directory"
+msgstr "两å??ç?®å½?"
#: ../glade2/meldapp.glade.h:31
-msgid "Custom command"
-msgstr "����令"
+msgid "Two way file"
+msgstr "两å??æ??件"
#: ../glade2/meldapp.glade.h:32
-msgid "Display"
-msgstr "�示"
+msgid "Use GNOME monospace font"
+msgstr "使ç?¨ GNOME ç?宽å?ä½?"
#: ../glade2/meldapp.glade.h:33
-msgid "Edit menu popup invokes"
-msgstr ""
+msgid "Use custom font"
+msgstr "使ç?¨è?ªå®?ä¹?å?ä½?"
#: ../glade2/meldapp.glade.h:34
-msgid "Editor"
-msgstr "ç¼?è¾?å?¨"
+msgid "Use syntax highlighting"
+msgstr "使ç?¨è¯æ³?é«?亮"
#: ../glade2/meldapp.glade.h:35
-msgid "Encoding"
-msgstr "ç¼?ç ?"
+msgid "Version control view"
+msgstr "ç??æ?¬æ?§å?¶æ?¥ç??"
#: ../glade2/meldapp.glade.h:36
-msgid "File Filters"
-msgstr "æ??件è¿?滤å?¨"
+msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+msgstr "è½½å?¥æ?¶ï¼?æ??æ¤é¡ºåº?å°?è¯?ç¼?ç ?ã??(å¦? utf8ï¼?gb2312ï¼?gbkï¼?gb18030)"
#: ../glade2/meldapp.glade.h:37
-msgid "Gnome Default"
-msgstr "GNOME �认"
+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 "Gnome default editor"
-msgstr "GNOME �认���"
+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 "Icons Only"
-msgstr "å?ªæ??å?¾æ ?"
+msgid "_Character"
+msgstr "å?符(_C)"
#: ../glade2/meldapp.glade.h:40
-msgid "Ignore .cvsrc (-f)"
-msgstr ""
+msgid "_Directory Comparison"
+msgstr "����(_D)"
#: ../glade2/meldapp.glade.h:41
-msgid "Ignore changes in amount of white space"
-msgstr ""
+msgid "_File Comparison"
+msgstr "æ??件æ¯?è¾?(_F)"
#: ../glade2/meldapp.glade.h:42
-msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
-msgstr ""
+msgid "_None"
+msgstr "æ? (_N)"
#: ../glade2/meldapp.glade.h:43
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr ""
+msgid "_Three Way Compare"
+msgstr "ä¸?å??æ¯?è¾?(_T)"
#: ../glade2/meldapp.glade.h:44
-msgid "Ignore changes which insert or delete blank lines"
-msgstr ""
+msgid "_Version Control Browser"
+msgstr "ç??æ?¬æ?§å?¶æµ?è§?å?¨(_V)"
#: ../glade2/meldapp.glade.h:45
-msgid "Internal editor"
-msgstr "å??é?¨ç¼?è¾?å?¨"
+msgid "_Word"
+msgstr "å?(_W)"
-#: ../glade2/meldapp.glade.h:46
-msgid "Line Wrapping "
-msgstr "��"
+#: ../glade2/vcview.glade.h:1
+msgid "Commit Files"
+msgstr "æ??交æ??件"
-#: ../glade2/meldapp.glade.h:47
-msgid "Locate CVS binary : Meld"
-msgstr "�� CVS ����Meld"
+#: ../glade2/vcview.glade.h:2
+msgid "Compare Options"
+msgstr "æ¯?è¾?é??项"
-#: ../glade2/meldapp.glade.h:48
-msgid "Meld"
-msgstr "Meld"
+#: ../glade2/vcview.glade.h:3
+msgid "Date"
+msgstr "æ?¥æ??"
-#: ../glade2/meldapp.glade.h:49
-msgid "Mine"
-msgstr "æ??ç??"
+#: ../glade2/vcview.glade.h:4
+msgid "Local copy against other remote revision"
+msgstr "æ?¬å?°å?¯æ?¬é??对å?¶å®?è¿?ç¨?æ ¡è®¢"
-#: ../glade2/meldapp.glade.h:50
-msgid "My Directory"
-msgstr "æ??ç??ç?®å½?"
+#: ../glade2/vcview.glade.h:5
+msgid "Local copy against same remote revision"
+msgstr "æ?¬å?°ç??å?¯æ?¬é??对ç?¸å??ç??è¿?ç¨?修订"
-#: ../glade2/meldapp.glade.h:51
-msgid "My File"
-msgstr "æ??ç??æ??件"
+#: ../glade2/vcview.glade.h:6
+msgid "Log Message"
+msgstr "��信�"
-#: ../glade2/meldapp.glade.h:52
-msgid "New..."
-msgstr "�建..."
+#: ../glade2/vcview.glade.h:7
+msgid "Previous Logs"
+msgstr "ä¸?次ç??æ?¥å¿?"
-#: ../glade2/meldapp.glade.h:53
-msgid "Original"
-msgstr "å??å§?"
+#: ../glade2/vcview.glade.h:8 ../vcview.py:183
+msgid "Tag"
+msgstr "æ ?ç¾"
-#: ../glade2/meldapp.glade.h:54
-msgid "Original Directory"
-msgstr "å??å§?ç?®å½?"
+#: ../glade2/vcview.glade.h:9
+msgid "VC Log"
+msgstr "VC ��"
-#: ../glade2/meldapp.glade.h:55
-msgid "Original File"
-msgstr "å??å§?æ??件"
+#: ../historyentry.py:248
+msgid "_Browse..."
+msgstr "��(_B)..."
-#: ../glade2/meldapp.glade.h:56
-msgid "Other"
-msgstr "��"
+#: ../historyentry.py:256
+msgid "Path"
+msgstr "路�"
-#: ../glade2/meldapp.glade.h:57
-msgid "Other Directory"
-msgstr "����"
+#: ../historyentry.py:257
+msgid "Path to file"
+msgstr "æ??件路å¾?"
-#: ../glade2/meldapp.glade.h:58
-msgid "Other File"
-msgstr "å?¶å®?æ??件"
+#: ../historyentry.py:258
+msgid "Pop up a file selector to choose a file"
+msgstr "å¼¹å?ºæ??件é??æ?©å?¨æ?¥é??æ?©ä¸?个æ??件"
-#: ../glade2/meldapp.glade.h:59
-msgid "Preferences : Meld"
-msgstr "é¦?é??项ï¼?Meld"
+#: ../historyentry.py:379
+msgid "Select directory"
+msgstr "é??æ?©ç?®å½?"
-#: ../glade2/meldapp.glade.h:60
-msgid "Prune empty directories (-P)"
-msgstr "é??æ¯?空ç?®å½?(-P)"
+#: ../historyentry.py:383
+msgid "Select file"
+msgstr "é??æ?©æ??件"
-#: ../glade2/meldapp.glade.h:61
-msgid "Quiet mode (-q)"
-msgstr "å®?é??模å¼?(-q)"
+#: ../meld:47
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Meld è¦?æ±? %s æ??æ?´é«?ç??æ?¬ã??"
-#: ../glade2/meldapp.glade.h:62
-msgid "Report _Bug"
-msgstr "æ?¥å??é??误(_B)"
+#: ../meld:64 ../meld:71
+msgid "Cannot import: "
+msgstr "æ? æ³?导å?¥ï¼?"
-#: ../glade2/meldapp.glade.h:63
-msgid "SVN Directory"
-msgstr "SVN ��"
+#: ../meld.desktop.in.h:1
+msgid "Compare and merge your files"
+msgstr "æ¯?è¾?å??å??并æ?¨ç??æ??件"
-#: ../glade2/meldapp.glade.h:64
-msgid "SVN view"
-msgstr "SVN æ?¥ç??"
+#: ../meld.desktop.in.h:2
+msgid "Meld Diff Viewer"
+msgstr "Meld Diff å·®å¼?æ?¥ç??å?¨"
-#: ../glade2/meldapp.glade.h:65
-msgid "Save in UTF-8 encoding"
-msgstr "以 UTF-8 ç¼?ç ?ä¿?å?"
+#: ../meldapp.py:151
+msgid "label"
+msgstr "æ ?ç¾"
-#: ../glade2/meldapp.glade.h:66
-msgid "Save in the files original encoding"
-msgstr "以æ??件ç??å??å§?ç¼?ç ?ä¿?å?"
+#: ../meldapp.py:151
+msgid "pattern"
+msgstr "æ ¼å¼?"
-#: ../glade2/meldapp.glade.h:67
-msgid "Show line numbers"
-msgstr "�示��"
+#: ../meldapp.py:219
+msgid "Only available if you have gnome-python-desktop installed"
+msgstr "å?ªæ??å®?è£? gnome-python-desktop å??æ??æ??æ??"
-#: ../glade2/meldapp.glade.h:68
-msgid "Simple : Lines only"
-msgstr "ç®?å??ï¼?å?ªæ??è¡?"
+#. file filters
+#. text filters
+#: ../meldapp.py:229 ../meldapp.py:234 ../vcview.py:163
+msgid "Name"
+msgstr "å??称"
-#: ../glade2/meldapp.glade.h:69
-msgid "Solid Filled Quadilaterals"
-msgstr ""
+#: ../meldapp.py:229 ../meldapp.py:234
+msgid "Active"
+msgstr "��"
-#: ../glade2/meldapp.glade.h:70
-msgid "Tabs equivalent to "
-msgstr ""
+#: ../meldapp.py:229
+msgid "Pattern"
+msgstr "æ ¼å¼?"
-#: ../glade2/meldapp.glade.h:71
-msgid "Text Beside Icons"
-msgstr "æ??æ?¬å?¨å?¾æ ?æ??"
+#: ../meldapp.py:234
+msgid "Regex"
+msgstr "è¯æ³?"
-#: ../glade2/meldapp.glade.h:72
-msgid "Text Filters"
-msgstr "æ??å?è¿?滤å?¨"
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meldapp.py:341
+msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+msgstr "�份 \t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-#: ../glade2/meldapp.glade.h:73
-msgid "Text Only"
-msgstr "å?ªæ??æ??æ?¬"
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meldapp.py:343
+#, 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
+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
+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
+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
+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
+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
+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
+#: ../meldapp.py:357
+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
+#: ../meldapp.py:359
+msgid "Script comment\t0\t#.*"
+msgstr "è??æ?¬æ³¨é?? \t0\t#.*"
+
+#: ../meldapp.py:428
+msgid "_File"
+msgstr "æ??件(_F)"
+
+#: ../meldapp.py:429
+msgid "_New..."
+msgstr "�建(_N)..."
-#: ../glade2/meldapp.glade.h:74
-msgid "Text Under Icons"
-msgstr "æ??æ?¬å?¨å?¾æ ?ä¸?"
+#: ../meldapp.py:429
+msgid "Start a new comparison"
+msgstr "å¼?å§?æ?°ç??æ¯?è¾?"
-#: ../glade2/meldapp.glade.h:75
-msgid "Three way directory"
-msgstr "ä¸?å??ç?®å½?"
+#: ../meldapp.py:430
+msgid "Save the current file"
+msgstr "ä¿?å?å½?å??æ??件"
-#: ../glade2/meldapp.glade.h:76
-msgid "Three way file"
-msgstr "ä¸?å??æ??件"
+#: ../meldapp.py:432
+msgid "Close the current file"
+msgstr "å?³é?å½?å??æ??件"
-#: ../glade2/meldapp.glade.h:77
-msgid "Two way directory"
-msgstr "两å??ç?®å½?"
+#: ../meldapp.py:433
+msgid "Quit the program"
+msgstr "é??å?ºç¨?åº?"
-#: ../glade2/meldapp.glade.h:78
-msgid "Two way file"
-msgstr "两å??æ??件"
+#: ../meldapp.py:435
+msgid "_Edit"
+msgstr "ç¼?è¾?(_E)"
-#: ../glade2/meldapp.glade.h:79
-msgid "Use Compression (-z)"
-msgstr "使ç?¨å??缩(-z)"
+#: ../meldapp.py:436
+msgid "Undo the last action"
+msgstr "æ?¤æ¶?æ??å??ç??æ??ä½?"
-#: ../glade2/meldapp.glade.h:80
-msgid "Use GNOME monospace font."
-msgstr "使ç?¨ GNOME ç?è·?å?ä½?ã??"
+#: ../meldapp.py:437
+msgid "Redo the last undone action"
+msgstr "é??å??æ??å??æ?¤æ¶?ç??æ??ä½?"
-#: ../glade2/meldapp.glade.h:81
-msgid "Use custom font."
-msgstr "使ç?¨è?ªå®?ä¹?å?ä½?ã??"
+#: ../meldapp.py:438
+msgid "Cut the selection"
+msgstr "å?ªå??é??ä¸ç??å??容"
-#: ../glade2/meldapp.glade.h:82
-msgid "Use syntax highlighting"
-msgstr "使ç?¨è¯æ³?å? 亮"
+#: ../meldapp.py:439
+msgid "Copy the selection"
+msgstr "å¤?å?¶é??ä¸ç??å??容"
-#: ../glade2/meldapp.glade.h:83
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "è£?å?¥æ?¶ï¼?æ??æ¤é¡ºåº?å°?è¯?ç¼?ç ?ã??(å¦? utf8ï¼?gb18030)"
+#: ../meldapp.py:440
+msgid "Paste the clipboard"
+msgstr "�贴�贴�"
-#: ../glade2/meldapp.glade.h:84
-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 ""
+#: ../meldapp.py:441
+msgid "Search for text"
+msgstr "æ??ç´¢æ??å?"
-#: ../glade2/meldapp.glade.h:85
-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 ""
+#: ../meldapp.py:442
+msgid "Find Ne_xt"
+msgstr "����个(_X)"
-#: ../glade2/meldapp.glade.h:86
-msgid "Whitespace is significant"
-msgstr ""
+#: ../meldapp.py:442
+msgid "Search forwards for the same text"
+msgstr "继ç»å??å??æ??ç´¢ç?¸å??ç??æ??å?"
-#: ../glade2/meldapp.glade.h:87
-msgid "_Character"
-msgstr "å?符(_C)"
+#: ../meldapp.py:443
+msgid "Find and replace text"
+msgstr "æ?¥æ?¾å¹¶æ?¿æ?¢æ??å?"
-#: ../glade2/meldapp.glade.h:88
-msgid "_Contents"
-msgstr "å??容(_C)"
+#: ../meldapp.py:444
+msgid "Go to the next difference"
+msgstr "转���个差�"
-#: ../glade2/meldapp.glade.h:90
-msgid "_Directory Comparison"
-msgstr "����(_D)"
+#: ../meldapp.py:445
+msgid "Go to the previous difference"
+msgstr "转���个差�"
-#: ../glade2/meldapp.glade.h:91
-msgid "_Down"
-msgstr "�移(_D)"
+#: ../meldapp.py:446
+msgid "Prefere_nces"
+msgstr "é¦?é??项(_N)"
-#: ../glade2/meldapp.glade.h:92
-msgid "_File Comparison"
-msgstr "æ??件æ¯?è¾?(_F)"
+#: ../meldapp.py:446
+msgid "Configure the application"
+msgstr "��设置"
-#: ../glade2/meldapp.glade.h:93
-msgid "_Logo"
-msgstr "æ ?å¿?(_L)"
+#: ../meldapp.py:448
+msgid "_View"
+msgstr "æ?¥ç??(_V)"
-#: ../glade2/meldapp.glade.h:94
-msgid "_New..."
-msgstr "�建(_N)..."
+#: ../meldapp.py:449
+msgid "File status"
+msgstr "æ??件ç?¶æ??"
-#: ../glade2/meldapp.glade.h:95
-msgid "_None"
-msgstr "æ? (_N)"
+#: ../meldapp.py:450
+msgid "Version status"
+msgstr "ç??æ?¬ç?¶æ??"
-#: ../glade2/meldapp.glade.h:96
-msgid "_SVN Browser"
-msgstr "SVN ���(_S)"
+#: ../meldapp.py:451
+msgid "File filters"
+msgstr "æ??件è¿?滤å?¨"
-#: ../glade2/meldapp.glade.h:97
-msgid "_Save"
-msgstr "ä¿?å?(_S)"
+#: ../meldapp.py:452
+msgid "Stop the current action"
+msgstr "å??æ¢å½?å??æ??ä½?"
-#: ../glade2/meldapp.glade.h:98
-msgid "_Three Way Compare"
-msgstr "ä¸?å??æ¯?è¾?(_T)"
+#: ../meldapp.py:453
+msgid "Refresh the view"
+msgstr "����"
-#: ../glade2/meldapp.glade.h:99
-msgid "_Up"
-msgstr "å??ä¸?(_U)"
+#: ../meldapp.py:454
+msgid "Reload"
+msgstr "é??æ?°è½½å?¥"
-#: ../glade2/meldapp.glade.h:100
-msgid "_Word"
-msgstr "å??è¯?(_W)"
+#: ../meldapp.py:454
+msgid "Reload the comparison"
+msgstr "é??æ?°è½½å?¥æ¯?è¾?"
-#: ../glade2/meldapp.glade.h:101
-msgid "http://meld.sourceforge.net";
-msgstr "http://meld.sourceforge.net";
+#: ../meldapp.py:456
+msgid "_Help"
+msgstr "帮�(_H)"
-#: ../glade2/meldapp.glade.h:102
-msgid "utf8 iso8859"
-msgstr "utf8 gb18030"
+#: ../meldapp.py:457
+msgid "_Contents"
+msgstr "å??容(_C)"
-#~ msgid "Save the current file"
-#~ msgstr "ä¿?å?å½?å??æ??件"
+#: ../meldapp.py:457
+msgid "Open the Meld manual"
+msgstr "æ??å¼? Meld 帮å?©æ??å??"
-#~ msgid "Save all files"
-#~ msgstr "ä¿?å?å?¨é?¨æ??件"
+#: ../meldapp.py:458
+msgid "Report _Bug"
+msgstr "æ?¥å??é??误(_B)"
-#~ msgid "_Print..."
-#~ msgstr "æ??å?°(_P)..."
+#: ../meldapp.py:458
+msgid "Report a bug in Meld"
+msgstr "æ?¥å?? Meld 缺é?·"
-#~ msgid "Print this comparison"
-#~ msgstr "æ??å?°æ¤æ¯?è¾?"
+#: ../meldapp.py:459
+msgid "About this program"
+msgstr "�����"
-#~ msgid "_Close"
-#~ msgstr "å?³é?(_C)"
+#: ../meldapp.py:462
+msgid "Full Screen"
+msgstr "��"
-#~ msgid "Close this tab"
-#~ msgstr "å?³é?æ¤æ ?ç¾"
+#: ../meldapp.py:462
+msgid "View the comparison in full screen"
+msgstr "以å?¨å±?模å¼?æ?¥ç??æ¯?è¾?"
-#~ msgid "_Undo"
-#~ msgstr "��(_U)"
+#: ../meldapp.py:463
+msgid "_Toolbar"
+msgstr "å·¥å?·æ ?(_T)"
-#~ msgid "Undo last change"
-#~ msgstr "æ?¤æ¶?ä¸?次ç??æ?´æ?¹"
+#: ../meldapp.py:463
+msgid "Show or hide the toolbar"
+msgstr "æ?¾ç¤ºæ??é??è??å·¥å?·æ ?"
-#~ msgid "_Redo"
-#~ msgstr "é??å??(_R)"
+#: ../meldapp.py:464
+msgid "_Statusbar"
+msgstr "ç?¶æ??æ ?(_S)"
-#~ msgid "Redo last change"
-#~ msgstr "é??å??ä¸?次ç??æ?´æ?¹"
+#: ../meldapp.py:464
+msgid "Show or hide the statusbar"
+msgstr "æ?¾ç¤ºæ??é??è??ç?¶æ??æ ?"
-#~ msgid "Search the document"
-#~ msgstr "æ??ç´¢æ??æ¡£"
+#: ../meldapp.py:795
+msgid "Cannot compare a mixture of files and directories.\n"
+msgstr "æ? æ³?对混å??ç??æ??件å??ç?®å½?è¿?è¡?æ¯?è¾?ã??\n"
-#~ msgid "_Find Next"
-#~ msgstr "����个(_F)"
+#: ../meldapp.py:838 ../meldapp.py:846
+msgid "file"
+msgstr "æ??件"
-#~ msgid "Repeat the last find"
-#~ msgstr "é??å¤?ä¸?次æ?¥æ?¾"
+#: ../meldapp.py:839 ../meldapp.py:845
+msgid "dir"
+msgstr "��"
-#~ msgid "_Replace"
-#~ msgstr "æ?¿æ?¢(_R)"
+#: ../meldapp.py:844
+msgid "Start with no window open"
+msgstr "å?¯å?¨æ?¶ä¸?æ??å¼?çª?å?£"
-#~ msgid "Find and replace text"
-#~ msgstr "æ?¥æ?¾å¹¶æ?¿æ?¢æ??æ?¬"
+#: ../meldapp.py:845
+#, python-format
+msgid "Start with Version Control browser in '%s'"
+msgstr "ç?¨ç??æ?¬æ?§å?¶æµ?è§?å?¨æ??å¼?â??%sâ??"
-#~ msgid "Cu_t"
-#~ msgstr "å?ªå??(_T)"
+#: ../meldapp.py:846
+#, python-format
+msgid "Start with Version Control diff of '%s'"
+msgstr "ç?¨ç??æ?¬æ?§å?¶æµ?è§?å?¨æ¯?è¾?â??%sâ??ç??å·®å¼?"
-#~ msgid "Copy selected text"
-#~ msgstr "å¤?å?¶é??ä¸ç??æ??æ?¬"
+#: ../meldapp.py:847
+msgid "Start with 2 or 3 way file comparison"
+msgstr "å?¯å?¨ä¸¤å??æ??ä¸?å??æ??件æ¯?è¾?"
-#~ msgid "_Copy"
-#~ msgstr "��(_C)"
+#: ../meldapp.py:848
+msgid "Start with 2 or 3 way directory comparison"
+msgstr "å?¯å?¨ä¸¤å??æ??ä¸?å??ç?®å½?æ¯?è¾?"
-#~ msgid "_Paste"
-#~ msgstr "ç²?è´´(P)"
+#: ../meldapp.py:855
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld æ?¯ä¸?个æ??件å??ç?®å½?æ¯?è¾?å·¥å?·ã??"
-#~ msgid "Paste selected text"
-#~ msgstr "ç²?è´´é??ä¸ç??æ??æ?¬"
+#: ../meldapp.py:858
+msgid "Set label to use instead of file name"
+msgstr "设置æ ?ç¾æ?¥ä»£æ?¿æ??件å??"
-#~ msgid "Rotate View"
-#~ msgstr "æ??转è§?å?¾"
+#: ../meldapp.py:860
+msgid "Automatically compare all differing files on startup"
+msgstr "å?¯å?¨æ?¶è?ªå?¨æ¯?è¾?æ??æ??è¦?æ¯?è¾?ç??æ??件"
-#~ msgid "Show Filenames"
-#~ msgstr "æ?¾ç¤ºæ??件å??"
+#: ../meldapp.py:861 ../meldapp.py:862 ../meldapp.py:863 ../meldapp.py:864
+msgid "Ignored for compatibility"
+msgstr "忽ç?¥ä¸?è?´ç??"
-#~ msgid "Refres_h"
-#~ msgstr "å?·æ?°(_H)"
+#: ../meldapp.py:867
+msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgstr "æ?°å»ºä¸?个 diff æ ?ç¾æ?¥æ?¯æ?? ä¸?å??æ??件æ??ç?®å½?ã??"
-#~ msgid "Recompute differences"
-#~ msgstr "é??æ?°è®¡ç®?å·®å¼?"
+#: ../meldapp.py:871
+msgid "Invalid number of arguments supplied for --diff."
+msgstr "æ??ä¾?ç»? --diff å??æ?°ç??æ?°å?æ? æ??ã??"
-#~ msgid "Pr_ev"
-#~ msgstr "���(_E)"
+#: ../meldapp.py:874
+#, python-format
+msgid "Wrong number of arguments (Got %i)"
+msgstr "å??æ?°æ?°å?é??误 (è°?ç?¨ %i)"
-#~ msgid "Previous difference"
-#~ msgstr "���差�"
+#: ../melddoc.py:46
+msgid "untitled"
+msgstr "æ? æ ?é¢?"
-#~ msgid "_Next"
-#~ msgstr "���(_N)"
+#. no common path. empty names get changed to "[None]"
+#: ../misc.py:190
+msgid "[None]"
+msgstr "[æ? ]"
-#~ msgid "Next difference"
-#~ msgstr "���差�"
+#: ../vcview.py:127
+msgid "_Commit"
+msgstr "æ??交(_C)"
-#~ msgid "Copy contents left"
-#~ msgstr "å¤?å?¶å·¦ä¾§å??容"
+#: ../vcview.py:127
+msgid "Commit"
+msgstr "æ??交"
-#~ msgid "Copy contents right"
-#~ msgstr "å¤?å?¶å?³ä¾§å??容"
+#. FIXME: popup used to use gtk.STOCK_GO_BACK
+#: ../vcview.py:128
+msgid "_Update"
+msgstr "æ?´æ?°(_U)"
-#~ msgid "Insert,Overwrite"
-#~ msgstr "æ??å?¥,è¦?ç??"
+#: ../vcview.py:128
+msgid "Update"
+msgstr "æ?´æ?°"
+
+#. FIXME: popup used to use gtk.STOCK_GO_FORWARD
+#: ../vcview.py:129
+msgid "_Add"
+msgstr "æ·»å? (_A)"
+
+#: ../vcview.py:129
+msgid "Add to VC"
+msgstr "æ·»å? å?° CV"
+
+#. FIXME: popup used to use gtk.STOCK_ADD
+#: ../vcview.py:130
+msgid "Add _Binary"
+msgstr "æ·»å? äº?è¿?å?¶(_B)"
+
+#: ../vcview.py:130
+msgid "Add binary to VC"
+msgstr "æ·»å? äº?è¿?å?¶å?° VC"
+
+#. FIXME: stock is inconsistent with other VC actions
+#: ../vcview.py:131
+msgid "_Remove"
+msgstr "å? é?¤(_R)"
+
+#: ../vcview.py:131
+msgid "Remove from VC"
+msgstr "ä»? CV å? é?¤"
-#~ msgid "%s"
-#~ msgstr "%s"
+#. FIXME: popup used to use gtk.STOCK_REMOVE
+#: ../vcview.py:132
+msgid "_Resolved"
+msgstr "å·²å¤?ç??(_R)"
-#~ msgid "Regex Error: %s"
-#~ msgstr "æ£å??表达å¼?å?ºé??ï¼?%s"
+#: ../vcview.py:132
+msgid "Mark as resolved for VC"
+msgstr "å?¨ VC ä¸æ ?记为â??å·²å¤?ç??â??"
-#~ msgid "Print... %s"
-#~ msgstr "æ??å?°... %s"
+#: ../vcview.py:133
+msgid "Revert to original"
+msgstr "转æ?¢ä¸ºå??件"
+
+#: ../vcview.py:134
+msgid "Delete locally"
+msgstr "ä»?æ?¬å?°å? é?¤"
-#~ msgid "Print Preview"
-#~ msgstr "æ??å?°é¢?è§?"
+#: ../vcview.py:138
+msgid "_Flatten"
+msgstr "å±?å¼?(_F)"
-#~ msgid "Folder Comparision"
-#~ msgstr "æ??件夹æ¯?è¾?"
+#: ../vcview.py:138
+msgid "Flatten directories"
+msgstr "����"
-#~ msgid "Working Copy Browser"
-#~ msgstr "工������"
+#: ../vcview.py:139
+msgid "_Modified"
+msgstr "已修�(_M)"
-#~ msgid "_Settings"
-#~ msgstr "设置(_S)"
+#: ../vcview.py:140
+msgid "_Normal"
+msgstr "æ£å¸¸(_N)"
-#~ msgid "Show Toolbar"
-#~ msgstr "æ?¾ç¤ºå·¥å?·æ ?"
+#: ../vcview.py:140
+msgid "Show normal"
+msgstr "æ?¾ç¤ºæ£å¸¸ç??"
-#~ msgid "Show Statusbar"
-#~ msgstr "æ?¾ç¤ºç?¶æ??æ ?"
+#: ../vcview.py:141
+msgid "Non _VC"
+msgstr "é?? _VC"
-#~ msgid "_Help"
-#~ msgstr "帮�(_H)"
+#: ../vcview.py:141
+msgid "Show unversioned files"
+msgstr "æ?¾ç¤ºç??æ?¬ä¸?详ç??æ??件"
-#~ msgid "_Version"
-#~ msgstr "ç??æ?¬(_V)"
+#: ../vcview.py:142
+msgid "Ignored"
+msgstr "已忽ç?¥ç??"
-#~ msgid "Compare versions"
-#~ msgstr "æ¯?è¾?ç??æ?¬"
+#: ../vcview.py:142
+msgid "Show ignored files"
+msgstr "æ?¾ç¤ºå·²å¿½ç?¥ç??æ??件"
-#~ msgid "Update the local copy"
-#~ msgstr "������"
+#: ../vcview.py:180
+msgid "Location"
+msgstr "ä½?ç½®"
-#~ msgid "Commit changes"
-#~ msgstr "æ??交æ?´æ?¹"
+#: ../vcview.py:181
+msgid "Status"
+msgstr "ç?¶æ??"
-#~ msgid "Add to control"
-#~ msgstr "æ·»å? å?°æ?§å?¶"
+#: ../vcview.py:182
+msgid "Rev"
+msgstr "修订ç??æ?¬"
-#~ msgid "_Delete"
-#~ msgstr "å? é?¤(_D)"
+#: ../vcview.py:184
+msgid "Options"
+msgstr "é??项"
-#~ msgid "Un_known"
-#~ msgstr "��(_K)"
+#: ../vcview.py:230
+msgid "Choose one Version Control"
+msgstr "é??æ?©ä¸?个ç??æ?¬æ?§å?¶"
-#~ msgid "_Console"
-#~ msgstr "���(_C)"
+#: ../vcview.py:231
+msgid "Only one Version Control in this directory"
+msgstr "å?¨è¿?个ç?®å½?å?ªæ??ä¸?个ç??æ?¬æ?§å?¶"
-#~ msgid "View command line output"
-#~ msgstr "æ?¥ç??å?½ä»¤è¡?è¾?å?º"
+#: ../vcview.py:316
+msgid "(Empty)"
+msgstr "(空)"
-#~ msgid "*"
-#~ msgstr "*"
+#: ../vcview.py:349
+#, python-format
+msgid "[%s] Fetching differences"
+msgstr "[%s] è?·å??å·®å¼?"
-#~ msgid "Replace _All"
-#~ msgstr "����(_A)"
+#: ../vcview.py:356
+#, python-format
+msgid "[%s] Applying patch"
+msgstr "[%s] ��补�"
-#~ msgid "_Replace..."
-#~ msgstr "æ?¿æ?¢(_R)..."
+#: ../vcview.py:360
+msgid "No differences found."
+msgstr "没æ??å??ç?°å·®å¼?ã??"
-#~ msgid "_Replace:"
-#~ msgstr "æ?¿æ?¢(_R)ï¼?"
+#: ../vcview.py:439
+msgid "Select some files first."
+msgstr "ä¼?å??é??æ?©æ??件ã??"
-#~ msgid "Override GNOME font"
-#~ msgstr "è¦?ç?? GNOME å?ä½?"
+#: ../vcview.py:505
+#, python-format
+msgid ""
+"\n"
+" Invoking 'patch' failed.\n"
+" \n"
+" Maybe you don't have 'GNU patch' installed,\n"
+" or you use an untested version of %s.\n"
+" \n"
+" Please send email bug report to:\n"
+" meld-list gnome org\n"
+" \n"
+" Containing the following information:\n"
+" \n"
+" - meld version: '%s'\n"
+" - source control software type: '%s'\n"
+" - source control software version: 'X.Y.Z'\n"
+" - the output of '%s somefile.txt'\n"
+" - patch command: '%s'\n"
+" (no need to actually run it, just provide\n"
+" the command line) \n"
+" \n"
+" Replace 'X.Y.Z' by the actual version for the\n"
+" source control software you use.\n"
+" "
+msgstr ""
+"\n"
+" è°?ç?¨ patch å?½ä»¤å¤±è´¥ã??\n"
+" \n"
+" å?¯è?½æ?¯å?¢å?¢è¿?没æ??å®?è£? GNU patchï¼?\n"
+" æ??è??æ?¨ä½¿ç?¨ç??æ?¯ä¸?个æ?ªç»?è¿?æµ?è¯?ç?? %s ç??æ?¬ã??\n"
+" \n"
+" 请å??é??ç?µå?é?®ä»¶å?°è¿?é??æ?¥å??é??误ï¼?\n"
+" meld-list gnome org\n"
+" \n"
+" 请å?¨é?®ä»¶ä¸å??å?«ä»¥ä¸?ä¿¡æ?¯ï¼?\n"
+" \n"
+" - meld version: '%s'\n"
+" - source control software type: '%s'\n"
+" - source control software version: 'X.Y.Z'\n"
+" - the output of '%s somefile.txt'\n"
+" - patch command: '%s'\n"
+" (并ä¸?é??è¦?ç??ç??è¿?è¡?å?½ä»¤ï¼?å?ªè¦?å??å?ºæ?¥å°±è¡?) \n"
+" \n"
+" X.Y.Z æ?¯æ?¨å®?é??使ç?¨ç??æº?æ?§å?¶è½¯ä»¶ç??ç??æ?¬å?·ã??\n"
+" "
+
+#. These are the possible states of files. Be sure to get the colons correct.
+#: ../vc/_vc.py:40
+msgid ""
+"Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
+"Missing"
+msgstr "忽ç?¥ï¼?ç??æ?¬ä¸?详:::é??误::æ?°æ·»å? :已修æ?¹:<b>å?²çª?</b>:å·²å? é?¤:丢失"
-#~ msgid "Override GNOME toolbar style"
-#~ msgstr "è¦?ç?? GNOME å·¥å?·æ ?æ ·å¼?"
+#: ../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â??"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
