[meld] Updated Japanese translation.
- From: Takeshi Aihana <aihana src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Japanese translation.
- Date: Thu, 30 Dec 2010 15:46:49 +0000 (UTC)
commit c49801090350e3632167764c2bd733bf74b0a98d
Author: Takeshi AIHANA <takeshi aihana gmail com>
Date: Fri Dec 31 00:46:25 2010 +0900
Updated Japanese translation.
po/ja.po | 764 ++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 426 insertions(+), 338 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index d89f6e8..31471e0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,21 +6,22 @@ msgid ""
msgstr ""
"Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2010-06-26 18:22+0900\n"
-"PO-Revision-Date: 2010-06-26 18:21+0900\n"
+"POT-Creation-Date: 2010-12-31 00:37+0900\n"
+"PO-Revision-Date: 2010-12-31 00:37+0900\n"
"Last-Translator: Takeshi AIHANA <takeshi aihana gmail com>\n"
"Language-Team: Japanese <gnome-translation gnome gr jp>\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../bin/meld:77
+#: ../bin/meld:96
msgid "Cannot import: "
msgstr "ã?¤ã?³ã??ã?¼ã??ã?§ã??ã?¾ã??ã??:"
-#: ../bin/meld:80
+#: ../bin/meld:99
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meld ã?«ã?¯ %s 以ä¸?ã??å¿?è¦?ã?§ã??ã??"
@@ -33,7 +34,7 @@ msgstr "è¤?æ?°ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??ã??ã??ã?¼ã?¸ã??ã?¾ã??"
msgid "Diff Viewer"
msgstr "å·®å??ã??ã?¥ã?¼ã?¢"
-#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.glade.h:4
+#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
msgid "Meld"
msgstr "Meld"
@@ -41,206 +42,224 @@ msgstr "Meld"
msgid "Meld Diff Viewer"
msgstr "Meld å·®å??ã??ã?¥ã?¼ã?¢"
-#: ../data/ui/filediff.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">ã??ã??ã?¤ã??ã?®ã??ã?¡ã?¤ã?«ã??å¤?æ?´ã??ã??ã?¦ã??ã?¾"
-"ã??ã??\n"
-"ã?©ã?®ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã?¾ã??ã??ï¼?</span>"
-
-#: ../data/ui/filediff.glade.h:3
-msgid "Copy to Clipboard"
-msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?¸ã?³ã??ã?¼"
-
-#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:180
-msgid "Create Patch"
-msgstr "ã??ã??ã??ã?®ç??æ??"
-
-#: ../data/ui/filediff.glade.h:5
+#: ../data/ui/filediff.ui.h:1
msgid "Save modified files?"
msgstr "å¤?æ?´ã??ã??ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã?¾ã??ã??ï¼?"
-#: ../data/ui/filediff.glade.h:6
+#: ../data/ui/filediff.ui.h:2
+msgid ""
+"Some files have been modified.\n"
+"Which ones would you like to save?"
+msgstr ""
+"ã??ã??ã?¤ã??ã?®ã??ã?¡ã?¤ã?«ã??å¤?æ?´ã??ã??ã?¦ã??ã?¾ã??ã??\n"
+"ã?©ã?®ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã?¾ã??ã??ï¼?"
+
+#: ../data/ui/filediff.ui.h:4
msgid "_Discard Changes"
msgstr "å¤?æ?´ã??å??ã??æ¶?ã??(_D)"
-#: ../data/ui/filediff.glade.h:7
+#: ../data/ui/filediff.ui.h:5
msgid "_Save Selected"
-msgstr "é?¸æ??ç¯?å?²ã?®ä¿?å?(_S)"
+msgstr "é?¸æ??ç¯?å?²ã??ä¿?å?ã??ã??(_S)"
-#: ../data/ui/findbar.glade.h:1
+#: ../data/ui/findbar.ui.h:1
msgid "Regular E_xpression"
msgstr "æ£è¦?表ç?¾(_X)"
-#: ../data/ui/findbar.glade.h:2
+#: ../data/ui/findbar.ui.h:2
msgid "Replace _All"
msgstr "å?¨ã?¦ç½®æ??(_A)"
-#: ../data/ui/findbar.glade.h:3
+#: ../data/ui/findbar.ui.h:3
msgid "Replace _With"
msgstr "次ã?§ç½®ã??æ??ã??ã??(_W):"
-#: ../data/ui/findbar.glade.h:4
+#: ../data/ui/findbar.ui.h:4
msgid "Who_le word"
msgstr "å??èª?å?¨ä½?(_L)"
-#: ../data/ui/findbar.glade.h:5
+#: ../data/ui/findbar.ui.h:5
msgid "_Match Case"
msgstr "大/å°?æ??å?ã??å?ºå?¥ã??ã??(_M)"
-#: ../data/ui/findbar.glade.h:6
+#: ../data/ui/findbar.ui.h:6
msgid "_Next"
msgstr "次ã?®çµ?æ??(_N)"
-#: ../data/ui/findbar.glade.h:7
+#: ../data/ui/findbar.ui.h:7
msgid "_Previous"
msgstr "å??ã?®çµ?æ??(_P)"
-#: ../data/ui/findbar.glade.h:8 ../meld/meldapp.py:154
+#: ../data/ui/findbar.ui.h:8 ../meld/meldapp.py:147
msgid "_Replace"
msgstr "ç½®æ??(_R)"
-#: ../data/ui/findbar.glade.h:9
+#: ../data/ui/findbar.ui.h:9
msgid "_Search for"
msgstr "æ¤?ç´¢ã??ã??æ??å?å??(_S):"
-#: ../data/ui/meldapp.glade.h:1
+#: ../data/ui/meldapp.ui.h:1
msgid "Choose Files"
msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
-#: ../data/ui/meldapp.glade.h:2
-msgid "Copyright © 2002-2009 Stephen Kennedy"
-msgstr "Copyright © 2002-2009 Stephen Kennedy"
+#: ../data/ui/meldapp.ui.h:2
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2010 Kai Willadsen"
+msgstr ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2010 Kai Willadsen"
-#: ../data/ui/meldapp.glade.h:3
+#: ../data/ui/meldapp.ui.h:4
msgid "Directory"
msgstr "ã??ã?©ã?«ã??"
-#: ../data/ui/meldapp.glade.h:5
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:7
msgid "Mine"
msgstr "è?ªå??ã?®ã??ã?®"
-#: ../data/ui/meldapp.glade.h:6
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:9
msgid "Original"
msgstr "ã?ªã?ªã?¸ã??ã?«"
-#: ../data/ui/meldapp.glade.h:7
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:11
msgid "Other"
msgstr "ä»?ã?®ã??ã?®"
-#: ../data/ui/meldapp.glade.h:8
-msgid "Three way directory"
-msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
-
-#: ../data/ui/meldapp.glade.h:9
-msgid "Three way file"
-msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
+#: ../data/ui/meldapp.ui.h:12
+msgid "Select VC Directory"
+msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?®é?¸æ??"
-#: ../data/ui/meldapp.glade.h:10
-msgid "Two way directory"
-msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
-
-#: ../data/ui/meldapp.glade.h:11
-msgid "Two way file"
-msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
-
-#: ../data/ui/meldapp.glade.h:12
-msgid "Version control view"
-msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«è¡¨ç¤º"
-
-#: ../data/ui/meldapp.glade.h:13
+#: ../data/ui/meldapp.ui.h:13
msgid "_Directory Comparison"
msgstr "ã??ã?©ã?«ã??ã?®æ¯?è¼?(_D)"
-#: ../data/ui/meldapp.glade.h:14
+#: ../data/ui/meldapp.ui.h:14
msgid "_File Comparison"
msgstr "ã??ã?¡ã?¤ã?«ã?®æ¯?è¼?(_F)"
-#: ../data/ui/meldapp.glade.h:15
+#: ../data/ui/meldapp.ui.h:15
msgid "_Three Way Compare"
msgstr "ï¼?ã?¤ã?®é??ã?§æ¯?è¼?ã??ã??(_T)"
-#: ../data/ui/meldapp.glade.h:16
+#: ../data/ui/meldapp.ui.h:16
msgid "_Version Control Browser"
msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?»ã??ã?©ã?¦ã?¶(_V)"
-#: ../data/ui/preferences.glade.h:1
-msgid "<b>Display</b>"
-msgstr "<b>表示</b>"
+#: ../data/ui/meldapp.ui.h:17
+msgid "translator-credits"
+msgstr "�� � <takeshi aihana gmail com>"
+
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Copy to Clipboard"
+msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?¸ã?³ã??ã?¼"
+
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Create Patch"
+msgstr "ã??ã??ã??ã?®ç??æ??"
+
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Create a patch"
+msgstr "ã??ã??ã??ã?®ç??æ??"
+
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Left and middle panes"
+msgstr "å·¦å?´ã?¨ç??ã??ä¸ã?®ã??ã?¤ã?³"
+
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Middle and right panes"
+msgstr "ç??ã??ä¸ã?¨å?³å?´ã?®ã??ã?¤ã?³"
-#: ../data/ui/preferences.glade.h:2
-msgid "<b>External editor</b>"
-msgstr "<b>å¤?é?¨ã?¨ã??ã?£ã?¿</b>"
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Use differences between:"
+msgstr "次ã?®ã??ã?¤ã?³ã?®é??ã?®å·®å??ã??ã??ã??ã??ã?«ã??ã??:"
-#: ../data/ui/preferences.glade.h:3
-msgid "<b>Font</b>"
-msgstr "<b>ã??ã?©ã?³ã??</b>"
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "ã?ªã?ªã?¸ã??ã?«ã?»ã??ã?¡ã?¤ã?«ã??é??ã?«ã??ã??(_R)"
-#: ../data/ui/preferences.glade.h:4
-msgid "<b>Loading</b>"
-msgstr "<b>èªã?¿è¾¼ã?¿</b>"
+#: ../data/ui/preferences.ui.h:1
+msgid "Display"
+msgstr "表示"
-#: ../data/ui/preferences.glade.h:5
+#: ../data/ui/preferences.ui.h:2
msgid "Do not _split words over two lines"
msgstr "å??èª?ã??äº?è¡?ã?«ã?¾ã??ã??ã?ªã??ã??ã??ã?«ã??ã??(_S)"
-#: ../data/ui/preferences.glade.h:6
+#: ../data/ui/preferences.ui.h:3
msgid "Edito_r command:"
msgstr "ã??ã?®ä»?ã?®ã?¨ã??ã?£ã?¿(_R)"
-#: ../data/ui/preferences.glade.h:7
+#: ../data/ui/preferences.ui.h:4
msgid "Editor"
msgstr "ã?¨ã??ã?£ã?¿"
-#: ../data/ui/preferences.glade.h:8
+#: ../data/ui/preferences.ui.h:5
msgid "Enable text _wrapping"
msgstr "æ??å?å??ã?®æ??ã??è¿?ã??ã??æ??å?¹ã?«ã??ã??(_W)"
-#: ../data/ui/preferences.glade.h:9
+#: ../data/ui/preferences.ui.h:6
msgid "Encoding"
msgstr "ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°"
-#: ../data/ui/preferences.glade.h:10
+#: ../data/ui/preferences.ui.h:7
+msgid "External editor"
+msgstr "å¤?é?¨ã?¨ã??ã?£ã?¿"
+
+#: ../data/ui/preferences.ui.h:8
msgid "File Filters"
msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?£ã?«ã?¿"
-#: ../data/ui/preferences.glade.h:11
+#: ../data/ui/preferences.ui.h:9
+msgid "Font"
+msgstr "ã??ã?©ã?³ã??"
+
+#: ../data/ui/preferences.ui.h:10
msgid "Ignore changes which insert or delete blank lines"
-msgstr "空è¡?ã?®æ?¿å?¥/å??é?¤ã??ç?¡è¦?ã??ã??"
+msgstr "空è¡?ã?®æ?¿å?¥ã??å??é?¤ã??ç?¡è¦?ã??ã??"
-#: ../data/ui/preferences.glade.h:12
+#: ../data/ui/preferences.ui.h:11
msgid "Ignore symbolic links"
msgstr "ã?·ã?³ã??ã?ªã??ã?¯ã?»ã?ªã?³ã?¯ã??ç?¡è¦?ã??ã??"
-#: ../data/ui/preferences.glade.h:13
+#: ../data/ui/preferences.ui.h:12
+msgid "Loading"
+msgstr "èªã?¿è¾¼ã?¿"
+
+#: ../data/ui/preferences.ui.h:13
msgid "Meld Preferences"
msgstr "Meld ã?®è¨å®?"
-#: ../data/ui/preferences.glade.h:14
+#: ../data/ui/preferences.ui.h:14
msgid "Show _line numbers"
msgstr "è¡?ç?ªå?·ã??表示ã??ã??(_L)"
-#: ../data/ui/preferences.glade.h:15
+#: ../data/ui/preferences.ui.h:15
+msgid "Show w_hitespace"
+msgstr "空ç?½ã??æ?¹è¡?ã??表示ã??ã??(_H)"
+
+#: ../data/ui/preferences.ui.h:16
msgid "Text Filters"
msgstr "æ??å?å??ã?®ã??ã?£ã?«ã?¿"
-#: ../data/ui/preferences.glade.h:16
+#: ../data/ui/preferences.ui.h:17
msgid "Use _default system editor"
msgstr "ã?·ã?¹ã??ã? ã?§ã??ã??ã?©ã?«ã??ã?®ã?¨ã??ã?£ã?¿ã??使ç?¨ã??ã??(_D)"
-#: ../data/ui/preferences.glade.h:17
+#: ../data/ui/preferences.ui.h:18
msgid "Use s_yntax highlighting"
msgstr "æ??æ³?ã??強調表示ã??ã??(_Y)"
-#: ../data/ui/preferences.glade.h:18
+#: ../data/ui/preferences.ui.h:19
msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
msgstr ""
"ã??ã?¡ã?¤ã?«ã??èªã??è¾¼ã??é??ã?«ã??次ã?®é ?ç?ªã?§ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã??試è¡?ã??ã?¾ã?? (ä¾?: utf8 "
"iso8859)"
-#: ../data/ui/preferences.glade.h:19
+#: ../data/ui/preferences.ui.h:20
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -250,7 +269,7 @@ msgstr ""
"ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã?®ã??ã?¿ã?¼ã?³ã?¯ã??ã??ã??ã??ã??ã?¹ã??ã?¼ã?¹ã?§å?ºå??ã?£ã?? SHELL å??å¼?ã?®ã?¯ã?¤ã?«ã??"
"ã?«ã?¼ã??ã?®ä¸¦ã?³ã?§ã??ã??"
-#: ../data/ui/preferences.glade.h:20
+#: ../data/ui/preferences.ui.h:21
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -264,164 +283,160 @@ msgstr ""
"ã??ã??該å½?ã??ã??ã?°ã?«ã?¼ã??ã?®æ??å?å??ã? ã??ç½®ã??æ??ã??ã?¾ã??ã??詳細ã?¯ã?¦ã?¼ã?¶ã?¼ã?ºã?»ã??ã??ã?¥ã?¢ã?«ã??"
"ã??覧ä¸?ã??ã??ã??"
-#: ../data/ui/preferences.glade.h:21
-msgid "_Automatically supply missing newline at end of file"
-msgstr "è?ªå??ç??ã?«ã??ã?¡ã?¤ã?«ã?®çµ?端ã?«æ?¹è¡?ã??追å? ã??ã??(_A)"
-
-#: ../data/ui/preferences.glade.h:22
+#: ../data/ui/preferences.ui.h:22
msgid "_Editor font:"
msgstr "ã?¨ã??ã?£ã?¿ã?®ã??ã?©ã?³ã??(_E):"
-#: ../data/ui/preferences.glade.h:23
+#: ../data/ui/preferences.ui.h:23
msgid "_Insert spaces instead of tabs"
msgstr "ã?¿ã??ã?®ä»£ã??ã??ã?«ç©ºç?½ã??æ?¿å?¥ã??ã??(_I)"
-#: ../data/ui/preferences.glade.h:24
+#: ../data/ui/preferences.ui.h:24
msgid "_Tab width:"
msgstr "ã?¿ã??ã?®å¹?(_T):"
-#: ../data/ui/preferences.glade.h:25
+#: ../data/ui/preferences.ui.h:25
msgid "_Use the system fixed width font"
msgstr "ã?·ã?¹ã??ã? ã?®å?ºå®?ã??ã?©ã?³ã??ã??使ã??(_U)"
-#: ../data/ui/vcview.glade.h:1
+#: ../data/ui/vcview.ui.h:1
msgid "Commit Files"
msgstr "ã??ã?¡ã?¤ã?«ã?®ã?³ã??ã??ã??"
-#: ../data/ui/vcview.glade.h:2
+#: ../data/ui/vcview.ui.h:2
msgid "Compare Options"
msgstr "æ¯?è¼?ã?®ã?ªã??ã?·ã?§ã?³"
-#: ../data/ui/vcview.glade.h:3
+#: ../data/ui/vcview.ui.h:3
msgid "Date"
msgstr "��"
-#: ../data/ui/vcview.glade.h:4
+#: ../data/ui/vcview.ui.h:4
msgid "Local copy against other remote revision"
msgstr "ã?ªã?¢ã?¼ã??ã?®ä»?ã?®ã?ªã??ã?¸ã?§ã?³ã??ã?ã?¼ã?«ã?«ã?¸ã?³ã??ã?¼ã??ã??"
-#: ../data/ui/vcview.glade.h:5
+#: ../data/ui/vcview.ui.h:5
msgid "Local copy against same remote revision"
msgstr "ã?ªã?¢ã?¼ã??ã?®å??ã??ã?ªã??ã?¸ã?§ã?³ã??ã?ã?¼ã?«ã?«ã?¸ã?³ã??ã?¼ã??ã??"
-#: ../data/ui/vcview.glade.h:6
+#: ../data/ui/vcview.ui.h:6
msgid "Log Message"
msgstr "ã?ã?°ã?»ã?¡ã??ã?»ã?¼ã?¸"
-#: ../data/ui/vcview.glade.h:7
+#: ../data/ui/vcview.ui.h:7
msgid "Previous Logs"
msgstr "å??ã?®ã?ã?°"
-#: ../data/ui/vcview.glade.h:8 ../meld/vcview.py:183
+#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
msgid "Tag"
msgstr "ã?¿ã?°"
-#: ../data/ui/vcview.glade.h:9
+#: ../data/ui/vcview.ui.h:9
msgid "VC Log"
msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?®ã?ã?°"
-#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:142 ../meld/vcview.py:118
msgid "_Compare"
msgstr "��"
-#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:142 ../meld/vcview.py:118
msgid "Compare selected"
msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã?¾ã??"
-#: ../meld/dirdiff.py:185
+#: ../meld/dirdiff.py:143
msgid "Left"
msgstr "å·¦ã?¸ã?³ã??ã?¼"
-#: ../meld/dirdiff.py:185
+#: ../meld/dirdiff.py:143
msgid "Copy To Left"
msgstr "å·¦ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
-#: ../meld/dirdiff.py:186
+#: ../meld/dirdiff.py:144
msgid "Right"
msgstr "å?³ã?¸ã?³ã??ã?¼"
-#: ../meld/dirdiff.py:186
+#: ../meld/dirdiff.py:144
msgid "Copy To Right"
msgstr "å?³ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
-#: ../meld/dirdiff.py:187
+#: ../meld/dirdiff.py:145
msgid "Delete selected"
msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã?ªã?©ã??å??é?¤ã??ã?¾ã??"
-#: ../meld/dirdiff.py:188 ../meld/filediff.py:840
+#: ../meld/dirdiff.py:146 ../meld/filediff.py:963
msgid "Hide"
msgstr "é? ã??"
-#: ../meld/dirdiff.py:188
+#: ../meld/dirdiff.py:146
msgid "Hide selected"
msgstr "é?¸æ??ç¯?å?²ã??é? ã??ã?¾ã??"
-#: ../meld/dirdiff.py:190 ../meld/filediff.py:179 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:148 ../meld/filediff.py:246 ../meld/vcview.py:119
msgid "Open selected"
msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??"
-#: ../meld/dirdiff.py:194
+#: ../meld/dirdiff.py:152
msgid "Case"
msgstr "大/å°?æ??å?"
-#: ../meld/dirdiff.py:194
+#: ../meld/dirdiff.py:152
msgid "Ignore case of entries"
msgstr "大/å°?æ??å?ã??ç?¡è¦?ã??ã?¾ã??"
-#: ../meld/dirdiff.py:195
+#: ../meld/dirdiff.py:153
msgid "Same"
msgstr "å??ã??é?¨å??"
-#: ../meld/dirdiff.py:195
+#: ../meld/dirdiff.py:153
msgid "Show identical"
msgstr "ä¸?è?´ã??ã??é?¨å??ã??表示ã??ã?¾ã??"
-#: ../meld/dirdiff.py:196
+#: ../meld/dirdiff.py:154
msgid "New"
msgstr "æ?°ã??ã??é?¨å??"
-#: ../meld/dirdiff.py:196
+#: ../meld/dirdiff.py:154
msgid "Show new"
msgstr "æ?°è¦?ã?®é?¨å??ã??表示ã??ã?¾ã??"
-#: ../meld/dirdiff.py:197
+#: ../meld/dirdiff.py:155
msgid "Modified"
msgstr "���"
-#: ../meld/dirdiff.py:197 ../meld/vcview.py:139
+#: ../meld/dirdiff.py:155 ../meld/vcview.py:132
msgid "Show modified"
msgstr "å¤?æ?´ã?®ã??ã??ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
-#: ../meld/dirdiff.py:199
+#: ../meld/dirdiff.py:157
msgid "Filters"
msgstr "ã??ã?£ã?«ã?¿"
-#: ../meld/dirdiff.py:199
+#: ../meld/dirdiff.py:157
msgid "Set active filters"
msgstr "ã??ã?£ã?«ã?¿ã??é?¸æ??ã??ã?¾ã??"
-#: ../meld/dirdiff.py:252 ../meld/dirdiff.py:298
+#: ../meld/dirdiff.py:213 ../meld/dirdiff.py:259
#, python-format
msgid "Error converting pattern '%s' to regular expression"
msgstr "'%s' ã?¨ã??ã??ã??ã?¿ã?¼ã?³ã??æ£è¦?表ç?¾ã?«å¤?æ??ã??ã??é??ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
-#: ../meld/dirdiff.py:309
+#: ../meld/dirdiff.py:270
#, python-format
msgid "Hide %s"
msgstr "%sã?®è¡¨ç¤ºã??å??ã??æ?¿ã??ã?¾ã??"
-#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:276
-#: ../meld/vcview.py:304
+#: ../meld/dirdiff.py:355 ../meld/dirdiff.py:365 ../meld/vcview.py:299
+#: ../meld/vcview.py:327
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] %s ã?®ã?¹ã?ã?£ã?³ä¸"
-#: ../meld/dirdiff.py:433
+#: ../meld/dirdiff.py:394
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "'%s' ã?¯ '%s' ã?«ã??ã?£ã?¦é? ã??ã??ã?¦ã??ã?¾ã??"
-#: ../meld/dirdiff.py:439
+#: ../meld/dirdiff.py:400
#, python-format
msgid ""
"You are running a case insensitive comparison on a case sensitive "
@@ -432,12 +447,12 @@ msgstr ""
"ã??ã??ã??ã??ã?¤ã??ã?®ã??ã?¡ã?¤ã?«ã?¯è¡¨ç¤ºã??ã??ã?¾ã??ã??:\n"
"%s"
-#: ../meld/dirdiff.py:516
+#: ../meld/dirdiff.py:477
#, python-format
msgid "[%s] Done"
msgstr "[%s] ��"
-#: ../meld/dirdiff.py:562
+#: ../meld/dirdiff.py:523
#, python-format
msgid ""
"'%s' exists.\n"
@@ -446,7 +461,7 @@ msgstr ""
"'%s' ã?¯å?å?¨ã??ã?¾ã??ã??\n"
"ä¸?æ?¸ã??ã??ã?¾ã??ã??ï¼?"
-#: ../meld/dirdiff.py:569
+#: ../meld/dirdiff.py:530
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -457,7 +472,7 @@ msgstr ""
"\n"
"%s"
-#: ../meld/dirdiff.py:587 ../meld/vcview.py:463
+#: ../meld/dirdiff.py:548 ../meld/vcview.py:486
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -466,7 +481,7 @@ msgstr ""
"'%s' ã?¯ã??ã?©ã?«ã??ã?§ã??ã??\n"
"å??帰ç??ã?«å??é?¤ã??ã?¾ã??ã??ï¼?"
-#: ../meld/dirdiff.py:594 ../meld/vcview.py:468
+#: ../meld/dirdiff.py:555 ../meld/vcview.py:491
#, python-format
msgid ""
"Error removing %s\n"
@@ -477,140 +492,192 @@ msgstr ""
"\n"
"%s"
-#: ../meld/dirdiff.py:606
+#: ../meld/dirdiff.py:567
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
-msgstr[0] " %i�"
-msgstr[1] " %i�"
+msgstr[0] "%i�"
+msgstr[1] "%i�"
-#: ../meld/dirdiff.py:607
+#: ../meld/dirdiff.py:568
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
-msgstr[0] " %iå??"
-msgstr[1] " %iå??"
+msgstr[0] "%iå??"
+msgstr[1] "%iå??"
-#: ../meld/dirdiff.py:608
+#: ../meld/dirdiff.py:569
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
-msgstr[0] " %iæ??é??"
-msgstr[1] " %iæ??é??"
+msgstr[0] "%iæ??é??"
+msgstr[1] "%iæ??é??"
-#: ../meld/dirdiff.py:609
+#: ../meld/dirdiff.py:570
#, python-format
msgid "%i day"
msgid_plural "%i days"
-msgstr[0] " %iæ?¥"
-msgstr[1] " %iæ?¥"
+msgstr[0] "%iæ?¥"
+msgstr[1] "%iæ?¥"
-#: ../meld/dirdiff.py:610
+#: ../meld/dirdiff.py:571
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
-msgstr[0] " %ié?±é??"
-msgstr[1] " %ié?±é??"
+msgstr[0] "%ié?±é??"
+msgstr[1] "%ié?±é??"
-#: ../meld/dirdiff.py:611
+#: ../meld/dirdiff.py:572
#, python-format
msgid "%i month"
msgid_plural "%i months"
-msgstr[0] " %iã?¶æ??"
-msgstr[1] " %iã?¶æ??"
+msgstr[0] "%iã?¶æ??"
+msgstr[1] "%iã?¶æ??"
-#: ../meld/dirdiff.py:612
+#: ../meld/dirdiff.py:573
#, python-format
msgid "%i year"
msgid_plural "%i years"
-msgstr[0] " %iå¹´"
-msgstr[1] " %iå¹´"
+msgstr[0] "%iå¹´"
+msgstr[1] "%iå¹´"
-#: ../meld/filediff.py:180
-msgid "Create a patch"
-msgstr "ã??ã??ã??ã??ç??æ??ã??ã?¾ã??"
+#: ../meld/filediff.py:247
+msgid "Format as patch..."
+msgstr "ã??ã??ã??ã?®ç??æ??..."
+
+#: ../meld/filediff.py:247
+msgid "Create a patch using differences between files"
+msgstr "ã??ã?¡ã?¤ã?«é??ã?®å·®å??ã??ã??ã??ã??ã??ã??ç??æ??ã??ã?¾ã??"
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:248
+msgid "Previous conflict"
+msgstr "å??ã?®è¡?çª?ç®?æ??"
+
+#: ../meld/filediff.py:248
+msgid "Go to the previous conflict"
+msgstr "å??ã?®è¡?çª?ç®?æ??ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
+
+#: ../meld/filediff.py:249
+msgid "Next conflict"
+msgstr "次ã?®è¡?çª?ç®?æ??"
+
+#: ../meld/filediff.py:249
+msgid "Go to the next conflict"
+msgstr "次ã?®è¡?çª?ç®?æ??ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
+
+#: ../meld/filediff.py:250
msgid "Push to left"
msgstr "å·¦å?´ã?¸é?©ç?¨ã??ã??"
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:250
msgid "Push current change to the left"
msgstr "ç?¾å?¨ã?®å¤?æ?´ã??å·¦å?´ã?¸ã??é?©ç?¨ã??ã?¾ã??"
-#: ../meld/filediff.py:182
+#: ../meld/filediff.py:251
msgid "Push to right"
msgstr "å?³å?´ã?¸é?©ç?¨ã??ã??"
-#: ../meld/filediff.py:182
+#: ../meld/filediff.py:251
msgid "Push current change to the right"
msgstr "ç?¾å?¨ã?®å¤?æ?´ã??å?³å?´ã?«ã??é?©ç?¨ã??ã?¾ã??"
#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:184
+#: ../meld/filediff.py:253
msgid "Pull from left"
msgstr "å·¦å?´ã?®ã?ã?£ã?³ã?»ã?«"
-#: ../meld/filediff.py:184
+#: ../meld/filediff.py:253
msgid "Pull change from the left"
msgstr "å·¦å?´ã?®å¤?æ?´ç?¹ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??"
-#: ../meld/filediff.py:185
+#: ../meld/filediff.py:254
msgid "Pull from right"
msgstr "å?³å?´ã?®ã?ã?£ã?³ã?»ã?«"
-#: ../meld/filediff.py:185
+#: ../meld/filediff.py:254
msgid "Pull change from the right"
msgstr "å?³å?´ã?®å¤?æ?´ç?¹ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??"
-#: ../meld/filediff.py:186
+#: ../meld/filediff.py:255
+msgid "Copy above left"
+msgstr "å·¦ã?®ä¸?ã?«ã?³ã??ã?¼ã??ã??"
+
+#: ../meld/filediff.py:255
+msgid "Copy change above the left chunk"
+msgstr "å·¦å?´ã?«ã??ã??å¤?æ?´ç?¹ã?®ä¸?ã?«ã?³ã??ã?¼ã??ã?¾ã??"
+
+#: ../meld/filediff.py:256
+msgid "Copy below left"
+msgstr "å·¦ã?®ä¸?ã?«ã?³ã??ã?¼ã??ã??"
+
+#: ../meld/filediff.py:256
+msgid "Copy change below the left chunk"
+msgstr "å·¦å?´ã?«ã??ã??å¤?æ?´ç?¹ã?®ä¸?ã?«ã?³ã??ã?¼ã??ã?¾ã??"
+
+#: ../meld/filediff.py:257
+msgid "Copy above right"
+msgstr "å?³ã?®ä¸?ã?«ã?³ã??ã?¼ã??ã??"
+
+#: ../meld/filediff.py:257
+msgid "Copy change above the right chunk"
+msgstr "å?³å?´ã?«ã??ã??å¤?æ?´ç?¹ã?®ä¸?ã?«ã?³ã??ã?¼ã??ã?¾ã??"
+
+#: ../meld/filediff.py:258
+msgid "Copy below right"
+msgstr "å?³ã?®ä¸?ã?«ã?³ã??ã?¼ã??ã??"
+
+#: ../meld/filediff.py:258
+msgid "Copy change below the right chunk"
+msgstr "å?³å?´ã?«ã??ã??å¤?æ?´ç?¹ã?®ä¸?ã?«ã?³ã??ã?¼ã??ã?¾ã??"
+
+#: ../meld/filediff.py:259
msgid "Delete"
msgstr "å??é?¤"
-#: ../meld/filediff.py:186
+#: ../meld/filediff.py:259
msgid "Delete change"
msgstr "å¤?æ?´ç?¹ã??å??é?¤ã??ã?¾ã??"
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:260
msgid "Merge all changes from left"
msgstr "å·¦å?´ã?®å¤?æ?´ç?¹ã?®ã??ã?¼ã?¸"
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:260
msgid "Merge all non-conflicting changes from the left"
msgstr "å·¦å?´ã?«ã??ã?? (è¡?çª?ã??ã??ã??ã?¨ã?®ã?ªã??) å¤?æ?´ç?¹ã??å?¨ã?¦ã??ã?¼ã?¸ã??ã?¾ã??"
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:261
msgid "Merge all changes from right"
msgstr "å?³å?´ã?®å¤?æ?´ç?¹ã?®ã??ã?¼ã?¸"
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:261
msgid "Merge all non-conflicting changes from the right"
msgstr "å·¦å?´ã?«ã??ã?? (è¡?çª?ã??ã??ã??ã?¨ã?®ã?ªã??) å¤?æ?´ç?¹ã??å?¨ã?¦ã??ã?¼ã?¸ã??ã?¾ã??"
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:262
msgid "Merge all non-conflicting"
msgstr "å?¨ã?¦ã?®å¤?æ?´ç?¹ã?®ã??ã?¼ã?¸"
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:262
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
+#: ../meld/filediff.py:333
msgid "INS"
msgstr "[æ?¿å?¥]"
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:333
msgid "OVR"
msgstr "[ä¸?æ?¸ã??]"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:335
#, python-format
msgid "Ln %i, Col %i"
msgstr "(%iè¡?ã??%iå??)"
-#: ../meld/filediff.py:433
+#: ../meld/filediff.py:537
#, python-format
msgid ""
"Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -620,54 +687,54 @@ msgstr ""
"ç´°ã?¯ã?¦ã?¼ã?¶ã?¼ã?ºã?»ã??ã??ã?¥ã?¢ã?«ã??ã??覧ä¸?ã??ã??ã??"
#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:530
+#: ../meld/filediff.py:645
msgid "<unnamed>"
msgstr "<å??å??ã?ªã??>"
-#: ../meld/filediff.py:705
+#: ../meld/filediff.py:828
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] ç?ªå?·ã??ã?¤ã?³ã?®ã?»ã??ã??"
-#: ../meld/filediff.py:711
+#: ../meld/filediff.py:834
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] ã??ã?¡ã?¤ã?«ã?®ã?ªã?¼ã??ã?³ä¸"
-#: ../meld/filediff.py:717 ../meld/filediff.py:844
+#: ../meld/filediff.py:840 ../meld/filediff.py:967
msgid "Hi_de"
msgstr "é? ã??(_D)"
-#: ../meld/filediff.py:738 ../meld/filediff.py:749 ../meld/filediff.py:762
-#: ../meld/filediff.py:768
+#: ../meld/filediff.py:861 ../meld/filediff.py:870 ../meld/filediff.py:882
+#: ../meld/filediff.py:888
msgid "Could not read file"
msgstr "ã??ã?¡ã?¤ã?«ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??"
-#: ../meld/filediff.py:741
+#: ../meld/filediff.py:862
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] ã??ã?¡ã?¤ã?«ã?®èªã?¿è¾¼ã?¿ä¸"
-#: ../meld/filediff.py:750
+#: ../meld/filediff.py:871
#, python-format
msgid "%s appears to be a binary file."
msgstr "%s ã?¯ã??ã?¤ã??ã?ªã?»ã??ã?¡ã?¤ã?«ã?®ã??ã??ã?§ã??"
-#: ../meld/filediff.py:763
+#: ../meld/filediff.py:883
#, python-format
msgid "%s is not in encodings: %s"
msgstr "%s ã?¯æ¬¡ã?®ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?§ã?¯ã??ã??ã?¾ã??ã??: %s"
-#: ../meld/filediff.py:789 ../meld/filemerge.py:70
+#: ../meld/filediff.py:913 ../meld/filemerge.py:69
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] å·®å??ã?®è¨?ç®?ä¸"
-#: ../meld/filediff.py:838
+#: ../meld/filediff.py:961
msgid "Files are identical"
msgstr "å??ä¸?ã?®ã??ã?¡ã?¤ã?«ã?§ã??"
-#: ../meld/filediff.py:972
+#: ../meld/filediff.py:1096
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -676,7 +743,7 @@ msgstr ""
"\"%s\" ã?¯å?å?¨ã??ã?¦ã??ã?¾ã??ï¼?\n"
"ä¸?æ?¸ã??ã??ã?¾ã??ã??ï¼?"
-#: ../meld/filediff.py:985
+#: ../meld/filediff.py:1109
#, python-format
msgid ""
"Error writing to %s\n"
@@ -687,12 +754,12 @@ msgstr ""
"\n"
"%s"
-#: ../meld/filediff.py:994
+#: ../meld/filediff.py:1118
#, python-format
msgid "Choose a name for buffer %i."
msgstr "ã??ã??ã??ã?¡ %i ã?®å??å??ã?®é?¸æ??"
-#: ../meld/filediff.py:1008
+#: ../meld/filediff.py:1133
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -703,7 +770,7 @@ msgstr ""
"\n"
"ã?©ã?®ã??ã?©ã?¼ã??ã??ã??ã??使ç?¨ã??ã?¾ã??ã??ï¼?"
-#: ../meld/filediff.py:1024
+#: ../meld/filediff.py:1149
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -712,12 +779,7 @@ msgstr ""
"'%s' ã?«ã?¯ '%s' ã?§ã?¨ã?³ã?³ã?¼ã??ã??ã??ã?¦ã??ã?ªã??æ??å?ã??å?«ã?¾ã??ã?¦ã??ã?¾ã??ã??\n"
"UTF-8 ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?¨ã??ã?¦ä¿?å?ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
-#. save as
-#: ../meld/filediff.py:1061
-msgid "Save patch as..."
-msgstr "å?¥å??ã?§ã??ã??ã??ã?®ä¿?å?..."
-
-#: ../meld/filediff.py:1108
+#: ../meld/filediff.py:1208
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -730,255 +792,258 @@ msgstr ""
"\n"
"ã??ã?®æ??ä½?ã??å??ã?«æ?»ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??ã??"
-#: ../meld/filemerge.py:78
+#: ../meld/filemerge.py:82
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] ã??ã?¡ã?¤ã?«ã?®ã??ã?¼ã?¸ä¸"
-#: ../meld/meldapp.py:139
+#: ../meld/meldapp.py:132
msgid "_File"
msgstr "ã??ã?¡ã?¤ã?«(_F)"
-#: ../meld/meldapp.py:140
+#: ../meld/meldapp.py:133
msgid "_New..."
msgstr "��(_N)..."
-#: ../meld/meldapp.py:140
+#: ../meld/meldapp.py:133
msgid "Start a new comparison"
msgstr "æ?°ã??ã??æ¯?è¼?ã??é??å§?ã??ã?¾ã??"
-#: ../meld/meldapp.py:141
+#: ../meld/meldapp.py:134
msgid "Save the current file"
msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã?¾ã??"
-#: ../meld/meldapp.py:143
+#: ../meld/meldapp.py:136
msgid "Close the current file"
msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??"
-#: ../meld/meldapp.py:144
+#: ../meld/meldapp.py:137
msgid "Quit the program"
msgstr "ã??ã?ã?°ã?©ã? ã??çµ?äº?ã??ã?¾ã??"
-#: ../meld/meldapp.py:146
+#: ../meld/meldapp.py:139
msgid "_Edit"
msgstr "ç·¨é??(_E)"
-#: ../meld/meldapp.py:147
+#: ../meld/meldapp.py:140
msgid "Undo the last action"
msgstr "æ??å¾?ã?«é?©ç?¨ã??ã??ã?¢ã?¯ã?·ã?§ã?³ã?«æ?»ã??ã?¾ã??"
-#: ../meld/meldapp.py:148
+#: ../meld/meldapp.py:141
msgid "Redo the last undone action"
msgstr "æ??å¾?ã?«é?©ç?¨ã??ã??ã?¢ã?¯ã?·ã?§ã?³ã??ã??ã??ç?´ã??ã?¾ã??"
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:142
msgid "Cut the selection"
msgstr "é?¸æ??ç¯?å?²ã??å??ã??å??ã??ã?¾ã??"
-#: ../meld/meldapp.py:150
+#: ../meld/meldapp.py:143
msgid "Copy the selection"
msgstr "é?¸æ??ç¯?å?²ã??ã?³ã??ã?¼ã??ã?¾ã??"
-#: ../meld/meldapp.py:151
+#: ../meld/meldapp.py:144
msgid "Paste the clipboard"
msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?®å??容ã??è²¼ã??ä»?ã??ã?¾ã??"
-#: ../meld/meldapp.py:152
+#: ../meld/meldapp.py:145
msgid "Search for text"
msgstr "æ¤?ç´¢ã??ã??æ??å?å??:"
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:146
msgid "Find Ne_xt"
msgstr "次��索(_X)"
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:146
msgid "Search forwards for the same text"
msgstr "å??æ?¹ã??æ¤?ç´¢ã??ã?¾ã??"
-#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:147
msgid "Find and replace text"
msgstr "æ??å?å??ã??æ¤?ç´¢ã??ã?¦ç½®æ??ã??ã?¾ã??"
-#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:148
msgid "Prefere_nces"
msgstr "è¨å®?(_N)"
-#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:148
msgid "Configure the application"
msgstr "Meld ã??è¨å®?ã??ã?¾ã??"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:150
msgid "_Changes"
msgstr "���(_C)"
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:151
msgid "Next change"
msgstr "次����"
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:151
msgid "Go to the next change"
msgstr "次ã?®å¤?æ?´ç?¹ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
-#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:152
msgid "Previous change"
msgstr "å??ã?®å¤?æ?´ç?¹"
-#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:152
msgid "Go to the previous change"
msgstr "å??ã?®å¤?æ?´ç?¹ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
-#: ../meld/meldapp.py:161
+#: ../meld/meldapp.py:154
msgid "_View"
msgstr "表示(_V)"
-#: ../meld/meldapp.py:162
+#: ../meld/meldapp.py:155
msgid "File status"
msgstr "ã??ã?¡ã?¤ã?«ã?®ç?¶æ??"
-#: ../meld/meldapp.py:163
+#: ../meld/meldapp.py:156
msgid "Version status"
msgstr "ã??ã?¼ã?¸ã?§ã?³"
-#: ../meld/meldapp.py:164
+#: ../meld/meldapp.py:157
msgid "File filters"
msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?£ã?«ã?¿"
-#: ../meld/meldapp.py:165
+#: ../meld/meldapp.py:158
msgid "Stop the current action"
msgstr "ç?¾å?¨é?©ç?¨ä¸ã?®ã?¢ã?¯ã?·ã?§ã?³ã??å??æ¢ã??ã?¾ã??"
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:159
msgid "Refresh the view"
msgstr "表示ã??æ?´æ?°ã??ã?¾ã??"
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:160
msgid "Reload"
msgstr "å??èªè¾¼ã?¿"
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:160
msgid "Reload the comparison"
msgstr "æ¯?è¼?å??容ã??æ?´æ?°ã??ã?¾ã??"
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:162
msgid "_Help"
msgstr "ã??ã?«ã??(_H)"
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:163
msgid "_Contents"
msgstr "�次(_C)"
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:163
msgid "Open the Meld manual"
msgstr "Meld ã??ã??ã?¥ã?¢ã?«é??ã??ã?¾ã??"
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:164
msgid "Report _Bug"
msgstr "ã??ã?°ã?®å ±å??(_B)"
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:164
msgid "Report a bug in Meld"
msgstr "Meld ã?®ã??ã?°ã??å ±å??ã??ã?¾ã??"
-#: ../meld/meldapp.py:172
+#: ../meld/meldapp.py:165
msgid "About this program"
msgstr "ã??ã?®ã??ã?ã?°ã?©ã? ã?«ã?¤ã??ã?¦"
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:168
msgid "Full Screen"
msgstr "ã??ã?«ã?¹ã?¯ã?ªã?¼ã?³è¡¨ç¤º"
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:168
msgid "View the comparison in full screen"
msgstr "æ¯?è¼?ç?¶æ³?ã??ã??ã?«ã?¹ã?¯ã?ªã?¼ã?³ã?§è¡¨ç¤ºã??ã?¾ã??"
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:169
msgid "_Toolbar"
msgstr "ã??ã?¼ã?«ã??ã?¼(_T)"
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:169
msgid "Show or hide the toolbar"
msgstr "ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤ºã?? ON/OFF ã??ã?¾ã??"
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:170
msgid "_Statusbar"
msgstr "ã?¹ã??ã?¼ã?¿ã?¹ã??ã?¼(_S)"
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:170
msgid "Show or hide the statusbar"
msgstr "ã?¹ã??ã?¼ã?¿ã?¹ã??ã?¼ã?®è¡¨ç¤ºã?? ON/OFF ã??ã?¾ã??"
#. exit at first non found directory + file
-#: ../meld/meldapp.py:533
+#: ../meld/meldapp.py:544
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?®é??ã?§ã?®æ¯?è¼?ã?¯ã?§ã??ã?¾ã??ã??ã??\n"
-#: ../meld/meldapp.py:587
+#: ../meld/meldapp.py:599
msgid "wrong number of arguments supplied to --diff"
msgstr "--diff ã?ªã??ã?·ã?§ã?³ã?«å¯¾ã??ã??å¼?æ?°ã?®æ?°ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-#: ../meld/meldapp.py:591
+#: ../meld/meldapp.py:603
msgid "Start with an empty window"
msgstr "ä½?ã??é??ã??ã??ã?« Meld ã??èµ·å??ã??ã??"
-#: ../meld/meldapp.py:592 ../meld/meldapp.py:593 ../meld/meldapp.py:595
+#: ../meld/meldapp.py:604 ../meld/meldapp.py:605 ../meld/meldapp.py:607
msgid "file"
msgstr "FILE"
-#: ../meld/meldapp.py:592 ../meld/meldapp.py:594 ../meld/meldapp.py:595
+#: ../meld/meldapp.py:604 ../meld/meldapp.py:606 ../meld/meldapp.py:607
msgid "dir"
msgstr "DIR"
-#: ../meld/meldapp.py:592
+#: ../meld/meldapp.py:604
msgid "Start a version control comparison"
msgstr "ã??ã?¼ã?¸ã?§ã?³ç®¡ç??ã?®æ¯?è¼?ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
-#: ../meld/meldapp.py:593
+#: ../meld/meldapp.py:605
msgid "Start a 2- or 3-way file comparison"
msgstr "ï¼?ã?ªã??ã??ï¼?å??ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
-#: ../meld/meldapp.py:594
+#: ../meld/meldapp.py:606
msgid "Start a 2- or 3-way directory comparison"
msgstr "ï¼?ã?ªã??ã??ï¼?å??ã?®ã??ã?©ã?«ã??ã??æ¯?è¼?ã??ã??ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
-#: ../meld/meldapp.py:595
+#: ../meld/meldapp.py:607
msgid "Start a comparison between file and dir/file"
msgstr "ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?¨ã??æ¯?è¼?ã??ã??ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
-#: ../meld/meldapp.py:601
+#: ../meld/meldapp.py:613
msgid "Meld is a file and directory comparison tool."
msgstr "Meld ã?¯ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?®å??容ã??æ¯?è¼?ã??ã??ã??ã?¼ã?«ã?§ã??:"
-#: ../meld/meldapp.py:604
+#: ../meld/meldapp.py:616
msgid "Set label to use instead of file name"
msgstr "ã??ã?¡ã?¤ã?«å??ã?®ä»£ã??ã??ã?«ä½¿ç?¨ã??ã??ã?©ã??ã?«ã??æ??å®?ã??ã??"
-#: ../meld/meldapp.py:606
+#: ../meld/meldapp.py:618
msgid "Automatically compare all differing files on startup"
msgstr "èµ·å??æ??ã?«ã??ã?¡ã?¤ã?«ã?®ä¸ã?«ã??ã??å?¨ã?¦å·®å??ã??è?ªå??ç??ã?«æ¤?å?ºã??ã??"
-#: ../meld/meldapp.py:607 ../meld/meldapp.py:608 ../meld/meldapp.py:609
-#: ../meld/meldapp.py:610
-msgid "Ignored for compatibility"
-msgstr "äº?æ??æ?§ã??ç?¡è¦?ã??ã??"
+#: ../meld/meldapp.py:621
+msgid "Set the target file for saving a merge result"
+msgstr "ã??ã?¼ã?¸ã??ã??çµ?æ??ã??ä¿?å?ã??ã??é??ã?®ã??ã?¡ã?¤ã?«å??ã??æ??å®?ã??ã??"
-#: ../meld/meldapp.py:613
+#: ../meld/meldapp.py:624
msgid "Creates a diff tab for up to 3 supplied files or directories."
msgstr "æ??å®?ã??ã??æ??大ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«ã?¾ã??ã?¯ã??ã?©ã?«ã??ã?«å¯¾ã??ã??å·®å??ã??ã?¿ã??ã?§è¡¨ç¤ºã??ã??"
-#: ../meld/meldapp.py:616
+#: ../meld/meldapp.py:627
#, python-format
msgid "too many arguments (wanted 0-4, got %d)"
msgstr "å¼?æ?°ã??å¤?ã??ã??ã?¾ã?? (0ã??4å??ã??æ?³å®?ã??ã?¦ã??ã??ã??å®?é??ã?¯%då??)"
-#: ../meld/melddoc.py:47
+#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
msgid "untitled"
msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:189
+#: ../meld/misc.py:192
msgid "[None]"
msgstr "[ã?ªã??]"
+#: ../meld/patchdialog.py:119
+msgid "Save Patch As..."
+msgstr "å?¥å??ã?§ã??ã??ã??ã?®ä¿?å?..."
+
#: ../meld/preferences.py:81
msgid "label"
msgstr "(æ?°ã??ã??å??å??)"
@@ -987,7 +1052,7 @@ msgstr "(æ?°ã??ã??å??å??)"
msgid "pattern"
msgstr "(æ?°ã??ã??ã??ã?¿ã?¼ã?³)"
-#: ../meld/preferences.py:143
+#: ../meld/preferences.py:142
msgid "Only available if you have gnome-python-desktop installed"
msgstr ""
"'gnome-python-desktop' ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã??å ´å??ã?«ã?®ã?¿è¡?ç?ªå?·ã??表示ã??ã??ã??ã?¨ã??"
@@ -995,217 +1060,241 @@ msgstr ""
#. file filters
#. text filters
-#: ../meld/preferences.py:166 ../meld/preferences.py:171 ../meld/vcview.py:163
+#: ../meld/preferences.py:167 ../meld/preferences.py:172 ../meld/vcview.py:156
msgid "Name"
msgstr "å??å??"
-#: ../meld/preferences.py:166 ../meld/preferences.py:171
+#: ../meld/preferences.py:167 ../meld/preferences.py:172
msgid "Active"
msgstr "æ??å?¹"
-#: ../meld/preferences.py:166
+#: ../meld/preferences.py:167
msgid "Pattern"
msgstr "ã??ã?¿ã?¼ã?³"
-#: ../meld/preferences.py:171
+#: ../meld/preferences.py:172
msgid "Regex"
msgstr "æ£è¦?表ç?¾"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:268
+#: ../meld/preferences.py:269
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
+#: ../meld/preferences.py:271
#, 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
+#: ../meld/preferences.py:273
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
+#: ../meld/preferences.py:275
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
+#: ../meld/preferences.py:277
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
+#: ../meld/preferences.py:279
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
+#: ../meld/preferences.py:281
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
+#: ../meld/preferences.py:283
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
+#: ../meld/preferences.py:285
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
+#: ../meld/preferences.py:287
msgid "Script comment\t0\t#.*"
msgstr "ã?¹ã?¯ã?ªã??ã??ã?®ã?³ã?¡ã?³ã??\t0\t#.*"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:120
msgid "_Commit"
msgstr "ã?³ã??ã??ã??(_C)"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:120
msgid "Commit"
msgstr "ã?³ã??ã??ã??ã??ã?¾ã??"
#. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:121
msgid "_Update"
msgstr "æ?´æ?°(_U)"
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:121
msgid "Update"
msgstr "æ?´æ?°ã??ã?¾ã??"
#. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:122
msgid "_Add"
msgstr "追å? (_A)"
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:122
msgid "Add to VC"
msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?«è¿½å? ã??ã?¾ã??"
#. FIXME: popup used to use gtk.STOCK_ADD
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:123
msgid "Add _Binary"
msgstr "ã??ã?¤ã??ã?ªã?®è¿½å? (_B)"
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:123
msgid "Add binary to VC"
msgstr "ã??ã?¤ã??ã?ªã??ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?«è¿½å? ã??ã?¾ã??"
#. FIXME: stock is inconsistent with other VC actions
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:124
msgid "_Remove"
msgstr "å??é?¤(_R)"
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:124
msgid "Remove from VC"
msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã??ã??å??é?¤ã??ã?¾ã??"
#. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:125
msgid "_Resolved"
msgstr "解決�(_R)"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:125
msgid "Mark as resolved for VC"
msgstr "ã??ã?¼ã?¸ã?§ã?³ç®¡ç??ã?§è§£æ±ºæ¸?ã?¿ã?§ã??ã??ã?¨ã??ã??"
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:126
msgid "Revert to original"
msgstr "å??ã?«æ?»ã??ã?¾ã??"
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:127
msgid "Delete locally"
msgstr "ã?ã?¼ã?«ã?«ã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã??ã?¾ã??"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:131
msgid "_Flatten"
msgstr "�覧表示(_F)"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:131
msgid "Flatten directories"
msgstr "é??ä¸?ã?®ã??ã?©ã?«ã??ã??ç?¡è¦?ã??ã?¾ã??"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:132
msgid "_Modified"
-msgstr "���(_M)"
+msgstr "å¤?æ?´æ¸?ã?®ã??ã?®(_M)"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:133
msgid "_Normal"
-msgstr "��(_N)"
+msgstr "é??常ã?®ã??ã?®(_N)"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:133
msgid "Show normal"
msgstr "é??常ã?®ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:134
msgid "Non _VC"
msgstr "VC以�(_V)"
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:134
msgid "Show unversioned files"
msgstr "ã??ã?¼ã?¸ã?§ã?³ç®¡ç??å¤?ã?®ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:135
msgid "Ignored"
-msgstr "��"
+msgstr "ç?¡è¦?ã??ã??ã??ã?®"
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:135
msgid "Show ignored files"
msgstr "ç?¡è¦?ã??ã??ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:176 ../meld/vcview.py:295
msgid "Location"
msgstr "å ´æ??"
-#: ../meld/vcview.py:181
+#: ../meld/vcview.py:177
msgid "Status"
msgstr "ç?¶æ??"
-#: ../meld/vcview.py:182
+#: ../meld/vcview.py:178
msgid "Rev"
msgstr "ã?ªã??ã?¸ã?§ã?³"
-#: ../meld/vcview.py:184
+#: ../meld/vcview.py:180
msgid "Options"
msgstr "ã?ªã??ã?·ã?§ã?³"
-#: ../meld/vcview.py:230
+#: ../meld/vcview.py:227
msgid "Choose one Version Control"
msgstr "ï¼?ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?®é?¸æ??"
-#: ../meld/vcview.py:231
+#: ../meld/vcview.py:228
msgid "Only one Version Control in this directory"
msgstr "ã??ã?®ã??ã?©ã?«ã??ã?®ï¼?ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã? ã??"
-#: ../meld/vcview.py:320
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:241
+#, python-format
+msgid "%s Not Installed"
+msgstr "%s ã?¯ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?¾ã??ã??"
+
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:245
+msgid "Invalid Repository"
+msgstr "ã??ã??ã??ã?ªã?ªã??ã?¸ã??ã?ªã?§ã??"
+
+#: ../meld/vcview.py:254
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:295
+#, python-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: ../meld/vcview.py:343
msgid "(Empty)"
msgstr "(空)"
-#: ../meld/vcview.py:353
+#: ../meld/vcview.py:376
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] å·®å??ã?®å??å¾?ä¸"
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:383
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] ã??ã??ã??ã?®é?©ç?¨ä¸"
-#: ../meld/vcview.py:364
+#: ../meld/vcview.py:387
msgid "No differences found."
msgstr "å·®å??ã?¯ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
-#: ../meld/vcview.py:438
+#: ../meld/vcview.py:461
msgid "Select some files first."
msgstr "ã?¾ã??æ??å??ã?«ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
-#: ../meld/vcview.py:504
+#: ../meld/vcview.py:527
#, python-format
msgid ""
"\n"
@@ -1254,7 +1343,7 @@ msgstr ""
" ã??ã?¼ã?¸ã?§ã?³ã?§ç½®ã??æ??ã??ã?¦ä¸?ã??ã??\n"
" "
-#: ../meld/ui/findbar.py:119
+#: ../meld/ui/findbar.py:120
#, python-format
msgid ""
"Regular expression error\n"
@@ -1263,43 +1352,42 @@ msgstr ""
"æ£è¦?表ç?¾ã?¨ã?©ã?¼\n"
"'%s'"
-#: ../meld/ui/historyentry.py:248
+#: ../meld/ui/historyentry.py:290
msgid "_Browse..."
msgstr "å??ç?§(_B)..."
-#: ../meld/ui/historyentry.py:256
+#: ../meld/ui/historyentry.py:298
msgid "Path"
msgstr "ã??ã?¹"
-#: ../meld/ui/historyentry.py:257
+#: ../meld/ui/historyentry.py:299
msgid "Path to file"
msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?¹ã?§ã??"
-#: ../meld/ui/historyentry.py:258
+#: ../meld/ui/historyentry.py:300
msgid "Pop up a file selector to choose a file"
msgstr "ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã?¾ã??"
-#: ../meld/ui/historyentry.py:379
+#: ../meld/ui/historyentry.py:419
msgid "Select directory"
msgstr "ã??ã?©ã?«ã??ã?®é?¸æ??"
-#: ../meld/ui/historyentry.py:383
+#: ../meld/ui/historyentry.py:423
msgid "Select file"
msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
-#: ../meld/ui/notebooklabel.py:61
+#: ../meld/ui/notebooklabel.py:60
msgid "Close tab"
msgstr "ã??ã?®ã?¿ã??ã??é??ã??ã?¾ã??"
#. These are the possible states of files. Be sure to get the colons correct.
#: ../meld/vc/_vc.py:40
msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
-"Missing"
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
msgstr ""
-"Ignored:Unversioned:::Error::Newly added:Modified:<b>��</b>:Removed:Missing"
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
-#: ../meld/vc/cvs.py:151
+#: ../meld/vc/cvs.py:156
#, python-format
msgid ""
"Error converting to a regular expression\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
