[meld] Update Japanese translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Update Japanese translation
- Date: Tue, 8 Jan 2019 12:19:45 +0000 (UTC)
commit 386e1dcb6d40fe987f6702fd1cd1ced5de238def
Author: Ryuta Fujii <translation sicklylife jp>
Date: Tue Jan 8 12:19:28 2019 +0000
Update Japanese translation
po/ja.po | 3184 +++++++++++++++++++++++++++++++++++++++++---------------------
1 file changed, 2122 insertions(+), 1062 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index e5c68dfa..bc009446 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,1519 +1,2579 @@
# meld ja.po.
# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# Takeshi AIHANA <takeshi aihana gmail com>, 2003-2011.
-# Toshiharu Kudoh <toshi kd2 gmail com>, 2012.
+# Toshiharu Kudoh <toshi kd2 gmail com>, 2012-2013.
+# Shinichirou Yamada <yamada_strong_yamada_nice_64bit yahoo co jp>, 2017.
+# sicklylife <translation sicklylife jp>, 2019.
#
msgid ""
msgstr ""
"Project-Id-Version: meld master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-02-04 12:15+0000\n"
-"PO-Revision-Date: 2012-02-05 00:23+0900\n"
-"Last-Translator: Toshiharu Kudoh <toshi kd2 gmail com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
+"POT-Creation-Date: 2019-01-07 22:26+0000\n"
+"PO-Revision-Date: 2019-01-08 21:02+0900\n"
+"Last-Translator: sicklylife <translation sicklylife jp>\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"
-"Language: ja\n"
"Generated-By: pygettext.py 1.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../bin/meld:97
+#: ../bin/meld:190
msgid "Cannot import: "
-msgstr "インãƒãƒ¼ãƒˆã§ãã¾ã›ã‚“:"
+msgstr "インãƒãƒ¼ãƒˆã§ãã¾ã›ã‚“: "
-#: ../bin/meld:100
+#: ../bin/meld:193
#, 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 "Diff Viewer"
-msgstr "差分ビューアー"
+#: ../bin/meld:249
+#, c-format
+msgid ""
+"Couldn’t load Meld-specific CSS (%s)\n"
+"%s"
+msgstr ""
-#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
+#: ../data/org.gnome.meld.desktop.in.h:1
+#: ../data/org.gnome.meld.appdata.xml.in.h:1
+#: ../meld/resources/ui/appwindow.ui.h:1
msgid "Meld"
msgstr "Meld"
-#: ../data/meld.desktop.in.h:4
+#: ../data/org.gnome.meld.desktop.in.h:2
+msgid "Diff Viewer"
+msgstr "差分ビューアー"
+
+#: ../data/org.gnome.meld.desktop.in.h:3
msgid "Meld Diff Viewer"
msgstr "Meld 差分ビューアー"
-#: ../data/ui/EditableList.ui.h:1
-msgid "Active"
-msgstr "有効"
+#: ../data/org.gnome.meld.desktop.in.h:4
+#: ../data/org.gnome.meld.appdata.xml.in.h:2
+msgid "Compare and merge your files"
+msgstr "複数ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較ã—ãŸã‚Šãƒžãƒ¼ã‚¸ã—ãŸã‚Šã—ã¾ã™"
-#: ../data/ui/EditableList.ui.h:2
-msgid "Add new filter"
-msgstr "æ–°ã—ã„ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’è¿½åŠ ã—ã¾ã™"
+#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list
MUST also end with a semicolon!
+#: ../data/org.gnome.meld.desktop.in.h:6
+msgid "diff;merge;"
+msgstr "diff;merge;比較;マージ;"
-#: ../data/ui/EditableList.ui.h:3
-msgid "Editable List"
-msgstr "編集å¯èƒ½ãªãƒªã‚¹ãƒˆ"
+#: ../data/org.gnome.meld.appdata.xml.in.h:3
+msgid ""
+"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
+"compare files, directories, and version controlled projects. It provides "
+"two- and three-way comparison of both files and directories, and supports "
+"many version control systems including Git, Mercurial, Bazaar and Subversion."
+msgstr ""
-#: ../data/ui/EditableList.ui.h:4
-msgid "Move _Down"
-msgstr "下ã¸ç§»å‹•ã™ã‚‹(_D)"
+#: ../data/org.gnome.meld.appdata.xml.in.h:4
+msgid ""
+"Meld helps you review code changes, understand patches, and makes enormous "
+"merge conflicts slightly less painful."
+msgstr ""
-#: ../data/ui/EditableList.ui.h:5
-msgid "Move _Up"
-msgstr "上ã¸ç§»å‹•ã™ã‚‹(_U)"
+#: ../data/org.gnome.meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr ""
-#: ../data/ui/EditableList.ui.h:6
-msgid "Move item down"
-msgstr "アイテムを下ã¸ç§»å‹•ã—ã¾ã™"
+#: ../data/mime/org.gnome.meld.xml.in.h:1
+msgid "Meld comparison description"
+msgstr ""
-#: ../data/ui/EditableList.ui.h:7
-msgid "Move item up"
-msgstr "アイテムを上ã¸ç§»å‹•ã—ã¾ã™"
+#: ../data/org.gnome.meld.gschema.xml.h:1
+msgid "Default window width"
+msgstr "デフォルトã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®å¹…"
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:166
-msgid "Name"
-msgstr "åå‰"
+#: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window height"
+msgstr "デフォルトã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®é«˜ã•"
-#: ../data/ui/EditableList.ui.h:9
-msgid "Pattern"
-msgstr "パターン"
+#: ../data/org.gnome.meld.gschema.xml.h:3
+msgid "Default window maximised state"
+msgstr "デフォルトã§ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒæœ€å¤§åŒ–ã•ã‚Œã‚‹ã‹ã©ã†ã‹"
-#: ../data/ui/EditableList.ui.h:10
-msgid "Remove selected filter"
-msgstr "é¸æŠžã—ãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’削除ã—ã¾ã™"
+#: ../data/org.gnome.meld.gschema.xml.h:4
+msgid "Default window fullscreen state"
+msgstr "デフォルトã§ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒãƒ•ãƒ«ã‚¹ã‚¯ãƒªãƒ¼ãƒ³è¡¨ç¤ºã•ã‚Œã‚‹ã‹ã©ã†ã‹"
-#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:130
-msgid "_Add"
-msgstr "è¿½åŠ (_A)"
+#: ../data/org.gnome.meld.gschema.xml.h:5
+msgid "Additional automatically detected text encodings"
+msgstr "自動検出ã•ã‚Œã‚‹è¿½åŠ ã®ãƒ†ã‚ストエンコーディング"
-#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:132
-msgid "_Remove"
-msgstr "削除(_R)"
+#: ../data/org.gnome.meld.gschema.xml.h:6
+msgid ""
+"Meld will use these text encodings to try to decode loaded text files before "
+"trying any other encodings. In addition to the encodings in this list, UTF-8 "
+"and the current locale-default encoding will always be used; other encodings "
+"may also be tried, depending on the user’s locale."
+msgstr ""
+"Meld ã¯ä»–ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚’試ã™å‰ã«ã€ã“れらã®ãƒ†ã‚ストエンコーディングを使用"
+"ã—ã¦ã€èªã¿è¾¼ã‚“ã テã‚ストファイルã®ãƒ‡ã‚³ãƒ¼ãƒ‰ã‚’試ã¿ã¾ã™ã€‚ã“ã®ãƒªã‚¹ãƒˆã®ã‚¨ãƒ³ã‚³ãƒ¼"
+"ディングã«åŠ ãˆã€UTF-8 ã¨ç¾åœ¨ã®ãƒã‚±ãƒ¼ãƒ«ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ãŒå¸¸ã«ä½¿"
+"用ã•ã‚Œã¾ã™ã€‚ユーザーã®ãƒã‚±ãƒ¼ãƒ«ã«ã‚ˆã£ã¦ã¯ã€ä»–ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã§ã®ãƒ‡ã‚³ãƒ¼ãƒ‰ã‚‚"
+"試ã•ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
+
+#: ../data/org.gnome.meld.gschema.xml.h:7
+msgid "Width of an indentation step"
+msgstr "タブã®å¹…"
+
+#: ../data/org.gnome.meld.gschema.xml.h:8
+msgid "The number of spaces to use for a single indent step"
+msgstr "インデント幅をスペース何個分ã«ã™ã‚‹ã‹"
+
+#: ../data/org.gnome.meld.gschema.xml.h:9
+msgid "Whether to indent using spaces or tabs"
+msgstr "スペースã¨ã‚¿ãƒ–ã®ã©ã¡ã‚‰ã‚’使ã£ã¦ã‚¤ãƒ³ãƒ‡ãƒ³ãƒˆã™ã‚‹ã‹"
+
+#: ../data/org.gnome.meld.gschema.xml.h:10
+msgid "If true, any new indentation will use spaces instead of tabs."
+msgstr ""
+"true ã®å ´åˆã€æ–°ã—ã„インデントã§ã¯ã‚¿ãƒ–ã®ä»£ã‚ã‚Šã«ã‚¹ãƒšãƒ¼ã‚¹ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
+
+#: ../data/org.gnome.meld.gschema.xml.h:11
+msgid "Show line numbers"
+msgstr "行番å·ã‚’表示ã™ã‚‹"
-#: ../data/ui/filediff.ui.h:1
-msgid "Save modified files?"
-msgstr "変更ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã—ã¾ã™ã‹ï¼Ÿ"
+#: ../data/org.gnome.meld.gschema.xml.h:12
+msgid "If true, line numbers will be shown in the gutter of file comparisons."
+msgstr "true ã®å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«æ¯”較時ã®ã‚¬ã‚¿ãƒ¼éƒ¨åˆ†ã«è¡Œç•ªå·ã‚’表示ã—ã¾ã™ã€‚"
-#: ../data/ui/filediff.ui.h:2
+#: ../data/org.gnome.meld.gschema.xml.h:13
+msgid "Highlight syntax"
+msgstr "シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆ"
+
+#: ../data/org.gnome.meld.gschema.xml.h:14
msgid ""
-"Some files have been modified.\n"
-"Which ones would you like to save?"
+"Whether to highlight syntax in comparisons. Because of Meld’s own color "
+"highlighting, this is off by default."
msgstr ""
-"ã„ãã¤ã‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚\n"
-"ã©ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã—ã¾ã™ã‹ï¼Ÿ"
-
-#: ../data/ui/filediff.ui.h:4
-msgid "_Discard Changes"
-msgstr "変更をå–り消ã™(_D)"
-#: ../data/ui/filediff.ui.h:5
-msgid "_Save Selected"
-msgstr "é¸æŠžç¯„囲をä¿å˜ã™ã‚‹(_S)"
+#: ../data/org.gnome.meld.gschema.xml.h:15
+msgid "Color scheme to use for syntax highlighting"
+msgstr "シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆã«ä½¿ç”¨ã™ã‚‹ã‚«ãƒ©ãƒ¼ã‚¹ã‚ーマ"
-#: ../data/ui/findbar.ui.h:1
-msgid "Regular E_xpression"
-msgstr "æ£è¦è¡¨ç¾(_X)"
+#: ../data/org.gnome.meld.gschema.xml.h:16
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr ""
+"シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆã®ãŸã‚ã«æ±ºã‚られãŸè‰²ã¯ GtkSourceView ã«ã‚ˆã£ã¦ä½¿ç”¨ã•ã‚Œã¾"
+"ã™"
-#: ../data/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "å…¨ã¦ç½®æ›(_A)"
+#: ../data/org.gnome.meld.gschema.xml.h:17
+msgid "Displayed whitespace"
+msgstr "ホワイトスペースを表示ã™ã‚‹"
-#: ../data/ui/findbar.ui.h:3
-msgid "Replace _With"
-msgstr "次ã§ç½®ãæ›ãˆã‚‹(_W):"
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid ""
+"Selector for individual whitespace character types to be shown. Possible "
+"values are 'space', 'tab', 'newline' and 'nbsp'."
+msgstr ""
+"表示ã™ã‚‹ç©ºç™½é¡žæ–‡å—ã®ç¨®é¡žã®è¨å®šã§ã™ã€‚使用å¯èƒ½ãªå€¤ã¯ "
+"'space'ã€'tab'ã€'newline'ã€'nbsp' ã§ã™ã€‚"
-#: ../data/ui/findbar.ui.h:4
-msgid "Who_le word"
-msgstr "å˜èªžå…¨ä½“(_L)"
+#: ../data/org.gnome.meld.gschema.xml.h:19
+msgid "Wrap mode"
+msgstr "折り返ã—ã®ãƒ¢ãƒ¼ãƒ‰"
-#: ../data/ui/findbar.ui.h:5
-msgid "_Match Case"
-msgstr "大/å°æ–‡å—を区別ã™ã‚‹(_M)"
+#: ../data/org.gnome.meld.gschema.xml.h:20
+msgid ""
+"Lines in file comparisons will be wrapped according to this setting, either "
+"not at all ('none'), at any character ('char') or only at the end of words "
+"('word')."
+msgstr ""
+"ファイル比較時ã®å„è¡Œã¯ã€ã“ã®è¨å®šã«å¾“ã£ã¦æŠ˜ã‚Šè¿”ã•ã‚Œã¾ã™ã€‚折り返ã•ãªã„å ´åˆã¯ "
+"'none'ã€ä»»æ„ã®æ–‡å—ã§æŠ˜ã‚Šè¿”ã™å ´åˆã¯ 'char'ã€å˜èªžã®æœ«å°¾ã§æŠ˜ã‚Šè¿”ã™å ´åˆã¯ 'word' "
+"を指定ã—ã¾ã™ã€‚"
-#: ../data/ui/findbar.ui.h:6
-msgid "_Next"
-msgstr "次ã®çµæžœ(_N)"
+#: ../data/org.gnome.meld.gschema.xml.h:21
+msgid "Highlight current line"
+msgstr "ç¾åœ¨ã®è¡Œã®ãƒã‚¤ãƒ©ã‚¤ãƒˆ"
-#: ../data/ui/findbar.ui.h:7
-msgid "_Previous"
-msgstr "å‰ã®çµæžœ(_P)"
+#: ../data/org.gnome.meld.gschema.xml.h:22
+msgid ""
+"If true, the line containing the cursor will be highlighted in file "
+"comparisons."
+msgstr "true ã®å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«æ¯”較時ã«ã‚«ãƒ¼ã‚½ãƒ«ã®ã‚ã‚‹è¡ŒãŒãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã‚Œã¾ã™ã€‚"
-#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
-msgid "_Replace"
-msgstr "ç½®æ›(_R)"
+#: ../data/org.gnome.meld.gschema.xml.h:23
+msgid "Use the system default monospace font"
+msgstr "システムデフォルトã®ç‰å¹…フォントを使用ã™ã‚‹"
-#: ../data/ui/findbar.ui.h:9
-msgid "_Search for"
-msgstr "検索ã™ã‚‹æ–‡å—列(_S):"
+#: ../data/org.gnome.meld.gschema.xml.h:24
+msgid ""
+"If false, custom-font will be used instead of the system monospace font."
+msgstr ""
+"false ã®å ´åˆã€ã‚·ã‚¹ãƒ†ãƒ ã® monospace フォントã®ä»£ã‚ã‚Šã«ã‚«ã‚¹ã‚¿ãƒ フォントãŒä½¿ç”¨ã•"
+"ã‚Œã¾ã™ã€‚"
-#: ../data/ui/meldapp.ui.h:1
-msgid "Choose Files"
-msgstr "ファイルã®é¸æŠž"
+#: ../data/org.gnome.meld.gschema.xml.h:25
+msgid "Custom font"
+msgstr "カスタムフォント"
-#: ../data/ui/meldapp.ui.h:2
+#: ../data/org.gnome.meld.gschema.xml.h:26
msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2011 Kai Willadsen"
+"The custom font to use, stored as a string and parsed as a Pango font "
+"description."
msgstr ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2011 Kai Willadsen"
-#: ../data/ui/meldapp.ui.h:4
-msgid "Directory"
-msgstr "フォルダー"
+#: ../data/org.gnome.meld.gschema.xml.h:27
+msgid "Ignore blank lines when comparing files"
+msgstr "ファイル比較時ã«ç©ºè¡Œã‚’無視ã™ã‚‹"
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:7
-msgid "Mine"
-msgstr "自分ã®ã‚‚ã®"
+#: ../data/org.gnome.meld.gschema.xml.h:28
+msgid ""
+"If true, blank lines will be trimmed when highlighting changes between files."
+msgstr ""
+"true ã®å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«é–“ã®å¤‰æ›´ç‚¹ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã™ã‚‹éš›ã«ã€ç©ºè¡Œã®å·®ç•°ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã—"
+"ã¾ã›ã‚“。"
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:9
-msgid "Original"
-msgstr "オリジナル"
+#: ../data/org.gnome.meld.gschema.xml.h:29
+msgid "Use the system default editor"
+msgstr "システムデフォルトã®ã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã‚’使用ã™ã‚‹"
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:11
-msgid "Other"
-msgstr "ä»–ã®ã‚‚ã®"
+#: ../data/org.gnome.meld.gschema.xml.h:30
+msgid ""
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
+msgstr ""
+"false ã®å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’別ã®ã‚¢ãƒ—リã§é–‹ãéš›ã«ã€ã‚·ã‚¹ãƒ†ãƒ ã®ã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã®ä»£ã‚ã‚Šã«"
+"指定ã—ãŸã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã‚³ãƒžãƒ³ãƒ‰ã‚’使用ã—ã¾ã™ã€‚"
-#: ../data/ui/meldapp.ui.h:12
-msgid "Select VC Directory"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ãƒ»ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®é¸æŠž"
+#: ../data/org.gnome.meld.gschema.xml.h:31
+msgid "The custom editor launch command"
+msgstr "カスタムエディター起動コマンド"
-#: ../data/ui/meldapp.ui.h:13
-msgid "_Directory Comparison"
-msgstr "フォルダーã®æ¯”較(_D)"
+#: ../data/org.gnome.meld.gschema.xml.h:32
+msgid ""
+"The command used to launch a custom editor. Some limited templating is "
+"supported here; at the moment '{file}' and '{line}' are recognised tokens."
+msgstr ""
-#: ../data/ui/meldapp.ui.h:14
-msgid "_File Comparison"
-msgstr "ファイルã®æ¯”較(_F)"
+#: ../data/org.gnome.meld.gschema.xml.h:33
+msgid "Columns to display"
+msgstr "表示ã™ã‚‹ã‚«ãƒ©ãƒ "
-#: ../data/ui/meldapp.ui.h:15
-msgid "_Three Way Compare"
-msgstr "3ã¤ã®é–“ã§æ¯”較ã™ã‚‹(_T)"
+#: ../data/org.gnome.meld.gschema.xml.h:34
+msgid ""
+"List of column names in folder comparison and whether they should be "
+"displayed."
+msgstr ""
+"フォルダー比較時ã®ã‚«ãƒ©ãƒ åã®ä¸€è¦§ã¨ã€ãれらを表示ã™ã‚‹ã‹ã©ã†ã‹ã®è¨å®šã§ã™ã€‚"
-#: ../data/ui/meldapp.ui.h:16
-msgid "_Version Control Browser"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ãƒ»ãƒ–ラウザー(_V)"
+#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../meld/resources/ui/preferences.ui.h:25
+msgid "Ignore symbolic links"
+msgstr "シンボリックリンクを無視ã™ã‚‹"
-#: ../data/ui/meldapp.ui.h:17
-msgid "translator-credits"
-msgstr "相花 毅 <takeshi aihana gmail com>"
+#: ../data/org.gnome.meld.gschema.xml.h:36
+msgid ""
+"If true, folder comparisons do not follow symbolic links when traversing the "
+"folder tree."
+msgstr ""
+"true ã®å ´åˆã€ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼æ¯”較時ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ãƒ„リー走査ã«ãŠã„ã¦ã€ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³"
+"クã®ãƒªãƒ³ã‚¯å…ˆã‚’走査ã—ã¾ã›ã‚“。"
-#: ../data/ui/patch-dialog.ui.h:1
-msgid "Copy to Clipboard"
-msgstr "クリップボードã¸ã‚³ãƒ”ー"
+#: ../data/org.gnome.meld.gschema.xml.h:37
+msgid "Use shallow comparison"
+msgstr "æµ…ã„比較を使用ã™ã‚‹"
-#: ../data/ui/patch-dialog.ui.h:2
-msgid "Create Patch"
-msgstr "パッãƒã®ç”Ÿæˆ"
+#: ../data/org.gnome.meld.gschema.xml.h:38
+msgid ""
+"If true, folder comparisons compare files based solely on size and mtime, "
+"considering files to be identical if their size and mtime match, and "
+"different otherwise."
+msgstr ""
+"true ã®å ´åˆã€ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼æ¯”較時ã«ã‚µã‚¤ã‚ºã¨ mtime ã ã‘を基準ã«ã—ã¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較"
+"ã—ã€ãれらãŒä¸€è‡´ã™ã‚Œã°åŒä¸€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã‚ã‚‹ã¨è¦‹åšã—ã¾ã™ã€‚"
-#: ../data/ui/patch-dialog.ui.h:3
-msgid "Create a patch"
-msgstr "パッãƒã®ç”Ÿæˆ"
+#: ../data/org.gnome.meld.gschema.xml.h:39
+msgid "File timestamp resolution"
+msgstr "ファイルã®ã‚¿ã‚¤ãƒ スタンプ分解能"
-#: ../data/ui/patch-dialog.ui.h:4
-msgid "Left and middle panes"
-msgstr "å·¦å´ã¨çœŸã‚“ä¸ã®ãƒšã‚¤ãƒ³"
+#: ../data/org.gnome.meld.gschema.xml.h:40
+msgid ""
+"When comparing based on mtime, this is the minimum difference in nanoseconds "
+"between two files before they’re considered to have different mtimes. This "
+"is useful when comparing files between filesystems with different timestamp "
+"resolution."
+msgstr ""
+"mtime ã«åŸºã¥ã„ã¦æ¯”較ã™ã‚‹å ´åˆã€ã“ã®å€¤ãŒ2ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«é–“ã«ãŠã„㦠mtime ãŒç•°ãªã‚‹"
+"ã¨è¦‹åšã•ã‚Œã‚‹æœ€å°ã®å·®ç•°(ナノ秒)ã§ã™ã€‚ã“ã‚Œã¯ã‚¿ã‚¤ãƒ スタンプ分解能ãŒç•°ãªã‚‹ãƒ•ã‚¡ã‚¤"
+"ルシステム間ã§ã€ãƒ•ã‚¡ã‚¤ãƒ«ã®æ¯”較を行ã†éš›ã«å½¹ç«‹ã¡ã¾ã™ã€‚"
-#: ../data/ui/patch-dialog.ui.h:5
-msgid "Middle and right panes"
-msgstr "真んä¸ã¨å³å´ã®ãƒšã‚¤ãƒ³"
+#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../meld/resources/ui/preferences.ui.h:22
+msgid "Apply text filters during folder comparisons"
+msgstr "フォルダーã®æ¯”較ä¸ã«ãƒ†ã‚ストフィルターをé©ç”¨ã™ã‚‹"
-#: ../data/ui/patch-dialog.ui.h:6
-msgid "Use differences between:"
-msgstr "次ã®ãƒšã‚¤ãƒ³ã®é–“ã®å·®åˆ†ã‚’パッãƒã«ã™ã‚‹:"
+#: ../data/org.gnome.meld.gschema.xml.h:42
+msgid ""
+"If true, folder comparisons that compare file contents also apply active "
+"text filters and the blank line trimming option, and ignore newline "
+"differences."
+msgstr ""
+"true ã®å ´åˆã€ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼æ¯”較時ã«ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容を比較ã™ã‚‹éš›ã«ã€æœ‰åŠ¹ãªãƒ†ã‚スト"
+"フィルターã¨ç©ºè¡Œã®ãƒˆãƒªãƒŸãƒ³ã‚°ã‚ªãƒ—ションãŒé©ç”¨ã•ã‚Œã€æ”¹è¡Œã«ã‚ˆã‚‹å·®ç•°ã¯ç„¡è¦–ã—ã¾"
+"ã™ã€‚"
-#: ../data/ui/patch-dialog.ui.h:7
-msgid "_Reverse patch direction"
-msgstr "オリジナル・ファイルを逆ã«ã™ã‚‹(_R)"
+#: ../data/org.gnome.meld.gschema.xml.h:43
+msgid "File status filters"
+msgstr "ファイルã®çŠ¶æ…‹ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼"
-#: ../data/ui/preferences.ui.h:1
-msgid "Display"
-msgstr "表示"
+#: ../data/org.gnome.meld.gschema.xml.h:44
+msgid "List of statuses used to filter visible files in folder comparison."
+msgstr ""
+"フォルダー比較時ã«ã€è¡¨ç¤ºã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’フィルタリングã™ã‚‹ãŸã‚ã«ä½¿ç”¨ã•ã‚Œã‚‹ã‚¹"
+"テータスã®ãƒªã‚¹ãƒˆã€‚"
-#: ../data/ui/preferences.ui.h:2
-msgid "Do not _split words over two lines"
-msgstr "å˜èªžãŒäºŒè¡Œã«ã¾ãŸãŒã‚‰ãªã„よã†ã«ã™ã‚‹(_S)"
+#: ../data/org.gnome.meld.gschema.xml.h:45
+msgid "Show the version control console output"
+msgstr ""
-#: ../data/ui/preferences.ui.h:3
-msgid "Edito_r command:"
-msgstr "エディターをコマンドã§æŒ‡å®šã™ã‚‹(_R):"
+#: ../data/org.gnome.meld.gschema.xml.h:46
+msgid ""
+"If true, a console output section will be shown in version control views, "
+"showing the commands run for version control operations."
+msgstr ""
-#: ../data/ui/preferences.ui.h:4
-msgid "Editor"
-msgstr "エディター"
+#: ../data/org.gnome.meld.gschema.xml.h:47
+msgid "Version control pane position"
+msgstr ""
-#: ../data/ui/preferences.ui.h:5
-msgid "Enable text _wrapping"
-msgstr "æ–‡å—列ã®æŠ˜ã‚Šè¿”ã—を有効ã«ã™ã‚‹(_W)"
+#: ../data/org.gnome.meld.gschema.xml.h:48
+msgid ""
+"This is the height of the main version control tree when the console pane is "
+"shown."
+msgstr ""
-#: ../data/ui/preferences.ui.h:6
-msgid "Encoding"
-msgstr "エンコーディング"
+#: ../data/org.gnome.meld.gschema.xml.h:49
+msgid "Present version comparisons as left-local/right-remote"
+msgstr ""
-#: ../data/ui/preferences.ui.h:7
-msgid "External editor"
-msgstr "外部エディター"
+#: ../data/org.gnome.meld.gschema.xml.h:50
+msgid ""
+"If true, version control comparisons will use a left-is-local, right-is-"
+"remote scheme to determine what order to present files in panes. Otherwise, "
+"a left-is-theirs, right-is-mine scheme is used."
+msgstr ""
-#: ../data/ui/preferences.ui.h:8
-msgid "File Filters"
-msgstr "ファイルã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼"
+#: ../data/org.gnome.meld.gschema.xml.h:51
+msgid "Order for files in three-way version control merge comparisons"
+msgstr ""
-#: ../data/ui/preferences.ui.h:9
-msgid "Font"
-msgstr "フォント"
+#: ../data/org.gnome.meld.gschema.xml.h:52
+msgid ""
+"Choices for file order are remote/merged/local and local/merged/remote. This "
+"preference only affects three-way comparisons launched from the version "
+"control view, so is used solely for merges/conflict resolution within Meld."
+msgstr ""
-#: ../data/ui/preferences.ui.h:10
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "空行ã®æŒ¿å…¥ã‚„削除を無視ã™ã‚‹"
+#: ../data/org.gnome.meld.gschema.xml.h:53
+msgid "Show margin in commit message editor"
+msgstr ""
-#: ../data/ui/preferences.ui.h:11
-msgid "Ignore symbolic links"
-msgstr "シンボリック・リンクを無視ã™ã‚‹"
+#: ../data/org.gnome.meld.gschema.xml.h:54
+msgid ""
+"If true, a guide will be displayed to show what column the margin is at in "
+"the version control commit message editor."
+msgstr ""
-#: ../data/ui/preferences.ui.h:12
-msgid "Loading"
-msgstr "èªã¿è¾¼ã¿"
+#: ../data/org.gnome.meld.gschema.xml.h:55
+msgid "Margin column in commit message editor"
+msgstr ""
-#: ../data/ui/preferences.ui.h:13
-msgid "Meld Preferences"
-msgstr "Meld ã®è¨å®š"
+#: ../data/org.gnome.meld.gschema.xml.h:56
+msgid ""
+"The column at which to show the margin in the version control commit message "
+"editor."
+msgstr ""
-#: ../data/ui/preferences.ui.h:14
-msgid "Show _line numbers"
-msgstr "行番å·ã‚’表示ã™ã‚‹(_L)"
+#: ../data/org.gnome.meld.gschema.xml.h:57
+msgid "Automatically hard-wrap commit messages"
+msgstr ""
-#: ../data/ui/preferences.ui.h:15
-msgid "Show w_hitespace"
-msgstr "空白や改行を表示ã™ã‚‹(_H)"
+#: ../data/org.gnome.meld.gschema.xml.h:58
+msgid ""
+"If true, the version control commit message editor will hard-wrap (i.e., "
+"insert line breaks) at the commit margin before commit."
+msgstr ""
-#: ../data/ui/preferences.ui.h:16
-msgid "Text Filters"
-msgstr "æ–‡å—列ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼"
+#: ../data/org.gnome.meld.gschema.xml.h:59
+msgid "Version control status filters"
+msgstr ""
-#: ../data/ui/preferences.ui.h:17
-msgid "Use _default system editor"
-msgstr "システムã§ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã‚’使用ã™ã‚‹(_D)"
+#: ../data/org.gnome.meld.gschema.xml.h:60
+msgid ""
+"List of statuses used to filter visible files in version control comparison."
+msgstr ""
-#: ../data/ui/preferences.ui.h:18
-msgid "Use s_yntax highlighting"
-msgstr "シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆã‚’有効ã«ã™ã‚‹(_Y)"
+#: ../data/org.gnome.meld.gschema.xml.h:61
+msgid "Filename-based filters"
+msgstr "ファイルåを対象ã¨ã—ãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ¼"
-#: ../data/ui/preferences.ui.h:19
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+#: ../data/org.gnome.meld.gschema.xml.h:62
+msgid ""
+"List of predefined filename-based filters that, if active, will remove "
+"matching files from a folder comparison."
msgstr ""
-"ファイルをèªã¿è¾¼ã‚€éš›ã«ã€æ¬¡ã®é †ç•ªã§ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚’試行ã—ã¾ã™ (例: utf8, "
-"iso8859)"
+"ファイルåãŒå¯¾è±¡ã®å®šç¾©ã•ã‚ŒãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã®ãƒªã‚¹ãƒˆã€‚有効ãªå ´åˆã€ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®æ¯”較"
+"ã‹ã‚‰ä¸€è‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’除外ã—ã¾ã™ã€‚"
+
+#: ../data/org.gnome.meld.gschema.xml.h:63
+msgid "Text-based filters"
+msgstr "テã‚ストを対象ã¨ã—ãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ¼"
-#: ../data/ui/preferences.ui.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:64
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."
+"List of predefined text-based regex filters that, if active, will remove "
+"text from being used in a file comparison. The text will still be displayed, "
+"but won’t contribute to the comparison itself."
msgstr ""
-"フォルダーã®æ¯”較を行ã†æ™‚ã€ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’åå‰ã§ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°ã§ãã¾"
-"ã™ã€‚フィルタリングã®ãƒ‘ターンã¯ãã‚Œãžã‚Œã€ã‚¹ãƒšãƒ¼ã‚¹ã§åŒºåˆ‡ã£ãŸ SHELL åž‹å¼ã®ãƒ¯ã‚¤ãƒ«"
-"ドカードã®ä¸¦ã³ã§ã™ã€‚"
+"テã‚ストãŒå¯¾è±¡ã®å®šç¾©ã•ã‚ŒãŸæ£è¦è¡¨ç¾ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã®ãƒªã‚¹ãƒˆã€‚有効ãªå ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«"
+"ã®æ¯”較ã‹ã‚‰ä¸€è‡´ã™ã‚‹ãƒ†ã‚ストを除外ã—ã¾ã™ã€‚一致ã—ãŸãƒ†ã‚スト自体ã¯è¡¨ç¤ºã•ã‚Œã¾ã™"
+"ãŒã€æ¯”較ã«ã¯å½±éŸ¿ã—ã¾ã›ã‚“。"
+
+#: ../data/styles/meld-base.xml.h:1
+msgid "Meld base scheme"
+msgstr "Meld ã®æ¨™æº–スã‚ーマ"
+
+#: ../data/styles/meld-base.xml.h:2
+msgid "Base color scheme for Meld highlighting"
+msgstr "Meld ãŒãƒã‚¤ãƒ©ã‚¤ãƒˆã«ç”¨ã„る標準カラースã‚ーマ"
+
+#: ../data/styles/meld-dark.xml.h:1
+msgid "Meld dark scheme"
+msgstr "Meld ダークスã‚ーマ"
+
+#: ../data/styles/meld-dark.xml.h:2
+msgid "Dark color scheme for Meld highlighting"
+msgstr "Meld ãŒãƒã‚¤ãƒ©ã‚¤ãƒˆã«ç”¨ã„るダークカラースã‚ーマ"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "全般"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:2
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "æ–°ã—ã„比較"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:3
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "比較を閉ã˜ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:4
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Meld を終了ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:5
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "ç¾åœ¨é©ç”¨ä¸ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’åœæ¢ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:6
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "比較内容を更新ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:7
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "フルスクリーンã§è¡¨ç¤ºã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:8
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "タブ"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:9
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "å‰ã®ã‚¿ãƒ–ã¸ç§»å‹•ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "次ã®ã‚¿ãƒ–ã¸ç§»å‹•ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "タブを切り替ãˆã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "タブを左ã¸ç§»å‹•ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "タブをå³ã¸ç§»å‹•ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:14
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "変更点"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "å‰ã®å¤‰æ›´ç‚¹ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:16
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "次ã®å¤‰æ›´ç‚¹ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:17
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "編集"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "å…ƒã«æˆ»ã™"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "ã‚„ã‚Šç›´ã—"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "切りå–ã‚Š"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "コピー"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "貼り付ã‘"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "検索"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:24
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "次を検索ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:25
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "å‰ã‚’検索ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:26
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "ç½®æ›"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:27
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "ファイルã®æ¯”較"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:28
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:29
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ–°ã—ã„åå‰ã§ä¿å˜ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:30
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "比較ä¸ã®ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:31
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "å‰ã®è¡çªç®‡æ‰€"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "次ã®è¡çªç®‡æ‰€"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "変更点を左ã¸é©ç”¨ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "変更点をå³ã¸é©ç”¨ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "変更点を左ã‹ã‚‰é©ç”¨ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "変更点をå³ã‹ã‚‰é©ç”¨ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:37
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "å·¦ã®å¤‰æ›´ç‚¹ã®ä¸Šã«ã‚³ãƒ”ーã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:38
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "å·¦ã®å¤‰æ›´ç‚¹ã®ä¸‹ã«ã‚³ãƒ”ーã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "å³ã®å¤‰æ›´ç‚¹ã®ä¸Šã«ã‚³ãƒ”ーã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "å³ã®å¤‰æ›´ç‚¹ã®ä¸‹ã«ã‚³ãƒ”ーã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:41
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "変更点を削除ã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "å‰ã®æ¯”較ペイン"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "次ã®æ¯”較ペイン"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:44
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "フォルダーã®æ¯”較"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:45
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "å·¦ã¸ã‚³ãƒ”ーã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:46
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "å³ã¸ã‚³ãƒ”ーã™ã‚‹"
-#: ../data/ui/preferences.ui.h:21
+#: ../meld/resources/gtk/help-overlay.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã®æ¯”較"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã¸ã‚³ãƒŸãƒƒãƒˆã™ã‚‹"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "コンソール出力ã®è¡¨ç¤º/éžè¡¨ç¤º"
+
+#: ../meld/resources/gtk/menus.ui.h:1
+msgid "_Preferences"
+msgstr "è¨å®š(_P)"
+
+#: ../meld/resources/gtk/menus.ui.h:2
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
+#: ../meld/resources/gtk/menus.ui.h:3
+msgid "Keyboard Shortcuts"
+msgstr "ã‚ーボードショートカット"
+
+#: ../meld/resources/gtk/menus.ui.h:4
+msgid "_About"
+msgstr "ã“ã®ã‚¢ãƒ—リケーションã«ã¤ã„ã¦(_A)"
+
+#: ../meld/resources/gtk/menus.ui.h:5
+msgid "_Quit"
+msgstr "終了(_Q)"
+
+#: ../meld/resources/ui/about-dialog.ui.h:1
+msgid "About Meld"
+msgstr "Meld ã«ã¤ã„ã¦"
+
+#: ../meld/resources/ui/about-dialog.ui.h:2
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."
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
msgstr ""
-"ファイルã®æ¯”較を行ã†æ™‚ã¯ã€ã‚る種類ã®å¤‰æ›´ã ã‘無視ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚無視ã™ã‚‹"
-"パターンã¯ãã‚Œãžã‚Œ Python å½¢å¼ã®æ£è¦è¡¨ç¾ã§æŒ‡å®šã—ã€ãã®å®Ÿè£…ã¯ç„¡è¦–ã™ã‚‹æ–‡å—列を"
-"空ã®æ–‡å—列ã§ç½®ãæ›ãˆã‚‹ã ã‘ã§ã™ã€‚ã‚‚ã—æ£è¦è¡¨ç¾ãƒ‘ターンã«ã‚°ãƒ«ãƒ¼ãƒ—ãŒå«ã¾ã‚Œã¦ã„ãŸ"
-"らã€è©²å½“ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—ã®æ–‡å—列ã ã‘ç½®ãæ›ãˆã¾ã™ã€‚詳細ã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚ºãƒ»ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’"
-"ã”覧下ã•ã„。"
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
-#: ../data/ui/preferences.ui.h:22
-msgid "_Editor font:"
-msgstr "エディターã®ãƒ•ã‚©ãƒ³ãƒˆ(_E):"
+#: ../meld/resources/ui/about-dialog.ui.h:4
+msgid "Website"
+msgstr "ウェブサイト"
-#: ../data/ui/preferences.ui.h:23
-msgid "_Insert spaces instead of tabs"
-msgstr "タブã®ä»£ã‚ã‚Šã«ç©ºç™½ã‚’挿入ã™ã‚‹(_I)"
+#: ../meld/resources/ui/about-dialog.ui.h:5
+msgid "translator-credits"
+msgstr ""
+"相花 毅 <takeshi aihana gmail com>\n"
+"Toshiharu Kudoh <toshi kd2 gmail com>\n"
+"Shinichirou Yamada <yamada_strong_yamada_nice_64bit yahoo co jp>\n"
+"sicklylife <translation sicklylife jp>"
-#: ../data/ui/preferences.ui.h:24
-msgid "_Tab width:"
-msgstr "タブã®å¹…(_T):"
+#: ../meld/resources/ui/column-list.ui.h:1
+#: ../meld/resources/ui/filter-list.ui.h:1
+msgid "Active"
+msgstr "有効"
-#: ../data/ui/preferences.ui.h:25
-msgid "_Use the system fixed width font"
-msgstr "システムã®å›ºå®šãƒ•ã‚©ãƒ³ãƒˆã‚’使ã†(_U)"
+#: ../meld/resources/ui/column-list.ui.h:2
+msgid "Column Name"
+msgstr "カラムå"
-#: ../data/ui/vcview.ui.h:1
+#: ../meld/resources/ui/column-list.ui.h:3
+#: ../meld/resources/ui/filter-list.ui.h:7 ../meld/resources/ui/vcview.ui.h:11
+#: ../meld/vcview.py:694
+msgid "_Remove"
+msgstr "削除(_R)"
+
+#: ../meld/resources/ui/column-list.ui.h:4
+#: ../meld/resources/ui/filter-list.ui.h:8
+msgid "Move item up"
+msgstr "アイテムを上ã¸ç§»å‹•ã—ã¾ã™"
+
+#: ../meld/resources/ui/column-list.ui.h:5
+#: ../meld/resources/ui/filter-list.ui.h:9
+msgid "Move _Up"
+msgstr "上ã¸ç§»å‹•ã™ã‚‹(_U)"
+
+#: ../meld/resources/ui/column-list.ui.h:6
+#: ../meld/resources/ui/filter-list.ui.h:10
+msgid "Move item down"
+msgstr "アイテムを下ã¸ç§»å‹•ã—ã¾ã™"
+
+#: ../meld/resources/ui/column-list.ui.h:7
+#: ../meld/resources/ui/filter-list.ui.h:11
+msgid "Move _Down"
+msgstr "下ã¸ç§»å‹•ã™ã‚‹(_D)"
+
+#: ../meld/resources/ui/commit-dialog.ui.h:1
+msgid "Commit"
+msgstr ""
+
+#: ../meld/resources/ui/commit-dialog.ui.h:2
msgid "Commit Files"
-msgstr "ファイルã®ã‚³ãƒŸãƒƒãƒˆ"
+msgstr ""
-#: ../data/ui/vcview.ui.h:2
+#: ../meld/resources/ui/commit-dialog.ui.h:3
msgid "Log Message"
-msgstr "ãƒã‚°ãƒ»ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+msgstr ""
-#: ../data/ui/vcview.ui.h:3
-msgid "Previous Logs"
-msgstr "å‰ã®ãƒã‚°"
+#: ../meld/resources/ui/commit-dialog.ui.h:4
+msgid "Previous logs:"
+msgstr ""
-#: ../data/ui/vcview.ui.h:4
-msgid "VC Log"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã®ãƒã‚°"
+#: ../meld/resources/ui/commit-dialog.ui.h:5
+msgid "Co_mmit"
+msgstr ""
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1
msgid "_Compare"
msgstr "比較(_C)"
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
-msgid "Compare selected"
+#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2
+msgid "Compare selected files"
msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較ã—ã¾ã™"
-#: ../meld/dirdiff.py:233
-msgid "Copy _Left"
-msgstr "å·¦ã¸ã‚³ãƒ”ーã™ã‚‹(_L)"
+#: ../meld/resources/ui/dirdiff.ui.h:3
+msgid "Collapse Recursively"
+msgstr ""
+
+#: ../meld/resources/ui/dirdiff.ui.h:4
+msgid "Collapse selected folder and all subfolders"
+msgstr ""
+
+#: ../meld/resources/ui/dirdiff.ui.h:5
+msgid "Expand Recursively"
+msgstr ""
+
+#: ../meld/resources/ui/dirdiff.ui.h:6
+msgid "Expand selected folder and all subfolders"
+msgstr ""
+
+#: ../meld/resources/ui/dirdiff.ui.h:7
+msgid "Copy to _Left"
+msgstr "å·¦ã¸ã‚³ãƒ”ー(_L)"
-#: ../meld/dirdiff.py:233
+#: ../meld/resources/ui/dirdiff.ui.h:8
msgid "Copy to left"
msgstr "å·¦ã¸ã‚³ãƒ”ーã—ã¾ã™"
-#: ../meld/dirdiff.py:234
-msgid "Copy _Right"
-msgstr "å³ã¸ã‚³ãƒ”ーã™ã‚‹(_R)"
+#: ../meld/resources/ui/dirdiff.ui.h:9
+msgid "Copy to _Right"
+msgstr "å³ã¸ã‚³ãƒ”ー(_R)"
-#: ../meld/dirdiff.py:234
+#: ../meld/resources/ui/dirdiff.ui.h:10
msgid "Copy to right"
msgstr "å³ã¸ã‚³ãƒ”ーã—ã¾ã™"
-#: ../meld/dirdiff.py:235
+#: ../meld/resources/ui/dirdiff.ui.h:11
msgid "Delete selected"
msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ãªã©ã‚’削除ã—ã¾ã™"
-#: ../meld/dirdiff.py:236 ../meld/filediff.py:1157
+#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958
+#: ../meld/filediff.py:1586
msgid "Hide"
msgstr "éš ã™"
-#: ../meld/dirdiff.py:236
+#: ../meld/resources/ui/dirdiff.ui.h:13
msgid "Hide selected"
msgstr "é¸æŠžç¯„å›²ã‚’éš ã—ã¾ã™"
-#: ../meld/dirdiff.py:240
-msgid "Case"
-msgstr "大/å°æ–‡å—"
+#: ../meld/resources/ui/dirdiff.ui.h:14
+msgid "Ignore Filename Case"
+msgstr "ファイルåã®å¤§/å°æ–‡å—を無視ã™ã‚‹"
-#: ../meld/dirdiff.py:240
-msgid "Ignore case of entries"
-msgstr "大/å°æ–‡å—を無視ã—ã¾ã™"
+#: ../meld/resources/ui/dirdiff.ui.h:15
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
-#: ../meld/dirdiff.py:241
+#: ../meld/resources/ui/dirdiff.ui.h:16
msgid "Same"
msgstr "åŒã˜éƒ¨åˆ†"
-#: ../meld/dirdiff.py:241
+#: ../meld/resources/ui/dirdiff.ui.h:17
msgid "Show identical"
msgstr "一致ã™ã‚‹éƒ¨åˆ†ã‚’表示ã—ã¾ã™"
-#: ../meld/dirdiff.py:242
+#: ../meld/resources/ui/dirdiff.ui.h:18
msgid "New"
msgstr "æ–°ã—ã„部分"
-#: ../meld/dirdiff.py:242
+#: ../meld/resources/ui/dirdiff.ui.h:19
msgid "Show new"
msgstr "æ–°è¦ã®éƒ¨åˆ†ã‚’表示ã—ã¾ã™"
-#: ../meld/dirdiff.py:243
+#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
msgid "Modified"
msgstr "変更済"
-#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
+#: ../meld/resources/ui/dirdiff.ui.h:21
msgid "Show modified"
msgstr "変更ã®ã‚るファイルを表示ã—ã¾ã™"
-#: ../meld/dirdiff.py:245
+#: ../meld/resources/ui/dirdiff.ui.h:22
msgid "Filters"
msgstr "フィルター"
-#: ../meld/dirdiff.py:245
+#: ../meld/resources/ui/dirdiff.ui.h:23
msgid "Set active filters"
msgstr "フィルターをé¸æŠžã—ã¾ã™"
-#: ../meld/dirdiff.py:362
-#, python-format
-msgid "Hide %s"
-msgstr "%s ã®è¡¨ç¤ºã‚’切り替ãˆã¾ã™"
+#: ../meld/resources/ui/encoding-selector.ui.h:1
+msgid "Search text encoding…"
+msgstr ""
-#: ../meld/dirdiff.py:465 ../meld/dirdiff.py:478 ../meld/vcview.py:322
-#: ../meld/vcview.py:346
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] %s ã®ã‚¹ã‚ャンä¸"
+#: ../meld/resources/ui/filediff.ui.h:1
+msgid "Format as Patch…"
+msgstr "パッãƒã‚’生æˆâ€¦"
-#: ../meld/dirdiff.py:577
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] 完了"
+#: ../meld/resources/ui/filediff.ui.h:2
+msgid "Create a patch using differences between files"
+msgstr "ファイル間ã®å·®åˆ†ã‹ã‚‰ãƒ‘ッãƒã‚’生æˆã—ã¾ã™"
-#: ../meld/dirdiff.py:581
-msgid "Multiple errors occurred while scanning this folder"
-msgstr "ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®èµ°æŸ»ä¸ã«è¤‡æ•°å›žã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
+#: ../meld/resources/ui/filediff.ui.h:3
+msgid "Save A_ll"
+msgstr "ã™ã¹ã¦ä¿å˜(_L)"
-#: ../meld/dirdiff.py:582
-msgid "Files with invalid encodings found"
-msgstr "é–“é•ã£ãŸã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ"
+#: ../meld/resources/ui/filediff.ui.h:4
+msgid "Save all files in the current comparison"
+msgstr "比較ä¸ã®ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã—ã¾ã™"
-#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:584
-msgid "Some files were in an incorrect encoding. The names are something like:"
+#: ../meld/resources/ui/filediff.ui.h:5
+msgid "Revert files to their saved versions"
+msgstr "ファイルをä¿å˜ã•ã‚ŒãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«æˆ»ã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr "åŒæœŸç‚¹ã‚’è¿½åŠ "
+
+#: ../meld/resources/ui/filediff.ui.h:7
+msgid "Add a synchronization point for changes between files"
msgstr ""
-"ã„ãã¤ã‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒé–“é•ã£ãŸã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚’æŒã£ã¦ã„ã¾ã—㟠(次ã®ã‚ˆã†ãªãƒ•ã‚¡"
-"イルåã§ã™):"
-#: ../meld/dirdiff.py:586
-msgid "Files hidden by case insensitive comparison"
-msgstr "大/å°æ–‡å—を区別ã›ãšã«æ¯”較ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§"
+#: ../meld/resources/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr "åŒæœŸç‚¹ã‚’クリア"
-#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:588
-msgid ""
-"You are running a case insensitive comparison on a case sensitive "
-"filesystem. The following files in this folder are hidden:"
+#: ../meld/resources/ui/filediff.ui.h:9
+msgid "Clear sychronization points for changes between files"
msgstr ""
-"大/å°æ–‡å—を区別ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã§å¤§/å°æ–‡å—を無視ã—ãŸæ¯”較を行ã£ã¦ã„ã¾"
-"ã™ã€‚ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã§ã¯æ¬¡ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“:"
-#: ../meld/dirdiff.py:599
-#, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "'%s' 㯠'%s' ã«ã‚ˆã£ã¦éš ã•ã‚Œã¦ã„ã¾ã™"
+#: ../meld/resources/ui/filediff.ui.h:10
+msgid "Previous Conflict"
+msgstr "å‰ã®è¡çªç®‡æ‰€"
-#: ../meld/dirdiff.py:624 ../meld/filediff.py:1008 ../meld/filediff.py:1161
-msgid "Hi_de"
-msgstr "éš ã™(_D)"
+#: ../meld/resources/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "å‰ã®è¡çªç®‡æ‰€ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™"
-#: ../meld/dirdiff.py:674
-#, python-format
-msgid ""
-"'%s' exists.\n"
-"Overwrite?"
+#: ../meld/resources/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr "次ã®è¡çªç®‡æ‰€"
+
+#: ../meld/resources/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "次ã®è¡çªç®‡æ‰€ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr "å·¦ã¸é©ç”¨"
+
+#: ../meld/resources/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "ç¾åœ¨ã®å¤‰æ›´ã‚’å·¦ã«ã‚‚é©ç”¨ã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr "å³ã¸é©ç”¨"
+
+#: ../meld/resources/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "ç¾åœ¨ã®å¤‰æ›´ã‚’å³ã«ã‚‚é©ç”¨ã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr "å·¦ã‹ã‚‰é©ç”¨"
+
+#: ../meld/resources/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "å·¦ã‹ã‚‰å¤‰æ›´ã‚’é©ç”¨ã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr "å³ã‹ã‚‰é©ç”¨"
+
+#: ../meld/resources/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "å³ã‹ã‚‰å¤‰æ›´ã‚’é©ç”¨ã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr "å·¦ã®ä¸Šã«ã‚³ãƒ”ー"
+
+#: ../meld/resources/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "å·¦ã®å¤‰æ›´ç‚¹ã®ä¸Šã«ã‚³ãƒ”ーã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr "å·¦ã®ä¸‹ã«ã‚³ãƒ”ー"
+
+#: ../meld/resources/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "å·¦ã®å¤‰æ›´ç‚¹ã®ä¸‹ã«ã‚³ãƒ”ーã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr "å³ã®ä¸Šã«ã‚³ãƒ”ー"
+
+#: ../meld/resources/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "å³ã®å¤‰æ›´ç‚¹ã®ä¸Šã«ã‚³ãƒ”ーã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr "å³ã®ä¸‹ã«ã‚³ãƒ”ー"
+
+#: ../meld/resources/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "å³ã®å¤‰æ›´ç‚¹ã®ä¸‹ã«ã‚³ãƒ”ーã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "削除"
+
+#: ../meld/resources/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "変更点を削除ã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr "å·¦ã‹ã‚‰ã™ã¹ã¦ã‚’マージ"
+
+#: ../meld/resources/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
msgstr ""
-"'%s' ã¯å˜åœ¨ã—ã¾ã™ã€‚\n"
-"上書ãã—ã¾ã™ã‹ï¼Ÿ"
-#: ../meld/dirdiff.py:681
-#, python-format
+#: ../meld/resources/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr "å³ã‹ã‚‰ã™ã¹ã¦ã‚’マージ"
+
+#: ../meld/resources/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr ""
+
+#: ../meld/resources/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr "ã™ã¹ã¦ã‚’マージ"
+
+#: ../meld/resources/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr ""
+
+#: ../meld/resources/ui/filediff.ui.h:38
+msgid "Previous Pane"
+msgstr "å‰ã®ãƒšã‚¤ãƒ³"
+
+#: ../meld/resources/ui/filediff.ui.h:39
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr "ã“ã®æ¯”較ã®ã‚ーボードフォーカスをå‰ã®ãƒ‰ã‚ュメントã«ç§»å‹•ã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:40
+msgid "Next Pane"
+msgstr "次ã®ãƒšã‚¤ãƒ³"
+
+#: ../meld/resources/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "ã“ã®æ¯”較ã®ã‚ーボードフォーカスを次ã®ãƒ‰ã‚ュメントã«ç§»å‹•ã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr "スクãƒãƒ¼ãƒ«ã‚’ãƒãƒƒã‚¯"
+
+#: ../meld/resources/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "ã™ã¹ã¦ã®ãƒšã‚¤ãƒ³ã§ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã‚’åŒæœŸã—ã¾ã™"
+
+#: ../meld/resources/ui/filediff.ui.h:44
msgid ""
-"Error copying '%s' to '%s'\n"
-"\n"
-"%s."
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
msgstr ""
-"'%s' ã‚’ '%s' ã¸ã‚³ãƒ”ーã™ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼\n"
-"\n"
-"%s"
+"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«æ›¸ã込むã“ã¨ã¯ã§ãã¾ã›ã‚“。ã“ã“をクリックã™ã‚‹ã“ã¨ã§ã€ã“ã®ãƒ•ã‚¡ã‚¤"
+"ルã®ãƒãƒƒã‚¯ã‚’解除ã—ã¦å¤‰æ›´ã‚’åŠ ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ãŒã€ã“れらã®å¤‰æ›´ã¯æ–°ã—ã„ファイ"
+"ルã«ä¿å˜ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../meld/dirdiff.py:699 ../meld/vcview.py:526
-#, python-format
+#: ../meld/resources/ui/filediff.ui.h:45
+msgid "File 3"
+msgstr "ファイル 3"
+
+#: ../meld/resources/ui/filediff.ui.h:46
+msgid "File 2"
+msgstr "ファイル 2"
+
+#: ../meld/resources/ui/filediff.ui.h:47
+msgid "File 1"
+msgstr "ファイル 1"
+
+#. Create icon and filename CellRenderer
+#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30
+#: ../meld/dirdiff.py:454
+msgid "Name"
+msgstr "åå‰"
+
+#: ../meld/resources/ui/filter-list.ui.h:3
+msgid "Pattern"
+msgstr "パターン"
+
+#: ../meld/resources/ui/filter-list.ui.h:4
+msgid "Add new filter"
+msgstr "æ–°ã—ã„ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’è¿½åŠ ã—ã¾ã™"
+
+#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9
+msgid "_Add"
+msgstr "è¿½åŠ (_A)"
+
+#: ../meld/resources/ui/filter-list.ui.h:6
+msgid "Remove selected filter"
+msgstr "é¸æŠžã—ãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’削除ã—ã¾ã™"
+
+#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040
+#: ../meld/iohelpers.py:107
+msgid "_Replace"
+msgstr "ç½®æ›(_R)"
+
+#: ../meld/resources/ui/findbar.ui.h:2
+msgid "Replace _All"
+msgstr "ã™ã¹ã¦ç½®æ›(_A)"
+
+#: ../meld/resources/ui/findbar.ui.h:3
+msgid "_Previous"
+msgstr "å‰ã®çµæžœ(_P)"
+
+#: ../meld/resources/ui/findbar.ui.h:4
+msgid "_Next"
+msgstr "次ã®çµæžœ(_N)"
+
+#: ../meld/resources/ui/findbar.ui.h:5
+msgid "Find:"
+msgstr "検索:"
+
+#: ../meld/resources/ui/findbar.ui.h:6
+msgid "Replace _with:"
+msgstr "次ã§ç½®æ›(_W):"
+
+#: ../meld/resources/ui/findbar.ui.h:7
+msgid "_Match case"
+msgstr "大/å°æ–‡å—を区別(_M)"
+
+#: ../meld/resources/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "å˜èªžå…¨ä½“(_L)"
+
+#: ../meld/resources/ui/findbar.ui.h:9
+msgid "Regular e_xpression"
+msgstr "æ£è¦è¡¨ç¾(_X)"
+
+#: ../meld/resources/ui/findbar.ui.h:10
+msgid "Wrapped"
+msgstr ""
+
+#: ../meld/resources/ui/language-selector.ui.h:1
+msgid "Search highlight mode…"
+msgstr ""
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532
+#: ../meld/newdifftab.py:53
+msgid "New comparison"
+msgstr "æ–°ã—ã„比較"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:2
+msgid "File comparison"
+msgstr "ファイルã®æ¯”較"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:3
+msgid "Directory comparison"
+msgstr "フォルダーã®æ¯”較"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:4
+msgid "Version control view"
+msgstr ""
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:5
+msgid "_3-way comparison"
+msgstr "3ã¤ã‚’比較(_3)"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:6
+msgid "Select Third File"
+msgstr "3番目ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:7
+msgid "Select Second File"
+msgstr "2番目ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:8
+msgid "Select First File"
+msgstr "1番目ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:9
+msgid "Select First Folder"
+msgstr "1番目ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’é¸æŠž"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:10
+msgid "Select Second Folder"
+msgstr "2番目ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’é¸æŠž"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:11
+msgid "Select Third Folder"
+msgstr "3番目ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’é¸æŠž"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr ""
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:13
+msgid "_Blank comparison"
+msgstr "空ã®æ¯”較(_B)"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:14
+msgid "C_ompare"
+msgstr "比較(_O)"
+
+#: ../meld/resources/ui/notebook-label.ui.h:1
+msgid "Close Tab"
+msgstr "タブを閉ã˜ã‚‹"
+
+#: ../meld/resources/ui/patch-dialog.ui.h:1
+msgid "Format as Patch"
+msgstr "パッãƒã‚’生æˆ"
+
+#: ../meld/resources/ui/patch-dialog.ui.h:2
+msgid "Copy to Clipboard"
+msgstr "クリップボードã¸ã‚³ãƒ”ー"
+
+#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163
+msgid "Save Patch"
+msgstr "パッãƒã‚’ä¿å˜"
+
+#: ../meld/resources/ui/patch-dialog.ui.h:4
+msgid "Use differences between:"
+msgstr "次ã®ãƒšã‚¤ãƒ³é–“ã®å·®åˆ†ã‚’使用ã™ã‚‹:"
+
+#: ../meld/resources/ui/patch-dialog.ui.h:5
+msgid "Left and middle panes"
+msgstr "å·¦ã¨ä¸å¤®ã®ãƒšã‚¤ãƒ³"
+
+#: ../meld/resources/ui/patch-dialog.ui.h:6
+msgid "Middle and right panes"
+msgstr "ä¸å¤®ã¨å³ã®ãƒšã‚¤ãƒ³"
+
+#: ../meld/resources/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "パッãƒã®å¯¾è±¡ã‚’逆ã«ã™ã‚‹(_R)"
+
+#: ../meld/resources/ui/preferences.ui.h:1
+msgid "Preferences"
+msgstr "è¨å®š"
+
+#: ../meld/resources/ui/preferences.ui.h:2
+msgid "Font"
+msgstr "フォント"
+
+#: ../meld/resources/ui/preferences.ui.h:3
+msgid "_Use the system fixed width font"
+msgstr "システムã®ç‰å¹…フォントを使用ã™ã‚‹(_U)"
+
+#: ../meld/resources/ui/preferences.ui.h:4
+msgid "_Editor font:"
+msgstr "エディターã®ãƒ•ã‚©ãƒ³ãƒˆ(_E):"
+
+#: ../meld/resources/ui/preferences.ui.h:5
+msgid "Display"
+msgstr "表示"
+
+#: ../meld/resources/ui/preferences.ui.h:6
+msgid "_Tab width:"
+msgstr "タブã®å¹…(_T):"
+
+#: ../meld/resources/ui/preferences.ui.h:7
+msgid "_Insert spaces instead of tabs"
+msgstr "タブã®ä»£ã‚ã‚Šã«ç©ºç™½ã‚’挿入ã™ã‚‹(_I)"
+
+#: ../meld/resources/ui/preferences.ui.h:8
+msgid "Enable text _wrapping"
+msgstr "æ–‡å—列ã®æŠ˜ã‚Šè¿”ã—を有効ã«ã™ã‚‹(_W)"
+
+#: ../meld/resources/ui/preferences.ui.h:9
+msgid "Do not _split words over two lines"
+msgstr "å˜èªžãŒäºŒè¡Œã«è·¨ãŒã‚‰ãªã„よã†ã«ã™ã‚‹(_S)"
+
+#: ../meld/resources/ui/preferences.ui.h:10
+msgid "Highlight _current line"
+msgstr "ç¾åœ¨ã®è¡Œã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã™ã‚‹(_C)"
+
+#: ../meld/resources/ui/preferences.ui.h:11
+msgid "Show _line numbers"
+msgstr "行番å·ã‚’表示ã™ã‚‹(_L)"
+
+#: ../meld/resources/ui/preferences.ui.h:12
+msgid "Show w_hitespace"
+msgstr "空白や改行を表示ã™ã‚‹(_H)"
+
+#: ../meld/resources/ui/preferences.ui.h:13
+msgid "Use s_yntax highlighting"
+msgstr "シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆã‚’有効ã«ã™ã‚‹(_Y)"
+
+#: ../meld/resources/ui/preferences.ui.h:14
+msgid "Syntax highlighting color scheme:"
+msgstr "シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆã®ã‚«ãƒ©ãƒ¼ã‚¹ã‚ーマ:"
+
+#: ../meld/resources/ui/preferences.ui.h:15
+msgid "External Editor"
+msgstr "外部エディター"
+
+#: ../meld/resources/ui/preferences.ui.h:16
+msgid "Use _default system editor"
+msgstr "デフォルトã®ã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã‚’使用ã™ã‚‹(_D)"
+
+#: ../meld/resources/ui/preferences.ui.h:17
+msgid "Edito_r command:"
+msgstr "エディターをコマンドã§æŒ‡å®šã™ã‚‹(_R):"
+
+#: ../meld/resources/ui/preferences.ui.h:18
+msgid "Editor"
+msgstr "エディター"
+
+#: ../meld/resources/ui/preferences.ui.h:19
+msgid "Shallow Comparison"
+msgstr "æµ…ã„比較"
+
+#: ../meld/resources/ui/preferences.ui.h:20
+msgid "C_ompare files based only on size and timestamp"
+msgstr "サイズã¨ã‚¿ã‚¤ãƒ スタンプã ã‘を基準ã«ã—ã¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較ã™ã‚‹(_O)"
+
+#: ../meld/resources/ui/preferences.ui.h:21
+msgid "_Timestamp resolution:"
+msgstr "タイムスタンプ分解能(_T):"
+
+#: ../meld/resources/ui/preferences.ui.h:23
+msgid "Note: enabling text filters may make comparing large files much slower"
+msgstr ""
+"備考: テã‚ストフィルターを有効ã«ã™ã‚‹ã¨ã€å¤§ããªãƒ•ã‚¡ã‚¤ãƒ«ã®æ¯”較ãŒé…ããªã‚‹å¯èƒ½æ€§"
+"ãŒã‚ã‚Šã¾ã™"
+
+#: ../meld/resources/ui/preferences.ui.h:24
+msgid "Symbolic Links"
+msgstr "シンボリックリンク"
+
+#: ../meld/resources/ui/preferences.ui.h:26
+msgid "Visible Columns"
+msgstr "表示ã™ã‚‹ã‚«ãƒ©ãƒ "
+
+#: ../meld/resources/ui/preferences.ui.h:27
+msgid "Folder Comparisons"
+msgstr "フォルダーã®æ¯”較"
+
+#: ../meld/resources/ui/preferences.ui.h:28
+msgid "Version Comparisons"
+msgstr ""
+
+#: ../meld/resources/ui/preferences.ui.h:29
+msgid "_Order when comparing file revisions:"
+msgstr ""
+
+#: ../meld/resources/ui/preferences.ui.h:30
+msgid "Order when _merging files:"
+msgstr ""
+
+#: ../meld/resources/ui/preferences.ui.h:31
+msgid "Commit Messages"
+msgstr "コミットメッセージ"
+
+#: ../meld/resources/ui/preferences.ui.h:32
+msgid "Show _right margin at:"
+msgstr "å³ãƒžãƒ¼ã‚¸ãƒ³ã‚’表示ã™ã‚‹(_R):"
+
+#: ../meld/resources/ui/preferences.ui.h:33
+msgid "Automatically _break lines at right margin on commit"
+msgstr ""
+
+#: ../meld/resources/ui/preferences.ui.h:34
+msgid "Version Control"
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†"
+
+#: ../meld/resources/ui/preferences.ui.h:35
+msgid "Filename filters"
+msgstr "ファイルåフィルター"
+
+#: ../meld/resources/ui/preferences.ui.h:36
msgid ""
-"'%s' is a directory.\n"
-"Remove recursively?"
+"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 ""
-"'%s' ã¯ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã§ã™ã€‚\n"
-"å†å¸°çš„ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ"
+"フォルダーã®æ¯”較を行ã†éš›ã€ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’åå‰ã§ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°ã§ãã¾"
+"ã™ã€‚フィルタリングã®ãƒ‘ターンã¯ãã‚Œãžã‚Œã€ã‚¹ãƒšãƒ¼ã‚¹ã§åŒºåˆ‡ã£ãŸ SHELL åž‹å¼ã®ãƒ¯ã‚¤ãƒ«"
+"ドカードã®ä¸¦ã³ã§ã™ã€‚"
-#: ../meld/dirdiff.py:706 ../meld/vcview.py:531
-#, python-format
+#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114
+msgid "File Filters"
+msgstr "ファイルフィルター"
+
+#: ../meld/resources/ui/preferences.ui.h:38
+msgid "Change trimming"
+msgstr "変更ã®ãƒˆãƒªãƒŸãƒ³ã‚°"
+
+#: ../meld/resources/ui/preferences.ui.h:39
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
+"変更点ã®å§‹ã¾ã‚Šã¨çµ‚ã‚ã‚Šã®éƒ¨åˆ†ã‹ã‚‰ã€ç©ºè¡Œã®å·®ç•°ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã—ãªã„よã†ã«é™¤å¤–ã™ã‚‹"
+
+#: ../meld/resources/ui/preferences.ui.h:40
+msgid "Text filters"
+msgstr "テã‚ストフィルター"
+
+#: ../meld/resources/ui/preferences.ui.h:41
msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
+"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 ""
-"%s を削除ã™ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼\n"
-"\n"
-"%s"
+"ファイルã®æ¯”較を行ã†æ™‚ã¯ã€ã‚る種類ã®å¤‰æ›´ã ã‘無視ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚無視ã™ã‚‹"
+"パターンã¯ãã‚Œãžã‚Œ Python å½¢å¼ã®æ£è¦è¡¨ç¾ã§æŒ‡å®šã—ã€ãã®å®Ÿè£…ã¯ç„¡è¦–ã™ã‚‹æ–‡å—列を"
+"空ã®æ–‡å—列ã§ç½®ãæ›ãˆã‚‹ã ã‘ã§ã™ã€‚ã‚‚ã—æ£è¦è¡¨ç¾ãƒ‘ターンã«ã‚°ãƒ«ãƒ¼ãƒ—ãŒå«ã¾ã‚Œã¦ã„ãŸ"
+"らã€è©²å½“ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—ã®æ–‡å—列ã ã‘ç½®ãæ›ãˆã¾ã™ã€‚詳細ã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚ºãƒ»ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’"
+"ã”覧下ã•ã„。"
-#: ../meld/dirdiff.py:731
-#, python-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] "%i秒"
-msgstr[1] "%i秒"
+#: ../meld/resources/ui/preferences.ui.h:42
+msgid "Text Filters"
+msgstr "テã‚ストフィルター"
-#: ../meld/dirdiff.py:732
-#, python-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] "%i分"
-msgstr[1] "%i分"
+#: ../meld/resources/ui/preferences.ui.h:43
+msgid "Left is remote, right is local"
+msgstr ""
-#: ../meld/dirdiff.py:733
-#, python-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] "%i時間"
-msgstr[1] "%i時間"
+#: ../meld/resources/ui/preferences.ui.h:44
+msgid "Left is local, right is remote"
+msgstr ""
-#: ../meld/dirdiff.py:734
-#, python-format
-msgid "%i day"
-msgid_plural "%i days"
-msgstr[0] "%iæ—¥"
-msgstr[1] "%iæ—¥"
+#: ../meld/resources/ui/preferences.ui.h:45
+msgid "Remote, merge, local"
+msgstr ""
+
+#: ../meld/resources/ui/preferences.ui.h:46
+msgid "Local, merge, remote"
+msgstr ""
+
+#: ../meld/resources/ui/preferences.ui.h:47
+msgid "1ns (ext4)"
+msgstr "1ナノ秒 (ext4)"
+
+#: ../meld/resources/ui/preferences.ui.h:48
+msgid "100ns (NTFS)"
+msgstr "100ナノ秒 (NTFS)"
+
+#: ../meld/resources/ui/preferences.ui.h:49
+msgid "1s (ext2/ext3)"
+msgstr "1秒 (ext2/ext3)"
+
+#: ../meld/resources/ui/preferences.ui.h:50
+msgid "2s (VFAT)"
+msgstr "2秒 (VFAT)"
+
+#: ../meld/resources/ui/push-dialog.ui.h:1
+msgid "Push local commits to remote?"
+msgstr ""
+
+#: ../meld/resources/ui/push-dialog.ui.h:2
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+
+#: ../meld/resources/ui/push-dialog.ui.h:3
+msgid "_Push commits"
+msgstr ""
+
+#: ../meld/resources/ui/revert-dialog.ui.h:1
+msgid "Discard unsaved changes to documents?"
+msgstr "ドã‚ュメントã¸ã®å¤‰æ›´ã‚’ä¿å˜ã›ãšã«ç ´æ£„ã—ã¾ã™ã‹?"
+
+#: ../meld/resources/ui/revert-dialog.ui.h:2
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr "次ã®ãƒ‰ã‚ュメントã¸ã®å¤‰æ›´ã¯æ°¸ä¹…ã«å¤±ã‚ã‚Œã¾ã™:"
+
+#: ../meld/resources/ui/revert-dialog.ui.h:3
+msgid "_Discard"
+msgstr "ç ´æ£„(_D)"
+
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:1
+msgid "Save changes to documents before closing?"
+msgstr "é–‰ã˜ã‚‹å‰ã«ãƒ‰ã‚ュメントã¸ã®å¤‰æ›´ã‚’ä¿å˜ã—ã¾ã™ã‹?"
+
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:2
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "ä¿å˜ã—ãªã„å ´åˆã€å¤‰æ›´ã¯æ°¸ä¹…ã«å¤±ã‚ã‚Œã¾ã™ã€‚"
+
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
+msgid "Close _without Saving"
+msgstr "ä¿å˜ã›ãšã«é–‰ã˜ã‚‹(_W)"
+
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039
+#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106
+msgid "_Cancel"
+msgstr "ã‚ャンセル(_C)"
+
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
+msgid "_Save"
+msgstr "ä¿å˜(_S)"
+
+#: ../meld/resources/ui/vcview.ui.h:3
+msgid "Co_mmit…"
+msgstr "コミット(_M)…"
+
+#: ../meld/resources/ui/vcview.ui.h:4
+msgid "Commit changes to version control"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:5
+msgid "_Update"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:6
+msgid "Update working copy from version control"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:7
+msgid "_Push"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:8
+msgid "Push local changes to remote"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:10
+msgid "Add to version control"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:12
+msgid "Remove from version control"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:13
+msgid "Mar_k as Resolved"
+msgstr ""
-#: ../meld/dirdiff.py:735
+#: ../meld/resources/ui/vcview.ui.h:14
+msgid "Mark as resolved in version control"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:15
+msgid "Re_vert"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:16
+msgid "Revert working copy to original state"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:17
+msgid "Delete from working copy"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:18
+msgid "Console"
+msgstr "コンソール"
+
+#: ../meld/resources/ui/vcview.ui.h:19
+msgid "Show or hide the version control console output pane"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:20
+msgid "_Flatten"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:21
+msgid "Flatten directories"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:22
+msgid "_Modified"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:23
+msgid "Show modified files"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:24
+msgid "_Normal"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:25
+msgid "Show normal files"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:26
+msgid "Un_versioned"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:27
+msgid "Show unversioned files"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
+msgid "Ignored"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:29
+msgid "Show ignored files"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366
+msgid "Location"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:32
+msgid "Status"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:33
+msgid "Extra"
+msgstr ""
+
+#: ../meld/resources/ui/vcview.ui.h:34
+msgid "Console output"
+msgstr "コンソール出力"
+
+#: ../meld/const.py:12
+msgid "UNIX (LF)"
+msgstr ""
+
+#: ../meld/const.py:13
+msgid "DOS/Windows (CR-LF)"
+msgstr ""
+
+#: ../meld/const.py:14
+msgid "Mac OS (CR)"
+msgstr ""
+
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:475 ../meld/preferences.py:138
+msgid "Size"
+msgstr "サイズ"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:483 ../meld/preferences.py:139
+msgid "Modification time"
+msgstr "更新日時"
+
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:491 ../meld/preferences.py:140
+msgid "Permissions"
+msgstr "アクセス権"
+
+#: ../meld/dirdiff.py:625
#, python-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i週間"
-msgstr[1] "%i週間"
+msgid "Hide %s"
+msgstr "%s ã®è¡¨ç¤ºã‚’切り替ãˆã¾ã™"
-#: ../meld/dirdiff.py:736
+#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790
#, python-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%iヶ月"
-msgstr[1] "%iヶ月"
+msgid "[%s] Scanning %s"
+msgstr "[%s] %s をスã‚ャンä¸"
-#: ../meld/dirdiff.py:737
+#: ../meld/dirdiff.py:925
#, python-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%iå¹´"
-msgstr[1] "%iå¹´"
+msgid "[%s] Done"
+msgstr "[%s] 完了"
-#: ../meld/filediff.py:294
-msgid "Format as patch..."
-msgstr "パッãƒã®ç”Ÿæˆ..."
+#: ../meld/dirdiff.py:933
+msgid "Folders have no differences"
+msgstr "フォルダーã«å·®ç•°ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: ../meld/filediff.py:294
-msgid "Create a patch using differences between files"
-msgstr "ファイル間ã®å·®åˆ†ã‹ã‚‰ãƒ‘ッãƒã‚’生æˆã—ã¾ã™"
+#: ../meld/dirdiff.py:935
+msgid "Contents of scanned files in folders are identical."
+msgstr "フォルダー内ã®ã‚¹ã‚ャンã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容ã¯åŒä¸€ã§ã™ã€‚"
-#: ../meld/filediff.py:295
-msgid "Previous conflict"
-msgstr "å‰ã®è¡çªç®‡æ‰€"
+#: ../meld/dirdiff.py:937
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+"フォルダー内ã®ã‚¹ã‚ャンã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯åŒä¸€ã®ã‚ˆã†ã«è¦‹ãˆã¾ã™ãŒã€å†…容ã¯ã‚¹ã‚ャン"
+"ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: ../meld/filediff.py:295
-msgid "Go to the previous conflict"
-msgstr "å‰ã®è¡çªç®‡æ‰€ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™"
+#: ../meld/dirdiff.py:940
+msgid "File filters are in use, so not all files have been scanned."
+msgstr ""
+"ファイルフィルターãŒä½¿ç”¨ã•ã‚Œã¦ã„ã‚‹ãŸã‚ã€ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚¹ã‚ャンã•ã‚ŒãŸã‚ã‘"
+"ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: ../meld/filediff.py:296
-msgid "Next conflict"
-msgstr "次ã®è¡çªç®‡æ‰€"
+#: ../meld/dirdiff.py:942
+msgid "Text filters are in use and may be masking content differences."
+msgstr ""
+"テã‚ストフィルターãŒä½¿ç”¨ã•ã‚Œã¦ã„ã‚‹ãŸã‚ã€å†…容ã®å·®ç•°ãŒé®è”½ã•ã‚Œã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚"
+"ã‚Šã¾ã™ã€‚"
-#: ../meld/filediff.py:296
-msgid "Go to the next conflict"
-msgstr "次ã®è¡çªç®‡æ‰€ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™"
+#: ../meld/dirdiff.py:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618
+#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+msgid "Hi_de"
+msgstr "éš ã™(_D)"
+
+#: ../meld/dirdiff.py:969
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®èµ°æŸ»ä¸ã«è¤‡æ•°å›žã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: ../meld/filediff.py:297
-msgid "Push to left"
-msgstr "å·¦å´ã¸é©ç”¨ã™ã‚‹"
+#: ../meld/dirdiff.py:970
+msgid "Files with invalid encodings found"
+msgstr "é–“é•ã£ãŸã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ"
-#: ../meld/filediff.py:297
-msgid "Push current change to the left"
-msgstr "ç¾åœ¨ã®å¤‰æ›´ã‚’å·¦å´ã¸ã‚‚é©ç”¨ã—ã¾ã™"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:972
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr ""
+"ã„ãã¤ã‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒé–“é•ã£ãŸã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚’æŒã£ã¦ã„ã¾ã—㟠(次ã®ã‚ˆã†ãªãƒ•ã‚¡"
+"イルåã§ã™):"
-#: ../meld/filediff.py:298
-msgid "Push to right"
-msgstr "å³å´ã¸é©ç”¨ã™ã‚‹"
+#: ../meld/dirdiff.py:974
+msgid "Files hidden by case insensitive comparison"
+msgstr "大/å°æ–‡å—を区別ã›ãšã«æ¯”較ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§"
-#: ../meld/filediff.py:298
-msgid "Push current change to the right"
-msgstr "ç¾åœ¨ã®å¤‰æ›´ã‚’å³å´ã«ã‚‚é©ç”¨ã—ã¾ã™"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:976
+msgid ""
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
+msgstr ""
+"大/å°æ–‡å—を区別ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã§å¤§/å°æ–‡å—を無視ã—ãŸæ¯”較を行ã£ã¦ã„ã¾"
+"ã™ã€‚ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã§ã¯æ¬¡ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“:"
-#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:300
-msgid "Pull from left"
-msgstr "å·¦å´ã®ã‚ャンセル"
+#: ../meld/dirdiff.py:987
+#, python-format
+msgid "“%s†hidden by “%sâ€"
+msgstr "“%sâ€ã¯â€œ%sâ€ã«ã‚ˆã£ã¦éš ã•ã‚Œã¦ã„ã¾ã™"
-#: ../meld/filediff.py:300
-msgid "Pull change from the left"
-msgstr "å·¦å´ã®å¤‰æ›´ç‚¹ã‚’ã‚ャンセルã—ã¾ã™"
+#: ../meld/dirdiff.py:1043
+#, python-format
+msgid "Replace folder “%s�"
+msgstr "“%sâ€ã‚’ç½®ãæ›ãˆã¾ã™ã‹?"
-#: ../meld/filediff.py:301
-msgid "Pull from right"
-msgstr "å³å´ã®ã‚ャンセル"
+#: ../meld/dirdiff.py:1045
+#, python-format
+msgid ""
+"Another folder with the same name already exists in “%sâ€.\n"
+"If you replace the existing folder, all files in it will be lost."
+msgstr ""
+"“%sâ€ã«åŒã˜åå‰ã®åˆ¥ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ãŒã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚\n"
+"フォルダーを置ãæ›ãˆã‚‹ã¨ã€æ—¢å˜ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã™ã¹ã¦å¤±ã‚ã‚Œã¾ã™ã€‚"
-#: ../meld/filediff.py:301
-msgid "Pull change from the right"
-msgstr "å³å´ã®å¤‰æ›´ç‚¹ã‚’ã‚ャンセルã—ã¾ã™"
+#: ../meld/dirdiff.py:1058
+msgid "Error copying file"
+msgstr "ファイルã®ã‚³ãƒ”ーエラー"
-#: ../meld/filediff.py:302
-msgid "Copy above left"
-msgstr "å·¦ã®ä¸Šã«ã‚³ãƒ”ーã™ã‚‹"
+#: ../meld/dirdiff.py:1059
+#, python-format
+msgid ""
+"Couldn’t copy %s\n"
+"to %s.\n"
+"\n"
+"%s"
+msgstr ""
+"コピーã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n"
+"コピー元: %s\n"
+"コピー先: %s\n"
+"%s"
-#: ../meld/filediff.py:302
-msgid "Copy change above the left chunk"
-msgstr "å·¦å´ã«ã‚る変更点ã®ä¸Šã«ã‚³ãƒ”ーã—ã¾ã™"
+#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720
+msgid "Error deleting {}"
+msgstr "{} ã®å‰Šé™¤ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: ../meld/filediff.py:303
-msgid "Copy below left"
-msgstr "å·¦ã®ä¸‹ã«ã‚³ãƒ”ーã™ã‚‹"
+#: ../meld/dirdiff.py:1593
+msgid "No folder"
+msgstr ""
-#: ../meld/filediff.py:303
-msgid "Copy change below the left chunk"
-msgstr "å·¦å´ã«ã‚る変更点ã®ä¸‹ã«ã‚³ãƒ”ーã—ã¾ã™"
+#: ../meld/filediff.py:905
+msgid "Comparison results will be inaccurate"
+msgstr "比較çµæžœã¯ä¸æ£ç¢ºã§ã™"
-#: ../meld/filediff.py:304
-msgid "Copy above right"
-msgstr "å³ã®ä¸Šã«ã‚³ãƒ”ーã™ã‚‹"
+#: ../meld/filediff.py:907
+msgid ""
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
+msgstr ""
+"フィルターãŒãƒ•ã‚¡ã‚¤ãƒ«å†…ã®è¡Œæ•°ã‚’変更ã—ã¾ã—ãŸãŒã€ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ãŸã‚ã€æ¯”較"
+"ã¯æ£ç¢ºã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: ../meld/filediff.py:304
-msgid "Copy change above the right chunk"
-msgstr "å³å´ã«ã‚る変更点ã®ä¸Šã«ã‚³ãƒ”ーã—ã¾ã™"
+#: ../meld/filediff.py:979
+msgid "Mark conflict as resolved?"
+msgstr "è¡çªç®‡æ‰€ã‚’解決済ã¿ã¨ã—ã¦ãƒžãƒ¼ã‚¯ã—ã¾ã™ã‹?"
-#: ../meld/filediff.py:305
-msgid "Copy below right"
-msgstr "å³ã®ä¸‹ã«ã‚³ãƒ”ーã™ã‚‹"
+#: ../meld/filediff.py:981
+msgid ""
+"If the conflict was resolved successfully, you may mark it as resolved now."
+msgstr ""
+"è¡çªç®‡æ‰€ã®è§£æ±ºã«æˆåŠŸã—ãŸå ´åˆã¯ã€è§£æ±ºæ¸ˆã¿ã¨ã—ã¦ãƒžãƒ¼ã‚¯ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: ../meld/filediff.py:305
-msgid "Copy change below the right chunk"
-msgstr "å³å´ã«ã‚る変更点ã®ä¸‹ã«ã‚³ãƒ”ーã—ã¾ã™"
+#: ../meld/filediff.py:983
+msgid "Cancel"
+msgstr "ã‚ャンセル"
-#: ../meld/filediff.py:306
-msgid "Delete"
-msgstr "削除"
+#: ../meld/filediff.py:984
+msgid "Mark _Resolved"
+msgstr "解決済ã¿ã¨ã—ã¦ãƒžãƒ¼ã‚¯(_R)"
-#: ../meld/filediff.py:306
-msgid "Delete change"
-msgstr "変更点を削除ã—ã¾ã™"
+#: ../meld/filediff.py:1303
+#, python-format
+msgid "There was a problem opening the file “%sâ€."
+msgstr "“%sâ€ã‚’é–‹ãéš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
-#: ../meld/filediff.py:307
-msgid "Merge all changes from left"
-msgstr "å·¦å´ã®å¤‰æ›´ç‚¹ã‚’マージã™ã‚‹"
+#: ../meld/filediff.py:1311
+#, python-format
+msgid "File %s appears to be a binary file."
+msgstr "%s ã¯ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚ˆã†ã§ã™ã€‚"
-#: ../meld/filediff.py:307
-msgid "Merge all non-conflicting changes from the left"
-msgstr "å·¦å´ã«ã‚ã‚‹ (è¡çªã™ã‚‹ã“ã¨ã®ãªã„) 変更点を全ã¦ãƒžãƒ¼ã‚¸ã—ã¾ã™"
+#: ../meld/filediff.py:1313
+msgid "Do you want to open the file using the default application?"
+msgstr "デフォルトã®ã‚¢ãƒ—リケーションを使用ã—ã¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã¾ã™ã‹?"
-#: ../meld/filediff.py:308
-msgid "Merge all changes from right"
-msgstr "å³å´ã®å¤‰æ›´ç‚¹ã‚’マージã™ã‚‹"
+#: ../meld/filediff.py:1315
+msgid "Open"
+msgstr "é–‹ã"
-#: ../meld/filediff.py:308
-msgid "Merge all non-conflicting changes from the right"
-msgstr "å·¦å´ã«ã‚ã‚‹ (è¡çªã™ã‚‹ã“ã¨ã®ãªã„) 変更点を全ã¦ãƒžãƒ¼ã‚¸ã—ã¾ã™"
+#: ../meld/filediff.py:1331
+#, python-format
+msgid "[%s] Computing differences"
+msgstr "[%s] 差分ã®è¨ˆç®—ä¸"
-#: ../meld/filediff.py:309
-msgid "Merge all non-conflicting"
-msgstr "å…¨ã¦ã®å¤‰æ›´ç‚¹ã‚’マージã™ã‚‹"
+#: ../meld/filediff.py:1392
+#, python-format
+msgid "File %s has changed on disk"
+msgstr "%s ã¯ãƒ‡ã‚£ã‚¹ã‚¯ä¸Šã§å¤‰æ›´ã•ã‚Œã¾ã—ãŸ"
-#: ../meld/filediff.py:309
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "å·¦å´ã¨å³å´ã¨ã§è¡çªã™ã‚‹ã“ã¨ã®ãªã„å…¨ã¦ã®å¤‰æ›´ç‚¹ã‚’å…¨ã¦ãƒžãƒ¼ã‚¸ã—ã¾ã™"
+#: ../meld/filediff.py:1393
+msgid "Do you want to reload the file?"
+msgstr "ファイルをå†èªã¿è¾¼ã¿ã—ã¾ã™ã‹?"
-#: ../meld/filediff.py:310
-msgid "Cycle through documents"
-msgstr "ドã‚ュメント間ã§åˆ‡æ›¿ãˆã‚‹"
+#: ../meld/filediff.py:1395
+msgid "_Reload"
+msgstr "å†èªã¿è¾¼ã¿(_R)"
-#: ../meld/filediff.py:310
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr "ã“ã®æ¯”較ã§ã‚ーボード・フォーカスを隣ã®ãƒ‰ã‚ュメントã«ç§»å‹•ã—ã¾ã™"
+#: ../meld/filediff.py:1551
+msgid "Files are identical"
+msgstr "åŒä¸€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™"
-#: ../meld/filediff.py:314
-msgid "Lock scrolling"
-msgstr "スクãƒãƒ¼ãƒ«ã®ãƒãƒƒã‚¯"
+#: ../meld/filediff.py:1564
+msgid ""
+"Text filters are being used, and may be masking differences between files. "
+"Would you like to compare the unfiltered files?"
+msgstr ""
+"テã‚ストフィルターを使用ã—ã¦ã„ã‚‹ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«é–“ã«é•ã„ãŒç”Ÿã˜ã‚‹å ´åˆãŒã‚ã‚Šã¾"
+"ã™ã€‚フィルタリングã›ãšã«æ¯”較ã—ã¾ã™ã‹?"
-#: ../meld/filediff.py:315
-msgid "Lock scrolling of all panes"
-msgstr "å…¨ã¦ã®ãƒšã‚¤ãƒ³ã§ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã‚’åŒæœŸã—ã¾ã™"
+#: ../meld/filediff.py:1569
+msgid "Files differ in line endings only"
+msgstr "ファイルã¯è¡Œæœ«ã®ã¿ãŒç•°ãªã‚Šã¾ã™"
-#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:396
-msgid "INS"
-msgstr "[挿入]"
+#: ../meld/filediff.py:1571
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"改行コード以外ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容ã¯åŒä¸€ã§ã™:\n"
+"%s"
-#: ../meld/filediff.py:396
-msgid "OVR"
-msgstr "[上書ã]"
+#: ../meld/filediff.py:1591
+msgid "Show without filters"
+msgstr "フィルター無ã—ã§è¡¨ç¤ºã™ã‚‹"
-#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:398
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "(%iè¡Œã€%i列)"
+#: ../meld/filediff.py:1613
+msgid "Change highlighting incomplete"
+msgstr "変更点ã®ãƒã‚¤ãƒ©ã‚¤ãƒˆãŒä¸å®Œå…¨ã§ã™"
-#: ../meld/filediff.py:722
-#, python-format
+#: ../meld/filediff.py:1614
msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
+"Some changes were not highlighted because they were too large. You can force "
+"Meld to take longer to highlight larger changes, though this may be slow."
msgstr ""
-"フィルター ('%s') ã§ãƒ•ã‚¡ã‚¤ãƒ«ã®è¡Œæ•°ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸã€‚差分ã«ä¸æ•´åˆãŒç”Ÿã˜ã¾ã™ã€‚"
-"詳細ã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚ºãƒ»ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’ã”覧下ã•ã„。"
+"変更点ãŒå¤šã™ãŽã‚‹ãŸã‚ã€ä¸€éƒ¨ãŒãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚Meld ã«ãƒã‚¤ãƒ©ã‚¤ãƒˆã‚’å¼·"
+"制ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ãŒã€å¤§ããªå¤‰æ›´ç‚¹ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã™ã‚‹ã«ã¯æ™‚é–“ãŒã‹ã‹ã‚Šã¾ã™ã€‚"
-#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:809
-msgid "<unnamed>"
-msgstr "<åå‰ãªã—>"
+#: ../meld/filediff.py:1622
+msgid "Keep highlighting"
+msgstr "ãƒã‚¤ãƒ©ã‚¤ãƒˆã‚’続ã‘ã‚‹"
-#: ../meld/filediff.py:996
-#, python-format
-msgid "[%s] Set num panes"
-msgstr "[%s] 番å·ãƒšã‚¤ãƒ³ã®ã‚»ãƒƒãƒˆ"
+#: ../meld/filediff.py:1624
+msgid "_Keep highlighting"
+msgstr "ãƒã‚¤ãƒ©ã‚¤ãƒˆã‚’続ã‘ã‚‹(_K)"
-#: ../meld/filediff.py:1002
-#, python-format
-msgid "[%s] Opening files"
-msgstr "[%s] ファイルã®ã‚ªãƒ¼ãƒ—ンä¸"
+#: ../meld/filediff.py:1637
+msgid "Saving failed"
+msgstr ""
-#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
-#: ../meld/filediff.py:1053
-msgid "Could not read file"
-msgstr "ファイルをèªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ"
+#: ../meld/filediff.py:1638
+msgid ""
+"Please consider copying any critical changes to another program or file to "
+"avoid data loss."
+msgstr ""
-#: ../meld/filediff.py:1027
-#, python-format
-msgid "[%s] Reading files"
-msgstr "[%s] ファイルã®èªã¿è¾¼ã¿ä¸"
+#: ../meld/filediff.py:1647
+msgid "Save Left Pane As"
+msgstr "å·¦ã®ãƒšã‚¤ãƒ³ã‚’別åã§ä¿å˜"
-#: ../meld/filediff.py:1036
-#, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s ã¯ãƒã‚¤ãƒŠãƒªãƒ»ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚ˆã†ã§ã™"
+#: ../meld/filediff.py:1649
+msgid "Save Middle Pane As"
+msgstr "ä¸å¤®ã®ãƒšã‚¤ãƒ³ã‚’別åã§ä¿å˜"
-#: ../meld/filediff.py:1048
-#, python-format
-msgid "%s is not in encodings: %s"
-msgstr "%s ã¯æ¬¡ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã§ã¯ã‚ã‚Šã¾ã›ã‚“: %s"
+#: ../meld/filediff.py:1651
+msgid "Save Right Pane As"
+msgstr "å³ã®ãƒšã‚¤ãƒ³ã‚’別åã§ä¿å˜"
-#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1664
#, python-format
-msgid "[%s] Computing differences"
-msgstr "[%s] 差分ã®è¨ˆç®—ä¸"
+msgid "File %s has changed on disk since it was opened"
+msgstr "%s ã¯é–‹ã‹ã‚ŒãŸå¾Œã«ãƒ‡ã‚£ã‚¹ã‚¯ä¸Šã§å¤‰æ›´ã•ã‚Œã¾ã—ãŸ"
-#: ../meld/filediff.py:1148
-msgid ""
-"Text filters are being used, and may be masking differences between files. "
-"Would you like to compare the unfiltered files?"
-msgstr ""
-"æ–‡å—列ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°ã‚’è¡Œã£ã¦ã„ã‚‹ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«ã®é–“ã«é•ã„ãŒç”Ÿã˜ã‚‹å ´åˆãŒã‚ã‚Š"
-"ã¾ã™ã€‚フィルタリングã›ãšã«æ¯”較ã—ã¦ã¿ã¾ã™ã‹ï¼Ÿ"
+#: ../meld/filediff.py:1666
+msgid "If you save it, any external changes will be lost."
+msgstr "ä¿å˜ã™ã‚‹ã¨ã€å¤–部ã‹ã‚‰ã®å¤‰æ›´ã¯å¤±ã‚ã‚Œã¾ã™ã€‚"
-#: ../meld/filediff.py:1154
-msgid "Files are identical"
-msgstr "åŒä¸€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™"
+#: ../meld/filediff.py:1669
+msgid "Save Anyway"
+msgstr "ã¨ã«ã‹ãä¿å˜ã™ã‚‹"
-#: ../meld/filediff.py:1164
-msgid "Show without filters"
-msgstr "フィルタリング無ã—ã§è¡¨ç¤ºã™ã‚‹"
+#: ../meld/filediff.py:1670
+msgid "Don’t Save"
+msgstr "ä¿å˜ã—ãªã„"
-#: ../meld/filediff.py:1354
-#, python-format
+#: ../meld/filediff.py:1712
msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+"File “{}†contains characters that can’t be encoded using its current "
+"encoding “{}â€."
msgstr ""
-"\"%s\" ã¯å˜åœ¨ã—ã¦ã„ã¾ã™ï¼\n"
-"上書ãã—ã¾ã™ã‹ï¼Ÿ"
+"“{}â€ã«ã¯ç¾åœ¨ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°â€œ{}â€ã§ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã§ããªã„æ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../meld/filediff.py:1367
+#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142
#, python-format
msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"Couldn’t save file due to:\n"
+"%s"
msgstr ""
-"%s ã¸æ›¸ã込む際ã«ã‚¨ãƒ©ãƒ¼\n"
-"\n"
+"次ã®ç†ç”±ã«ã‚ˆã‚Šãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸ:\n"
"%s"
-#: ../meld/filediff.py:1376
+#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141
#, python-format
-msgid "Choose a name for buffer %i."
-msgstr "ãƒãƒƒãƒ•ã‚¡ãƒ¼ %i ã®åå‰ã®é¸æŠž"
+msgid "Could not save file %s."
+msgstr "%s ã‚’ä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../meld/filediff.py:1391
-#, python-format
+#: ../meld/filediff.py:2113
+msgid "Live comparison updating disabled"
+msgstr "比較ã®ãƒ©ã‚¤ãƒ–アップデートã¯ç„¡åŠ¹ã§ã™"
+
+#: ../meld/filediff.py:2114
msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+"Live updating of comparisons is disabled when synchronization points are "
+"active. You can still manually refresh the comparison, and live updates will "
+"resume when synchronization points are cleared."
msgstr ""
-"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ« '%s' ã«ã¯è¡Œã®çµ‚端ãŒæ··ã–ã£ã¦ã„ã¾ã™ã€‚\n"
-"\n"
-"ã©ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’使用ã—ã¾ã™ã‹ï¼Ÿ"
+"åŒæœŸç‚¹ãŒæœ‰åŠ¹ãªå ´åˆã€æ¯”較ã®ãƒ©ã‚¤ãƒ–アップデートã¯ç„¡åŠ¹åŒ–ã•ã‚Œã¾ã™ã€‚åŒæœŸç‚¹ãŒã‚¯ãƒªã‚¢"
+"ã•ã‚Œã‚‹ã¨ãƒ©ã‚¤ãƒ–アップデートãŒå†é–‹ã•ã‚Œã¾ã™ã€‚ã¾ãŸã€æ¯”較ã¯æ‰‹å‹•ã§æ›´æ–°ã™ã‚‹ã“ã¨ã‚‚ã§"
+"ãã¾ã™ã€‚"
-#: ../meld/filediff.py:1407
+#: ../meld/filemerge.py:37
#, python-format
-msgid ""
-"'%s' contains characters not encodable with '%s'\n"
-"Would you like to save as UTF-8?"
+msgid "[%s] Merging files"
+msgstr "[%s] ファイルをマージä¸"
+
+#: ../meld/gutterrendererchunk.py:220
+msgid "Copy _up"
+msgstr "上ã«ã‚³ãƒ”ー(_U)"
+
+#: ../meld/gutterrendererchunk.py:221
+msgid "Copy _down"
+msgstr "下ã«ã‚³ãƒ”ー(_D)"
+
+#: ../meld/iohelpers.py:37
+msgid "Deleting remote folders is not supported"
msgstr ""
-"'%s' ã«ã¯ '%s' ã§ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã•ã‚Œã¦ã„ãªã„æ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚\n"
-"UTF-8 エンコーディングã¨ã—ã¦ä¿å˜ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-#: ../meld/filediff.py:1466
-#, python-format
-msgid ""
-"Reloading will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
+#: ../meld/iohelpers.py:39
+msgid "Not a file or directory"
msgstr ""
-"å†èªè¾¼ã™ã‚‹ã¨æ¬¡ã®å¤‰æ›´ç‚¹ãŒç ´æ£„ã•ã‚Œã¾ã™:\n"
-"%s\n"
-"\n"
-"ã“ã®æ“作を元ã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: ../meld/filemerge.py:82
+#: ../meld/iohelpers.py:43
+msgid "“{}†can’t be put in the trash. Do you want to delete it immediately?"
+msgstr ""
+
+#: ../meld/iohelpers.py:48
+msgid "This remote location does not support sending items to the trash."
+msgstr ""
+
+#: ../meld/iohelpers.py:53
+#, fuzzy
+#| msgid "Delete change"
+msgid "_Delete Permanently"
+msgstr "変更点を削除ã—ã¾ã™"
+
+#: ../meld/iohelpers.py:100
#, python-format
-msgid "[%s] Merging files"
-msgstr "[%s] ファイルã®ãƒžãƒ¼ã‚¸ä¸"
+msgid "Replace file “%s�"
+msgstr "“%sâ€ã‚’ç½®ãæ›ãˆã¾ã™ã‹?"
+
+#: ../meld/iohelpers.py:102
+#, python-format
+msgid ""
+"A file with this name already exists in “%sâ€.\n"
+"If you replace the existing file, its contents will be lost."
+msgstr ""
+"“%sâ€ã«åŒã˜åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚\n"
+"ファイルを置ãæ›ãˆã‚‹ã¨ã€æ—¢å˜ã®å†…容ã¯å¤±ã‚ã‚Œã¾ã™ã€‚"
-#: ../meld/meldapp.py:152
+#: ../meld/meldapp.py:169
msgid "wrong number of arguments supplied to --diff"
msgstr "--diff オプションã«å¯¾ã™ã‚‹å¼•æ•°ã®æ•°ãŒé–“é•ã£ã¦ã„ã¾ã™"
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:174
msgid "Start with an empty window"
-msgstr "何も開ã‹ãšã« Meld ã‚’èµ·å‹•ã™ã‚‹"
+msgstr "空ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§èµ·å‹•ã™ã‚‹"
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
msgid "file"
-msgstr "FILE"
+msgstr "ファイル"
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
-msgid "dir"
-msgstr "DIR"
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
+msgid "folder"
+msgstr "フォルダー"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:176
msgid "Start a version control comparison"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã®æ¯”較モードã§èµ·å‹•ã™ã‚‹"
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:178
msgid "Start a 2- or 3-way file comparison"
-msgstr "2ãªã„ã—3個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較ã™ã‚‹ãƒ¢ãƒ¼ãƒ‰ã§èµ·å‹•ã™ã‚‹"
+msgstr "2ã¤ã€ã¾ãŸã¯3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較ã™ã‚‹ãƒ¢ãƒ¼ãƒ‰ã§èµ·å‹•ã™ã‚‹"
-#: ../meld/meldapp.py:159
-msgid "Start a 2- or 3-way directory comparison"
-msgstr "2ãªã„ã—3個ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’比較ã™ã‚‹ãƒ¢ãƒ¼ãƒ‰ã§èµ·å‹•ã™ã‚‹"
+#: ../meld/meldapp.py:180
+msgid "Start a 2- or 3-way folder comparison"
+msgstr "2ã¤ã€ã¾ãŸã¯3ã¤ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’比較ã™ã‚‹ãƒ¢ãƒ¼ãƒ‰ã§èµ·å‹•ã™ã‚‹"
-#: ../meld/meldapp.py:160
-msgid "Start a comparison between file and dir/file"
-msgstr "ファイルã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã¨ã‚’比較ã™ã‚‹ãƒ¢ãƒ¼ãƒ‰ã§èµ·å‹•ã™ã‚‹"
+#: ../meld/meldapp.py:223
+#, python-format
+msgid "Error: %s\n"
+msgstr "エラー: %s\n"
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:230
msgid "Meld is a file and directory comparison tool."
-msgstr "Meld ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®å†…容を比較ã™ã‚‹ãƒ„ールã§ã™:"
+msgstr "Meld ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®å†…容を比較ã™ã‚‹ãƒ„ールã§ã™ã€‚"
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:234
msgid "Set label to use instead of file name"
msgstr "ファイルåã®ä»£ã‚ã‚Šã«ä½¿ç”¨ã™ã‚‹ãƒ©ãƒ™ãƒ«ã‚’指定ã™ã‚‹"
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:237
+msgid "Open a new tab in an already running instance"
+msgstr "ã™ã§ã«å®Ÿè¡Œä¸ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã§æ–°ã—ã„タブを開ã"
+
+#: ../meld/meldapp.py:240
msgid "Automatically compare all differing files on startup"
-msgstr "起動時ã«ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸ã«ã‚ã‚‹å…¨ã¦å·®åˆ†ã‚’自動的ã«æ¤œå‡ºã™ã‚‹"
+msgstr "起動時ã«ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸ã«ã‚ã‚‹ã™ã¹ã¦ã®å·®åˆ†ã‚’自動的ã«æ¤œå‡ºã™ã‚‹"
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:243
msgid "Ignored for compatibility"
-msgstr "互æ›æ€§ã‚’無視ã™ã‚‹"
+msgstr ""
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:247
msgid "Set the target file for saving a merge result"
-msgstr "マージã—ãŸçµæžœã‚’ä¿å˜ã™ã‚‹éš›ã®ãƒ•ã‚¡ã‚¤ãƒ«åを指定ã™ã‚‹"
+msgstr "マージã—ãŸçµæžœã‚’ä¿å˜ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«åを指定ã™ã‚‹"
+
+#: ../meld/meldapp.py:250
+msgid "Automatically merge files"
+msgstr "自動的ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’マージã™ã‚‹"
+
+#: ../meld/meldapp.py:254
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr ""
-#: ../meld/meldapp.py:179
-msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "指定ã—ãŸæœ€å¤§3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¾ãŸã¯ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã«å¯¾ã™ã‚‹å·®åˆ†ã‚’タブã§è¡¨ç¤ºã™ã‚‹"
+#: ../meld/meldapp.py:258
+msgid "Create a diff tab for the supplied files or folders"
+msgstr ""
+
+#: ../meld/meldapp.py:278
+#, python-format
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr ""
+"引数ãŒå¤šã™ãŽã¾ã™ (有効ãªæ•°ã¯ 0 〜 3 ã§ã™ãŒ %d 個ã®å¼•æ•°ã‚’å—ã‘å–ã‚Šã¾ã—ãŸ)"
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:281
+msgid "can’t auto-merge less than 3 files"
+msgstr "3ã¤æœªæº€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ªãƒ¼ãƒˆãƒžãƒ¼ã‚¸ã§ãã¾ã›ã‚“"
+
+#: ../meld/meldapp.py:283
+msgid "can’t auto-merge directories"
+msgstr "ディレクトリã¯ã‚ªãƒ¼ãƒˆãƒžãƒ¼ã‚¸ã§ãã¾ã›ã‚“"
+
+#: ../meld/meldapp.py:297
+msgid "Error reading saved comparison file"
+msgstr "ä¿å˜ã•ã‚ŒãŸæ¯”較ファイルã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼"
+
+#: ../meld/meldapp.py:314
#, python-format
-msgid "too many arguments (wanted 0-4, got %d)"
-msgstr "引数ãŒå¤šã™ãŽã¾ã™ (0〜4個を想定ã—ã¦ã„ãŸãŒå®Ÿéš›ã¯%d個)"
+msgid "invalid path or URI “%sâ€"
+msgstr "無効ãªãƒ‘スã¾ãŸã¯ URI “%sâ€"
+
+#: ../meld/meldapp.py:320
+msgid "remote folder “{}†not supported"
+msgstr ""
-#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
-msgid "can't compare more than three directories"
-msgstr "3ã¤ä»¥ä¸Šã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®é–“ã§ã®æ¯”較ã¯ã§ãã¾ã›ã‚“"
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:124
+msgid "<unnamed>"
+msgstr "<åå‰ãªã—>"
-#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
+#: ../meld/melddoc.py:63
msgid "untitled"
msgstr "タイトルãªã—"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:56
msgid "_File"
msgstr "ファイル(_F)"
-#: ../meld/meldwindow.py:126
-msgid "_New..."
-msgstr "æ–°è¦(_N)..."
+#: ../meld/meldwindow.py:57
+msgid "_New Comparison…"
+msgstr "æ–°ã—ã„比較(_N)…"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:58
msgid "Start a new comparison"
msgstr "æ–°ã—ã„比較を開始ã—ã¾ã™"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:61
msgid "Save the current file"
msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã—ã¾ã™"
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:63
+msgid "Save As…"
+msgstr "別åã§ä¿å˜â€¦"
+
+#: ../meld/meldwindow.py:64
+msgid "Save the current file with a different name"
+msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’別ã®åå‰ã§ä¿å˜ã—ã¾ã™"
+
+#: ../meld/meldwindow.py:67
msgid "Close the current file"
msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‰ã˜ã¾ã™"
-#: ../meld/meldwindow.py:130
-msgid "Quit the program"
-msgstr "プãƒã‚°ãƒ©ãƒ を終了ã—ã¾ã™"
-
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:70
msgid "_Edit"
msgstr "編集(_E)"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:72
msgid "Undo the last action"
msgstr "最後ã«é©ç”¨ã—ãŸã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã«æˆ»ã—ã¾ã™"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:75
msgid "Redo the last undone action"
msgstr "最後ã«é©ç”¨ã—ãŸã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’ã‚„ã‚Šç›´ã—ã¾ã™"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:77
msgid "Cut the selection"
msgstr "é¸æŠžç¯„囲を切りå–ã‚Šã¾ã™"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:79
msgid "Copy the selection"
msgstr "é¸æŠžç¯„囲をコピーã—ã¾ã™"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:81
msgid "Paste the clipboard"
msgstr "クリップボードã®å†…容を貼り付ã‘ã¾ã™"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:83
+msgid "Find…"
+msgstr "検索…"
+
+#: ../meld/meldwindow.py:83
msgid "Search for text"
-msgstr "検索ã™ã‚‹æ–‡å—列:"
+msgstr "検索ã™ã‚‹æ–‡å—列"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:85
msgid "Find Ne_xt"
-msgstr "次を検索ã™ã‚‹(_X)"
+msgstr "次を検索(_X)"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:86
msgid "Search forwards for the same text"
msgstr "åŒã˜æ–‡å—列をå‰æ–¹æ¤œç´¢ã—ã¾ã™"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:88
msgid "Find _Previous"
-msgstr "å‰ã‚’検索ã™ã‚‹(_P)"
+msgstr "å‰ã‚’検索(_P)"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:89
msgid "Search backwards for the same text"
msgstr "åŒã˜æ–‡å—列を後方検索ã—ã¾ã™"
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:92
+msgid "_Replace…"
+msgstr "ç½®æ›(_R)…"
+
+#: ../meld/meldwindow.py:93
msgid "Find and replace text"
msgstr "æ–‡å—列を検索ã—ã¦ç½®æ›ã—ã¾ã™"
-#: ../meld/meldwindow.py:142
-msgid "Prefere_nces"
-msgstr "è¨å®š(_N)"
+#: ../meld/meldwindow.py:95
+msgid "Go to _Line"
+msgstr "指定行ã¸ç§»å‹•(_L)"
-#: ../meld/meldwindow.py:142
-msgid "Configure the application"
-msgstr "Meld ã‚’è¨å®šã—ã¾ã™"
+#: ../meld/meldwindow.py:96
+msgid "Go to a specific line"
+msgstr "指定ã—ãŸè¡Œã¸ç§»å‹•ã—ã¾ã™"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:99
msgid "_Changes"
msgstr "変更点(_C)"
-#: ../meld/meldwindow.py:145
-msgid "Next change"
+#: ../meld/meldwindow.py:100
+msgid "Next Change"
msgstr "次ã®å¤‰æ›´ç‚¹"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:101
msgid "Go to the next change"
msgstr "次ã®å¤‰æ›´ç‚¹ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™"
-#: ../meld/meldwindow.py:146
-msgid "Previous change"
+#: ../meld/meldwindow.py:103
+msgid "Previous Change"
msgstr "å‰ã®å¤‰æ›´ç‚¹"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:104
msgid "Go to the previous change"
msgstr "å‰ã®å¤‰æ›´ç‚¹ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™"
-#: ../meld/meldwindow.py:147
-msgid "Open externally"
+#: ../meld/meldwindow.py:106
+msgid "Open Externally"
msgstr "別ã®ã‚¢ãƒ—リã§é–‹ã"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:107
msgid "Open selected file or directory in the default external application"
msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚„フォルダーをデフォルトã®ã‚¢ãƒ—リケーションã§é–‹ãã¾ã™"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:111
msgid "_View"
msgstr "表示(_V)"
-#: ../meld/meldwindow.py:150
-msgid "File status"
+#: ../meld/meldwindow.py:112
+msgid "File Status"
msgstr "ファイルã®çŠ¶æ…‹"
-#: ../meld/meldwindow.py:151
-msgid "Version status"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
+#: ../meld/meldwindow.py:113
+msgid "Version Status"
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®çŠ¶æ…‹"
-#: ../meld/meldwindow.py:152
-msgid "File filters"
-msgstr "ファイルã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼"
-
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:116
msgid "Stop the current action"
msgstr "ç¾åœ¨é©ç”¨ä¸ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’åœæ¢ã—ã¾ã™"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:119
msgid "Refresh the view"
msgstr "表示を更新ã—ã¾ã™"
-#: ../meld/meldwindow.py:155
-msgid "Reload"
-msgstr "å†èªè¾¼ã¿"
-
-#: ../meld/meldwindow.py:155
-msgid "Reload the comparison"
-msgstr "比較内容を更新ã—ã¾ã™"
-
-#: ../meld/meldwindow.py:157
-msgid "_Tabs"
-msgstr "タブ(_T)"
-
-#: ../meld/meldwindow.py:158
-msgid "_Previous Tab"
-msgstr "å‰ã®ã‚¿ãƒ–(_P)"
-
-#: ../meld/meldwindow.py:158
-msgid "Activate previous tab"
-msgstr "å‰ã®ã‚¿ãƒ–ã«åˆ‡ã‚Šæ›¿ãˆã¾ã™"
-
-#: ../meld/meldwindow.py:159
-msgid "_Next Tab"
-msgstr "次ã®ã‚¿ãƒ–(_N)"
+#: ../meld/meldwindow.py:123
+msgid "Fullscreen"
+msgstr "フルスクリーン"
-#: ../meld/meldwindow.py:159
-msgid "Activate next tab"
-msgstr "次ã®ã‚¿ãƒ–ã«åˆ‡ã‚Šæ›¿ãˆã¾ã™"
-
-#: ../meld/meldwindow.py:160
-msgid "Move Tab _Left"
-msgstr "タブを左ã¸ç§»å‹•ã™ã‚‹(_L)"
-
-#: ../meld/meldwindow.py:160
-msgid "Move current tab to left"
-msgstr "ã“ã®ã‚¿ãƒ–ã‚’å·¦å´ã¸ç§»å‹•ã—ã¾ã™"
-
-#: ../meld/meldwindow.py:161
-msgid "Move Tab _Right"
-msgstr "タブをå³ã¸ç§»å‹•ã™ã‚‹(_R)"
-
-#: ../meld/meldwindow.py:161
-msgid "Move current tab to right"
-msgstr "ã“ã®ã‚¿ãƒ–ã‚’å³å´ã¸ç§»å‹•ã—ã¾ã™"
-
-#: ../meld/meldwindow.py:163
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#: ../meld/meldwindow.py:164
-msgid "_Contents"
-msgstr "目次(_C)"
-
-#: ../meld/meldwindow.py:164
-msgid "Open the Meld manual"
-msgstr "Meld ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’é–‹ãã¾ã™"
-
-#: ../meld/meldwindow.py:165
-msgid "Report _Bug"
-msgstr "ãƒã‚°ã®å ±å‘Š(_B)"
-
-#: ../meld/meldwindow.py:165
-msgid "Report a bug in Meld"
-msgstr "Meld ã®ãƒã‚°ã‚’å ±å‘Šã—ã¾ã™"
-
-#: ../meld/meldwindow.py:166
-msgid "About this program"
-msgstr "ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã«ã¤ã„ã¦"
-
-#: ../meld/meldwindow.py:169
-msgid "Full Screen"
-msgstr "フルスクリーン表示"
-
-#: ../meld/meldwindow.py:169
-msgid "View the comparison in full screen"
+#: ../meld/meldwindow.py:124
+msgid "View the comparison in fullscreen"
msgstr "比較状æ³ã‚’フルスクリーンã§è¡¨ç¤ºã—ã¾ã™"
-#: ../meld/meldwindow.py:170
-msgid "_Toolbar"
-msgstr "ツールãƒãƒ¼(_T)"
+#: ../meld/meldwindow.py:133
+msgid "Open Recent"
+msgstr "最近ã®æ¯”較"
-#: ../meld/meldwindow.py:170
-msgid "Show or hide the toolbar"
-msgstr "ツールãƒãƒ¼ã®è¡¨ç¤ºã‚’ ON/OFF ã—ã¾ã™"
+#: ../meld/meldwindow.py:134
+msgid "Open recent files"
+msgstr "最近ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã¾ã™"
-#: ../meld/meldwindow.py:171
-msgid "_Statusbar"
-msgstr "ステータスãƒãƒ¼(_S)"
+#: ../meld/meldwindow.py:567
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr "オートマージã«ã¯3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¿…è¦ã§ã™: %r"
-#: ../meld/meldwindow.py:171
-msgid "Show or hide the statusbar"
-msgstr "ステータスãƒãƒ¼ã®è¡¨ç¤ºã‚’ ON/OFF ã—ã¾ã™"
+#: ../meld/meldwindow.py:588
+msgid "Cannot compare a mixture of files and directories"
+msgstr "ファイルã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®é–“ã§ã®æ¯”較ã¯ã§ãã¾ã›ã‚“"
-#: ../meld/meldwindow.py:538
-msgid "Switch to this tab"
-msgstr "ã“ã®ã‚¿ãƒ–ã«åˆ‡ã‚Šæ›¿ãˆã¾ã™"
+#: ../meld/misc.py:155
+msgid ""
+"{}\n"
+"\n"
+"Meld encountered a critical error while running:\n"
+"<tt>{}</tt>"
+msgstr ""
-#. exit at first non found directory + file
-#: ../meld/meldwindow.py:629
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "ファイルã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®é–“ã§ã®æ¯”較ã¯ã§ãã¾ã›ã‚“。\n"
+#: ../meld/misc.py:237
+#, python-format
+msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+msgstr ""
+"%s-%s ã®ã‚«ãƒ©ãƒ¼ã‚¹ã‚ーマã®è©³ç´°ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ã“ã‚Œã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒæ£å¸¸"
+"ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:174
+#: ../meld/misc.py:311
msgid "[None]"
msgstr "[ãªã—]"
-#: ../meld/patchdialog.py:122
-msgid "Save Patch As..."
-msgstr "åå‰ã‚’付ã‘ã¦ãƒ‘ッãƒã‚’ä¿å˜..."
-
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:42 ../meld/preferences.py:135
msgid "label"
msgstr "(æ–°ã—ã„åå‰)"
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:42 ../meld/preferences.py:135
msgid "pattern"
msgstr "(æ–°ã—ã„パターン)"
-#: ../meld/preferences.py:111
-msgid "Only available if you have gnome-python-desktop installed"
-msgstr ""
-"'gnome-python-desktop' をインストールã—ã¦ã„ã‚‹å ´åˆã«ã®ã¿è¡Œç•ªå·ã‚’表示ã™ã‚‹ã“ã¨ãŒ"
-"ã§ãã¾ã™ã€‚"
+#: ../meld/recent.py:106
+msgid "Version control:"
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†:"
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:234
-msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+#: ../meld/ui/bufferselectors.py:114
+#, python-brace-format
+msgid "{name} ({charset})"
+msgstr ""
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:236
-msgid ""
-"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
-"Desktop.ini\n"
+#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152
+msgid "Plain Text"
msgstr ""
-"OS 特有ã®ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
-"Desktop.ini\n"
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#. Abbreviation for line, column so that it will fit in the status bar
+#: ../meld/ui/statusbar.py:124
#, 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:240
-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:242
-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:244
-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:246
-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:248
-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:250
-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:252
-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:254
-msgid "Script comment\t0\t#.*"
-msgstr "スクリプトã®ã‚³ãƒ¡ãƒ³ãƒˆ\t0\t#.*"
-
-#: ../meld/vcview.py:128
-msgid "Co_mmit"
-msgstr "コミット(_M)"
+msgid "Ln %i, Col %i"
+msgstr "(%iè¡Œã€%i列)"
-#: ../meld/vcview.py:128
-msgid "Commit"
-msgstr "コミットã—ã¾ã™"
+#: ../meld/ui/statusbar.py:177
+msgid "Line you want to move the cursor to"
+msgstr ""
-#: ../meld/vcview.py:129
-msgid "_Update"
-msgstr "æ›´æ–°(_U)"
+#: ../meld/ui/vcdialogs.py:55
+msgid "No files will be committed"
+msgstr ""
-#: ../meld/vcview.py:129
-msgid "Update"
-msgstr "æ›´æ–°ã—ã¾ã™"
+#. Translators: First %s is replaced by translated "%d unpushed
+#. commits", second %s is replaced by translated "%d branches"
+#: ../meld/vc/git.py:92
+#, python-format
+msgid "%s in %s"
+msgstr ""
-#: ../meld/vcview.py:130
-msgid "Add to VC"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã«è¿½åŠ ã—ã¾ã™"
+#. Translators: These messages cover the case where there is
+#. only one branch, and are not part of another message.
+#: ../meld/vc/git.py:93 ../meld/vc/git.py:100
+#, python-format
+msgid "%d unpushed commit"
+msgid_plural "%d unpushed commits"
+msgstr[0] ""
-#: ../meld/vcview.py:131
-msgid "Add _Binary"
-msgstr "ãƒã‚¤ãƒŠãƒªã®è¿½åŠ (_B)"
+#: ../meld/vc/git.py:95
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] ""
-#: ../meld/vcview.py:131
-msgid "Add binary to VC"
-msgstr "ãƒã‚¤ãƒŠãƒªã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã«è¿½åŠ ã—ã¾ã™"
+#: ../meld/vc/git.py:334
+#, python-format
+msgid "Mode changed from %s to %s"
+msgstr ""
-#: ../meld/vcview.py:132
-msgid "Remove from VC"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã‹ã‚‰å‰Šé™¤ã—ã¾ã™"
+#: ../meld/vc/git.py:342
+msgid "Partially staged"
+msgstr ""
-#: ../meld/vcview.py:133
-msgid "_Resolved"
-msgstr "解決済(_R)"
+#: ../meld/vc/git.py:342
+msgid "Staged"
+msgstr ""
-#: ../meld/vcview.py:133
-msgid "Mark as resolved for VC"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã§è§£æ±ºæ¸ˆã¿ã§ã‚ã‚‹ã¨ã™ã‚‹"
+#. Translators: This is the displayed name of a version control system
+#. when no version control system is actually found.
+#: ../meld/vc/_null.py:37
+msgid "None"
+msgstr "ãªã—"
-#: ../meld/vcview.py:134
-msgid "Revert to original"
-msgstr "å…ƒã«æˆ»ã—ã¾ã™"
+#: ../meld/vc/svn.py:203
+#, python-format
+msgid "Rev %s"
+msgstr ""
-#: ../meld/vcview.py:135
-msgid "Delete locally"
-msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒ»ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã—ã¾ã™"
+#: ../meld/vc/_vc.py:54
+msgid "Merged"
+msgstr ""
-#: ../meld/vcview.py:139
-msgid "_Flatten"
-msgstr "一覧表示(_F)"
+#: ../meld/vc/_vc.py:54
+msgid "Base"
+msgstr ""
-#: ../meld/vcview.py:139
-msgid "Flatten directories"
-msgstr "é…下ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’無視ã—ã¾ã™"
+#: ../meld/vc/_vc.py:54
+msgid "Local"
+msgstr ""
-#: ../meld/vcview.py:140
-msgid "_Modified"
-msgstr "変更済ã®ã‚‚ã®(_M)"
+#: ../meld/vc/_vc.py:54
+msgid "Remote"
+msgstr ""
-#: ../meld/vcview.py:141
-msgid "_Normal"
-msgstr "通常ã®ã‚‚ã®(_N)"
+#: ../meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr ""
-#: ../meld/vcview.py:141
-msgid "Show normal"
-msgstr "通常ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示ã—ã¾ã™"
+#: ../meld/vc/_vc.py:73
+msgid "Error"
+msgstr ""
-#: ../meld/vcview.py:142
-msgid "Non _VC"
-msgstr "VC以外(_V)"
+#: ../meld/vc/_vc.py:75
+msgid "Newly added"
+msgstr ""
-#: ../meld/vcview.py:142
-msgid "Show unversioned files"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示ã—ã¾ã™"
+#: ../meld/vc/_vc.py:77
+msgid "Renamed"
+msgstr ""
-#: ../meld/vcview.py:143
-msgid "Ignored"
-msgstr "無視ã—ãŸã‚‚ã®"
+#: ../meld/vc/_vc.py:78
+msgid "Conflict"
+msgstr ""
-#: ../meld/vcview.py:143
-msgid "Show ignored files"
-msgstr "無視ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示ã—ã¾ã™"
+#: ../meld/vc/_vc.py:79
+msgid "Removed"
+msgstr ""
-#: ../meld/vcview.py:186 ../meld/vcview.py:318
-msgid "Location"
-msgstr "å ´æ‰€"
+#: ../meld/vc/_vc.py:80
+msgid "Missing"
+msgstr ""
-#: ../meld/vcview.py:187
-msgid "Status"
-msgstr "状態"
+#: ../meld/vc/_vc.py:81
+msgid "Not present"
+msgstr ""
-#: ../meld/vcview.py:188
-msgid "Rev"
-msgstr "リビジョン"
+#. Translators: This error message is shown when a version
+#. control binary isn't installed.
+#: ../meld/vcview.py:282
+#, python-format
+msgid "%(name)s (%(cmd)s not installed)"
+msgstr ""
-#: ../meld/vcview.py:189
-msgid "Tag"
-msgstr "ã‚¿ã‚°"
+#. Translators: This error message is shown when a version
+#. controlled repository is invalid.
+#: ../meld/vcview.py:286
+#, python-format
+msgid "%(name)s (Invalid repository)"
+msgstr ""
-#: ../meld/vcview.py:190
-msgid "Options"
-msgstr "オプション"
+#: ../meld/vcview.py:307
+msgid "No valid version control system found in this folder"
+msgstr ""
-#: ../meld/vcview.py:249
-msgid "Choose one Version Control"
-msgstr "1ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã®é¸æŠž"
+#: ../meld/vcview.py:309
+msgid "Only one version control system found in this folder"
+msgstr ""
-#: ../meld/vcview.py:250
-msgid "Only one Version Control in this directory"
-msgstr "ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®1ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã ã‘"
+#: ../meld/vcview.py:311
+msgid "Choose which version control system to use"
+msgstr ""
-#. TRANSLATORS: this is an error message when a version control
-#. application isn't installed or can't be found
-#: ../meld/vcview.py:263
+#. TRANSLATORS: This is the location of the directory being viewed
+#: ../meld/vcview.py:366
#, 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:267
-msgid "Invalid Repository"
-msgstr "ãŠã‹ã—ãªãƒªãƒã‚¸ãƒˆãƒªã§ã™"
+msgid "%s: %s"
+msgstr ""
-#: ../meld/vcview.py:276
-#, python-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#. Initial yield so when we add this to our tasks, we don't
+#. create iterators that may be invalidated.
+#: ../meld/vcview.py:373
+msgid "Scanning repository"
+msgstr ""
-#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:318
+#: ../meld/vcview.py:402
#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
+msgid "Scanning %s"
+msgstr "%s をスã‚ャンä¸"
-#: ../meld/vcview.py:362
+#: ../meld/vcview.py:441
msgid "(Empty)"
msgstr "(空)"
-#: ../meld/vcview.py:400
+#: ../meld/vcview.py:487
+#, python-format
+msgid "%s — local"
+msgstr ""
+
+#: ../meld/vcview.py:488
#, python-format
-msgid "[%s] Fetching differences"
-msgstr "[%s] 差分ã®å–å¾—ä¸"
+msgid "%s — remote"
+msgstr ""
-#: ../meld/vcview.py:408
+#: ../meld/vcview.py:496
#, python-format
-msgid "[%s] Applying patch"
-msgstr "[%s] パッãƒã®é©ç”¨ä¸"
+msgid "%s (local, merge, remote)"
+msgstr ""
#: ../meld/vcview.py:501
-msgid "Select some files first."
-msgstr "ã¾ãšæœ€åˆã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¦ä¸‹ã•ã„。"
+#, python-format
+msgid "%s (remote, merge, local)"
+msgstr ""
-#: ../meld/vcview.py:574
+#: ../meld/vcview.py:512
#, python-format
-msgid ""
-"\n"
-" Invoking 'patch' failed.\n"
-" \n"
-" Maybe you don't have 'GNU patch' installed,\n"
-" or you use an untested version of %s.\n"
-" \n"
-" Please send email bug report to:\n"
-" meld-list gnome org\n"
-" \n"
-" Containing the following information:\n"
-" \n"
-" - meld version: '%s'\n"
-" - source control software type: '%s'\n"
-" - source control software version: 'X.Y.Z'\n"
-" - the output of '%s somefile.txt'\n"
-" - patch command: '%s'\n"
-" (no need to actually run it, just provide\n"
-" the command line) \n"
-" \n"
-" Replace 'X.Y.Z' by the actual version for the\n"
-" source control software you use.\n"
-" "
+msgid "%s — repository"
msgstr ""
-"\n"
-" 'patch' コマンドã®é©ç”¨ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n"
-" \n"
-" ãŠãらã 'GNU patch' ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„ã‹\n"
-" ãƒãƒ¼ã‚¸ãƒ§ãƒ³%s (開発版) ã‚’ãŠä½¿ã„ã®ã©ã¡ã‚‰ã‹ã®ã‚ˆã†ã§ã™ã€‚\n"
-" \n"
-" ãƒã‚°å ±å‘Šã¨ã—ã¦æ¬¡ã®å®›å…ˆã«æƒ…å ±ã‚’æä¾›ã—ã¦ä¸‹ã•ã„:\n"
-" meld-list gnome org\n"
-" \n"
-" ãã®éš›ã¯ã€æ¬¡ã«ç¤ºã™æƒ…å ±ã‚’æä¾›ã—ã¦ä¸‹ã•ã„ (英文):\n"
-" \n"
-" - meld version: '%s'\n"
-" - source control software type: '%s'\n"
-" - source control software version: 'X.Y.Z'\n"
-" - the output of '%s somefile.txt'\n"
-" - patch command: '%s'\n"
-" (実際ã«å®Ÿè¡Œã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“; å˜ã«ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã®\n"
-" 引数を知りãŸã„ã ã‘ã§ã™) \n"
-" \n"
-" 上㮠'X.Y.Z' ã¯ãŠä½¿ã„ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚½ãƒ•ãƒˆè‡ªèº«ã®\n"
-" ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ç½®ãæ›ãˆã¦ä¸‹ã•ã„\n"
-" "
-
-#: ../meld/ui/findbar.py:127
+
+#: ../meld/vcview.py:518
+#, python-format
+msgid "%s (working, repository)"
+msgstr ""
+
+#: ../meld/vcview.py:522
#, python-format
+msgid "%s (repository, working)"
+msgstr ""
+
+#: ../meld/vcview.py:688
+msgid "Remove folder and all its files?"
+msgstr ""
+
+#: ../meld/vcview.py:690
msgid ""
-"Regular expression error\n"
-"'%s'"
+"This will remove all selected files and folders, and all files within any "
+"selected folders, from version control."
msgstr ""
-"æ£è¦è¡¨ç¾ã‚¨ãƒ©ãƒ¼\n"
-"'%s'"
-#: ../meld/ui/historyentry.py:293
-msgid "_Browse..."
-msgstr "å‚ç…§(_B)..."
+#: ../meld/vcview.py:804
+msgid "Clear"
+msgstr ""
-#: ../meld/ui/historyentry.py:301
-msgid "Path"
-msgstr "パス"
+#~ msgid "Show toolbar"
+#~ msgstr "ツールãƒãƒ¼ã‚’表示ã™ã‚‹"
-#: ../meld/ui/historyentry.py:302
-msgid "Path to file"
-msgstr "ファイルã®ãƒ‘スã§ã™"
+#~ msgid "If true, the window toolbar is visible."
+#~ msgstr "true ã®å ´åˆã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ãƒ„ールãƒãƒ¼ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
-#: ../meld/ui/historyentry.py:303
-msgid "Pop up a file selector to choose a file"
-msgstr "ファイルをé¸æŠžã—ã¾ã™"
+#~ msgid "Show statusbar"
+#~ msgstr "ステータスãƒãƒ¼ã‚’表示ã™ã‚‹"
-#: ../meld/ui/historyentry.py:441
-msgid "Select directory"
-msgstr "フォルダーã®é¸æŠž"
+#~ msgid "If true, the window statusbar is visible."
+#~ msgstr "true ã®å ´åˆã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
-#: ../meld/ui/historyentry.py:445
-msgid "Select file"
-msgstr "ファイルã®é¸æŠž"
+#~ msgid "Editable List"
+#~ msgstr "編集å¯èƒ½ãªãƒªã‚¹ãƒˆ"
-#: ../meld/ui/notebooklabel.py:60
-msgid "Close tab"
-msgstr "ã“ã®ã‚¿ãƒ–ã‚’é–‰ã˜ã¾ã™"
+#~ msgid "Format as Patch..."
+#~ 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:Conflict:Removed:Missing"
-msgstr ""
-"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
+#~ msgid "Meld Preferences"
+#~ msgstr "Meld ã®è¨å®š"
-#: ../meld/vc/cvs.py:163
-#, python-format
-msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
-msgstr ""
-"æ£è¦è¡¨ç¾ã«å¤‰æ›ã™ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ\n"
-"パターン: '%s'\n"
-"エラー: '%s'"
+#~ msgid "INS"
+#~ msgstr "[挿入]"
+
+#~ msgid "OVR"
+#~ msgstr "[上書ã]"
+
+#~ msgid "_Save as UTF-8"
+#~ msgstr "UTF-8 ã§ä¿å˜(_S)"
+
+#~ msgid "Couldn't encode text as “%sâ€"
+#~ msgstr "テã‚ストを “%s†ã§ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸ"
+
+#~ msgid "Find..."
+#~ msgstr "検索..."
+
+#~ msgid "_Replace..."
+#~ msgstr "ç½®æ›(_R)..."
+
+#~ msgid "_Toolbar"
+#~ msgstr "ツールãƒãƒ¼(_T)"
+
+#~ msgid "Show or hide the toolbar"
+#~ msgstr "ツールãƒãƒ¼ã‚’表示ã¾ãŸã¯éžè¡¨ç¤ºã«ã—ã¾ã™"
+
+#~ msgid "_Meld"
+#~ msgstr "Meld(_M)"
+
+#~ msgid "Quit the program"
+#~ msgstr "プãƒã‚°ãƒ©ãƒ を終了ã—ã¾ã™"
+
+#~ msgid "Prefere_nces"
+#~ msgstr "è¨å®š(_N)"
-#~ msgid "Compare Options"
-#~ msgstr "比較ã®ã‚ªãƒ—ション"
+#~ msgid "Configure the application"
+#~ msgstr "Meld ã‚’è¨å®šã—ã¾ã™"
-#~ msgid "Date"
-#~ msgstr "日付"
+#~ msgid "_Contents"
+#~ msgstr "目次(_C)"
-#~ msgid "Local copy against other remote revision"
-#~ msgstr "リモートã®ä»–ã®ãƒªãƒ“ジョンをãƒãƒ¼ã‚«ãƒ«ã¸ã‚³ãƒ”ーã™ã‚‹"
+#~ msgid "Open the Meld manual"
+#~ msgstr "Meld ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’é–‹ãã¾ã™"
-#~ msgid "Local copy against same remote revision"
-#~ msgstr "リモートã®åŒã˜ãƒªãƒ“ジョンをãƒãƒ¼ã‚«ãƒ«ã¸ã‚³ãƒ”ーã™ã‚‹"
+#~ msgid "About this application"
+#~ msgstr "ã“ã®ã‚¢ãƒ—リケーションã«ã¤ã„ã¦"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]