[meld] 2009-10-18 Updated Japanese translation.
- From: Takeshi Aihana <aihana src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [meld] 2009-10-18 Updated Japanese translation.
- Date: Sun, 18 Oct 2009 05:12:56 +0000 (UTC)
commit b549dbd5383fc1c211e64d3bdb3f469f731f6026
Author: Takeshi AIHANA <takeshi aihana gmail com>
Date: Sun Oct 18 14:12:41 2009 +0900
2009-10-18 Updated Japanese translation.
po/ja.po | 1153 +++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 619 insertions(+), 534 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 1d4ae2f..503ed06 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2009-04-29 21:19+0900\n"
-"PO-Revision-Date: 2009-04-29 21:19+0900\n"
+"POT-Creation-Date: 2009-10-18 14:12+0900\n"
+"PO-Revision-Date: 2009-10-18 13:45+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,107 +16,424 @@ msgstr ""
"Generated-By: pygettext.py 1.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../dirdiff.py:173 ../vcview.py:124
+#: ../bin/meld:77
+msgid "Cannot import: "
+msgstr "ã?¤ã?³ã??ã?¼ã??ã?§ã??ã?¾ã??ã??:"
+
+#: ../bin/meld:80
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Meld ã?«ã?¯ %s 以ä¸?ã??å¿?è¦?ã?§ã??ã??"
+
+#: ../data/meld.desktop.in.h:1
+msgid "Compare and merge your files"
+msgstr "è¤?æ?°ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??ã??ã??ã?¼ã?¸ã??ã?¾ã??"
+
+#: ../data/meld.desktop.in.h:2
+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:166
+msgid "Create Patch"
+msgstr "ã??ã??ã??ã?®ç??æ??"
+
+#: ../data/ui/filediff.glade.h:5
+msgid "Save modified files?"
+msgstr "å¤?æ?´ã??ã??ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã?¾ã??ã??ï¼?"
+
+#: ../data/ui/filediff.glade.h:6
+msgid "_Discard Changes"
+msgstr "å¤?æ?´ã??å??ã??æ¶?ã??(_D)"
+
+#: ../data/ui/filediff.glade.h:7
+msgid "_Save Selected"
+msgstr "é?¸æ??ç¯?å?²ã?®ä¿?å?(_S)"
+
+#: ../data/ui/findbar.glade.h:1
+msgid "Regular E_xpression"
+msgstr "æ£è¦?表ç?¾(_X)"
+
+#: ../data/ui/findbar.glade.h:2
+msgid "Replace _All"
+msgstr "å?¨ã?¦ç½®æ??(_A)"
+
+#: ../data/ui/findbar.glade.h:3
+msgid "Replace _With"
+msgstr "次ã?§ç½®ã??æ??ã??ã??(_W):"
+
+#: ../data/ui/findbar.glade.h:4
+msgid "Who_le word"
+msgstr "å??èª?å?¨ä½?(_L)"
+
+#: ../data/ui/findbar.glade.h:5
+msgid "_Match Case"
+msgstr "大/å°?æ??å?ã??å?ºå?¥ã??ã??(_M)"
+
+#: ../data/ui/findbar.glade.h:6
+msgid "_Next"
+msgstr "次ã?®çµ?æ??(_N)"
+
+#: ../data/ui/findbar.glade.h:7
+msgid "_Previous"
+msgstr "å??ã?®çµ?æ??(_P)"
+
+#: ../data/ui/findbar.glade.h:8 ../meld/meldapp.py:442
+msgid "_Replace"
+msgstr "ç½®æ??(_R)"
+
+#: ../data/ui/findbar.glade.h:9
+msgid "_Search for"
+msgstr "æ¤?ç´¢ã??ã??æ??å?å??(_S):"
+
+#: ../data/ui/meldapp.glade.h:1
+msgid "<b>Edit Menu</b>"
+msgstr "<b>ç·¨é??ã?¡ã??ã?¥ã?¼</b>"
+
+#: ../data/ui/meldapp.glade.h:2
+msgid "<b>Font</b>"
+msgstr "<b>ã??ã?©ã?³ã??</b>"
+
+#: ../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>"
+
+#: ../data/ui/meldapp.glade.h:5
+msgid "Automatically supply missing newline at end of file"
+msgstr "è?ªå??ç??ã?«ã??ã?¡ã?¤ã?«ã?®çµ?端ã?«æ?¹è¡?ã??追å? ã??ã??"
+
+#: ../data/ui/meldapp.glade.h:6
+msgid "Choose Files"
+msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
+
+#: ../data/ui/meldapp.glade.h:7
+msgid "Copyright © 2002-2009 Stephen Kennedy"
+msgstr "Copyright © 2002-2009 Stephen Kennedy"
+
+#: ../data/ui/meldapp.glade.h:8
+msgid "Custom command"
+msgstr "ã??ã?®ä»?ã?®ã?¨ã??ã?£ã?¿"
+
+#: ../data/ui/meldapp.glade.h:9
+msgid "Directory"
+msgstr "ã??ã?©ã?«ã??"
+
+#: ../data/ui/meldapp.glade.h:10
+msgid "Edit files with:"
+msgstr "ã??ã?¡ã?¤ã?«ã??ç·¨é??ã??ã??é??ã?«ä½¿ç?¨ã??ã??ã?¢ã??ã?ª:"
+
+#: ../data/ui/meldapp.glade.h:11
+msgid "Editor"
+msgstr "ã?¨ã??ã?£ã?¿"
+
+#: ../data/ui/meldapp.glade.h:12
+msgid "Encoding"
+msgstr "ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°"
+
+#: ../data/ui/meldapp.glade.h:13
+msgid "File Filters"
+msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?£ã?«ã?¿"
+
+#: ../data/ui/meldapp.glade.h:14
+msgid "Gnome default editor"
+msgstr "GNOME ã?®ã??ã??ã?©ã?«ã??ã?»ã?¨ã??ã?£ã?¿"
+
+#: ../data/ui/meldapp.glade.h:15
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "空è¡?ã?®æ?¿å?¥/å??é?¤ã??ç?¡è¦?ã??ã??"
+
+#: ../data/ui/meldapp.glade.h:16
+msgid "Ignore symbolic links"
+msgstr "ã?·ã?³ã??ã?ªã??ã?¯ã?»ã?ªã?³ã?¯ã??ç?¡è¦?ã??ã??"
+
+#: ../data/ui/meldapp.glade.h:17
+msgid "Insert spaces instead of tabs"
+msgstr "ã?¿ã??ã?®ä»£ã??ã??ã?«ç©ºç?½ã??æ?¿å?¥ã??ã??"
+
+#: ../data/ui/meldapp.glade.h:18
+msgid "Internal editor"
+msgstr "Meld å°?ç?¨ã?¨ã??ã?£ã?¿"
+
+#: ../data/ui/meldapp.glade.h:19
+msgid "Line Wrapping "
+msgstr "è¡?ã?®ã?©ã??ã??: "
+
+#: ../data/ui/meldapp.glade.h:20
+msgid "Meld"
+msgstr "Meld"
+
+#: ../data/ui/meldapp.glade.h:21
+msgid "Mine"
+msgstr "è?ªå??ã?®ã??ã?®"
+
+#: ../data/ui/meldapp.glade.h:22
+msgid "Original"
+msgstr "ã?ªã?ªã?¸ã??ã?«"
+
+#: ../data/ui/meldapp.glade.h:23
+msgid "Other"
+msgstr "ä»?ã?®ã??ã?®"
+
+#: ../data/ui/meldapp.glade.h:24
+msgid "Preferences : Meld"
+msgstr "è¨å®?: Meld"
+
+#: ../data/ui/meldapp.glade.h:25
+msgid "Show line numbers"
+msgstr "è¡?ç?ªå?·ã??表示ã??ã??"
+
+#: ../data/ui/meldapp.glade.h:26
+msgid "Tab width"
+msgstr "ã?¿ã??å¹?"
+
+#: ../data/ui/meldapp.glade.h:27
+msgid "Text Filters"
+msgstr "ã??ã?ã?¹ã??ã?®ã??ã?£ã?«ã?¿"
+
+#: ../data/ui/meldapp.glade.h:28
+msgid "Three way directory"
+msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
+
+#: ../data/ui/meldapp.glade.h:29
+msgid "Three way file"
+msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
+
+#: ../data/ui/meldapp.glade.h:30
+msgid "Two way directory"
+msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
+
+#: ../data/ui/meldapp.glade.h:31
+msgid "Two way file"
+msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
+
+#: ../data/ui/meldapp.glade.h:32
+msgid "Use GNOME monospace font"
+msgstr "GNOME æ??å®?ã?®å?ºå®?å¹?ã?®ã??ã?©ã?³ã??ã??使ç?¨ã??ã??"
+
+#: ../data/ui/meldapp.glade.h:33
+msgid "Use custom font"
+msgstr "ã??ã?©ã?³ã??ã??é?¸æ??ã??ã??: "
+
+#: ../data/ui/meldapp.glade.h:34
+msgid "Use syntax highlighting"
+msgstr "強調表示ã??ã??"
+
+#: ../data/ui/meldapp.glade.h:35
+msgid "Version control view"
+msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«è¡¨ç¤º"
+
+#: ../data/ui/meldapp.glade.h:36
+msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+msgstr ""
+"ã??ã?¡ã?¤ã?«ã??èªã??è¾¼ã??é??ã?«ã??次ã?®é ?ç?ªã?§ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã??試è¡?ã??ã?¾ã?? (ä¾?: utf8 "
+"iso8859)"
+
+#: ../data/ui/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 "
+"separated by spaces."
+msgstr ""
+"ã??ã?©ã?«ã??ã?®æ¯?è¼?ã??è¡?ã??æ??ã??ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã??å??å??ã?§ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã?§ã??ã?¾ã??ã??"
+"ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã?®ã??ã?¿ã?¼ã?³ã?¯ã??ã??ã??ã??ã??ã?¹ã??ã?¼ã?¹ã?§å?ºå??ã?£ã?? SHELL å??å¼?ã?®ã?¯ã?¤ã?«ã??"
+"ã?«ã?¼ã??ã?®ä¸¦ã?³ã?§ã??ã??"
+
+#: ../data/ui/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 "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
+msgstr ""
+"ã??ã?¡ã?¤ã?«ã?®æ¯?è¼?ã??è¡?ã??æ??ã?¯ã??ã??ã??種é¡?ã?®å¤?æ?´ã? ã??ç?¡è¦?ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ç?¡è¦?ã??ã??"
+"ã??ã?¿ã?¼ã?³ã?¯ã??ã??ã??ã?? Python å½¢å¼?ã?®æ£è¦?表ç?¾ã?§æ??å®?ã??ã??ã??ã?®å®?è£?ã?¯ç?¡è¦?ã??ã??æ??å?å??ã??"
+"空ã?®æ??å?å??ã?§ç½®ã??æ??ã??ã??ã? ã??ã?§ã??ã??ã??ã??æ£è¦?表ç?¾ã??ã?¿ã?¼ã?³ã?«ã?°ã?«ã?¼ã??ã??å?«ã?¾ã??ã?¦ã??ã??"
+"ã??ã??該å½?ã??ã??ã?°ã?«ã?¼ã??ã?®æ??å?å??ã? ã??ç½®ã??æ??ã??ã?¾ã??ã??詳細ã?¯ã?¦ã?¼ã?¶ã?¼ã?ºã?»ã??ã??ã?¥ã?¢ã?«ã??"
+"ã??覧ä¸?ã??ã??ã??"
+
+#: ../data/ui/meldapp.glade.h:39
+msgid "_Character"
+msgstr "æ??å?ã??ã?¨(_C)"
+
+#: ../data/ui/meldapp.glade.h:40
+msgid "_Directory Comparison"
+msgstr "ã??ã?©ã?«ã??ã?®æ¯?è¼?(_D)"
+
+#: ../data/ui/meldapp.glade.h:41
+msgid "_File Comparison"
+msgstr "ã??ã?¡ã?¤ã?«ã?®æ¯?è¼?(_F)"
+
+#: ../data/ui/meldapp.glade.h:42
+msgid "_None"
+msgstr "ã??ã?ªã??(_N)"
+
+#: ../data/ui/meldapp.glade.h:43
+msgid "_Three Way Compare"
+msgstr "ï¼?ã?¤ã?®é??ã?§æ¯?è¼?ã??ã??(_T)"
+
+#: ../data/ui/meldapp.glade.h:44
+msgid "_Version Control Browser"
+msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?»ã??ã?©ã?¦ã?¶(_V)"
+
+#: ../data/ui/meldapp.glade.h:45
+msgid "_Word"
+msgstr "å??èª?ã??ã?¨(_W)"
+
+#: ../data/ui/vcview.glade.h:1
+msgid "Commit Files"
+msgstr "ã??ã?¡ã?¤ã?«ã?®ã?³ã??ã??ã??"
+
+#: ../data/ui/vcview.glade.h:2
+msgid "Compare Options"
+msgstr "æ¯?è¼?ã?®ã?ªã??ã?·ã?§ã?³"
+
+#: ../data/ui/vcview.glade.h:3
+msgid "Date"
+msgstr "��"
+
+#: ../data/ui/vcview.glade.h:4
+msgid "Local copy against other remote revision"
+msgstr "ã?ªã?¢ã?¼ã??ã?®ä»?ã?®ã?ªã??ã?¸ã?§ã?³ã??ã?ã?¼ã?«ã?«ã?¸ã?³ã??ã?¼ã??ã??"
+
+#: ../data/ui/vcview.glade.h:5
+msgid "Local copy against same remote revision"
+msgstr "ã?ªã?¢ã?¼ã??ã?®å??ã??ã?ªã??ã?¸ã?§ã?³ã??ã?ã?¼ã?«ã?«ã?¸ã?³ã??ã?¼ã??ã??"
+
+#: ../data/ui/vcview.glade.h:6
+msgid "Log Message"
+msgstr "ã?ã?°ã?»ã?¡ã??ã?»ã?¼ã?¸"
+
+#: ../data/ui/vcview.glade.h:7
+msgid "Previous Logs"
+msgstr "å??ã?®ã?ã?°"
+
+#: ../data/ui/vcview.glade.h:8 ../meld/vcview.py:183
+msgid "Tag"
+msgstr "ã?¿ã?°"
+
+#: ../data/ui/vcview.glade.h:9
+msgid "VC Log"
+msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?®ã?ã?°"
+
+#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
msgid "_Compare"
msgstr "��"
-#: ../dirdiff.py:173 ../vcview.py:124
+#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
msgid "Compare selected"
msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã?¾ã??"
-#: ../dirdiff.py:174
+#: ../meld/dirdiff.py:185
msgid "Left"
msgstr "å·¦ã?¸ã?³ã??ã?¼"
-#: ../dirdiff.py:174 ../filediff.py:120
+#: ../meld/dirdiff.py:185 ../meld/filediff.py:167
msgid "Copy To Left"
msgstr "å·¦ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
-#: ../dirdiff.py:175
+#: ../meld/dirdiff.py:186
msgid "Right"
msgstr "å?³ã?¸ã?³ã??ã?¼"
-#: ../dirdiff.py:175 ../filediff.py:121
+#: ../meld/dirdiff.py:186 ../meld/filediff.py:168
msgid "Copy To Right"
msgstr "å?³ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
-#: ../dirdiff.py:176
+#: ../meld/dirdiff.py:187
msgid "Delete selected"
msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã?ªã?©ã??å??é?¤ã??ã?¾ã??"
-#: ../dirdiff.py:177
+#: ../meld/dirdiff.py:188 ../meld/filediff.py:652
msgid "Hide"
msgstr "é? ã??"
-#: ../dirdiff.py:177
+#: ../meld/dirdiff.py:188
msgid "Hide selected"
msgstr "é?¸æ??ç¯?å?²ã??é? ã??ã?¾ã??"
-#: ../dirdiff.py:179 ../filediff.py:118 ../vcview.py:125
+#: ../meld/dirdiff.py:190 ../meld/filediff.py:165 ../meld/vcview.py:126
msgid "Open selected"
msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??"
-#: ../dirdiff.py:183
+#: ../meld/dirdiff.py:194
msgid "Case"
msgstr "大/å°?æ??å?"
-#: ../dirdiff.py:183
+#: ../meld/dirdiff.py:194
msgid "Ignore case of entries"
msgstr "大/å°?æ??å?ã??ç?¡è¦?ã??ã?¾ã??"
-#: ../dirdiff.py:184
+#: ../meld/dirdiff.py:195
msgid "Same"
msgstr "å??ã??é?¨å??"
-#: ../dirdiff.py:184
+#: ../meld/dirdiff.py:195
msgid "Show identical"
msgstr "ä¸?è?´ã??ã??é?¨å??ã??表示ã??ã?¾ã??"
-#: ../dirdiff.py:185
+#: ../meld/dirdiff.py:196
msgid "New"
msgstr "æ?°ã??ã??é?¨å??"
-#: ../dirdiff.py:185
+#: ../meld/dirdiff.py:196
msgid "Show new"
msgstr "æ?°è¦?ã?®é?¨å??ã??表示ã??ã?¾ã??"
-#: ../dirdiff.py:186
+#: ../meld/dirdiff.py:197
msgid "Modified"
msgstr "���"
-#: ../dirdiff.py:186 ../vcview.py:137
+#: ../meld/dirdiff.py:197 ../meld/vcview.py:139
msgid "Show modified"
msgstr "å¤?æ?´ã?®ã??ã??ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
-#: ../dirdiff.py:188
+#: ../meld/dirdiff.py:199
msgid "Filters"
msgstr "ã??ã?£ã?«ã?¿"
-#: ../dirdiff.py:188
+#: ../meld/dirdiff.py:199
msgid "Set active filters"
msgstr "ã??ã?£ã?«ã?¿ã??é?¸æ??ã??ã?¾ã??"
-#: ../dirdiff.py:241 ../dirdiff.py:287
+#: ../meld/dirdiff.py:252 ../meld/dirdiff.py:298
#, python-format
msgid "Error converting pattern '%s' to regular expression"
msgstr "'%s' ã?¨ã??ã??ã??ã?¿ã?¼ã?³ã??æ£è¦?表ç?¾ã?«å¤?æ??ã??ã??é??ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
-#: ../dirdiff.py:298
+#: ../meld/dirdiff.py:309
#, python-format
msgid "Hide %s"
msgstr "%sã?®è¡¨ç¤ºã??å??ã??æ?¿ã??ã?¾ã??"
-#: ../dirdiff.py:383 ../dirdiff.py:393 ../vcview.py:270 ../vcview.py:298
+#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:272
+#: ../meld/vcview.py:300
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] %s ã?®ã?¹ã?ã?£ã?³ä¸"
-#: ../dirdiff.py:422
+#: ../meld/dirdiff.py:433
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "'%s' ã?¯ '%s' ã?«ã??ã?£ã?¦é? ã??ã??ã?¦ã??ã?¾ã??"
-#: ../dirdiff.py:428
+#: ../meld/dirdiff.py:439
#, python-format
msgid ""
"You are running a case insensitive comparison on a case sensitive "
@@ -127,12 +444,12 @@ msgstr ""
"ã??ã??ã??ã??ã?¤ã??ã?®ã??ã?¡ã?¤ã?«ã?¯è¡¨ç¤ºã??ã??ã?¾ã??ã??:\n"
"%s"
-#: ../dirdiff.py:501
+#: ../meld/dirdiff.py:516
#, python-format
msgid "[%s] Done"
msgstr "[%s] ��"
-#: ../dirdiff.py:547
+#: ../meld/dirdiff.py:562
#, python-format
msgid ""
"'%s' exists.\n"
@@ -141,7 +458,7 @@ msgstr ""
"'%s' ã?¯å?å?¨ã??ã?¾ã??ã??\n"
"ä¸?æ?¸ã??ã??ã?¾ã??ã??ï¼?"
-#: ../dirdiff.py:554
+#: ../meld/dirdiff.py:569
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -152,7 +469,7 @@ msgstr ""
"\n"
"%s"
-#: ../dirdiff.py:572 ../vcview.py:460
+#: ../meld/dirdiff.py:587 ../meld/vcview.py:464
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -161,7 +478,7 @@ msgstr ""
"'%s' ã?¯ã??ã?©ã?«ã??ã?§ã??ã??\n"
"å??帰ç??ã?«å??é?¤ã??ã?¾ã??ã??ï¼?"
-#: ../dirdiff.py:579 ../vcview.py:465
+#: ../meld/dirdiff.py:594 ../meld/vcview.py:469
#, python-format
msgid ""
"Error removing %s\n"
@@ -172,83 +489,79 @@ msgstr ""
"\n"
"%s"
-#: ../dirdiff.py:590
+#: ../meld/dirdiff.py:606
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
msgstr[0] " %i�"
msgstr[1] " %i�"
-#: ../dirdiff.py:591
+#: ../meld/dirdiff.py:607
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
msgstr[0] " %iå??"
msgstr[1] " %iå??"
-#: ../dirdiff.py:592
+#: ../meld/dirdiff.py:608
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
msgstr[0] " %iæ??é??"
msgstr[1] " %iæ??é??"
-#: ../dirdiff.py:593
+#: ../meld/dirdiff.py:609
#, python-format
msgid "%i day"
msgid_plural "%i days"
msgstr[0] " %iæ?¥"
msgstr[1] " %iæ?¥"
-#: ../dirdiff.py:594
+#: ../meld/dirdiff.py:610
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
msgstr[0] " %ié?±é??"
msgstr[1] " %ié?±é??"
-#: ../dirdiff.py:595
+#: ../meld/dirdiff.py:611
#, python-format
msgid "%i month"
msgid_plural "%i months"
msgstr[0] " %iã?¶æ??"
msgstr[1] " %iã?¶æ??"
-#: ../dirdiff.py:596
+#: ../meld/dirdiff.py:612
#, python-format
msgid "%i year"
msgid_plural "%i years"
msgstr[0] " %iå¹´"
msgstr[1] " %iå¹´"
-#: ../filediff.py:119 ../glade2/filediff.glade.h:4
-msgid "Create Patch"
-msgstr "ã??ã??ã??ã?®ç??æ??"
-
-#: ../filediff.py:119
+#: ../meld/filediff.py:166
msgid "Create a patch"
msgstr "ã??ã??ã??ã??ç??æ??ã??ã?¾ã??"
-#: ../filediff.py:120
+#: ../meld/filediff.py:167
msgid "Copy all changes from right pane to left pane"
msgstr "å?¨ã?¦ã?®å·®å??ã??å?³ã??ã??å·¦ã?¸ã?³ã??ã?¼ã??ã?¾ã??"
-#: ../filediff.py:121
+#: ../meld/filediff.py:168
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:170
+#: ../meld/filediff.py:221
msgid "INS,OVR"
msgstr "[æ?¿å?¥],[ä¸?æ?¸ã??]"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:172
+#: ../meld/filediff.py:223
#, python-format
msgid "Ln %i, Col %i"
msgstr "(%iè¡?, %iæ¡?)"
-#: ../filediff.py:230
+#: ../meld/filediff.py:286
#, python-format
msgid ""
"Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -257,31 +570,37 @@ msgstr ""
"æ£è¦?表ç?¾ '%s' ã?§ã??ã?¡ã?¤ã?«ã?®è¡?æ?°ã??å¤?æ?´ã??ã??ã?¾ã??ã??ã??å·®å??ã?«ä¸?æ?´å??ã??ç?ºç??ã??ã?¾ã??ã??詳"
"ç´°ã?¯ã?¦ã?¼ã?¶ã?¼ã?ºã?»ã??ã??ã?¥ã?¢ã?«ã??ã??覧ä¸?ã??ã??ã??"
-#: ../filediff.py:499
+#. TRANSLATORS: this is the name of a new file which has not yet been saved
+#: ../meld/filediff.py:379
+msgid "<unnamed>"
+msgstr "<å??å??ã?ªã??>"
+
+#: ../meld/filediff.py:559
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] ç?ªå?·ã??ã?¤ã?³ã?®ã?»ã??ã??"
-#: ../filediff.py:505
+#: ../meld/filediff.py:565
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] ã??ã?¡ã?¤ã?«ã?®ã?ªã?¼ã??ã?³ä¸"
-#: ../filediff.py:523 ../filediff.py:537 ../filediff.py:553 ../filediff.py:560
+#: ../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' ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??"
-#: ../filediff.py:524 ../filediff.py:561
+#: ../meld/filediff.py:584 ../meld/filediff.py:621
msgid "The error was:"
msgstr "���:"
-#: ../filediff.py:529
+#: ../meld/filediff.py:589
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] ã??ã?¡ã?¤ã?«ã?®èªã?¿è¾¼ã?¿ä¸"
-#: ../filediff.py:538
+#: ../meld/filediff.py:598
msgid ""
"It contains ascii nulls.\n"
"Perhaps it is a binary file."
@@ -289,17 +608,25 @@ msgstr ""
"ASCII ã?®ã??ã?«æ??å?ã??å?«ã?¾ã??ã?¦ã??ã?¾ã??ã??\n"
"ã??ã?¤ã??ã?ªã?»ã??ã?¡ã?¤ã?«ã?®ã??ã??ã?§ã??ã??"
-#: ../filediff.py:554
+#: ../meld/filediff.py:614
#, python-format
msgid "I tried encodings %s."
msgstr "%s ã?¨ã??ã??ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?§è©¦ã??ã?¦ã?¿ã?¾ã??ã??ã??"
-#: ../filediff.py:581
+#: ../meld/filediff.py:641
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] å·®å??ã?®è¨?ç®?ä¸"
-#: ../filediff.py:708
+#: ../meld/filediff.py:651
+msgid "Files are identical"
+msgstr "å??ä¸?ã?®ã??ã?¡ã?¤ã?«ã?§ã??"
+
+#: ../meld/filediff.py:656
+msgid "Hi_de"
+msgstr "é? ã??(_D)"
+
+#: ../meld/filediff.py:795
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -308,7 +635,7 @@ msgstr ""
"\"%s\" ã?¯å?å?¨ã??ã?¦ã??ã?¾ã??ï¼?\n"
"ä¸?æ?¸ã??ã??ã?¾ã??ã??ï¼?"
-#: ../filediff.py:721
+#: ../meld/filediff.py:808
#, python-format
msgid ""
"Error writing to %s\n"
@@ -319,12 +646,12 @@ msgstr ""
"\n"
"%s"
-#: ../filediff.py:730
+#: ../meld/filediff.py:817
#, python-format
msgid "Choose a name for buffer %i."
-msgstr "ã??ã??ã??ã?¡ %i ã?®å??å??ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+msgstr "ã??ã??ã??ã?¡ %i ã?®å??å??ã?®é?¸æ??"
-#: ../filediff.py:744
+#: ../meld/filediff.py:831
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -335,7 +662,7 @@ msgstr ""
"\n"
"ã?©ã?®ã??ã?©ã?¼ã??ã??ã??ã??使ç?¨ã??ã?¾ã??ã??ï¼?"
-#: ../filediff.py:760
+#: ../meld/filediff.py:847
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -345,11 +672,11 @@ msgstr ""
"UTF-8 ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã?¨ã??ã?¦ä¿?å?ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
#. save as
-#: ../filediff.py:800
+#: ../meld/filediff.py:885
msgid "Save patch as..."
msgstr "å?¥å??ã?§ã??ã??ã??ã?®ä¿?å?..."
-#: ../filediff.py:867
+#: ../meld/filediff.py:943
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -362,360 +689,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"
-"Which ones would you like to save?</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">ã??ã??ã?¤ã??ã?®ã??ã?¡ã?¤ã?«ã??å¤?æ?´ã??ã??ã?¦ã??ã?¾"
-"ã??ã??\n"
-"ã?©ã?®ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã?¾ã??ã??ï¼?</span>"
-
-#: ../glade2/filediff.glade.h:3
-msgid "Copy to Clipboard"
-msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?¸ã?³ã??ã?¼"
-
-#: ../glade2/filediff.glade.h:5
-msgid "Save modified files?"
-msgstr "å¤?æ?´ã??ã??ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã?¾ã??ã??ï¼?"
-
-#: ../glade2/filediff.glade.h:6
-msgid "_Discard Changes"
-msgstr "å¤?æ?´ã??å??ã??æ¶?ã??(_D)"
-
-#: ../glade2/filediff.glade.h:7
-msgid "_Save Selected"
-msgstr "é?¸æ??ç¯?å?²ã?®ä¿?å?(_S)"
-
-#: ../glade2/findbar.glade.h:1
-msgid "Regular E_xpression"
-msgstr "æ£è¦?表ç?¾(_X)"
-
-#: ../glade2/findbar.glade.h:2
-msgid "Replace _All"
-msgstr "å?¨ã?¦ç½®æ??(_A)"
-
-#: ../glade2/findbar.glade.h:3
-msgid "Replace _With"
-msgstr "次ã?§ç½®ã??æ??ã??ã??(_W):"
-
-#: ../glade2/findbar.glade.h:4
-msgid "Who_le word"
-msgstr "å??èª?å?¨ä½?(_L)"
-
-#: ../glade2/findbar.glade.h:5
-msgid "_Match Case"
-msgstr "大/å°?æ??å?ã??å?ºå?¥ã??ã??(_M)"
-
-#: ../glade2/findbar.glade.h:6
-msgid "_Next"
-msgstr "次ã?®çµ?æ??(_N)"
-
-#: ../glade2/findbar.glade.h:7
-msgid "_Previous"
-msgstr "å??ã?®çµ?æ??(_P)"
-
-#: ../glade2/findbar.glade.h:8 ../meldapp.py:522
-msgid "_Replace"
-msgstr "ç½®æ??(_R)"
-
-#: ../glade2/findbar.glade.h:9
-msgid "_Search for"
-msgstr "æ¤?ç´¢ã??ã??æ??å?å??(_S):"
-
-#: ../glade2/meldapp.glade.h:1
-msgid "<b>Edit Menu</b>"
-msgstr "<b>ç·¨é??ã?¡ã??ã?¥ã?¼</b>"
-
-#: ../glade2/meldapp.glade.h:2
-msgid "<b>Font</b>"
-msgstr "<b>ã??ã?©ã?³ã??</b>"
-
-#: ../glade2/meldapp.glade.h:3
-msgid "<b>Loading</b>"
-msgstr "<b>èªã?¿è¾¼ã?¿</b>"
-
-#: ../glade2/meldapp.glade.h:4
-msgid "<b>Misc</b>"
-msgstr "<b>ã??ã?®ä»?</b>"
-
-#: ../glade2/meldapp.glade.h:5
-msgid "Automatically supply missing newline at end of file"
-msgstr "è?ªå??ç??ã?«ã??ã?¡ã?¤ã?«ã?®çµ?端ã?«æ?¹è¡?ã??追å? ã??ã??"
-
-#: ../glade2/meldapp.glade.h:6
-msgid "Choose Files"
-msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
-
-#: ../glade2/meldapp.glade.h:7
-msgid "Copyright © 2002-2009 Stephen Kennedy"
-msgstr "Copyright © 2002-2009 Stephen Kennedy"
-
-#: ../glade2/meldapp.glade.h:8
-msgid "Custom command"
-msgstr "ã??ã?®ä»?ã?®ã?¨ã??ã?£ã?¿"
-
-#: ../glade2/meldapp.glade.h:9
-msgid "Directory"
-msgstr "ã??ã?©ã?«ã??"
-
-#: ../glade2/meldapp.glade.h:10
-msgid "Edit files with:"
-msgstr "ã??ã?¡ã?¤ã?«ã??ç·¨é??ã??ã??é??ã?«ä½¿ç?¨ã??ã??ã?¢ã??ã?ª:"
-
-#: ../glade2/meldapp.glade.h:11
-msgid "Editor"
-msgstr "ã?¨ã??ã?£ã?¿"
-
-#: ../glade2/meldapp.glade.h:12
-msgid "Encoding"
-msgstr "ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°"
-
-#: ../glade2/meldapp.glade.h:13
-msgid "File Filters"
-msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?£ã?«ã?¿"
-
-#: ../glade2/meldapp.glade.h:14
-msgid "Gnome default editor"
-msgstr "GNOME ã?®ã??ã??ã?©ã?«ã??ã?»ã?¨ã??ã?£ã?¿"
-
-#: ../glade2/meldapp.glade.h:15
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "空è¡?ã?®æ?¿å?¥/å??é?¤ã??ç?¡è¦?ã??ã??"
-
-#: ../glade2/meldapp.glade.h:16
-msgid "Ignore symbolic links"
-msgstr "ã?·ã?³ã??ã?ªã??ã?¯ã?»ã?ªã?³ã?¯ã??ç?¡è¦?ã??ã??"
-
-#: ../glade2/meldapp.glade.h:17
-msgid "Insert spaces instead of tabs"
-msgstr "ã?¿ã??ã?®ä»£ã??ã??ã?«ç©ºç?½ã??æ?¿å?¥ã??ã??"
-
-#: ../glade2/meldapp.glade.h:18
-msgid "Internal editor"
-msgstr "Meld å°?ç?¨ã?¨ã??ã?£ã?¿"
-
-#: ../glade2/meldapp.glade.h:19
-msgid "Line Wrapping "
-msgstr "è¡?ã?®ã?©ã??ã??: "
-
-#: ../glade2/meldapp.glade.h:20
-msgid "Meld"
-msgstr "Meld"
-
-#: ../glade2/meldapp.glade.h:21
-msgid "Mine"
-msgstr "è?ªå??ã?®ã??ã?®"
-
-#: ../glade2/meldapp.glade.h:22
-msgid "Original"
-msgstr "ã?ªã?ªã?¸ã??ã?«"
-
-#: ../glade2/meldapp.glade.h:23
-msgid "Other"
-msgstr "ä»?ã?®ã??ã?®"
-
-#: ../glade2/meldapp.glade.h:24
-msgid "Preferences : Meld"
-msgstr "è¨å®?: Meld"
-
-#: ../glade2/meldapp.glade.h:25
-msgid "Show line numbers"
-msgstr "è¡?ç?ªå?·ã??表示ã??ã??"
-
-#: ../glade2/meldapp.glade.h:26
-msgid "Tab width"
-msgstr "ã?¿ã??å¹?"
-
-#: ../glade2/meldapp.glade.h:27
-msgid "Text Filters"
-msgstr "ã??ã?ã?¹ã??ã?®ã??ã?£ã?«ã?¿"
-
-#: ../glade2/meldapp.glade.h:28
-msgid "Three way directory"
-msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
-
-#: ../glade2/meldapp.glade.h:29
-msgid "Three way file"
-msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
-
-#: ../glade2/meldapp.glade.h:30
-msgid "Two way directory"
-msgstr "ï¼?ã?¤ã?®ã??ã?©ã?«ã??"
-
-#: ../glade2/meldapp.glade.h:31
-msgid "Two way file"
-msgstr "ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«"
-
-#: ../glade2/meldapp.glade.h:32
-msgid "Use GNOME monospace font"
-msgstr "GNOME ã?®å?ºå®?ã??ã?©ã?³ã??ã??使ç?¨ã??ã??"
-
-#: ../glade2/meldapp.glade.h:33
-msgid "Use custom font"
-msgstr "ã??ã?©ã?³ã??ã??é?¸æ??ã??ã??: "
-
-#: ../glade2/meldapp.glade.h:34
-msgid "Use syntax highlighting"
-msgstr "強調表示ã??ã??"
-
-#: ../glade2/meldapp.glade.h:35
-msgid "Version control view"
-msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«è¡¨ç¤º"
-
-#: ../glade2/meldapp.glade.h:36
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr ""
-"ã??ã?¡ã?¤ã?«ã??èªã??è¾¼ã??é??ã?«ã??次ã?®é ?ç?ªã?§ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°ã??試è¡?ã??ã?¾ã?? (ä¾?: utf8 "
-"iso8859)"
-
-#: ../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 "
-"separated by spaces."
-msgstr ""
-"ã??ã?©ã?«ã??ã?®æ¯?è¼?ã??è¡?ã??æ??ã??ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã??å??å??ã?§ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã?§ã??ã?¾ã??ã??"
-"ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã?®ã??ã?¿ã?¼ã?³ã?¯ã??ã??ã??ã??ã??ã?¹ã??ã?¼ã?¹ã?§å?ºå??ã?£ã?? SHELL å??å¼?ã?®ã?¯ã?¤ã?«ã??"
-"ã?«ã?¼ã??ã?®ä¸¦ã?³ã?§ã??ã??"
-
-#: ../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 "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
-msgstr ""
-"ã??ã?¡ã?¤ã?«ã?®æ¯?è¼?ã??è¡?ã??æ??ã?¯ã??ã??ã??種é¡?ã?®å¤?æ?´ã? ã??ç?¡è¦?ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ç?¡è¦?ã??ã??"
-"ã??ã?¿ã?¼ã?³ã?¯ã??ã??ã??ã?? Python å½¢å¼?ã?®æ£è¦?表ç?¾ã?§æ??å®?ã??ã??ã??ã?®å®?è£?ã?¯ç?¡è¦?ã??ã??æ??å?å??ã??"
-"空ã?®æ??å?å??ã?§ç½®ã??æ??ã??ã??ã? ã??ã?§ã??ã??ã??ã??æ£è¦?表ç?¾ã??ã?¿ã?¼ã?³ã?«ã?°ã?«ã?¼ã??ã??å?«ã?¾ã??ã?¦ã??ã??"
-"ã??ã??該å½?ã??ã??ã?°ã?«ã?¼ã??ã?®æ??å?å??ã? ã??ç½®ã??æ??ã??ã?¾ã??ã??詳細ã?¯ã?¦ã?¼ã?¶ã?¼ã?ºã?»ã??ã??ã?¥ã?¢ã?«ã??"
-"ã??覧ä¸?ã??ã??ã??"
-
-#: ../glade2/meldapp.glade.h:39
-msgid "_Character"
-msgstr "æ??å?ã??ã?¨(_C)"
-
-#: ../glade2/meldapp.glade.h:40
-msgid "_Directory Comparison"
-msgstr "ã??ã?©ã?«ã??ã?®æ¯?è¼?(_D)"
-
-#: ../glade2/meldapp.glade.h:41
-msgid "_File Comparison"
-msgstr "ã??ã?¡ã?¤ã?«ã?®æ¯?è¼?(_F)"
-
-#: ../glade2/meldapp.glade.h:42
-msgid "_None"
-msgstr "ã??ã?ªã??(_N)"
-
-#: ../glade2/meldapp.glade.h:43
-msgid "_Three Way Compare"
-msgstr "ï¼?ã?¤ã?®é??ã?§æ¯?è¼?ã??ã??(_T)"
-
-#: ../glade2/meldapp.glade.h:44
-msgid "_Version Control Browser"
-msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?»ã??ã?©ã?¦ã?¶(_V)"
-
-#: ../glade2/meldapp.glade.h:45
-msgid "_Word"
-msgstr "å??èª?ã??ã?¨(_W)"
-
-#: ../glade2/vcview.glade.h:1
-msgid "Commit Files"
-msgstr "ã??ã?¡ã?¤ã?«ã?®ã?³ã??ã??ã??"
-
-#: ../glade2/vcview.glade.h:2
-msgid "Compare Options"
-msgstr "æ¯?è¼?ã?®ã?ªã??ã?·ã?§ã?³"
-
-#: ../glade2/vcview.glade.h:3
-msgid "Date"
-msgstr "��"
-
-#: ../glade2/vcview.glade.h:4
-msgid "Local copy against other remote revision"
-msgstr "ã?ªã?¢ã?¼ã??ã?®ä»?ã?®ã?ªã??ã?¸ã?§ã?³ã??ã?ã?¼ã?«ã?«ã?¸ã?³ã??ã?¼ã??ã??"
-
-#: ../glade2/vcview.glade.h:5
-msgid "Local copy against same remote revision"
-msgstr "ã?ªã?¢ã?¼ã??ã?®å??ã??ã?ªã??ã?¸ã?§ã?³ã??ã?ã?¼ã?«ã?«ã?¸ã?³ã??ã?¼ã??ã??"
-
-#: ../glade2/vcview.glade.h:6
-msgid "Log Message"
-msgstr "ã?ã?°ã?»ã?¡ã??ã?»ã?¼ã?¸"
-
-#: ../glade2/vcview.glade.h:7
-msgid "Previous Logs"
-msgstr "å??ã?®ã?ã?°"
-
-#: ../glade2/vcview.glade.h:8 ../vcview.py:181
-msgid "Tag"
-msgstr "ã?¿ã?°"
-
-#: ../glade2/vcview.glade.h:9
-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 "è¤?æ?°ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??ã??ã??ã?¼ã?¸ã??ã?¾ã??"
-
-#: ../meld.desktop.in.h:2
-msgid "Meld Diff Viewer"
-msgstr "Meld å·®å??ã??ã?¥ã?¼ã?¢"
-
-#: ../meldapp.py:153
+#: ../meld/meldapp.py:150
msgid "label"
msgstr "(æ?°ã??ã??å??å??)"
-#: ../meldapp.py:153
+#: ../meld/meldapp.py:150
msgid "pattern"
msgstr "(æ?°ã??ã??ã??ã?¿ã?¼ã?³)"
-#: ../meldapp.py:221
+#: ../meld/meldapp.py:218
msgid "Only available if you have gnome-python-desktop installed"
msgstr ""
"'gnome-python-desktop' ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã??å ´å??ã?«ã?®ã?¿è¡?ç?ªå?·ã??表示ã??ã??ã??ã?¨ã??"
@@ -723,393 +705,449 @@ msgstr ""
#. file filters
#. text filters
-#: ../meldapp.py:231 ../meldapp.py:236 ../vcview.py:161
+#: ../meld/meldapp.py:228 ../meld/meldapp.py:233 ../meld/vcview.py:163
msgid "Name"
msgstr "å??å??"
-#: ../meldapp.py:231 ../meldapp.py:236
+#: ../meld/meldapp.py:228 ../meld/meldapp.py:233
msgid "Active"
msgstr "æ??å?¹"
-#: ../meldapp.py:231
+#: ../meld/meldapp.py:228
msgid "Pattern"
msgstr "ã??ã?¿ã?¼ã?³"
-#: ../meldapp.py:236
+#: ../meld/meldapp.py:233
msgid "Regex"
msgstr "æ£è¦?表ç?¾"
-#: ../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:412
+#: ../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
-#: ../meldapp.py:414
+#: ../meld/meldapp.py:342
#, 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:416
+#: ../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
-#: ../meldapp.py:418
+#: ../meld/meldapp.py:346
msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
msgstr "ã?¡ã??ã?£ã?¢\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:420
+#: ../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
-#: ../meldapp.py:422
+#: ../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
-#: ../meldapp.py:424
+#: ../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
-#: ../meldapp.py:426
+#: ../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
-#: ../meldapp.py:428
+#: ../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
-#: ../meldapp.py:430
+#: ../meld/meldapp.py:358
msgid "Script comment\t0\t#.*"
msgstr "ã?¹ã?¯ã?ªã??ã??ã?®ã?³ã?¡ã?³ã??\t0\t#.*"
-#: ../meldapp.py:508
+#: ../meld/meldapp.py:427
+msgid "_File"
+msgstr "ã??ã?¡ã?¤ã?«(_F)"
+
+#: ../meld/meldapp.py:428
msgid "_New..."
msgstr "��(_N)..."
-#: ../meldapp.py:508
+#: ../meld/meldapp.py:428
msgid "Start a new comparison"
msgstr "æ?°ã??ã??æ¯?è¼?ã??é??å§?ã??ã?¾ã??"
-#: ../meldapp.py:509
+#: ../meld/meldapp.py:429
msgid "Save the current file"
msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã?¾ã??"
-#: ../meldapp.py:511
+#: ../meld/meldapp.py:431
msgid "Close the current file"
msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??"
-#: ../meldapp.py:512
+#: ../meld/meldapp.py:432
msgid "Quit the program"
msgstr "ã??ã?ã?°ã?©ã? ã??çµ?äº?ã??ã?¾ã??"
-#: ../meldapp.py:515
+#: ../meld/meldapp.py:434
+msgid "_Edit"
+msgstr "ç·¨é??(_E)"
+
+#: ../meld/meldapp.py:435
msgid "Undo the last action"
-msgstr "æ??å¾?ã?®ã?¢ã?¯ã?·ã?§ã?³ã?«æ?»ã??ã?¾ã??"
+msgstr "æ??å¾?ã?«é?©ç?¨ã??ã??ã?¢ã?¯ã?·ã?§ã?³ã?«æ?»ã??ã?¾ã??"
-#: ../meldapp.py:516
+#: ../meld/meldapp.py:436
msgid "Redo the last undone action"
msgstr "æ??å¾?ã?«é?©ç?¨ã??ã??ã?¢ã?¯ã?·ã?§ã?³ã??ã??ã??ç?´ã??ã?¾ã??"
-#: ../meldapp.py:517
+#: ../meld/meldapp.py:437
msgid "Cut the selection"
msgstr "é?¸æ??ç¯?å?²ã??å??ã??å??ã??ã?¾ã??"
-#: ../meldapp.py:518
+#: ../meld/meldapp.py:438
msgid "Copy the selection"
msgstr "é?¸æ??ç¯?å?²ã??ã?³ã??ã?¼ã??ã?¾ã??"
-#: ../meldapp.py:519
+#: ../meld/meldapp.py:439
msgid "Paste the clipboard"
msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?®å??容ã??è²¼ã??ä»?ã??ã?¾ã??"
-#: ../meldapp.py:520
+#: ../meld/meldapp.py:440
msgid "Search for text"
msgstr "æ¤?ç´¢ã??ã??æ??å?å??:"
-#: ../meldapp.py:521
+#: ../meld/meldapp.py:441
msgid "Find Ne_xt"
msgstr "次��索(_X)"
-#: ../meldapp.py:521
+#: ../meld/meldapp.py:441
msgid "Search forwards for the same text"
msgstr "å??æ?¹ã??æ¤?ç´¢ã??ã?¾ã??"
-#: ../meldapp.py:522
+#: ../meld/meldapp.py:442
msgid "Find and replace text"
msgstr "æ??å?å??ã??æ¤?ç´¢ã??ã?¦ç½®æ??ã??ã?¾ã??"
-#: ../meldapp.py:523
+#: ../meld/meldapp.py:443
msgid "Go to the next difference"
msgstr "次ã?®å·®å??ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
-#: ../meldapp.py:524
+#: ../meld/meldapp.py:444
msgid "Go to the previous difference"
msgstr "å??ã?®å·®å??ã?¸ã?¸ã?£ã?³ã??ã??ã?¾ã??"
-#: ../meldapp.py:525
+#: ../meld/meldapp.py:445
msgid "Prefere_nces"
msgstr "è¨å®?(_N)"
-#: ../meldapp.py:525
+#: ../meld/meldapp.py:445
msgid "Configure the application"
msgstr "Meld ã??è¨å®?ã??ã?¾ã??"
-#: ../meldapp.py:531
+#: ../meld/meldapp.py:447
+msgid "_View"
+msgstr "表示(_V)"
+
+#: ../meld/meldapp.py:448
+msgid "File status"
+msgstr "ã??ã?¡ã?¤ã?«ã?®ç?¶æ??"
+
+#: ../meld/meldapp.py:449
+msgid "Version status"
+msgstr "ã??ã?¼ã?¸ã?§ã?³"
+
+#: ../meld/meldapp.py:450
+msgid "File filters"
+msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?£ã?«ã?¿"
+
+#: ../meld/meldapp.py:451
msgid "Stop the current action"
-msgstr "ç?¾å?¨ã?®ã?¢ã?¯ã?·ã?§ã?³ã??å??æ¢ã??ã?¾ã??"
+msgstr "ç?¾å?¨é?©ç?¨ä¸ã?®ã?¢ã?¯ã?·ã?§ã?³ã??å??æ¢ã??ã?¾ã??"
-#: ../meldapp.py:532
+#: ../meld/meldapp.py:452
msgid "Refresh the view"
msgstr "表示ã??æ?´æ?°ã??ã?¾ã??"
-#: ../meldapp.py:533
+#: ../meld/meldapp.py:453
msgid "Reload"
msgstr "å??èªè¾¼ã?¿"
-#: ../meldapp.py:533
+#: ../meld/meldapp.py:453
msgid "Reload the comparison"
msgstr "æ¯?è¼?å??容ã??æ?´æ?°ã??ã?¾ã??"
-#: ../meldapp.py:536
+#: ../meld/meldapp.py:455
+msgid "_Help"
+msgstr "ã??ã?«ã??(_H)"
+
+#: ../meld/meldapp.py:456
msgid "_Contents"
msgstr "�次(_C)"
-#: ../meldapp.py:536
+#: ../meld/meldapp.py:456
msgid "Open the Meld manual"
msgstr "Meld ã??ã??ã?¥ã?¢ã?«é??ã??ã?¾ã??"
-#: ../meldapp.py:537
+#: ../meld/meldapp.py:457
msgid "Report _Bug"
msgstr "ã??ã?°ã?®å ±å??(_B)"
-#: ../meldapp.py:537
+#: ../meld/meldapp.py:457
msgid "Report a bug in Meld"
msgstr "Meld ã?®ã??ã?°ã??å ±å??ã??ã?¾ã??"
-#: ../meldapp.py:538
+#: ../meld/meldapp.py:458
msgid "About this program"
msgstr "ã??ã?®ã??ã?ã?°ã?©ã? ã?«ã?¤ã??ã?¦"
-#: ../meldapp.py:856
+#: ../meld/meldapp.py:461
+msgid "Full Screen"
+msgstr "ã??ã?«ã?¹ã?¯ã?ªã?¼ã?³è¡¨ç¤º"
+
+#: ../meld/meldapp.py:461
+msgid "View the comparison in full screen"
+msgstr "æ¯?è¼?ç?¶æ³?ã??ã??ã?«ã?¹ã?¯ã?ªã?¼ã?³ã?§è¡¨ç¤ºã??ã?¾ã??"
+
+#: ../meld/meldapp.py:462
+msgid "_Toolbar"
+msgstr "ã??ã?¼ã?«ã??ã?¼(_T)"
+
+#: ../meld/meldapp.py:462
+msgid "Show or hide the toolbar"
+msgstr "ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤ºã?? ON/OFF ã??ã?¾ã??"
+
+#: ../meld/meldapp.py:463
+msgid "_Statusbar"
+msgstr "ã?¹ã??ã?¼ã?¿ã?¹ã??ã?¼(_S)"
+
+#: ../meld/meldapp.py:463
+msgid "Show or hide the statusbar"
+msgstr "ã?¹ã??ã?¼ã?¿ã?¹ã??ã?¼ã?®è¡¨ç¤ºã?? ON/OFF ã??ã?¾ã??"
+
+#. exit at first non found directory + file
+#: ../meld/meldapp.py:804
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?®é??ã?§ã?®æ¯?è¼?ã?¯ã?§ã??ã?¾ã??ã??ã??\n"
-#: ../meldapp.py:899 ../meldapp.py:907
+#: ../meld/meldapp.py:858
+msgid "wrong number of arguments supplied to --diff"
+msgstr "--diff ã?ªã??ã?·ã?§ã?³ã?«å¯¾ã??ã??å¼?æ?°ã?®æ?°ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#: ../meld/meldapp.py:862
+msgid "Start with an empty window"
+msgstr "ä½?ã??é??ã??ã??ã?« Meld ã??èµ·å??ã??ã??"
+
+#: ../meld/meldapp.py:863 ../meld/meldapp.py:864 ../meld/meldapp.py:866
msgid "file"
msgstr "FILE"
-#: ../meldapp.py:900 ../meldapp.py:906
+#: ../meld/meldapp.py:863 ../meld/meldapp.py:865 ../meld/meldapp.py:866
msgid "dir"
msgstr "DIR"
-#: ../meldapp.py:905
-msgid "Start with no window open"
-msgstr "ä½?ã??é??ã??ã??ã?« Meld ã??èµ·å??ã??ã??"
+#: ../meld/meldapp.py:863
+msgid "Start a version control comparison"
+msgstr "ã??ã?¼ã?¸ã?§ã?³ç®¡ç??ã?®æ¯?è¼?ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
-#: ../meldapp.py:906
-#, python-format
-msgid "Start with Version Control browser in '%s'"
-msgstr "'%s' ã?«å¯¾ã??ã??ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?®ã??ã?©ã?¦ã?¶ã??表示ã??ã??"
+#: ../meld/meldapp.py:864
+msgid "Start a 2- or 3-way file comparison"
+msgstr "ï¼?ã?ªã??ã??ï¼?å??ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
-#: ../meldapp.py:907
-#, python-format
-msgid "Start with Version Control diff of '%s'"
-msgstr "'%s' ã?«å¯¾ã??ã??ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?®å·®å??ã??表示ã??ã??"
+#: ../meld/meldapp.py:865
+msgid "Start a 2- or 3-way directory comparison"
+msgstr "ï¼?ã?ªã??ã??ï¼?å??ã?®ã??ã?©ã?«ã??ã??æ¯?è¼?ã??ã??ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
-#: ../meldapp.py:908
-msgid "Start with 2 or 3 way file comparison"
-msgstr "ï¼?ã?¾ã??ã?¯ï¼?å??ã?®ã??ã?¡ã?¤ã?«ã??æ¯?è¼?ã??ã??"
+#: ../meld/meldapp.py:866
+msgid "Start a comparison between file and dir/file"
+msgstr "ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?¨ã??æ¯?è¼?ã??ã??ã?¢ã?¼ã??ã?§èµ·å??ã??ã??"
-#: ../meldapp.py:909
-msgid "Start with 2 or 3 way directory comparison"
-msgstr "ï¼?ã?¾ã??ã?¯ï¼?å??ã?®ã??ã?©ã?«ã??ã??æ¯?è¼?ã??ã??"
-
-#: ../meldapp.py:916
+#: ../meld/meldapp.py:872
msgid "Meld is a file and directory comparison tool."
-msgstr "Meld ã?¯ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?®å??容ã??æ¯?è¼?ã??ã??ã??ã?¼ã?«ã?§ã??ã??"
+msgstr "Meld ã?¯ã??ã?¡ã?¤ã?«ã?¨ã??ã?©ã?«ã??ã?®å??容ã??æ¯?è¼?ã??ã??ã??ã?¼ã?«ã?§ã??:"
-#: ../meldapp.py:919
+#: ../meld/meldapp.py:875
msgid "Set label to use instead of file name"
msgstr "ã??ã?¡ã?¤ã?«å??ã?®ä»£ã??ã??ã?«ä½¿ç?¨ã??ã??ã?©ã??ã?«ã??æ??å®?ã??ã??"
-#: ../meldapp.py:921
+#: ../meld/meldapp.py:877
msgid "Automatically compare all differing files on startup"
msgstr "èµ·å??æ??ã?«ã??ã?¡ã?¤ã?«ã?®ä¸ã?«ã??ã??å?¨ã?¦å·®å??ã??è?ªå??ç??ã?«æ¤?å?ºã??ã??"
-#: ../meldapp.py:922 ../meldapp.py:923 ../meldapp.py:924 ../meldapp.py:925
+#: ../meld/meldapp.py:878 ../meld/meldapp.py:879 ../meld/meldapp.py:880
+#: ../meld/meldapp.py:881
msgid "Ignored for compatibility"
msgstr "äº?æ??æ?§ã??ç?¡è¦?ã??ã??"
-#: ../meldapp.py:928
+#: ../meld/meldapp.py:884
msgid "Creates a diff tab for up to 3 supplied files or directories."
msgstr "æ??å®?ã??ã??æ??大ï¼?ã?¤ã?®ã??ã?¡ã?¤ã?«ã?¾ã??ã?¯ã??ã?©ã?«ã??ã?«å¯¾ã??ã??å·®å??ã??ã?¿ã??ã?§è¡¨ç¤ºã??ã??"
-#: ../meldapp.py:932
-msgid "Invalid number of arguments supplied for --diff."
-msgstr "--diff ã?ªã??ã?·ã?§ã?³ã?«å¯¾ã??ã??å¼?æ?°ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#: ../meldapp.py:935
+#: ../meld/meldapp.py:887
#, python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "å¼?æ?°ã?®æ?°ã??é??é??ã?£ã?¦ã??ã?¾ã?? (%i å??ã?¨å??ã??å??ã??ã?¾ã??ã??)"
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "å¼?æ?°ã??å¤?ã??ã??ã?¾ã?? (0ã??3å??ã??æ?³å®?ã??ã?¦ã??ã??ã??å®?é??ã?¯%då??)"
-#: ../melddoc.py:46
+#: ../meld/melddoc.py:46
msgid "untitled"
msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
#. no common path. empty names get changed to "[None]"
-#: ../misc.py:191
+#: ../meld/misc.py:189
msgid "[None]"
msgstr "[ã?ªã??]"
-#: ../vcview.py:126
+#: ../meld/vcview.py:127
msgid "_Commit"
msgstr "ã?³ã??ã??ã??(_C)"
-#: ../vcview.py:126
+#: ../meld/vcview.py:127
msgid "Commit"
msgstr "ã?³ã??ã??ã??ã??ã?¾ã??"
#. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../vcview.py:127
+#: ../meld/vcview.py:128
msgid "_Update"
msgstr "æ?´æ?°(_U)"
-#: ../vcview.py:127
+#: ../meld/vcview.py:128
msgid "Update"
msgstr "æ?´æ?°ã??ã?¾ã??"
#. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../vcview.py:128
+#: ../meld/vcview.py:129
msgid "_Add"
msgstr "追å? (_A)"
-#: ../vcview.py:128
+#: ../meld/vcview.py:129
msgid "Add to VC"
msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?«è¿½å? ã??ã?¾ã??"
#. FIXME: popup used to use gtk.STOCK_ADD
-#: ../vcview.py:129
+#: ../meld/vcview.py:130
msgid "Add _Binary"
msgstr "ã??ã?¤ã??ã?ªã?®è¿½å? (_B)"
-#: ../vcview.py:129
+#: ../meld/vcview.py:130
msgid "Add binary to VC"
msgstr "ã??ã?¤ã??ã?ªã??ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?«è¿½å? ã??ã?¾ã??"
#. FIXME: stock is inconsistent with other VC actions
-#: ../vcview.py:130
+#: ../meld/vcview.py:131
msgid "_Remove"
msgstr "å??é?¤(_R)"
-#: ../vcview.py:130
+#: ../meld/vcview.py:131
msgid "Remove from VC"
msgstr "ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã??ã??å??é?¤ã??ã?¾ã??"
#. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../vcview.py:131
+#: ../meld/vcview.py:132
+msgid "_Resolved"
+msgstr "解決�(_R)"
+
+#: ../meld/vcview.py:132
+msgid "Mark as resolved for VC"
+msgstr "ã??ã?¼ã?¸ã?§ã?³ç®¡ç??ã?§è§£æ±ºæ¸?ã?¿ã?§ã??ã??ã?¨ã??ã??"
+
+#: ../meld/vcview.py:133
msgid "Revert to original"
msgstr "å??ã?«æ?»ã??ã?¾ã??"
-#: ../vcview.py:132
+#: ../meld/vcview.py:134
msgid "Delete locally"
msgstr "ã?ã?¼ã?«ã?«ã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã??ã?¾ã??"
-#: ../vcview.py:136
+#: ../meld/vcview.py:138
msgid "_Flatten"
msgstr "�覧表示(_F)"
-#: ../vcview.py:136
+#: ../meld/vcview.py:138
msgid "Flatten directories"
-msgstr "ã??ã?£ã?¬ã?¯ã??ã?ªé??層ã??ç?¡è¦?ã??ã?¾ã??"
+msgstr "é??ä¸?ã?®ã??ã?©ã?«ã??ã??ç?¡è¦?ã??ã?¾ã??"
-#: ../vcview.py:137
+#: ../meld/vcview.py:139
msgid "_Modified"
msgstr "���(_M)"
-#: ../vcview.py:138
+#: ../meld/vcview.py:140
msgid "_Normal"
msgstr "��(_N)"
-#: ../vcview.py:138
+#: ../meld/vcview.py:140
msgid "Show normal"
msgstr "é??常ã?®ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
-#: ../vcview.py:139
+#: ../meld/vcview.py:141
msgid "Non _VC"
msgstr "VC以�(_V)"
-#: ../vcview.py:139
+#: ../meld/vcview.py:141
msgid "Show unversioned files"
msgstr "ã??ã?¼ã?¸ã?§ã?³ç®¡ç??å¤?ã?®ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
-#: ../vcview.py:140
+#: ../meld/vcview.py:142
msgid "Ignored"
msgstr "��"
-#: ../vcview.py:140
+#: ../meld/vcview.py:142
msgid "Show ignored files"
msgstr "ç?¡è¦?ã??ã??ã??ã?¡ã?¤ã?«ã??表示ã??ã?¾ã??"
-#: ../vcview.py:178
+#: ../meld/vcview.py:180
msgid "Location"
msgstr "å ´æ??"
-#: ../vcview.py:179
+#: ../meld/vcview.py:181
msgid "Status"
msgstr "ç?¶æ??"
-#: ../vcview.py:180
+#: ../meld/vcview.py:182
msgid "Rev"
msgstr "ã?ªã??ã?¸ã?§ã?³"
-#: ../vcview.py:182
+#: ../meld/vcview.py:184
msgid "Options"
msgstr "ã?ªã??ã?·ã?§ã?³"
-#: ../vcview.py:228
+#: ../meld/vcview.py:230
msgid "Choose one Version Control"
msgstr "ï¼?ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã?®é?¸æ??"
-#: ../vcview.py:229
+#: ../meld/vcview.py:231
msgid "Only one Version Control in this directory"
msgstr "ã??ã?®ã??ã?©ã?«ã??ã?®ï¼?ã??ã?¼ã?¸ã?§ã?³ã?»ã?³ã?³ã??ã?ã?¼ã?«ã? ã??"
-#: ../vcview.py:314
+#: ../meld/vcview.py:316
msgid "(Empty)"
msgstr "(空)"
-#: ../vcview.py:347
+#: ../meld/vcview.py:349
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] å·®å??ã?®å??å¾?ä¸"
-#: ../vcview.py:354
+#: ../meld/vcview.py:356
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] ã??ã??ã??ã?®é?©ç?¨ä¸"
-#: ../vcview.py:358
+#: ../meld/vcview.py:360
msgid "No differences found."
msgstr "å·®å??ã?¯ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
-#: ../vcview.py:437
+#: ../meld/vcview.py:439
msgid "Select some files first."
msgstr "ã?¾ã??æ??å??ã?«ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
-#: ../vcview.py:501
+#: ../meld/vcview.py:505
#, python-format
msgid ""
"\n"
@@ -1128,13 +1166,18 @@ msgid ""
" - source control software version: 'X.Y.Z'\n"
" - the output of '%s somefile.txt'\n"
" - patch command: '%s'\n"
+" (no need to actually run it, just provide\n"
+" the command line) \n"
+" \n"
+" Replace 'X.Y.Z' by the actual version for the\n"
+" source control software you use.\n"
" "
msgstr ""
"\n"
-" 'patch' ã?³ã??ã?³ã??ã?®å®?è¡?ã?«å¤±æ??ã??ã?¾ã??ã??ã??\n"
+" 'patch' ã?³ã??ã?³ã??ã?®é?©ç?¨ã?«å¤±æ??ã??ã?¾ã??ã??ã??\n"
" \n"
" ã??ã??ã??ã?? 'GNU patch' ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??ã??\n"
-" %s ã?®é??ç?ºç??ã??ã??使ã??ã?®ã??ã??ã?§ã??ã??\n"
+" ã??ã?¼ã?¸ã?§ã?³%s (é??ç?ºç??) ã??ã??使ã??ã?®ã?©ã?¡ã??ã??ã?®ã??ã??ã?§ã??ã??\n"
" \n"
" ã??ã?°å ±å??ã?¨ã??ã?¦æ¬¡ã?®å®?å??ã?«æ??å ±ã??æ??ä¾?ã??ã?¦ä¸?ã??ã??:\n"
" meld-list gnome org\n"
@@ -1146,17 +1189,59 @@ msgstr ""
" - source control software version: 'X.Y.Z'\n"
" - the output of '%s somefile.txt'\n"
" - patch command: '%s'\n"
+" (å®?é??ã?«å®?è¡?ã??ã??å¿?è¦?ã?¯ã??ã??ã?¾ã??ã??; å??ã?«ã?³ã??ã?³ã??ã?©ã?¤ã?³ã?®\n"
+" å¼?æ?°ã??ç?¥ã??ã??ã??ã? ã??ã?§ã??) \n"
+" \n"
+" ä¸?ã?® 'X.Y.Z' ã?¯ã??使ã??ã?®ã??ã?¼ã?¸ã?§ã?³ç®¡ç??ã?½ã??ã??è?ªèº«ã?®\n"
+" ã??ã?¼ã?¸ã?§ã?³ã?§ç½®ã??æ??ã??ã?¦ä¸?ã??ã??\n"
" "
+#: ../meld/ui/findbar.py:119
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"æ£è¦?表ç?¾ã?¨ã?©ã?¼\n"
+"'%s'"
+
+#: ../meld/ui/historyentry.py:248
+msgid "_Browse..."
+msgstr "å??ç?§(_B)..."
+
+#: ../meld/ui/historyentry.py:256
+msgid "Path"
+msgstr "ã??ã?¹"
+
+#: ../meld/ui/historyentry.py:257
+msgid "Path to file"
+msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?¹ã?§ã??"
+
+#: ../meld/ui/historyentry.py:258
+msgid "Pop up a file selector to choose a file"
+msgstr "ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã?¾ã??"
+
+#: ../meld/ui/historyentry.py:379
+msgid "Select directory"
+msgstr "ã??ã?©ã?«ã??ã?®é?¸æ??"
+
+#: ../meld/ui/historyentry.py:383
+msgid "Select file"
+msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
+
+#: ../meld/ui/notebooklabel.py:61
+msgid "Close tab"
+msgstr "ã??ã?®ã?¿ã??ã??é??ã??ã?¾ã??"
+
#. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:39
+#: ../meld/vc/_vc.py:40
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:151
+#: ../meld/vc/cvs.py:151
#, python-format
msgid ""
"Error converting to a regular expression\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
