GNOME.org
 

[meld] Updated Japanese translation.

commit ea260a6a0be128a1b95f5f9cc9bf82b153139dfd
Author: Takeshi AIHANA <takeshi aihana gmail com>
Date:   Sat Jun 26 18:23:20 2010 +0900

    Updated Japanese translation.

 po/ja.po |  726 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 392 insertions(+), 334 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 503ed06..d89f6e8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,13 +1,13 @@
 # meld ja.po.
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
-# Takeshi AIHANA <takeshi aihana gmail com>, 2003-2009.
+# Copyright (C) 2003-2010 Free Software Foundation, Inc.
+# Takeshi AIHANA <takeshi aihana gmail com>, 2003-2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2009-10-18 14:12+0900\n"
-"PO-Revision-Date: 2009-10-18 13:45+0900\n"
+"POT-Creation-Date: 2010-06-26 18:22+0900\n"
+"PO-Revision-Date: 2010-06-26 18:21+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"
@@ -30,6 +30,14 @@ msgid "Compare and merge your files"
 msgstr "è¤?æ?°ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??ã??ã??ã?¼ã?¸ã??ã?¾ã??"
 
 #: ../data/meld.desktop.in.h:2
+msgid "Diff Viewer"
+msgstr "å·®å??ã??ã?¥ã?¼ã?¢"
+
+#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.glade.h:4
+msgid "Meld"
+msgstr "Meld"
+
+#: ../data/meld.desktop.in.h:4
 msgid "Meld Diff Viewer"
 msgstr "Meld å·®å??ã??ã?¥ã?¼ã?¢"
 
@@ -46,7 +54,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?¸ã?³ã??ã?¼"
 
-#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:166
+#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:180
 msgid "Create Patch"
 msgstr "ã??ã??ã??ã?®ç??æ??"
 
@@ -90,7 +98,7 @@ msgstr "次ã?®çµ?æ??(_N)"
 msgid "_Previous"
 msgstr "å??ã?®çµ?æ??(_P)"
 
-#: ../data/ui/findbar.glade.h:8 ../meld/meldapp.py:442
+#: ../data/ui/findbar.glade.h:8 ../meld/meldapp.py:154
 msgid "_Replace"
 msgstr "ç½®æ??(_R)"
 
@@ -99,152 +107,140 @@ msgid "_Search for"
 msgstr "æ¤?ç´¢ã??ã??æ??å­?å??(_S):"
 
 #: ../data/ui/meldapp.glade.h:1
-msgid "<b>Edit Menu</b>"
-msgstr "<b>ç·¨é??ã?¡ã??ã?¥ã?¼</b>"
+msgid "Choose Files"
+msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
 
 #: ../data/ui/meldapp.glade.h:2
-msgid "<b>Font</b>"
-msgstr "<b>ã??ã?©ã?³ã??</b>"
+msgid "Copyright © 2002-2009 Stephen Kennedy"
+msgstr "Copyright © 2002-2009 Stephen Kennedy"
 
 #: ../data/ui/meldapp.glade.h:3
-msgid "<b>Loading</b>"
-msgstr "<b>読�込�</b>"
-
-#: ../data/ui/meldapp.glade.h:4
-msgid "<b>Misc</b>"
-msgstr "<b>ã??ã?®ä»?</b>"
+msgid "Directory"
+msgstr "ã??ã?©ã?«ã??"
 
 #: ../data/ui/meldapp.glade.h:5
-msgid "Automatically supply missing newline at end of file"
-msgstr "è?ªå??ç??ã?«ã??ã?¡ã?¤ã?«ã?®çµ?端ã?«æ?¹è¡?ã??追å? ã??ã??"
+msgid "Mine"
+msgstr "è?ªå??ã?®ã??ã?®"
 
 #: ../data/ui/meldapp.glade.h:6
-msgid "Choose Files"
-msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
+msgid "Original"
+msgstr "ã?ªã?ªã?¸ã??ã?«"
 
 #: ../data/ui/meldapp.glade.h:7
-msgid "Copyright © 2002-2009 Stephen Kennedy"
-msgstr "Copyright © 2002-2009 Stephen Kennedy"
+msgid "Other"
+msgstr "ä»?ã?®ã??ã?®"
 
 #: ../data/ui/meldapp.glade.h:8
-msgid "Custom command"
-msgstr "ã??ã?®ä»?ã?®ã?¨ã??ã?£ã?¿"
+msgid "Three way directory"
+msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
 
 #: ../data/ui/meldapp.glade.h:9
-msgid "Directory"
-msgstr "ã??ã?©ã?«ã??"
+msgid "Three way file"
+msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
 
 #: ../data/ui/meldapp.glade.h:10
-msgid "Edit files with:"
-msgstr "ã??ã?¡ã?¤ã?«ã??ç·¨é??ã??ã??é??ã?«ä½¿ç?¨ã??ã??ã?¢ã??ã?ª:"
+msgid "Two way directory"
+msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
 
 #: ../data/ui/meldapp.glade.h:11
-msgid "Editor"
-msgstr "ã?¨ã??ã?£ã?¿"
+msgid "Two way file"
+msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
 
 #: ../data/ui/meldapp.glade.h:12
-msgid "Encoding"
-msgstr "ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°"
+msgid "Version control view"
+msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«è¡¨ç¤º"
 
 #: ../data/ui/meldapp.glade.h:13
-msgid "File Filters"
-msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?£ã?«ã?¿"
+msgid "_Directory Comparison"
+msgstr "ã??ã?©ã?«ã??ã?®æ¯?è¼?(_D)"
 
 #: ../data/ui/meldapp.glade.h:14
-msgid "Gnome default editor"
-msgstr "GNOME ã?®ã??ã??ã?©ã?«ã??ã?»ã?¨ã??ã?£ã?¿"
+msgid "_File Comparison"
+msgstr "ã??ã?¡ã?¤ã?«ã?®æ¯?è¼?(_F)"
 
 #: ../data/ui/meldapp.glade.h:15
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "空è¡?ã?®æ?¿å?¥/å??é?¤ã??ç?¡è¦?ã??ã??"
+msgid "_Three Way Compare"
+msgstr "ï¼?ã?¤ã?®é??ã?§æ¯?è¼?ã??ã??(_T)"
 
 #: ../data/ui/meldapp.glade.h:16
-msgid "Ignore symbolic links"
-msgstr "ã?·ã?³ã??ã?ªã??ã?¯ã?»ã?ªã?³ã?¯ã??ç?¡è¦?ã??ã??"
-
-#: ../data/ui/meldapp.glade.h:17
-msgid "Insert spaces instead of tabs"
-msgstr "ã?¿ã??ã?®ä»£ã??ã??ã?«ç©ºç?½ã??æ?¿å?¥ã??ã??"
+msgid "_Version Control Browser"
+msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã?»ã??ã?©ã?¦ã?¶(_V)"
 
-#: ../data/ui/meldapp.glade.h:18
-msgid "Internal editor"
-msgstr "Meld å°?ç?¨ã?¨ã??ã?£ã?¿"
+#: ../data/ui/preferences.glade.h:1
+msgid "<b>Display</b>"
+msgstr "<b>表示</b>"
 
-#: ../data/ui/meldapp.glade.h:19
-msgid "Line Wrapping "
-msgstr "è¡?ã?®ã?©ã??ã??: "
+#: ../data/ui/preferences.glade.h:2
+msgid "<b>External editor</b>"
+msgstr "<b>å¤?é?¨ã?¨ã??ã?£ã?¿</b>"
 
-#: ../data/ui/meldapp.glade.h:20
-msgid "Meld"
-msgstr "Meld"
+#: ../data/ui/preferences.glade.h:3
+msgid "<b>Font</b>"
+msgstr "<b>ã??ã?©ã?³ã??</b>"
 
-#: ../data/ui/meldapp.glade.h:21
-msgid "Mine"
-msgstr "è?ªå??ã?®ã??ã?®"
+#: ../data/ui/preferences.glade.h:4
+msgid "<b>Loading</b>"
+msgstr "<b>読�込�</b>"
 
-#: ../data/ui/meldapp.glade.h:22
-msgid "Original"
-msgstr "ã?ªã?ªã?¸ã??ã?«"
+#: ../data/ui/preferences.glade.h:5
+msgid "Do not _split words over two lines"
+msgstr "å??èª?ã??äº?è¡?ã?«ã?¾ã??ã??ã?ªã??ã??ã??ã?«ã??ã??(_S)"
 
-#: ../data/ui/meldapp.glade.h:23
-msgid "Other"
-msgstr "ä»?ã?®ã??ã?®"
+#: ../data/ui/preferences.glade.h:6
+msgid "Edito_r command:"
+msgstr "ã??ã?®ä»?ã?®ã?¨ã??ã?£ã?¿(_R)"
 
-#: ../data/ui/meldapp.glade.h:24
-msgid "Preferences : Meld"
-msgstr "設�: Meld"
-
-#: ../data/ui/meldapp.glade.h:25
-msgid "Show line numbers"
-msgstr "è¡?ç?ªå?·ã??表示ã??ã??"
+#: ../data/ui/preferences.glade.h:7
+msgid "Editor"
+msgstr "ã?¨ã??ã?£ã?¿"
 
-#: ../data/ui/meldapp.glade.h:26
-msgid "Tab width"
-msgstr "ã?¿ã??å¹?"
+#: ../data/ui/preferences.glade.h:8
+msgid "Enable text _wrapping"
+msgstr "æ??å­?å??ã?®æ??ã??è¿?ã??ã??æ??å?¹ã?«ã??ã??(_W)"
 
-#: ../data/ui/meldapp.glade.h:27
-msgid "Text Filters"
-msgstr "ã??ã?­ã?¹ã??ã?®ã??ã?£ã?«ã?¿"
+#: ../data/ui/preferences.glade.h:9
+msgid "Encoding"
+msgstr "ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°"
 
-#: ../data/ui/meldapp.glade.h:28
-msgid "Three way directory"
-msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
+#: ../data/ui/preferences.glade.h:10
+msgid "File Filters"
+msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?£ã?«ã?¿"
 
-#: ../data/ui/meldapp.glade.h:29
-msgid "Three way file"
-msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
+#: ../data/ui/preferences.glade.h:11
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "空è¡?ã?®æ?¿å?¥/å??é?¤ã??ç?¡è¦?ã??ã??"
 
-#: ../data/ui/meldapp.glade.h:30
-msgid "Two way directory"
-msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
+#: ../data/ui/preferences.glade.h:12
+msgid "Ignore symbolic links"
+msgstr "ã?·ã?³ã??ã?ªã??ã?¯ã?»ã?ªã?³ã?¯ã??ç?¡è¦?ã??ã??"
 
-#: ../data/ui/meldapp.glade.h:31
-msgid "Two way file"
-msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
+#: ../data/ui/preferences.glade.h:13
+msgid "Meld Preferences"
+msgstr "Meld �設�"
 
-#: ../data/ui/meldapp.glade.h:32
-msgid "Use GNOME monospace font"
-msgstr "GNOME æ??å®?ã?®å?ºå®?å¹?ã?®ã??ã?©ã?³ã??ã??使ç?¨ã??ã??"
+#: ../data/ui/preferences.glade.h:14
+msgid "Show _line numbers"
+msgstr "è¡?ç?ªå?·ã??表示ã??ã??(_L)"
 
-#: ../data/ui/meldapp.glade.h:33
-msgid "Use custom font"
-msgstr "ã??ã?©ã?³ã??ã??é?¸æ??ã??ã??: "
+#: ../data/ui/preferences.glade.h:15
+msgid "Text Filters"
+msgstr "æ??å­?å??ã?®ã??ã?£ã?«ã?¿"
 
-#: ../data/ui/meldapp.glade.h:34
-msgid "Use syntax highlighting"
-msgstr "強調表示ã??ã??"
+#: ../data/ui/preferences.glade.h:16
+msgid "Use _default system editor"
+msgstr "ã?·ã?¹ã??ã? ã?§ã??ã??ã?©ã?«ã??ã?®ã?¨ã??ã?£ã?¿ã??使ç?¨ã??ã??(_D)"
 
-#: ../data/ui/meldapp.glade.h:35
-msgid "Version control view"
-msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«è¡¨ç¤º"
+#: ../data/ui/preferences.glade.h:17
+msgid "Use s_yntax highlighting"
+msgstr "æ??æ³?ã??強調表示ã??ã??(_Y)"
 
-#: ../data/ui/meldapp.glade.h:36
+#: ../data/ui/preferences.glade.h:18
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
 msgstr ""
 "ã??ã?¡ã?¤ã?«ã??読ã??è¾¼ã??é??ã?«ã??次ã?®é ?ç?ªã?§ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã??試è¡?ã??ã?¾ã?? (ä¾?: utf8 "
 "iso8859)"
 
-#: ../data/ui/meldapp.glade.h:37
+#: ../data/ui/preferences.glade.h:19
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -254,7 +250,7 @@ msgstr ""
 "ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã?®ã??ã?¿ã?¼ã?³ã?¯ã??ã??ã??ã??ã??ã?¹ã??ã?¼ã?¹ã?§å?ºå??ã?£ã?? SHELL å??å¼?ã?®ã?¯ã?¤ã?«ã??"
 "ã?«ã?¼ã??ã?®ä¸¦ã?³ã?§ã??ã??"
 
-#: ../data/ui/meldapp.glade.h:38
+#: ../data/ui/preferences.glade.h:20
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -268,33 +264,25 @@ msgstr ""
 "ã??ã??該å½?ã??ã??ã?°ã?«ã?¼ã??ã?®æ??å­?å??ã? ã??ç½®ã??æ??ã??ã?¾ã??ã??詳細ã?¯ã?¦ã?¼ã?¶ã?¼ã?ºã?»ã??ã??ã?¥ã?¢ã?«ã??"
 "ã??覧ä¸?ã??ã??ã??"
 
-#: ../data/ui/meldapp.glade.h:39
-msgid "_Character"
-msgstr "æ??å­?ã??ã?¨(_C)"
+#: ../data/ui/preferences.glade.h:21
+msgid "_Automatically supply missing newline at end of file"
+msgstr "è?ªå??ç??ã?«ã??ã?¡ã?¤ã?«ã?®çµ?端ã?«æ?¹è¡?ã??追å? ã??ã??(_A)"
 
-#: ../data/ui/meldapp.glade.h:40
-msgid "_Directory Comparison"
-msgstr "ã??ã?©ã?«ã??ã?®æ¯?è¼?(_D)"
+#: ../data/ui/preferences.glade.h:22
+msgid "_Editor font:"
+msgstr "ã?¨ã??ã?£ã?¿ã?®ã??ã?©ã?³ã??(_E):"
 
-#: ../data/ui/meldapp.glade.h:41
-msgid "_File Comparison"
-msgstr "ã??ã?¡ã?¤ã?«ã?®æ¯?è¼?(_F)"
-
-#: ../data/ui/meldapp.glade.h:42
-msgid "_None"
-msgstr "ã??ã?ªã??(_N)"
-
-#: ../data/ui/meldapp.glade.h:43
-msgid "_Three Way Compare"
-msgstr "ï¼?ã?¤ã?®é??ã?§æ¯?è¼?ã??ã??(_T)"
+#: ../data/ui/preferences.glade.h:23
+msgid "_Insert spaces instead of tabs"
+msgstr "ã?¿ã??ã?®ä»£ã??ã??ã?«ç©ºç?½ã??æ?¿å?¥ã??ã??(_I)"
 
-#: ../data/ui/meldapp.glade.h:44
-msgid "_Version Control Browser"
-msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã?»ã??ã?©ã?¦ã?¶(_V)"
+#: ../data/ui/preferences.glade.h:24
+msgid "_Tab width:"
+msgstr "ã?¿ã??ã?®å¹?(_T):"
 
-#: ../data/ui/meldapp.glade.h:45
-msgid "_Word"
-msgstr "å??èª?ã??ã?¨(_W)"
+#: ../data/ui/preferences.glade.h:25
+msgid "_Use the system fixed width font"
+msgstr "ã?·ã?¹ã??ã? ã?®å?ºå®?ã??ã?©ã?³ã??ã??使ã??(_U)"
 
 #: ../data/ui/vcview.glade.h:1
 msgid "Commit Files"
@@ -344,7 +332,7 @@ msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã?¾ã??"
 msgid "Left"
 msgstr "å·¦ã?¸ã?³ã??ã?¼"
 
-#: ../meld/dirdiff.py:185 ../meld/filediff.py:167
+#: ../meld/dirdiff.py:185
 msgid "Copy To Left"
 msgstr "å·¦ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
 
@@ -352,7 +340,7 @@ msgstr "å·¦ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
 msgid "Right"
 msgstr "å?³ã?¸ã?³ã??ã?¼"
 
-#: ../meld/dirdiff.py:186 ../meld/filediff.py:168
+#: ../meld/dirdiff.py:186
 msgid "Copy To Right"
 msgstr "å?³ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
 
@@ -360,7 +348,7 @@ msgstr "å?³ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
 msgid "Delete selected"
 msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã?ªã?©ã??å??é?¤ã??ã?¾ã??"
 
-#: ../meld/dirdiff.py:188 ../meld/filediff.py:652
+#: ../meld/dirdiff.py:188 ../meld/filediff.py:840
 msgid "Hide"
 msgstr "é? ã??"
 
@@ -368,7 +356,7 @@ msgstr "é? ã??"
 msgid "Hide selected"
 msgstr "é?¸æ??ç¯?å?²ã??é? ã??ã?¾ã??"
 
-#: ../meld/dirdiff.py:190 ../meld/filediff.py:165 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:190 ../meld/filediff.py:179 ../meld/vcview.py:126
 msgid "Open selected"
 msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??"
 
@@ -422,8 +410,8 @@ msgstr "'%s' ã?¨ã??ã??ã??ã?¿ã?¼ã?³ã??æ­£è¦?表ç?¾ã?«å¤?æ??ã??ã??é??ã?«ã?¨ã?©ã?¼
 msgid "Hide %s"
 msgstr "%sã?®è¡¨ç¤ºã??å??ã??æ?¿ã??ã?¾ã??"
 
-#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:272
-#: ../meld/vcview.py:300
+#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:276
+#: ../meld/vcview.py:304
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] %s �����中"
@@ -469,7 +457,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:587 ../meld/vcview.py:464
+#: ../meld/dirdiff.py:587 ../meld/vcview.py:463
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -478,7 +466,7 @@ msgstr ""
 "'%s' ã?¯ã??ã?©ã?«ã??ã?§ã??ã??\n"
 "å??帰ç??ã?«å??é?¤ã??ã?¾ã??ã??ï¼?"
 
-#: ../meld/dirdiff.py:594 ../meld/vcview.py:469
+#: ../meld/dirdiff.py:594 ../meld/vcview.py:468
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -538,30 +526,91 @@ msgid_plural "%i years"
 msgstr[0] " %iå¹´"
 msgstr[1] " %iå¹´"
 
-#: ../meld/filediff.py:166
+#: ../meld/filediff.py:180
 msgid "Create a patch"
 msgstr "ã??ã??ã??ã??ç??æ??ã??ã?¾ã??"
 
-#: ../meld/filediff.py:167
-msgid "Copy all changes from right pane to left pane"
-msgstr "å?¨ã?¦ã?®å·®å??ã??å?³ã??ã??å·¦ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
+#: ../meld/filediff.py:181
+msgid "Push to left"
+msgstr "å·¦å?´ã?¸é?©ç?¨ã??ã??"
+
+#: ../meld/filediff.py:181
+msgid "Push current change to the left"
+msgstr "ç?¾å?¨ã?®å¤?æ?´ã??å·¦å?´ã?¸ã??é?©ç?¨ã??ã?¾ã??"
+
+#: ../meld/filediff.py:182
+msgid "Push to right"
+msgstr "å?³å?´ã?¸é?©ç?¨ã??ã??"
+
+#: ../meld/filediff.py:182
+msgid "Push current change to the right"
+msgstr "ç?¾å?¨ã?®å¤?æ?´ã??å?³å?´ã?«ã??é?©ç?¨ã??ã?¾ã??"
+
+#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
+#: ../meld/filediff.py:184
+msgid "Pull from left"
+msgstr "左�������"
+
+#: ../meld/filediff.py:184
+msgid "Pull change from the left"
+msgstr "å·¦å?´ã?®å¤?æ?´ç?¹ã??ã?­ã?£ã?³ã?»ã?«ã??ã?¾ã??"
+
+#: ../meld/filediff.py:185
+msgid "Pull from right"
+msgstr "��������"
+
+#: ../meld/filediff.py:185
+msgid "Pull change from the right"
+msgstr "å?³å?´ã?®å¤?æ?´ç?¹ã??ã?­ã?£ã?³ã?»ã?«ã??ã?¾ã??"
+
+#: ../meld/filediff.py:186
+msgid "Delete"
+msgstr "å??é?¤"
 
-#: ../meld/filediff.py:168
-msgid "Copy all changes from left pane to right pane"
-msgstr "å?¨ã?¦ã?®å·®å??ã??å·¦ã??ã??å?³ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
+#: ../meld/filediff.py:186
+msgid "Delete change"
+msgstr "å¤?æ?´ç?¹ã??å??é?¤ã??ã?¾ã??"
 
-#. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../meld/filediff.py:221
-msgid "INS,OVR"
-msgstr "[æ?¿å?¥],[ä¸?æ?¸ã??]"
+#: ../meld/filediff.py:187
+msgid "Merge all changes from left"
+msgstr "å·¦å?´ã?®å¤?æ?´ç?¹ã?®ã??ã?¼ã?¸"
+
+#: ../meld/filediff.py:187
+msgid "Merge all non-conflicting changes from the left"
+msgstr "å·¦å?´ã?«ã??ã?? (è¡?çª?ã??ã??ã??ã?¨ã?®ã?ªã??) å¤?æ?´ç?¹ã??å?¨ã?¦ã??ã?¼ã?¸ã??ã?¾ã??"
+
+#: ../meld/filediff.py:188
+msgid "Merge all changes from right"
+msgstr "å?³å?´ã?®å¤?æ?´ç?¹ã?®ã??ã?¼ã?¸"
+
+#: ../meld/filediff.py:188
+msgid "Merge all non-conflicting changes from the right"
+msgstr "å·¦å?´ã?«ã??ã?? (è¡?çª?ã??ã??ã??ã?¨ã?®ã?ªã??) å¤?æ?´ç?¹ã??å?¨ã?¦ã??ã?¼ã?¸ã??ã?¾ã??"
+
+#: ../meld/filediff.py:189
+msgid "Merge all non-conflicting"
+msgstr "å?¨ã?¦ã?®å¤?æ?´ç?¹ã?®ã??ã?¼ã?¸"
+
+#: ../meld/filediff.py:189
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "å·¦å?´ã?¨å?³å?´ã?¨ã?§è¡?çª?ã??ã??ã??ã?¨ã?®ã?ªã??å?¨ã?¦ã?®å¤?æ?´ç?¹ã??å?¨ã?¦ã??ã?¼ã?¸ã??ã?¾ã??"
+
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:258
+msgid "INS"
+msgstr "[æ?¿å?¥]"
+
+#: ../meld/filediff.py:258
+msgid "OVR"
+msgstr "[ä¸?æ?¸ã??]"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:260
 #, python-format
 msgid "Ln %i, Col %i"
-msgstr "(%iè¡?, %iæ¡?)"
+msgstr "(%iè¡?ã??%iå??)"
 
-#: ../meld/filediff.py:286
+#: ../meld/filediff.py:433
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -571,62 +620,54 @@ msgstr ""
 "ç´°ã?¯ã?¦ã?¼ã?¶ã?¼ã?ºã?»ã??ã??ã?¥ã?¢ã?«ã??ã??覧ä¸?ã??ã??ã??"
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:379
+#: ../meld/filediff.py:530
 msgid "<unnamed>"
 msgstr "<å??å??ã?ªã??>"
 
-#: ../meld/filediff.py:559
+#: ../meld/filediff.py:705
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] ç?ªå?·ã??ã?¤ã?³ã?®ã?»ã??ã??"
 
-#: ../meld/filediff.py:565
+#: ../meld/filediff.py:711
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] ã??ã?¡ã?¤ã?«ã?®ã?ªã?¼ã??ã?³ä¸­"
 
-#: ../meld/filediff.py:583 ../meld/filediff.py:597 ../meld/filediff.py:613
-#: ../meld/filediff.py:620
-#, python-format
-msgid "Could not read from '%s'"
-msgstr "'%s' ã??読ã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??"
+#: ../meld/filediff.py:717 ../meld/filediff.py:844
+msgid "Hi_de"
+msgstr "é? ã??(_D)"
 
-#: ../meld/filediff.py:584 ../meld/filediff.py:621
-msgid "The error was:"
-msgstr "���:"
+#: ../meld/filediff.py:738 ../meld/filediff.py:749 ../meld/filediff.py:762
+#: ../meld/filediff.py:768
+msgid "Could not read file"
+msgstr "ã??ã?¡ã?¤ã?«ã??読ã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../meld/filediff.py:589
+#: ../meld/filediff.py:741
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] ã??ã?¡ã?¤ã?«ã?®èª­ã?¿è¾¼ã?¿ä¸­"
 
-#: ../meld/filediff.py:598
-msgid ""
-"It contains ascii nulls.\n"
-"Perhaps it is a binary file."
-msgstr ""
-"ASCII ã?®ã??ã?«æ??å­?ã??å?«ã?¾ã??ã?¦ã??ã?¾ã??ã??\n"
-"ã??ã?¤ã??ã?ªã?»ã??ã?¡ã?¤ã?«ã?®ã??ã??ã?§ã??ã??"
+#: ../meld/filediff.py:750
+#, python-format
+msgid "%s appears to be a binary file."
+msgstr "%s ã?¯ã??ã?¤ã??ã?ªã?»ã??ã?¡ã?¤ã?«ã?®ã??ã??ã?§ã??"
 
-#: ../meld/filediff.py:614
+#: ../meld/filediff.py:763
 #, python-format
-msgid "I tried encodings %s."
-msgstr "%s ã?¨ã??ã??ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?§è©¦ã??ã?¦ã?¿ã?¾ã??ã??ã??"
+msgid "%s is not in encodings: %s"
+msgstr "%s ã?¯æ¬¡ã?®ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?§ã?¯ã??ã??ã?¾ã??ã??: %s"
 
-#: ../meld/filediff.py:641
+#: ../meld/filediff.py:789 ../meld/filemerge.py:70
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] å·®å??ã?®è¨?ç®?中"
 
-#: ../meld/filediff.py:651
+#: ../meld/filediff.py:838
 msgid "Files are identical"
 msgstr "å??ä¸?ã?®ã??ã?¡ã?¤ã?«ã?§ã??"
 
-#: ../meld/filediff.py:656
-msgid "Hi_de"
-msgstr "é? ã??(_D)"
-
-#: ../meld/filediff.py:795
+#: ../meld/filediff.py:972
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -635,7 +676,7 @@ msgstr ""
 "\"%s\" ã?¯å­?å?¨ã??ã?¦ã??ã?¾ã??ï¼?\n"
 "ä¸?æ?¸ã??ã??ã?¾ã??ã??ï¼?"
 
-#: ../meld/filediff.py:808
+#: ../meld/filediff.py:985
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -646,12 +687,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/filediff.py:817
+#: ../meld/filediff.py:994
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "ã??ã??ã??ã?¡ %i ã?®å??å??ã?®é?¸æ??"
 
-#: ../meld/filediff.py:831
+#: ../meld/filediff.py:1008
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -662,7 +703,7 @@ msgstr ""
 "\n"
 "ã?©ã?®ã??ã?©ã?¼ã??ã??ã??ã??使ç?¨ã??ã?¾ã??ã??ï¼?"
 
-#: ../meld/filediff.py:847
+#: ../meld/filediff.py:1024
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -672,11 +713,11 @@ msgstr ""
 "UTF-8 ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?¨ã??ã?¦ä¿?å­?ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
 
 #. save as
-#: ../meld/filediff.py:885
+#: ../meld/filediff.py:1061
 msgid "Save patch as..."
 msgstr "å?¥å??ã?§ã??ã??ã??ã?®ä¿?å­?..."
 
-#: ../meld/filediff.py:943
+#: ../meld/filediff.py:1108
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -689,313 +730,247 @@ msgstr ""
 "\n"
 "ã??ã?®æ??ä½?ã??å??ã?«æ?»ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../meld/meldapp.py:150
-msgid "label"
-msgstr "(æ?°ã??ã??å??å??)"
-
-#: ../meld/meldapp.py:150
-msgid "pattern"
-msgstr "(æ?°ã??ã??ã??ã?¿ã?¼ã?³)"
-
-#: ../meld/meldapp.py:218
-msgid "Only available if you have gnome-python-desktop installed"
-msgstr ""
-"'gnome-python-desktop' ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã??å ´å??ã?«ã?®ã?¿è¡?ç?ªå?·ã??表示ã??ã??ã??ã?¨ã??"
-"ã?§ã??ã?¾ã??ã??"
-
-#. file filters
-#. text filters
-#: ../meld/meldapp.py:228 ../meld/meldapp.py:233 ../meld/vcview.py:163
-msgid "Name"
-msgstr "å??å??"
-
-#: ../meld/meldapp.py:228 ../meld/meldapp.py:233
-msgid "Active"
-msgstr "æ??å?¹"
-
-#: ../meld/meldapp.py:228
-msgid "Pattern"
-msgstr "ã??ã?¿ã?¼ã?³"
-
-#: ../meld/meldapp.py:233
-msgid "Regex"
-msgstr "正�表�"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:340
-msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-msgstr "ã??ã??ã?¯ã?¢ã??ã??\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:342
+#: ../meld/filemerge.py:78
 #, python-format
-msgid "Version Control\t1\t%s\n"
-msgstr "Version Control\t1\t%s\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:344
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-msgstr "ã??ã?¤ã??ã?ª\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:346
-msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgstr "ã?¡ã??ã?£ã?¢\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+msgid "[%s] Merging files"
+msgstr "[%s] ã??ã?¡ã?¤ã?«ã?®ã??ã?¼ã?¸ä¸­"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:348
-msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-msgstr "CVS ã?®ã?­ã?¼ã?¯ã?¼ã??\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:350
-msgid "C++ comment\t0\t//.*\n"
-msgstr "C++ ã?®ã?³ã?¡ã?³ã??\t0\t//.*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:352
-msgid "C comment\t0\t/\\*.*?\\*/\n"
-msgstr "C ã?®ã?³ã?¡ã?³ã??\t0\t/\\*.*?\\*/\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:354
-msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
-msgstr "空ç?½æ??å­?\t0\t[ \\t\\r\\f\\v]*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:356
-msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
-msgstr "å??é ­ã?®ç©ºç?½æ??å­?\t0\t^[ \\t\\r\\f\\v]*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:358
-msgid "Script comment\t0\t#.*"
-msgstr "ã?¹ã?¯ã?ªã??ã??ã?®ã?³ã?¡ã?³ã??\t0\t#.*"
-
-#: ../meld/meldapp.py:427
+#: ../meld/meldapp.py:139
 msgid "_File"
 msgstr "ã??ã?¡ã?¤ã?«(_F)"
 
-#: ../meld/meldapp.py:428
+#: ../meld/meldapp.py:140
 msgid "_New..."
 msgstr "��(_N)..."
 
-#: ../meld/meldapp.py:428
+#: ../meld/meldapp.py:140
 msgid "Start a new comparison"
 msgstr "æ?°ã??ã??æ¯?è¼?ã??é??å§?ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:429
+#: ../meld/meldapp.py:141
 msgid "Save the current file"
 msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??ä¿?å­?ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:431
+#: ../meld/meldapp.py:143
 msgid "Close the current file"
 msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:432
+#: ../meld/meldapp.py:144
 msgid "Quit the program"
 msgstr "ã??ã?­ã?°ã?©ã? ã??çµ?äº?ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:434
+#: ../meld/meldapp.py:146
 msgid "_Edit"
 msgstr "ç·¨é??(_E)"
 
-#: ../meld/meldapp.py:435
+#: ../meld/meldapp.py:147
 msgid "Undo the last action"
 msgstr "æ??å¾?ã?«é?©ç?¨ã??ã??ã?¢ã?¯ã?·ã?§ã?³ã?«æ?»ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:436
+#: ../meld/meldapp.py:148
 msgid "Redo the last undone action"
 msgstr "æ??å¾?ã?«é?©ç?¨ã??ã??ã?¢ã?¯ã?·ã?§ã?³ã??ã??ã??ç?´ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:437
+#: ../meld/meldapp.py:149
 msgid "Cut the selection"
 msgstr "é?¸æ??ç¯?å?²ã??å??ã??å??ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:438
+#: ../meld/meldapp.py:150
 msgid "Copy the selection"
 msgstr "é?¸æ??ç¯?å?²ã??ã?³ã??ã?¼ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:439
+#: ../meld/meldapp.py:151
 msgid "Paste the clipboard"
 msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?®å??容ã??è²¼ã??ä»?ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:440
+#: ../meld/meldapp.py:152
 msgid "Search for text"
 msgstr "æ¤?ç´¢ã??ã??æ??å­?å??:"
 
-#: ../meld/meldapp.py:441
+#: ../meld/meldapp.py:153
 msgid "Find Ne_xt"
 msgstr "次��索(_X)"
 
-#: ../meld/meldapp.py:441
+#: ../meld/meldapp.py:153
 msgid "Search forwards for the same text"
 msgstr "å??æ?¹ã??æ¤?ç´¢ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:442
+#: ../meld/meldapp.py:154
 msgid "Find and replace text"
 msgstr "æ??å­?å??ã??æ¤?ç´¢ã??ã?¦ç½®æ??ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:443
-msgid "Go to the next difference"
-msgstr "次ã?®å·®å??ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
-
-#: ../meld/meldapp.py:444
-msgid "Go to the previous difference"
-msgstr "å??ã?®å·®å??ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
-
-#: ../meld/meldapp.py:445
+#: ../meld/meldapp.py:155
 msgid "Prefere_nces"
 msgstr "設�(_N)"
 
-#: ../meld/meldapp.py:445
+#: ../meld/meldapp.py:155
 msgid "Configure the application"
 msgstr "Meld ã??設å®?ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:447
+#: ../meld/meldapp.py:157
+msgid "_Changes"
+msgstr "���(_C)"
+
+#: ../meld/meldapp.py:158
+msgid "Next change"
+msgstr "次����"
+
+#: ../meld/meldapp.py:158
+msgid "Go to the next change"
+msgstr "次ã?®å¤?æ?´ç?¹ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
+
+#: ../meld/meldapp.py:159
+msgid "Previous change"
+msgstr "å??ã?®å¤?æ?´ç?¹"
+
+#: ../meld/meldapp.py:159
+msgid "Go to the previous change"
+msgstr "å??ã?®å¤?æ?´ç?¹ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
+
+#: ../meld/meldapp.py:161
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../meld/meldapp.py:448
+#: ../meld/meldapp.py:162
 msgid "File status"
 msgstr "ã??ã?¡ã?¤ã?«ã?®ç?¶æ??"
 
-#: ../meld/meldapp.py:449
+#: ../meld/meldapp.py:163
 msgid "Version status"
 msgstr "ã??ã?¼ã?¸ã?§ã?³"
 
-#: ../meld/meldapp.py:450
+#: ../meld/meldapp.py:164
 msgid "File filters"
 msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?£ã?«ã?¿"
 
-#: ../meld/meldapp.py:451
+#: ../meld/meldapp.py:165
 msgid "Stop the current action"
 msgstr "ç?¾å?¨é?©ç?¨ä¸­ã?®ã?¢ã?¯ã?·ã?§ã?³ã??å??æ­¢ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:452
+#: ../meld/meldapp.py:166
 msgid "Refresh the view"
 msgstr "表示ã??æ?´æ?°ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:453
+#: ../meld/meldapp.py:167
 msgid "Reload"
 msgstr "å??読込ã?¿"
 
-#: ../meld/meldapp.py:453
+#: ../meld/meldapp.py:167
 msgid "Reload the comparison"
 msgstr "æ¯?è¼?å??容ã??æ?´æ?°ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:455
+#: ../meld/meldapp.py:169
 msgid "_Help"
 msgstr "ã??ã?«ã??(_H)"
 
-#: ../meld/meldapp.py:456
+#: ../meld/meldapp.py:170
 msgid "_Contents"
 msgstr "�次(_C)"
 
-#: ../meld/meldapp.py:456
+#: ../meld/meldapp.py:170
 msgid "Open the Meld manual"
 msgstr "Meld ã??ã??ã?¥ã?¢ã?«é??ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:457
+#: ../meld/meldapp.py:171
 msgid "Report _Bug"
 msgstr "ã??ã?°ã?®å ±å??(_B)"
 
-#: ../meld/meldapp.py:457
+#: ../meld/meldapp.py:171
 msgid "Report a bug in Meld"
 msgstr "Meld ã?®ã??ã?°ã??å ±å??ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:458
+#: ../meld/meldapp.py:172
 msgid "About this program"
 msgstr "ã??ã?®ã??ã?­ã?°ã?©ã? ã?«ã?¤ã??ã?¦"
 
-#: ../meld/meldapp.py:461
+#: ../meld/meldapp.py:175
 msgid "Full Screen"
 msgstr "ã??ã?«ã?¹ã?¯ã?ªã?¼ã?³è¡¨ç¤º"
 
-#: ../meld/meldapp.py:461
+#: ../meld/meldapp.py:175
 msgid "View the comparison in full screen"
 msgstr "æ¯?è¼?ç?¶æ³?ã??ã??ã?«ã?¹ã?¯ã?ªã?¼ã?³ã?§è¡¨ç¤ºã??ã?¾ã??"
 
-#: ../meld/meldapp.py:462
+#: ../meld/meldapp.py:176
 msgid "_Toolbar"
 msgstr "ã??ã?¼ã?«ã??ã?¼(_T)"
 
-#: ../meld/meldapp.py:462
+#: ../meld/meldapp.py:176
 msgid "Show or hide the toolbar"
 msgstr "ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤ºã?? ON/OFF ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:463
+#: ../meld/meldapp.py:177
 msgid "_Statusbar"
 msgstr "ã?¹ã??ã?¼ã?¿ã?¹ã??ã?¼(_S)"
 
-#: ../meld/meldapp.py:463
+#: ../meld/meldapp.py:177
 msgid "Show or hide the statusbar"
 msgstr "ã?¹ã??ã?¼ã?¿ã?¹ã??ã?¼ã?®è¡¨ç¤ºã?? ON/OFF ã??ã?¾ã??"
 
 #. exit at first non found directory + file
-#: ../meld/meldapp.py:804
+#: ../meld/meldapp.py:533
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?®é??ã?§ã?®æ¯?è¼?ã?¯ã?§ã??ã?¾ã??ã??ã??\n"
 
-#: ../meld/meldapp.py:858
+#: ../meld/meldapp.py:587
 msgid "wrong number of arguments supplied to --diff"
 msgstr "--diff ã?ªã??ã?·ã?§ã?³ã?«å¯¾ã??ã??å¼?æ?°ã?®æ?°ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../meld/meldapp.py:862
+#: ../meld/meldapp.py:591
 msgid "Start with an empty window"
 msgstr "ä½?ã??é??ã??ã??ã?« Meld ã??èµ·å??ã??ã??"
 
-#: ../meld/meldapp.py:863 ../meld/meldapp.py:864 ../meld/meldapp.py:866
+#: ../meld/meldapp.py:592 ../meld/meldapp.py:593 ../meld/meldapp.py:595
 msgid "file"
 msgstr "FILE"
 
-#: ../meld/meldapp.py:863 ../meld/meldapp.py:865 ../meld/meldapp.py:866
+#: ../meld/meldapp.py:592 ../meld/meldapp.py:594 ../meld/meldapp.py:595
 msgid "dir"
 msgstr "DIR"
 
-#: ../meld/meldapp.py:863
+#: ../meld/meldapp.py:592
 msgid "Start a version control comparison"
 msgstr "ã??ã?¼ã?¸ã?§ã?³ç®¡ç??ã?®æ¯?è¼?ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
 
-#: ../meld/meldapp.py:864
+#: ../meld/meldapp.py:593
 msgid "Start a 2- or 3-way file comparison"
 msgstr "ï¼?ã?ªã??ã??ï¼?å??ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
 
-#: ../meld/meldapp.py:865
+#: ../meld/meldapp.py:594
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "ï¼?ã?ªã??ã??ï¼?å??ã?®ã??ã?©ã?«ã??ã??æ¯?è¼?ã??ã??ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
 
-#: ../meld/meldapp.py:866
+#: ../meld/meldapp.py:595
 msgid "Start a comparison between file and dir/file"
 msgstr "ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?¨ã??æ¯?è¼?ã??ã??ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
 
-#: ../meld/meldapp.py:872
+#: ../meld/meldapp.py:601
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld ã?¯ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?®å??容ã??æ¯?è¼?ã??ã??ã??ã?¼ã?«ã?§ã??:"
 
-#: ../meld/meldapp.py:875
+#: ../meld/meldapp.py:604
 msgid "Set label to use instead of file name"
 msgstr "ã??ã?¡ã?¤ã?«å??ã?®ä»£ã??ã??ã?«ä½¿ç?¨ã??ã??ã?©ã??ã?«ã??æ??å®?ã??ã??"
 
-#: ../meld/meldapp.py:877
+#: ../meld/meldapp.py:606
 msgid "Automatically compare all differing files on startup"
 msgstr "èµ·å??æ??ã?«ã??ã?¡ã?¤ã?«ã?®ä¸­ã?«ã??ã??å?¨ã?¦å·®å??ã??è?ªå??ç??ã?«æ¤?å?ºã??ã??"
 
-#: ../meld/meldapp.py:878 ../meld/meldapp.py:879 ../meld/meldapp.py:880
-#: ../meld/meldapp.py:881
+#: ../meld/meldapp.py:607 ../meld/meldapp.py:608 ../meld/meldapp.py:609
+#: ../meld/meldapp.py:610
 msgid "Ignored for compatibility"
 msgstr "äº?æ??æ?§ã??ç?¡è¦?ã??ã??"
 
-#: ../meld/meldapp.py:884
+#: ../meld/meldapp.py:613
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr "æ??å®?ã??ã??æ??大ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«ã?¾ã??ã?¯ã??ã?©ã?«ã??ã?«å¯¾ã??ã??å·®å??ã??ã?¿ã??ã?§è¡¨ç¤ºã??ã??"
 
-#: ../meld/meldapp.py:887
+#: ../meld/meldapp.py:616
 #, python-format
-msgid "too many arguments (wanted 0-3, got %d)"
-msgstr "å¼?æ?°ã??å¤?ã??ã??ã?¾ã?? (0ã??3å??ã??æ?³å®?ã??ã?¦ã??ã??ã??å®?é??ã?¯%då??)"
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr "å¼?æ?°ã??å¤?ã??ã??ã?¾ã?? (0ã??4å??ã??æ?³å®?ã??ã?¦ã??ã??ã??å®?é??ã?¯%då??)"
 
-#: ../meld/melddoc.py:46
+#: ../meld/melddoc.py:47
 msgid "untitled"
 msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
 
@@ -1004,6 +979,89 @@ msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
 msgid "[None]"
 msgstr "[ã?ªã??]"
 
+#: ../meld/preferences.py:81
+msgid "label"
+msgstr "(æ?°ã??ã??å??å??)"
+
+#: ../meld/preferences.py:81
+msgid "pattern"
+msgstr "(æ?°ã??ã??ã??ã?¿ã?¼ã?³)"
+
+#: ../meld/preferences.py:143
+msgid "Only available if you have gnome-python-desktop installed"
+msgstr ""
+"'gnome-python-desktop' ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã??å ´å??ã?«ã?®ã?¿è¡?ç?ªå?·ã??表示ã??ã??ã??ã?¨ã??"
+"ã?§ã??ã?¾ã??ã??"
+
+#. file filters
+#. text filters
+#: ../meld/preferences.py:166 ../meld/preferences.py:171 ../meld/vcview.py:163
+msgid "Name"
+msgstr "å??å??"
+
+#: ../meld/preferences.py:166 ../meld/preferences.py:171
+msgid "Active"
+msgstr "æ??å?¹"
+
+#: ../meld/preferences.py:166
+msgid "Pattern"
+msgstr "ã??ã?¿ã?¼ã?³"
+
+#: ../meld/preferences.py:171
+msgid "Regex"
+msgstr "正�表�"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:268
+msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+msgstr "ã??ã??ã?¯ã?¢ã??ã??\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:270
+#, python-format
+msgid "Version Control\t1\t%s\n"
+msgstr "Version Control\t1\t%s\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:272
+msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+msgstr "ã??ã?¤ã??ã?ª\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:274
+msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+msgstr "ã?¡ã??ã?£ã?¢\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:276
+msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+msgstr "CVS ã?®ã?­ã?¼ã?¯ã?¼ã??\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:278
+msgid "C++ comment\t0\t//.*\n"
+msgstr "C++ ã?®ã?³ã?¡ã?³ã??\t0\t//.*\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:280
+msgid "C comment\t0\t/\\*.*?\\*/\n"
+msgstr "C ã?®ã?³ã?¡ã?³ã??\t0\t/\\*.*?\\*/\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:282
+msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
+msgstr "空ç?½æ??å­?\t0\t[ \\t\\r\\f\\v]*\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:284
+msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
+msgstr "å??é ­ã?®ç©ºç?½æ??å­?\t0\t^[ \\t\\r\\f\\v]*\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:286
+msgid "Script comment\t0\t#.*"
+msgstr "ã?¹ã?¯ã?ªã??ã??ã?®ã?³ã?¡ã?³ã??\t0\t#.*"
+
 #: ../meld/vcview.py:127
 msgid "_Commit"
 msgstr "ã?³ã??ã??ã??(_C)"
@@ -1125,29 +1183,29 @@ msgstr "ï¼?ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã?®é?¸æ??"
 msgid "Only one Version Control in this directory"
 msgstr "ã??ã?®ã??ã?©ã?«ã??ã?®ï¼?ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?­ã?¼ã?«ã? ã??"
 
-#: ../meld/vcview.py:316
+#: ../meld/vcview.py:320
 msgid "(Empty)"
 msgstr "(空)"
 
-#: ../meld/vcview.py:349
+#: ../meld/vcview.py:353
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] å·®å??ã?®å??å¾?中"
 
-#: ../meld/vcview.py:356
+#: ../meld/vcview.py:360
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] ã??ã??ã??ã?®é?©ç?¨ä¸­"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:364
 msgid "No differences found."
 msgstr "å·®å??ã?¯ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../meld/vcview.py:439
+#: ../meld/vcview.py:438
 msgid "Select some files first."
 msgstr "ã?¾ã??æ??å??ã?«ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../meld/vcview.py:505
+#: ../meld/vcview.py:504
 #, python-format
 msgid ""
 "\n"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]