[meld] Updated Japanese translation

[Takeshi Aihana <aihana src gnome org>]

commit 1ef2ce3382e11470242ed8732a61d585c99c8992
Author: Takeshi AIHANA <takeshi aihana gmail com>
Date:   Wed Apr 29 21:24:43 2009 +0900

    Updated Japanese translation
---
 po/ChangeLog |    4 +
 po/ja.po     |  838 ++++++++++++++++++++++++++++------------------------------
 2 files changed, 402 insertions(+), 440 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index 25d26d9..03233ec 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-29  Takeshi AIHANA <takeshi aihana gmail com>
+
+	* ja.po: Updated Japanese translation.
+
 2009-04-20  Daniel Nylander <po danielnylander se>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/ja.po b/po/ja.po
index 78a5774..1d4ae2f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,13 +1,13 @@
 # meld ja.po.
-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
-# Takeshi AIHANA <takeshi aihana gmail com>, 2003-2008.
+# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Takeshi AIHANA <takeshi aihana gmail com>, 2003-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: meld trunk\n"
+"Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2008-12-01 22:20+0900\n"
-"PO-Revision-Date: 2008-12-01 22:13+0900\n"
+"POT-Creation-Date: 2009-04-29 21:19+0900\n"
+"PO-Revision-Date: 2009-04-29 21:19+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi aihana gmail com>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
@@ -16,101 +16,107 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../dirdiff.py:189 ../glade2/meldapp.glade.h:67 ../vcview.py:119
+#: ../dirdiff.py:173 ../vcview.py:124
 msgid "_Compare"
 msgstr "��"
 
-#: ../dirdiff.py:189 ../vcview.py:119
+#: ../dirdiff.py:173 ../vcview.py:124
 msgid "Compare selected"
 msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã?¾ã??"
 
-#. FIXME: the glade files were inconsistent: GO_BACK vs GOTO_FIRST, "Left" vs "Copy To Left"
-#: ../dirdiff.py:191
+#: ../dirdiff.py:174
 msgid "Left"
-msgstr "å·¦"
+msgstr "å·¦ã?¸ã?³ã??ã?¼"
 
-#: ../dirdiff.py:191 ../filediff.py:137
+#: ../dirdiff.py:174 ../filediff.py:120
 msgid "Copy To Left"
-msgstr "å·¦ã?¸ã?³ã??ã?¼"
+msgstr "å·¦ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
 
-#. FIXME: the glade files were inconsistent: GO_FORWARD vs GOTO_LAST, "Right" vs "Copy To Right"
-#: ../dirdiff.py:193
+#: ../dirdiff.py:175
 msgid "Right"
-msgstr "å?³"
+msgstr "å?³ã?¸ã?³ã??ã?¼"
 
-#: ../dirdiff.py:193 ../filediff.py:138
+#: ../dirdiff.py:175 ../filediff.py:121
 msgid "Copy To Right"
-msgstr "å?³ã?¸ã?³ã??ã?¼"
+msgstr "å?³ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
 
-#: ../dirdiff.py:194
+#: ../dirdiff.py:176
 msgid "Delete selected"
-msgstr "é?¸æ??ç¯?å?²ã??å??é?¤ã??ã?¾ã??"
+msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã?ªã?©ã??å??é?¤ã??ã?¾ã??"
 
-#: ../dirdiff.py:195
-msgid "Hide..."
-msgstr "é? ã??..."
+#: ../dirdiff.py:177
+msgid "Hide"
+msgstr "é? ã??"
 
-#: ../dirdiff.py:195
+#: ../dirdiff.py:177
 msgid "Hide selected"
 msgstr "é?¸æ??ç¯?å?²ã??é? ã??ã?¾ã??"
 
-#: ../dirdiff.py:197 ../filediff.py:135 ../vcview.py:120
+#: ../dirdiff.py:179 ../filediff.py:118 ../vcview.py:125
 msgid "Open selected"
-msgstr "é?¸æ??ç¯?å?²ã??é??ã??ã?¾ã??"
+msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??"
 
-#: ../dirdiff.py:201
+#: ../dirdiff.py:183
 msgid "Case"
 msgstr "大/å°?æ??å­?"
 
-#: ../dirdiff.py:201
+#: ../dirdiff.py:183
 msgid "Ignore case of entries"
 msgstr "大/å°?æ??å­?ã??ç?¡è¦?ã??ã?¾ã??"
 
-#: ../dirdiff.py:202
+#: ../dirdiff.py:184
 msgid "Same"
 msgstr "å??ã??é?¨å??"
 
-#: ../dirdiff.py:202
+#: ../dirdiff.py:184
 msgid "Show identical"
 msgstr "ä¸?è?´ã??ã??é?¨å??ã??表示ã??ã?¾ã??"
 
-#: ../dirdiff.py:203
+#: ../dirdiff.py:185
 msgid "New"
 msgstr "æ?°ã??ã??é?¨å??"
 
-#: ../dirdiff.py:203
+#: ../dirdiff.py:185
 msgid "Show new"
 msgstr "æ?°è¦?ã?®é?¨å??ã??表示ã??ã?¾ã??"
 
-#: ../dirdiff.py:204
+#: ../dirdiff.py:186
 msgid "Modified"
 msgstr "���"
 
-#: ../dirdiff.py:204 ../vcview.py:132
+#: ../dirdiff.py:186 ../vcview.py:137
 msgid "Show modified"
-msgstr "å¤?æ?´ã?®ã??ã??é?¨å??ã??表示ã??ã?¾ã??"
+msgstr "å¤?æ?´ã?®ã??ã??ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
 
-#: ../dirdiff.py:265 ../dirdiff.py:280
+#: ../dirdiff.py:188
+msgid "Filters"
+msgstr "ã??ã?£ã?«ã?¿"
+
+#: ../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:288
+#: ../dirdiff.py:298
 #, python-format
 msgid "Hide %s"
-msgstr "%sã??é? ã??ã?¾ã??"
+msgstr "%sã?®è¡¨ç¤ºã??å??ã??æ?¿ã??ã?¾ã??"
 
-#: ../dirdiff.py:373 ../dirdiff.py:383 ../vcview.py:225 ../vcview.py:253
+#: ../dirdiff.py:383 ../dirdiff.py:393 ../vcview.py:270 ../vcview.py:298
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] %s �����中"
 
-#: ../dirdiff.py:416
+#: ../dirdiff.py:422
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' ã?¯ '%s' ã?«ã??ã?£ã?¦é? ã??ã??ã?¦ã??ã?¾ã??"
 
-#: ../dirdiff.py:422
+#: ../dirdiff.py:428
 #, python-format
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
@@ -121,12 +127,12 @@ msgstr ""
 "ã??ã??ã??ã??ã?¤ã??ã?®ã??ã?¡ã?¤ã?«ã?¯è¡¨ç¤ºã??ã??ã?¾ã??ã??:\n"
 "%s"
 
-#: ../dirdiff.py:496
+#: ../dirdiff.py:501
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] ��"
 
-#: ../dirdiff.py:542
+#: ../dirdiff.py:547
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -135,7 +141,7 @@ msgstr ""
 "'%s' ã?¯å­?å?¨ã??ã?¾ã??ã??\n"
 "ä¸?æ?¸ã??ã??ã?¾ã??ã??ï¼?"
 
-#: ../dirdiff.py:549
+#: ../dirdiff.py:554
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -146,16 +152,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../dirdiff.py:567 ../vcview.py:417
+#: ../dirdiff.py:572 ../vcview.py:460
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
-"Remove recusively?"
+"Remove recursively?"
 msgstr ""
 "'%s' ã?¯ã??ã?©ã?«ã??ã?§ã??ã??\n"
 "å??帰ç??ã?«å??é?¤ã??ã?¾ã??ã??ï¼?"
 
-#: ../dirdiff.py:574 ../vcview.py:422
+#: ../dirdiff.py:579 ../vcview.py:465
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -166,103 +172,83 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../dirdiff.py:585
+#: ../dirdiff.py:590
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] " %i�"
 msgstr[1] " %i�"
 
-#: ../dirdiff.py:586
+#: ../dirdiff.py:591
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] " %iå??"
 msgstr[1] " %iå??"
 
-#: ../dirdiff.py:587
+#: ../dirdiff.py:592
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] " %iæ??é??"
 msgstr[1] " %iæ??é??"
 
-#: ../dirdiff.py:588
+#: ../dirdiff.py:593
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] " %iæ?¥"
 msgstr[1] " %iæ?¥"
 
-#: ../dirdiff.py:589
+#: ../dirdiff.py:594
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] " %ié?±é??"
 msgstr[1] " %ié?±é??"
 
-#: ../dirdiff.py:590
+#: ../dirdiff.py:595
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] " %iã?¶æ??"
 msgstr[1] " %iã?¶æ??"
 
-#: ../dirdiff.py:591
+#: ../dirdiff.py:596
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] " %iå¹´"
 msgstr[1] " %iå¹´"
 
-#: ../filediff.py:130 ../meldapp.py:560
-msgid "Save the current file"
-msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??ä¿?å­?ã??ã?¾ã??"
-
-#: ../filediff.py:131
-msgid "Save the current file with a different name"
-msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã?«å?¥ã?®å??å??ã??ä»?ã??ã?¦ä¿?å­?ã??ã?¾ã??"
-
-#: ../filediff.py:132 ../meldapp.py:568
-msgid "Cut the selection"
-msgstr "é?¸æ??ç¯?å?²ã??å??ã??å??ã??ã?¾ã??"
-
-#: ../filediff.py:133 ../meldapp.py:569
-msgid "Copy the selection"
-msgstr "é?¸æ??ç¯?å?²ã??ã?³ã??ã?¼ã??ã?¾ã??"
-
-#: ../filediff.py:134 ../meldapp.py:570
-msgid "Paste the clipboard"
-msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?®å??容ã??è²¼ã??ä»?ã??ã?¾ã??"
-
-#: ../filediff.py:136 ../glade2/filediff.glade.h:4
+#: ../filediff.py:119 ../glade2/filediff.glade.h:4
 msgid "Create Patch"
 msgstr "ã??ã??ã??ã?®ç??æ??"
 
-#: ../filediff.py:136
+#: ../filediff.py:119
 msgid "Create a patch"
 msgstr "ã??ã??ã??ã??ç??æ??ã??ã?¾ã??"
 
-#: ../filediff.py:137
+#: ../filediff.py:120
 msgid "Copy all changes from right pane to left pane"
 msgstr "å?¨ã?¦ã?®å·®å??ã??å?³ã??ã??å·¦ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
 
-#: ../filediff.py:138
+#: ../filediff.py:121
 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:187
+#: ../filediff.py:170
 msgid "INS,OVR"
 msgstr "[æ?¿å?¥],[ä¸?æ?¸ã??]"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:189
+#: ../filediff.py:172
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "(%iè¡?, %iæ¡?)"
 
-#: ../filediff.py:247
+#: ../filediff.py:230
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -271,68 +257,49 @@ msgstr ""
 "æ­£è¦?表ç?¾ '%s' ã?§ã??ã?¡ã?¤ã?«ã?®è¡?æ?°ã??å¤?æ?´ã??ã??ã?¾ã??ã??ã??å·®å??ã?«ä¸?æ?´å??ã??ç?ºç??ã??ã?¾ã??ã??詳"
 "ç´°ã?¯ã?¦ã?¼ã?¶ã?¼ã?ºã?»ã??ã??ã?¥ã?¢ã?«ã??ã??覧ä¸?ã??ã??ã??"
 
-#: ../filediff.py:511
-#, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"正�表����\n"
-"'%s'"
-
-#: ../filediff.py:523
-#, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "æ­£è¦?表ç?¾ '%s' ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
-
-#: ../filediff.py:525
-#, python-format
-msgid "The text '%s' was not found."
-msgstr "ã??ã?­ã?¹ã?? '%s' ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
-
-#: ../filediff.py:578
+#: ../filediff.py:499
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] ç?ªå?·ã??ã?¤ã?³ã?®ã?»ã??ã??"
 
-#: ../filediff.py:585
+#: ../filediff.py:505
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] ã??ã?¡ã?¤ã?«ã?®ã?ªã?¼ã??ã?³ä¸­"
 
-#: ../filediff.py:602 ../filediff.py:616 ../filediff.py:632 ../filediff.py:639
+#: ../filediff.py:523 ../filediff.py:537 ../filediff.py:553 ../filediff.py:560
 #, python-format
 msgid "Could not read from '%s'"
-msgstr "'%s' ã??読ã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??ã??"
+msgstr "'%s' ã??読ã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../filediff.py:603 ../filediff.py:640
+#: ../filediff.py:524 ../filediff.py:561
 msgid "The error was:"
 msgstr "���:"
 
-#: ../filediff.py:608
+#: ../filediff.py:529
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] ã??ã?¡ã?¤ã?«ã?®èª­ã?¿è¾¼ã?¿ä¸­"
 
-#: ../filediff.py:617
+#: ../filediff.py:538
 msgid ""
 "It contains ascii nulls.\n"
 "Perhaps it is a binary file."
 msgstr ""
-"ACII ã?®ã??ã?«æ??å­?ã??å?«ã?¾ã??ã?¦ã??ã?¾ã??ã??\n"
+"ASCII ã?®ã??ã?«æ??å­?ã??å?«ã?¾ã??ã?¦ã??ã?¾ã??ã??\n"
 "ã??ã?¤ã??ã?ªã?»ã??ã?¡ã?¤ã?«ã?®ã??ã??ã?§ã??ã??"
 
-#: ../filediff.py:633
+#: ../filediff.py:554
 #, python-format
 msgid "I tried encodings %s."
 msgstr "%s ã?¨ã??ã??ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?§è©¦ã??ã?¦ã?¿ã?¾ã??ã??ã??"
 
-#: ../filediff.py:662
+#: ../filediff.py:581
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] å·®å??ã?®è¨?ç®?中"
 
-#: ../filediff.py:768
+#: ../filediff.py:708
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -341,7 +308,7 @@ msgstr ""
 "\"%s\" ã?¯å­?å?¨ã??ã?¦ã??ã?¾ã??ï¼?\n"
 "ä¸?æ?¸ã??ã??ã?¾ã??ã??ï¼?"
 
-#: ../filediff.py:781
+#: ../filediff.py:721
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -352,12 +319,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../filediff.py:790
+#: ../filediff.py:730
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "ã??ã??ã??ã?¡ %i ã?®å??å??ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../filediff.py:803
+#: ../filediff.py:744
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -368,7 +335,7 @@ msgstr ""
 "\n"
 "ã?©ã?®ã??ã?©ã?¼ã??ã??ã??ã??使ç?¨ã??ã?¾ã??ã??ï¼?"
 
-#: ../filediff.py:819
+#: ../filediff.py:760
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -378,11 +345,11 @@ msgstr ""
 "UTF-8 ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?¨ã??ã?¦ä¿?å­?ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
 
 #. save as
-#: ../filediff.py:870
+#: ../filediff.py:800
 msgid "Save patch as..."
 msgstr "å?¥å??ã?§ã??ã??ã??ã?®ä¿?å­?..."
 
-#: ../filediff.py:929
+#: ../filediff.py:867
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -395,6 +362,15 @@ msgstr ""
 "\n"
 "ã??ã?®æ??ä½?ã??å??ã?«æ?»ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??ã??"
 
+#: ../findbar.py:120
+#, 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"
@@ -409,297 +385,200 @@ msgid "Copy to Clipboard"
 msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?¸ã?³ã??ã?¼"
 
 #: ../glade2/filediff.glade.h:5
-msgid "Find"
-msgstr "�索"
+msgid "Save modified files?"
+msgstr "å¤?æ?´ã??ã??ã??ã?¡ã?¤ã?«ã??ä¿?å­?ã??ã?¾ã??ã??ï¼?"
 
 #: ../glade2/filediff.glade.h:6
-msgid "Match _entire word only"
-msgstr "æ??å­?å??å?¨ä½?ã?«ä¸?è?´ã??ã??ã??ã?®ã? ã??æ¤?ç´¢ã??ã??(_E)"
+msgid "_Discard Changes"
+msgstr "å¤?æ?´ã??å??ã??æ¶?ã??(_D)"
 
 #: ../glade2/filediff.glade.h:7
-msgid "Regular e_xpression"
-msgstr "æ­£è¦?表ç?¾ã?§æ¤?ç´¢ã??ã??(_X)"
+msgid "_Save Selected"
+msgstr "é?¸æ??ç¯?å?²ã?®ä¿?å­?(_S)"
 
-#: ../glade2/filediff.glade.h:8
-msgid "Save modified files?"
-msgstr "å¤?æ?´ã??ã??ã??ã?¡ã?¤ã?«ã??ä¿?å­?ã??ã?¾ã??ã??ï¼?"
+#: ../glade2/findbar.glade.h:1
+msgid "Regular E_xpression"
+msgstr "正�表�(_X)"
 
-#: ../glade2/filediff.glade.h:9
-msgid "Search for:"
-msgstr "æ¤?ç´¢ã??ã??æ??å­?å??:"
+#: ../glade2/findbar.glade.h:2
+msgid "Replace _All"
+msgstr "å?¨ã?¦ç½®æ??(_A)"
 
-#: ../glade2/filediff.glade.h:10
-msgid "_Discard Changes"
-msgstr "å¤?æ?´ã??å??ã??æ¶?ã??(_D)"
+#: ../glade2/findbar.glade.h:3
+msgid "Replace _With"
+msgstr "次ã?§ç½®ã??æ??ã??ã??(_W):"
 
-#: ../glade2/filediff.glade.h:11
-msgid "_Match case"
+#: ../glade2/findbar.glade.h:4
+msgid "Who_le word"
+msgstr "å??èª?å?¨ä½?(_L)"
+
+#: ../glade2/findbar.glade.h:5
+msgid "_Match Case"
 msgstr "大/å°?æ??å­?ã??å?ºå?¥ã??ã??(_M)"
 
-#: ../glade2/filediff.glade.h:12
-msgid "_Save Selected"
-msgstr "é?¸æ??ç¯?å?²ã?®ä¿?å­?(_S)"
+#: ../glade2/findbar.glade.h:6
+msgid "_Next"
+msgstr "次ã?®çµ?æ??(_N)"
 
-#: ../glade2/filediff.glade.h:13
-msgid "_Wrap around"
-msgstr "è¤?æ?°è¡?ã?«ã?¾ã??ã??ã??æ??å­?å??ã??æ¤?ç´¢ã??ã??(_W)"
+#: ../glade2/findbar.glade.h:7
+msgid "_Previous"
+msgstr "å??ã?®çµ?æ??(_P)"
 
-#: ../glade2/meldapp.glade.h:1
-msgid "(gnome-default-editor)"
-msgstr "(gnome-default-editor)"
+#: ../glade2/findbar.glade.h:8 ../meldapp.py:522
+msgid "_Replace"
+msgstr "ç½®æ??(_R)"
 
-#: ../glade2/meldapp.glade.h:2
-msgid "<b>Drawing Style</b>"
-msgstr "<b>表示����</b>"
+#: ../glade2/findbar.glade.h:9
+msgid "_Search for"
+msgstr "æ¤?ç´¢ã??ã??æ??å­?å??(_S):"
 
-#: ../glade2/meldapp.glade.h:3
+#: ../glade2/meldapp.glade.h:1
 msgid "<b>Edit Menu</b>"
 msgstr "<b>ç·¨é??ã?¡ã??ã?¥ã?¼</b>"
 
-#: ../glade2/meldapp.glade.h:4
+#: ../glade2/meldapp.glade.h:2
 msgid "<b>Font</b>"
 msgstr "<b>ã??ã?©ã?³ã??</b>"
 
-#: ../glade2/meldapp.glade.h:5
+#: ../glade2/meldapp.glade.h:3
 msgid "<b>Loading</b>"
 msgstr "<b>読�込�</b>"
 
-#: ../glade2/meldapp.glade.h:6
+#: ../glade2/meldapp.glade.h:4
 msgid "<b>Misc</b>"
 msgstr "<b>ã??ã?®ä»?</b>"
 
-#: ../glade2/meldapp.glade.h:7
-msgid "<b>Saving</b>"
-msgstr "<b>ä¿?å­?</b>"
-
-#: ../glade2/meldapp.glade.h:8
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>ã??ã?¼ã?«ã??ã?¼ã?®å¤?観</b>"
-
-#: ../glade2/meldapp.glade.h:9
-msgid "<b>Whitespace</b>"
-msgstr "<b>ã??ã?¯ã?¤ã??ã?¹ã??ã?¼ã?¹</b>"
-
-#: ../glade2/meldapp.glade.h:10
-msgid "<span weight=\"bold\" size=\"x-large\">Compare</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">��</span>"
-
-#: ../glade2/meldapp.glade.h:11
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">表示</span>"
-
-#: ../glade2/meldapp.glade.h:12
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ã?¨ã??ã?£ã?¿</span>"
-
-#: ../glade2/meldapp.glade.h:13
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°</span>"
-
-#: ../glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ã??ã?¡ã?¤ã?«ã?®ã??ã?£ã?«ã?¿</span>"
-
-#: ../glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ã??ã?­ã?¹ã??ã?®ã??ã?£ã?«ã?¿</span>"
-
-#: ../glade2/meldapp.glade.h:16
+#: ../glade2/meldapp.glade.h:5
 msgid "Automatically supply missing newline at end of file"
 msgstr "è?ªå??ç??ã?«ã??ã?¡ã?¤ã?«ã?®çµ?端ã?«æ?¹è¡?ã??追å? ã??ã??"
 
-#: ../glade2/meldapp.glade.h:17
+#: ../glade2/meldapp.glade.h:6
 msgid "Choose Files"
 msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
 
-#: ../glade2/meldapp.glade.h:18
-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 ""
-"中央ã??ã?¼ã?«å·®å??ã??表示ã??ã??ã?¹ã?¿ã?¤ã?«ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??ã?¹ã?¯ã?­ã?¼ã?«è¡¨ç¤ºã??é??ã??å ´å??"
-"ã?¯ã??ã??ã?? \"ã?·ã?³ã??ã?«\" ã?ªã?¹ã?¿ã?¤ã?«ã??é?¸æ??ã??ã??æ?¹ã??ã??ã??ã?§ã??ã??ã??ã??"
-
-#: ../glade2/meldapp.glade.h:19
-msgid "Copyright © 2002-2008 Stephen Kennedy"
-msgstr "Copyright © 2002-2008 Stephen Kennedy"
-
-#: ../glade2/meldapp.glade.h:20
-msgid "Curved: Filled Curves"
-msgstr "æ?²ç·?: æ?²ç·?ã??使ã?£ã?¦å¡?ã??ã?¤ã?¶ã??"
+#: ../glade2/meldapp.glade.h:7
+msgid "Copyright © 2002-2009 Stephen Kennedy"
+msgstr "Copyright © 2002-2009 Stephen Kennedy"
 
-#: ../glade2/meldapp.glade.h:21
+#: ../glade2/meldapp.glade.h:8
 msgid "Custom command"
 msgstr "ã??ã?®ä»?ã?®ã?¨ã??ã?£ã?¿"
 
-#: ../glade2/meldapp.glade.h:22
+#: ../glade2/meldapp.glade.h:9
 msgid "Directory"
 msgstr "ã??ã?©ã?«ã??"
 
-#: ../glade2/meldapp.glade.h:23
-msgid "Display"
-msgstr "表示"
-
-#: ../glade2/meldapp.glade.h:24
+#: ../glade2/meldapp.glade.h:10
 msgid "Edit files with:"
 msgstr "ã??ã?¡ã?¤ã?«ã??ç·¨é??ã??ã??é??ã?«ä½¿ç?¨ã??ã??ã?¢ã??ã?ª:"
 
-#: ../glade2/meldapp.glade.h:25
+#: ../glade2/meldapp.glade.h:11
 msgid "Editor"
 msgstr "ã?¨ã??ã?£ã?¿"
 
-#: ../glade2/meldapp.glade.h:26
+#: ../glade2/meldapp.glade.h:12
 msgid "Encoding"
 msgstr "ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°"
 
-#: ../glade2/meldapp.glade.h:27
+#: ../glade2/meldapp.glade.h:13
 msgid "File Filters"
 msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?£ã?«ã?¿"
 
-#: ../glade2/meldapp.glade.h:28
-msgid "Gnome Default"
-msgstr "ã??ã?¹ã?¯ã??ã??ã??ã?«å¾?ã??"
-
-#: ../glade2/meldapp.glade.h:29
+#: ../glade2/meldapp.glade.h:14
 msgid "Gnome default editor"
 msgstr "GNOME ã?®ã??ã??ã?©ã?«ã??ã?»ã?¨ã??ã?£ã?¿"
 
-#: ../glade2/meldapp.glade.h:30
-msgid "Icons Only"
-msgstr "������"
-
-#: ../glade2/meldapp.glade.h:31
-msgid "Ignore changes in amount of white space"
-msgstr "ã??ã?¯ã?¤ã??ã?¹ã??ã?¼ã?¹ã?®æ?°ã??ç?¡è¦?ã??ã??"
-
-#: ../glade2/meldapp.glade.h:32
-msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
-msgstr "大/å°?æ??å­?ã?®å¤?æ?´ã??ç?¡è¦?ã??ã??; 大æ??å­?ã?¨å°?æ??å­?ã??å??ç­?ã?«æ?±ã??"
-
-#: ../glade2/meldapp.glade.h:33
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr "空è¡?ã?®æ?¿å?¥/å??é?¤ã??ã?®ã??ã?®ã??ç?¡è¦?ã??ã??"
-
-#: ../glade2/meldapp.glade.h:34
+#: ../glade2/meldapp.glade.h:15
 msgid "Ignore changes which insert or delete blank lines"
 msgstr "空è¡?ã?®æ?¿å?¥/å??é?¤ã??ç?¡è¦?ã??ã??"
 
-#: ../glade2/meldapp.glade.h:35
+#: ../glade2/meldapp.glade.h:16
 msgid "Ignore symbolic links"
 msgstr "ã?·ã?³ã??ã?ªã??ã?¯ã?»ã?ªã?³ã?¯ã??ç?¡è¦?ã??ã??"
 
-#: ../glade2/meldapp.glade.h:36
+#: ../glade2/meldapp.glade.h:17
 msgid "Insert spaces instead of tabs"
 msgstr "ã?¿ã??ã?®ä»£ã??ã??ã?«ç©ºç?½ã??æ?¿å?¥ã??ã??"
 
-#: ../glade2/meldapp.glade.h:37
+#: ../glade2/meldapp.glade.h:18
 msgid "Internal editor"
 msgstr "Meld å°?ç?¨ã?¨ã??ã?£ã?¿"
 
-#: ../glade2/meldapp.glade.h:38
+#: ../glade2/meldapp.glade.h:19
 msgid "Line Wrapping "
 msgstr "è¡?ã?®ã?©ã??ã??: "
 
-#: ../glade2/meldapp.glade.h:39
+#: ../glade2/meldapp.glade.h:20
 msgid "Meld"
 msgstr "Meld"
 
-#: ../glade2/meldapp.glade.h:40
+#: ../glade2/meldapp.glade.h:21
 msgid "Mine"
 msgstr "è?ªå??ã?®ã??ã?®"
 
-#: ../glade2/meldapp.glade.h:41
+#: ../glade2/meldapp.glade.h:22
 msgid "Original"
 msgstr "ã?ªã?ªã?¸ã??ã?«"
 
-#: ../glade2/meldapp.glade.h:42
+#: ../glade2/meldapp.glade.h:23
 msgid "Other"
 msgstr "ä»?ã?®ã??ã?®"
 
-#: ../glade2/meldapp.glade.h:43
+#: ../glade2/meldapp.glade.h:24
 msgid "Preferences : Meld"
 msgstr "設�: Meld"
 
-#: ../glade2/meldapp.glade.h:44
-msgid "Save in UTF-8 encoding"
-msgstr "UTF-8 ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?§ä¿?å­?ã??ã??"
-
-#: ../glade2/meldapp.glade.h:45
-msgid "Save in the files original encoding"
-msgstr "ã?ªã?ªã?¸ã??ã?«ã?®ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?§ä¿?å­?ã??ã??"
-
-#: ../glade2/meldapp.glade.h:46
+#: ../glade2/meldapp.glade.h:25
 msgid "Show line numbers"
 msgstr "è¡?ç?ªå?·ã??表示ã??ã??"
 
-#: ../glade2/meldapp.glade.h:47
-msgid "Simple: Lines only"
-msgstr "ã?·ã?³ã??ã?«: ç·?ç?»ã?®ã?¿"
-
-#: ../glade2/meldapp.glade.h:48
-msgid "Solid: Filled Quadilaterals"
-msgstr "ç?©å½¢: å??è§?å½¢ã?§å¡?ã??ã?¤ã?¶ã??"
-
-#: ../glade2/meldapp.glade.h:49
+#: ../glade2/meldapp.glade.h:26
 msgid "Tab width"
 msgstr "ã?¿ã??å¹?"
 
-#: ../glade2/meldapp.glade.h:50
-msgid "Text Beside Icons"
-msgstr "ã?¢ã?¤ã?³ã?³ã?®æ¨ªã?«ã?©ã??ã?«"
-
-#: ../glade2/meldapp.glade.h:51
+#: ../glade2/meldapp.glade.h:27
 msgid "Text Filters"
 msgstr "ã??ã?­ã?¹ã??ã?®ã??ã?£ã?«ã?¿"
 
-#: ../glade2/meldapp.glade.h:52
-msgid "Text Only"
-msgstr "ã?©ã??ã?«ã?®ã?¿"
-
-#: ../glade2/meldapp.glade.h:53
-msgid "Text Under Icons"
-msgstr "ã?¢ã?¤ã?³ã?³ã?®ä¸?ã?«ã?©ã??ã?«"
-
-#: ../glade2/meldapp.glade.h:54
+#: ../glade2/meldapp.glade.h:28
 msgid "Three way directory"
-msgstr "ä¸?ã?¤ã?®ã??ã?©ã?«ã??"
+msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
 
-#: ../glade2/meldapp.glade.h:55
+#: ../glade2/meldapp.glade.h:29
 msgid "Three way file"
-msgstr "ä¸?ã?¤ã?®ã??ã?¡ã?¤ã?«"
+msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
 
-#: ../glade2/meldapp.glade.h:56
+#: ../glade2/meldapp.glade.h:30
 msgid "Two way directory"
-msgstr "äº?ã?¤ã?®ã??ã?©ã?«ã??"
+msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
 
-#: ../glade2/meldapp.glade.h:57
+#: ../glade2/meldapp.glade.h:31
 msgid "Two way file"
-msgstr "äº?ã?¤ã?®ã??ã?¡ã?¤ã?«"
+msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
 
-#: ../glade2/meldapp.glade.h:58
+#: ../glade2/meldapp.glade.h:32
 msgid "Use GNOME monospace font"
 msgstr "GNOME ã?®å?ºå®?ã??ã?©ã?³ã??ã??使ç?¨ã??ã??"
 
-#: ../glade2/meldapp.glade.h:59
+#: ../glade2/meldapp.glade.h:33
 msgid "Use custom font"
 msgstr "ã??ã?©ã?³ã??ã??é?¸æ??ã??ã??: "
 
-#: ../glade2/meldapp.glade.h:60
+#: ../glade2/meldapp.glade.h:34
 msgid "Use syntax highlighting"
 msgstr "強調表示ã??ã??"
 
-#: ../glade2/meldapp.glade.h:61
+#: ../glade2/meldapp.glade.h:35
 msgid "Version control view"
 msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«è¡¨ç¤º"
 
-#: ../glade2/meldapp.glade.h:62
+#: ../glade2/meldapp.glade.h:36
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
 msgstr ""
 "ã??ã?¡ã?¤ã?«ã??読ã??è¾¼ã??é??ã?«ã??次ã?®é ?ç?ªã?§ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã??試è¡?ã??ã?¾ã?? (ä¾?: utf8 "
 "iso8859)"
 
-#: ../glade2/meldapp.glade.h:63
+#: ../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 "
@@ -709,7 +588,7 @@ msgstr ""
 "ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã?®ã??ã?¿ã?¼ã?³ã?¯ã??ã??ã??ã??ã??ã?¹ã??ã?¼ã?¹ã?§å?ºå??ã?£ã?? SHELL å??å¼?ã?®ã?¯ã?¤ã?«ã??"
 "ã?«ã?¼ã??ã?®ä¸¦ã?³ã?§ã??ã??"
 
-#: ../glade2/meldapp.glade.h:64
+#: ../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 "
@@ -723,41 +602,33 @@ msgstr ""
 "ã??ã??該å½?ã??ã??ã?°ã?«ã?¼ã??ã?®æ??å­?å??ã? ã??ç½®ã??æ??ã??ã?¾ã??ã??詳細ã?¯ã?¦ã?¼ã?¶ã?¼ã?ºã?»ã??ã??ã?¥ã?¢ã?«ã??"
 "ã??覧ä¸?ã??ã??ã??"
 
-#: ../glade2/meldapp.glade.h:65
-msgid "Whitespace is significant"
-msgstr "ã??ã?¯ã?¤ã??ã?¹ã??ã?¼ã?¹ã??ç?¡è¦?ã??ã?ªã??"
-
-#: ../glade2/meldapp.glade.h:66
+#: ../glade2/meldapp.glade.h:39
 msgid "_Character"
-msgstr "æ??å­?å??ä½?(_C)"
+msgstr "æ??å­?ã??ã?¨(_C)"
 
-#: ../glade2/meldapp.glade.h:68
+#: ../glade2/meldapp.glade.h:40
 msgid "_Directory Comparison"
 msgstr "ã??ã?©ã?«ã??ã?®æ¯?è¼?(_D)"
 
-#: ../glade2/meldapp.glade.h:69
+#: ../glade2/meldapp.glade.h:41
 msgid "_File Comparison"
 msgstr "ã??ã?¡ã?¤ã?«ã?®æ¯?è¼?(_F)"
 
-#: ../glade2/meldapp.glade.h:70
-msgid "_Logo"
-msgstr "ã?­ã?´"
-
-#: ../glade2/meldapp.glade.h:71
+#: ../glade2/meldapp.glade.h:42
 msgid "_None"
 msgstr "ã??ã?ªã??(_N)"
 
-#: ../glade2/meldapp.glade.h:72
+#: ../glade2/meldapp.glade.h:43
 msgid "_Three Way Compare"
-msgstr "ä¸?ã?¤ã?®é??ã?§æ¯?è¼?ã??ã??(_T)"
+msgstr "ï¼?ã?¤ã?®é??ã?§æ¯?è¼?ã??ã??(_T)"
 
-#: ../glade2/meldapp.glade.h:73
+#: ../glade2/meldapp.glade.h:44
 msgid "_Version Control Browser"
 msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã?»ã??ã?©ã?¦ã?¶(_V)"
 
-#: ../glade2/meldapp.glade.h:74
+#: ../glade2/meldapp.glade.h:45
 msgid "_Word"
-msgstr "ã?¯ã?¼ã??å??ä½?(_W)"
+msgstr "å??èª?ã??ã?¨(_W)"
 
 #: ../glade2/vcview.glade.h:1
 msgid "Commit Files"
@@ -787,7 +658,7 @@ msgstr "ã?­ã?°ã?»ã?¡ã??ã?»ã?¼ã?¸"
 msgid "Previous Logs"
 msgstr "å??ã?®ã?­ã?°"
 
-#: ../glade2/vcview.glade.h:8 ../vcview.py:184
+#: ../glade2/vcview.glade.h:8 ../vcview.py:181
 msgid "Tag"
 msgstr "ã?¿ã?°"
 
@@ -795,11 +666,39 @@ msgstr "ã?¿ã?°"
 msgid "VC Log"
 msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã?®ã?­ã?°"
 
+#: ../historyentry.py:247
+msgid "_Browse..."
+msgstr "å??ç?§(_B)..."
+
+#: ../historyentry.py:255
+msgid "Path"
+msgstr "ã??ã?¹"
+
+#: ../historyentry.py:256
+msgid "Path to file"
+msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?¹ã?§ã??"
+
+#: ../historyentry.py:257
+msgid "Pop up a file selector to choose a file"
+msgstr "ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã?¾ã??"
+
+#: ../historyentry.py:378
+msgid "Select directory"
+msgstr "ã??ã?©ã?«ã??ã?®é?¸æ??"
+
+#: ../historyentry.py:382
+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 "è¤?æ?°ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??ã??ã??ã?¼ã?¸ã??ã?¾ã??"
@@ -808,7 +707,7 @@ msgstr "è¤?æ?°ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??ã??ã??ã?¼ã?¸ã??ã?¾ã??"
 msgid "Meld Diff Viewer"
 msgstr "Meld å·®å??ã??ã?¥ã?¼ã?¢"
 
-#: ../meldapp.py:152
+#: ../meldapp.py:153
 msgid "label"
 msgstr "(æ?°ã??ã??å??å??)"
 
@@ -816,235 +715,252 @@ msgstr "(æ?°ã??ã??å??å??)"
 msgid "pattern"
 msgstr "(æ?°ã??ã??ã??ã?¿ã?¼ã?³)"
 
+#: ../meldapp.py:221
+msgid "Only available if you have gnome-python-desktop installed"
+msgstr ""
+"'gnome-python-desktop' ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã??å ´å??ã?«ã?®ã?¿è¡?ç?ªå?·ã??表示ã??ã??ã??ã?¨ã??"
+"ã?§ã??ã?¾ã??ã??"
+
 #. file filters
 #. text filters
-#: ../meldapp.py:260 ../meldapp.py:265 ../vcview.py:164
+#: ../meldapp.py:231 ../meldapp.py:236 ../vcview.py:161
 msgid "Name"
 msgstr "å??å??"
 
-#: ../meldapp.py:260 ../meldapp.py:265
+#: ../meldapp.py:231 ../meldapp.py:236
 msgid "Active"
 msgstr "æ??å?¹"
 
-#: ../meldapp.py:260
+#: ../meldapp.py:231
 msgid "Pattern"
 msgstr "ã??ã?¿ã?¼ã?³"
 
-#: ../meldapp.py:265
+#: ../meldapp.py:236
 msgid "Regex"
 msgstr "正�表�"
 
-#: ../meldapp.py:295
-msgid ""
-"Spaces instead of tab is only available if you have gnome-python-desktop "
-"installed."
-msgstr ""
-"'gnome-python-desktop' ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã??å ´å??ã?«ã?®ã?¿ã?¿ã??ã?®ä»£ã??ã??ã?«ç©ºç?½ã??æ?¿"
-"å?¥ã?§ã??ã?¾ã??"
-
-#: ../meldapp.py:303
-msgid ""
-"Line numbers are only available if you have gnome-python-desktop installed."
-msgstr ""
-"'gnome-python-desktop' ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã??å ´å??ã?«ã?®ã?¿è¡?ç?ªå?·ã??表示ã??ã??ã??ã?¨ã??"
-"ã?§ã??ã?¾ã??ã??"
-
-#: ../meldapp.py:307
-msgid ""
-"Syntax highlighting is only available if you have gnome-python-desktop "
-"installed."
-msgstr ""
-"'gnome-python-desktop' ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã??å ´å??ã?«ã?®ã?¿å¼·èª¿è¡¨ç¤ºã??å?©ç?¨ã?§ã??ã?¾"
-"ã??ã??"
-
-#: ../meldapp.py:396
+#: ../meldapp.py:340
 msgid "Close tab"
 msgstr "ã??ã?®ã?¿ã??ã??é??ã??ã?¾ã??"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:471
+#: ../meldapp.py:412
 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:473
-msgid ""
-"Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
-msgstr ""
-"ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-"
-"inventory RCS\n"
+#: ../meldapp.py:414
+#, python-format
+msgid "Version Control\t1\t%s\n"
+msgstr "Version Control\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:475
+#: ../meldapp.py:416
 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:477
+#: ../meldapp.py:418
 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:479
+#: ../meldapp.py:420
 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:481
+#: ../meldapp.py:422
 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:483
+#: ../meldapp.py:424
 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:485
+#: ../meldapp.py:426
 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:487
+#: ../meldapp.py:428
 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:489
+#: ../meldapp.py:430
 msgid "Script comment\t0\t#.*"
 msgstr "ã?¹ã?¯ã?ªã??ã??ã?®ã?³ã?¡ã?³ã??\t0\t#.*"
 
-#: ../meldapp.py:559
+#: ../meldapp.py:508
 msgid "_New..."
 msgstr "��(_N)..."
 
-#: ../meldapp.py:559
+#: ../meldapp.py:508
 msgid "Start a new comparison"
 msgstr "æ?°ã??ã??æ¯?è¼?ã??é??å§?ã??ã?¾ã??"
 
-#: ../meldapp.py:562
+#: ../meldapp.py:509
+msgid "Save the current file"
+msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??ä¿?å­?ã??ã?¾ã??"
+
+#: ../meldapp.py:511
 msgid "Close the current file"
 msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??"
 
-#: ../meldapp.py:563
+#: ../meldapp.py:512
 msgid "Quit the program"
 msgstr "ã??ã?­ã?°ã?©ã? ã??çµ?äº?ã??ã?¾ã??"
 
-#: ../meldapp.py:566
+#: ../meldapp.py:515
 msgid "Undo the last action"
 msgstr "æ??å¾?ã?®ã?¢ã?¯ã?·ã?§ã?³ã?«æ?»ã??ã?¾ã??"
 
-#: ../meldapp.py:567
+#: ../meldapp.py:516
 msgid "Redo the last undone action"
 msgstr "æ??å¾?ã?«é?©ç?¨ã??ã??ã?¢ã?¯ã?·ã?§ã?³ã??ã??ã??ç?´ã??ã?¾ã??"
 
-#: ../meldapp.py:571
+#: ../meldapp.py:517
+msgid "Cut the selection"
+msgstr "é?¸æ??ç¯?å?²ã??å??ã??å??ã??ã?¾ã??"
+
+#: ../meldapp.py:518
+msgid "Copy the selection"
+msgstr "é?¸æ??ç¯?å?²ã??ã?³ã??ã?¼ã??ã?¾ã??"
+
+#: ../meldapp.py:519
+msgid "Paste the clipboard"
+msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?®å??容ã??è²¼ã??ä»?ã??ã?¾ã??"
+
+#: ../meldapp.py:520
 msgid "Search for text"
 msgstr "æ¤?ç´¢ã??ã??æ??å­?å??:"
 
-#: ../meldapp.py:572
+#: ../meldapp.py:521
 msgid "Find Ne_xt"
 msgstr "次��索(_X)"
 
-#: ../meldapp.py:572
+#: ../meldapp.py:521
 msgid "Search forwards for the same text"
 msgstr "å??æ?¹ã??æ¤?ç´¢ã??ã?¾ã??"
 
-#: ../meldapp.py:573
+#: ../meldapp.py:522
+msgid "Find and replace text"
+msgstr "æ??å­?å??ã??æ¤?ç´¢ã??ã?¦ç½®æ??ã??ã?¾ã??"
+
+#: ../meldapp.py:523
 msgid "Go to the next difference"
 msgstr "次ã?®å·®å??ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
 
-#: ../meldapp.py:574
+#: ../meldapp.py:524
 msgid "Go to the previous difference"
 msgstr "å??ã?®å·®å??ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
 
-#: ../meldapp.py:575
+#: ../meldapp.py:525
+msgid "Prefere_nces"
+msgstr "設�(_N)"
+
+#: ../meldapp.py:525
 msgid "Configure the application"
 msgstr "Meld ã??設å®?ã??ã?¾ã??"
 
-#: ../meldapp.py:578
+#: ../meldapp.py:531
 msgid "Stop the current action"
 msgstr "ç?¾å?¨ã?®ã?¢ã?¯ã?·ã?§ã?³ã??å??æ­¢ã??ã?¾ã??"
 
-#: ../meldapp.py:579
+#: ../meldapp.py:532
 msgid "Refresh the view"
 msgstr "表示ã??æ?´æ?°ã??ã?¾ã??"
 
-#: ../meldapp.py:580
+#: ../meldapp.py:533
 msgid "Reload"
 msgstr "å??読込ã?¿"
 
-#: ../meldapp.py:580
+#: ../meldapp.py:533
 msgid "Reload the comparison"
 msgstr "æ¯?è¼?å??容ã??æ?´æ?°ã??ã?¾ã??"
 
-#: ../meldapp.py:583
+#: ../meldapp.py:536
 msgid "_Contents"
 msgstr "�次(_C)"
 
-#: ../meldapp.py:583
+#: ../meldapp.py:536
 msgid "Open the Meld manual"
 msgstr "Meld ã??ã??ã?¥ã?¢ã?«é??ã??ã?¾ã??"
 
-#: ../meldapp.py:584
+#: ../meldapp.py:537
 msgid "Report _Bug"
 msgstr "ã??ã?°ã?®å ±å??(_B)"
 
-#: ../meldapp.py:584
+#: ../meldapp.py:537
 msgid "Report a bug in Meld"
 msgstr "Meld ã?®ã??ã?°ã??å ±å??ã??ã?¾ã??"
 
-#: ../meldapp.py:585
-msgid "Mailing _List"
-msgstr "ã?¡ã?¼ã?ªã?³ã?°ã?»ã?ªã?¹ã??(_L)"
-
-#: ../meldapp.py:585
-msgid "Go to the Meld mailing list"
-msgstr "Meld ã??ã?­ã?¸ã?§ã?¯ã??ã?®ã?¡ã?¼ã?ªã?³ã?°ã?»ã?ªã?¹ã??ã?¸ç§»å??ã??ã?¾ã??"
-
-#: ../meldapp.py:586
+#: ../meldapp.py:538
 msgid "About this program"
 msgstr "ã??ã?®ã??ã?­ã?°ã?©ã? ã?«ã?¤ã??ã?¦"
 
-#: ../meldapp.py:851
+#: ../meldapp.py:856
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?®é??ã?§ã?®æ¯?è¼?ã?¯ã?§ã??ã?¾ã??ã??ã??\n"
 
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: ../meldapp.py:901
+#: ../meldapp.py:899 ../meldapp.py:907
+msgid "file"
+msgstr "FILE"
+
+#: ../meldapp.py:900 ../meldapp.py:906
+msgid "dir"
+msgstr "DIR"
+
+#: ../meldapp.py:905
+msgid "Start with no window open"
+msgstr "ä½?ã??é??ã??ã??ã?« Meld ã??èµ·å??ã??ã??"
+
+#: ../meldapp.py:906
 #, python-format
-msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
-msgstr ""
-"Meld %s\n"
-"ä½?è??: Stephen Kennedy <stevek gnome org>"
+msgid "Start with Version Control browser in '%s'"
+msgstr "'%s' ã?«å¯¾ã??ã??ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã?®ã??ã?©ã?¦ã?¶ã??表示ã??ã??"
+
+#: ../meldapp.py:907
+#, python-format
+msgid "Start with Version Control diff of '%s'"
+msgstr "'%s' ã?«å¯¾ã??ã??ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã?®å·®å??ã??表示ã??ã??"
+
+#: ../meldapp.py:908
+msgid "Start with 2 or 3 way file comparison"
+msgstr "ï¼?ã?¾ã??ã?¯ï¼?å??ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??"
 
-#: ../meldapp.py:931
+#: ../meldapp.py:909
+msgid "Start with 2 or 3 way directory comparison"
+msgstr "ï¼?ã?¾ã??ã?¯ï¼?å??ã?®ã??ã?©ã?«ã??ã??æ¯?è¼?ã??ã??"
+
+#: ../meldapp.py:916
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld ã?¯ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?®å??容ã??æ¯?è¼?ã??ã??ã??ã?¼ã?«ã?§ã??ã??"
+
+#: ../meldapp.py:919
 msgid "Set label to use instead of file name"
 msgstr "ã??ã?¡ã?¤ã?«å??ã?®ä»£ã??ã??ã?«ä½¿ç?¨ã??ã??ã?©ã??ã?«ã??æ??å®?ã??ã??"
 
-#: ../meldapp.py:932
+#: ../meldapp.py:921
 msgid "Automatically compare all differing files on startup"
 msgstr "èµ·å??æ??ã?«ã??ã?¡ã?¤ã?«ã?®ä¸­ã?«ã??ã??å?¨ã?¦å·®å??ã??è?ªå??ç??ã?«æ¤?å?ºã??ã??"
 
-#: ../meldapp.py:933 ../meldapp.py:934 ../meldapp.py:935 ../meldapp.py:936
+#: ../meldapp.py:922 ../meldapp.py:923 ../meldapp.py:924 ../meldapp.py:925
 msgid "Ignored for compatibility"
 msgstr "äº?æ??æ?§ã??ç?¡è¦?ã??ã??"
 
-#: ../meldapp.py:939
-msgid "Creates a diff tab for up to 3 supplied files."
-msgstr "æ??å®?ã??ã??ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«ã?«å¯¾ã??ã??å·®å??ã??ã??ã??ã??ã??表示ã??ã??"
+#: ../meldapp.py:928
+msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgstr "æ??å®?ã??ã??æ??大ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«ã?¾ã??ã?¯ã??ã?©ã?«ã??ã?«å¯¾ã??ã??å·®å??ã??ã?¿ã??ã?§è¡¨ç¤ºã??ã??"
 
-#: ../meldapp.py:949
+#: ../meldapp.py:932
 msgid "Invalid number of arguments supplied for --diff."
 msgstr "--diff ã?ªã??ã?·ã?§ã?³ã?«å¯¾ã??ã??å¼?æ?°ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../meldapp.py:972
+#: ../meldapp.py:935
 #, python-format
 msgid "Wrong number of arguments (Got %i)"
 msgstr "å¼?æ?°ã?®æ?°ã??é??é??ã?£ã?¦ã??ã?¾ã?? (%i å??ã?¨å??ã??å??ã??ã?¾ã??ã??)"
@@ -1054,151 +970,193 @@ msgid "untitled"
 msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
 
 #. no common path. empty names get changed to "[None]"
-#: ../misc.py:120
+#: ../misc.py:191
 msgid "[None]"
 msgstr "[ã?ªã??]"
 
-#: ../vcview.py:121
+#: ../vcview.py:126
 msgid "_Commit"
 msgstr "ã?³ã??ã??ã??(_C)"
 
-#: ../vcview.py:121
+#: ../vcview.py:126
 msgid "Commit"
 msgstr "ã?³ã??ã??ã??ã??ã?¾ã??"
 
 #. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../vcview.py:122
+#: ../vcview.py:127
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
-#: ../vcview.py:122
+#: ../vcview.py:127
 msgid "Update"
 msgstr "æ?´æ?°ã??ã?¾ã??"
 
 #. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../vcview.py:123
+#: ../vcview.py:128
 msgid "_Add"
 msgstr "追å? (_A)"
 
-#: ../vcview.py:123
+#: ../vcview.py:128
 msgid "Add to VC"
 msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã?«è¿½å? ã??ã?¾ã??"
 
 #. FIXME: popup used to use gtk.STOCK_ADD
-#: ../vcview.py:124
+#: ../vcview.py:129
 msgid "Add _Binary"
 msgstr "ã??ã?¤ã??ã?ªã?®è¿½å? (_B)"
 
-#: ../vcview.py:124
+#: ../vcview.py:129
 msgid "Add binary to VC"
 msgstr "ã??ã?¤ã??ã?ªã??ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã?«è¿½å? ã??ã?¾ã??"
 
 #. FIXME: stock is inconsistent with other VC actions
-#: ../vcview.py:125
+#: ../vcview.py:130
 msgid "_Remove"
 msgstr "å??é?¤(_R)"
 
-#: ../vcview.py:125
+#: ../vcview.py:130
 msgid "Remove from VC"
 msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã??ã??å??é?¤ã??ã?¾ã??"
 
 #. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../vcview.py:126
+#: ../vcview.py:131
 msgid "Revert to original"
 msgstr "å??ã?«æ?»ã??ã?¾ã??"
 
-#: ../vcview.py:127
+#: ../vcview.py:132
 msgid "Delete locally"
 msgstr "ã?­ã?¼ã?«ã?«ã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã??ã?¾ã??"
 
-#: ../vcview.py:131
+#: ../vcview.py:136
 msgid "_Flatten"
 msgstr "�覧表示(_F)"
 
-#: ../vcview.py:131
+#: ../vcview.py:136
 msgid "Flatten directories"
 msgstr "ã??ã?£ã?¬ã?¯ã??ã?ªé??層ã??ç?¡è¦?ã??ã?¾ã??"
 
-#: ../vcview.py:132
+#: ../vcview.py:137
 msgid "_Modified"
 msgstr "���(_M)"
 
-#: ../vcview.py:133
+#: ../vcview.py:138
 msgid "_Normal"
 msgstr "��(_N)"
 
-#: ../vcview.py:133
+#: ../vcview.py:138
 msgid "Show normal"
 msgstr "é??常ã?®ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
 
-#: ../vcview.py:134
+#: ../vcview.py:139
 msgid "Non _VC"
 msgstr "VC以�(_V)"
 
-#: ../vcview.py:134
+#: ../vcview.py:139
 msgid "Show unversioned files"
 msgstr "ã??ã?¼ã?¸ã?§ã?³ç®¡ç??å¤?ã?®ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
 
-#: ../vcview.py:135
+#: ../vcview.py:140
 msgid "Ignored"
 msgstr "��"
 
-#: ../vcview.py:135
+#: ../vcview.py:140
 msgid "Show ignored files"
 msgstr "ç?¡è¦?ã??ã??ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
 
-#: ../vcview.py:181
+#: ../vcview.py:178
 msgid "Location"
 msgstr "å ´æ??"
 
-#: ../vcview.py:182
+#: ../vcview.py:179
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../vcview.py:183
+#: ../vcview.py:180
 msgid "Rev"
 msgstr "ã?ªã??ã?¸ã?§ã?³"
 
-#: ../vcview.py:185
+#: ../vcview.py:182
 msgid "Options"
 msgstr "ã?ªã??ã?·ã?§ã?³"
 
-#: ../vcview.py:269
+#: ../vcview.py:228
+msgid "Choose one Version Control"
+msgstr "ï¼?ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã?®é?¸æ??"
+
+#: ../vcview.py:229
+msgid "Only one Version Control in this directory"
+msgstr "ã??ã?®ã??ã?©ã?«ã??ã?®ï¼?ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã? ã??"
+
+#: ../vcview.py:314
 msgid "(Empty)"
 msgstr "(空)"
 
-#: ../vcview.py:306
+#: ../vcview.py:347
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] å·®å??ã?®å??å¾?中"
 
-#: ../vcview.py:313
+#: ../vcview.py:354
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] ã??ã??ã??ã?®é?©ç?¨ä¸­"
 
-#: ../vcview.py:317
+#: ../vcview.py:358
 msgid "No differences found."
 msgstr "å·®å??ã?¯ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../vcview.py:394
+#: ../vcview.py:437
 msgid "Select some files first."
 msgstr "ã?¾ã??æ??å??ã?«ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../vcview.py:461
-msgid "Invoking patch failed, you need GNU patch."
+#: ../vcview.py:501
+#, 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"
+"                    "
 msgstr ""
-"patch ã?³ã??ã?³ã??ã?®å?¼ã?³å?ºã??ã?«å¤±æ??ã??ã?¾ã??ã?? (GNU patch ã??ã?­ã?°ã?©ã? ã??å¿?è¦?ã?§ã??)"
+"\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"
+"                    "
 
 #. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:40
+#: ../vc/_vc.py:39
 msgid ""
 "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
 "Missing"
 msgstr ""
 "Ignored:Unversioned:::Error::Newly added:Modified:<b>��</b>:Removed:Missing"
 
-#: ../vc/cvs.py:155
+#: ../vc/cvs.py:151
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"