[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, 22 Jan 2019 11:03:57 +0000 (UTC)
commit 3d6b14b0602cfd04b10bff1df60a0ac7c5b7d93b
Author: Ryuta Fujii <translation sicklylife jp>
Date: Tue Jan 22 11:03:25 2019 +0000
Update Japanese translation
(cherry picked from commit d0a37917b33385fe5cd7936cf94014d1813447ea)
po/ja.po | 1975 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 991 insertions(+), 984 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 579752e4..0df0ef68 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2019-01-10 21:55+0000\n"
-"PO-Revision-Date: 2019-01-08 21:02+0900\n"
+"POT-Creation-Date: 2019-01-14 15:16+0000\n"
+"PO-Revision-Date: 2019-01-22 19:55+0900\n"
"Last-Translator: sicklylife <translation sicklylife jp>\n"
"Language-Team: Japanese <gnome-translation gnome gr jp>\n"
"Language: ja\n"
@@ -20,25 +20,26 @@ msgstr ""
"Generated-By: pygettext.py 1.5\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../bin/meld:190
+#: ../bin/meld:194
msgid "Cannot import: "
msgstr "インãƒãƒ¼ãƒˆã§ãã¾ã›ã‚“: "
-#: ../bin/meld:193
+#: ../bin/meld:197
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meld ã«ã¯ %s 以上ãŒå¿…è¦ã§ã™ã€‚"
-#: ../bin/meld:249
+#: ../bin/meld:243
#, c-format
msgid ""
"Couldn’t load Meld-specific CSS (%s)\n"
"%s"
msgstr ""
+"Meld 固有㮠CSS (%s) ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ\n"
+"%s"
#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1
-#: ../meld/resources/ui/appwindow.ui.h:1
+#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1
msgid "Meld"
msgstr "Meld"
@@ -99,10 +100,26 @@ msgid "Default window fullscreen state"
msgstr "デフォルトã§ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒãƒ•ãƒ«ã‚¹ã‚¯ãƒªãƒ¼ãƒ³è¡¨ç¤ºã•ã‚Œã‚‹ã‹ã©ã†ã‹"
#: ../data/org.gnome.meld.gschema.xml.h:5
+msgid "Show toolbar"
+msgstr "ツールãƒãƒ¼ã‚’表示ã™ã‚‹"
+
+#: ../data/org.gnome.meld.gschema.xml.h:6
+msgid "If true, the window toolbar is visible."
+msgstr "true ã®å ´åˆã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ãƒ„ールãƒãƒ¼ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
+
+#: ../data/org.gnome.meld.gschema.xml.h:7
+msgid "Show statusbar"
+msgstr "ステータスãƒãƒ¼ã‚’表示ã™ã‚‹"
+
+#: ../data/org.gnome.meld.gschema.xml.h:8
+msgid "If true, the window statusbar is visible."
+msgstr "true ã®å ´åˆã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
+
+#: ../data/org.gnome.meld.gschema.xml.h:9
msgid "Additional automatically detected text encodings"
msgstr "自動検出ã•ã‚Œã‚‹è¿½åŠ ã®ãƒ†ã‚ストエンコーディング"
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: ../data/org.gnome.meld.gschema.xml.h:10
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 "
@@ -115,56 +132,56 @@ msgstr ""
"用ã•ã‚Œã¾ã™ã€‚ユーザーã®ãƒã‚±ãƒ¼ãƒ«ã«ã‚ˆã£ã¦ã¯ã€ä»–ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã§ã®ãƒ‡ã‚³ãƒ¼ãƒ‰ã‚‚"
"試ã•ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: ../data/org.gnome.meld.gschema.xml.h:11
msgid "Width of an indentation step"
msgstr "タブã®å¹…"
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: ../data/org.gnome.meld.gschema.xml.h:12
msgid "The number of spaces to use for a single indent step"
msgstr "インデント幅をスペース何個分ã«ã™ã‚‹ã‹"
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: ../data/org.gnome.meld.gschema.xml.h:13
msgid "Whether to indent using spaces or tabs"
msgstr "スペースã¨ã‚¿ãƒ–ã®ã©ã¡ã‚‰ã‚’使ã£ã¦ã‚¤ãƒ³ãƒ‡ãƒ³ãƒˆã™ã‚‹ã‹"
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: ../data/org.gnome.meld.gschema.xml.h:14
msgid "If true, any new indentation will use spaces instead of tabs."
msgstr ""
"true ã®å ´åˆã€æ–°ã—ã„インデントã§ã¯ã‚¿ãƒ–ã®ä»£ã‚ã‚Šã«ã‚¹ãƒšãƒ¼ã‚¹ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../data/org.gnome.meld.gschema.xml.h:15
msgid "Show line numbers"
msgstr "行番å·ã‚’表示ã™ã‚‹"
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:16
msgid "If true, line numbers will be shown in the gutter of file comparisons."
msgstr "true ã®å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«æ¯”較時ã®ã‚¬ã‚¿ãƒ¼éƒ¨åˆ†ã«è¡Œç•ªå·ã‚’表示ã—ã¾ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:17
msgid "Highlight syntax"
msgstr "シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆ"
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:18
msgid ""
"Whether to highlight syntax in comparisons. Because of Meld’s own color "
"highlighting, this is off by default."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:19
msgid "Color scheme to use for syntax highlighting"
msgstr "シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆã«ä½¿ç”¨ã™ã‚‹ã‚«ãƒ©ãƒ¼ã‚¹ã‚ーマ"
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:20
msgid "Used by GtkSourceView to determine colors for syntax highlighting"
msgstr ""
"シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆã®ãŸã‚ã«æ±ºã‚られãŸè‰²ã¯ GtkSourceView ã«ã‚ˆã£ã¦ä½¿ç”¨ã•ã‚Œã¾"
"ã™"
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:21
msgid "Displayed whitespace"
msgstr "ホワイトスペースを表示ã™ã‚‹"
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:22
msgid ""
"Selector for individual whitespace character types to be shown. Possible "
"values are 'space', 'tab', 'newline' and 'nbsp'."
@@ -172,11 +189,11 @@ msgstr ""
"表示ã™ã‚‹ç©ºç™½é¡žæ–‡å—ã®ç¨®é¡žã®è¨å®šã§ã™ã€‚使用å¯èƒ½ãªå€¤ã¯ "
"'space'ã€'tab'ã€'newline'ã€'nbsp' ã§ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:23
msgid "Wrap mode"
msgstr "折り返ã—ã®ãƒ¢ãƒ¼ãƒ‰"
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:24
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 "
@@ -186,53 +203,53 @@ msgstr ""
"'none'ã€ä»»æ„ã®æ–‡å—ã§æŠ˜ã‚Šè¿”ã™å ´åˆã¯ 'char'ã€å˜èªžã®æœ«å°¾ã§æŠ˜ã‚Šè¿”ã™å ´åˆã¯ 'word' "
"を指定ã—ã¾ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:25
msgid "Highlight current line"
msgstr "ç¾åœ¨ã®è¡Œã®ãƒã‚¤ãƒ©ã‚¤ãƒˆ"
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:26
msgid ""
"If true, the line containing the cursor will be highlighted in file "
"comparisons."
msgstr "true ã®å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«æ¯”較時ã«ã‚«ãƒ¼ã‚½ãƒ«ã®ã‚ã‚‹è¡ŒãŒãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã‚Œã¾ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:27
msgid "Use the system default monospace font"
msgstr "システムデフォルトã®ç‰å¹…フォントを使用ã™ã‚‹"
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:28
msgid ""
"If false, custom-font will be used instead of the system monospace font."
msgstr ""
"false ã®å ´åˆã€ã‚·ã‚¹ãƒ†ãƒ ã® monospace フォントã®ä»£ã‚ã‚Šã«ã‚«ã‚¹ã‚¿ãƒ フォントãŒä½¿ç”¨ã•"
"ã‚Œã¾ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:29
msgid "Custom font"
msgstr "カスタムフォント"
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:30
msgid ""
"The custom font to use, stored as a string and parsed as a Pango font "
"description."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:31
msgid "Ignore blank lines when comparing files"
msgstr "ファイル比較時ã«ç©ºè¡Œã‚’無視ã™ã‚‹"
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:32
msgid ""
"If true, blank lines will be trimmed when highlighting changes between files."
msgstr ""
"true ã®å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«é–“ã®å¤‰æ›´ç‚¹ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã™ã‚‹éš›ã«ã€ç©ºè¡Œã®å·®ç•°ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã—"
"ã¾ã›ã‚“。"
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:33
msgid "Use the system default editor"
msgstr "システムデフォルトã®ã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã‚’使用ã™ã‚‹"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:34
msgid ""
"If false, custom-editor-command will be used instead of the system editor "
"when opening files externally."
@@ -240,33 +257,32 @@ msgstr ""
"false ã®å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’別ã®ã‚¢ãƒ—リã§é–‹ãéš›ã«ã€ã‚·ã‚¹ãƒ†ãƒ ã®ã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã®ä»£ã‚ã‚Šã«"
"指定ã—ãŸã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã‚³ãƒžãƒ³ãƒ‰ã‚’使用ã—ã¾ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:35
msgid "The custom editor launch command"
msgstr "カスタムエディター起動コマンド"
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:36
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/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:37
msgid "Columns to display"
msgstr "表示ã™ã‚‹ã‚«ãƒ©ãƒ "
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: ../data/org.gnome.meld.gschema.xml.h:38
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
msgstr ""
"フォルダー比較時ã®ã‚«ãƒ©ãƒ åã®ä¸€è¦§ã¨ã€ãれらを表示ã™ã‚‹ã‹ã©ã†ã‹ã®è¨å®šã§ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:35
-#: ../meld/resources/ui/preferences.ui.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25
msgid "Ignore symbolic links"
msgstr "シンボリックリンクを無視ã™ã‚‹"
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:40
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
@@ -274,11 +290,11 @@ msgstr ""
"true ã®å ´åˆã€ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼æ¯”較時ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ãƒ„リー走査ã«ãŠã„ã¦ã€ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³"
"クã®ãƒªãƒ³ã‚¯å…ˆã‚’走査ã—ã¾ã›ã‚“。"
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:41
msgid "Use shallow comparison"
msgstr "æµ…ã„比較を使用ã™ã‚‹"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:42
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 "
@@ -287,11 +303,11 @@ msgstr ""
"true ã®å ´åˆã€ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼æ¯”較時ã«ã‚µã‚¤ã‚ºã¨ mtime ã ã‘を基準ã«ã—ã¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較"
"ã—ã€ãれらãŒä¸€è‡´ã™ã‚Œã°åŒä¸€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã‚ã‚‹ã¨è¦‹åšã—ã¾ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../data/org.gnome.meld.gschema.xml.h:43
msgid "File timestamp resolution"
msgstr "ファイルã®ã‚¿ã‚¤ãƒ スタンプ分解能"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:44
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 "
@@ -302,12 +318,11 @@ msgstr ""
"ã¨è¦‹åšã•ã‚Œã‚‹æœ€å°ã®å·®ç•°(ナノ秒)ã§ã™ã€‚ã“ã‚Œã¯ã‚¿ã‚¤ãƒ スタンプ分解能ãŒç•°ãªã‚‹ãƒ•ã‚¡ã‚¤"
"ルシステム間ã§ã€ãƒ•ã‚¡ã‚¤ãƒ«ã®æ¯”較を行ã†éš›ã«å½¹ç«‹ã¡ã¾ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:41
-#: ../meld/resources/ui/preferences.ui.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22
msgid "Apply text filters during folder comparisons"
msgstr "フォルダーã®æ¯”較ä¸ã«ãƒ†ã‚ストフィルターをé©ç”¨ã™ã‚‹"
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:46
msgid ""
"If true, folder comparisons that compare file contents also apply active "
"text filters and the blank line trimming option, and ignore newline "
@@ -317,102 +332,102 @@ msgstr ""
"フィルターã¨ç©ºè¡Œã®ãƒˆãƒªãƒŸãƒ³ã‚°ã‚ªãƒ—ションãŒé©ç”¨ã•ã‚Œã€æ”¹è¡Œã«ã‚ˆã‚‹å·®ç•°ã¯ç„¡è¦–ã—ã¾"
"ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:47
msgid "File status filters"
msgstr "ファイルã®çŠ¶æ…‹ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:48
msgid "List of statuses used to filter visible files in folder comparison."
msgstr ""
"フォルダー比較時ã«ã€è¡¨ç¤ºã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’フィルタリングã™ã‚‹ãŸã‚ã«ä½¿ç”¨ã•ã‚Œã‚‹ã‚¹"
"テータスã®ãƒªã‚¹ãƒˆã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:49
msgid "Show the version control console output"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:50
msgid ""
"If true, a console output section will be shown in version control views, "
"showing the commands run for version control operations."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:51
msgid "Version control pane position"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:52
msgid ""
"This is the height of the main version control tree when the console pane is "
"shown."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:53
msgid "Present version comparisons as left-local/right-remote"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:54
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/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:55
msgid "Order for files in three-way version control merge comparisons"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:56
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/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:57
msgid "Show margin in commit message editor"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:58
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/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:59
msgid "Margin column in commit message editor"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:60
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:61
msgid "Automatically hard-wrap commit messages"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:62
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/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:63
msgid "Version control status filters"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:64
msgid ""
"List of statuses used to filter visible files in version control comparison."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:65
msgid "Filename-based filters"
msgstr "ファイルåを対象ã¨ã—ãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ¼"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: ../data/org.gnome.meld.gschema.xml.h:66
msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
@@ -420,11 +435,11 @@ msgstr ""
"ファイルåãŒå¯¾è±¡ã®å®šç¾©ã•ã‚ŒãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã®ãƒªã‚¹ãƒˆã€‚有効ãªå ´åˆã€ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®æ¯”較"
"ã‹ã‚‰ä¸€è‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’除外ã—ã¾ã™ã€‚"
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: ../data/org.gnome.meld.gschema.xml.h:67
msgid "Text-based filters"
msgstr "テã‚ストを対象ã¨ã—ãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ¼"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: ../data/org.gnome.meld.gschema.xml.h:68
msgid ""
"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, "
@@ -450,622 +465,397 @@ msgstr "Meld ダークスã‚ーマ"
msgid "Dark color scheme for Meld highlighting"
msgstr "Meld ãŒãƒã‚¤ãƒ©ã‚¤ãƒˆã«ç”¨ã„るダークカラースã‚ーマ"
-#: ../meld/resources/gtk/help-overlay.ui.h:1
-msgctxt "shortcut window"
-msgid "General"
-msgstr "全般"
+#: ../data/ui/application.ui.h:1
+msgid "About Meld"
+msgstr "Meld ã«ã¤ã„ã¦"
-#: ../meld/resources/gtk/help-overlay.ui.h:2
-msgctxt "shortcut window"
-msgid "New comparison"
-msgstr "æ–°ã—ã„比較"
+#: ../data/ui/application.ui.h:2
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
+msgstr ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
-#: ../meld/resources/gtk/help-overlay.ui.h:3
-msgctxt "shortcut window"
-msgid "Close a comparison"
-msgstr "比較を閉ã˜ã‚‹"
+#: ../data/ui/application.ui.h:4
+msgid "Website"
+msgstr "ウェブサイト"
-#: ../meld/resources/gtk/help-overlay.ui.h:4
-msgctxt "shortcut window"
-msgid "Quit Meld"
-msgstr "Meld を終了ã™ã‚‹"
+#: ../data/ui/application.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>"
-#: ../meld/resources/gtk/help-overlay.ui.h:5
-msgctxt "shortcut window"
-msgid "Stop the current action"
-msgstr "ç¾åœ¨é©ç”¨ä¸ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’åœæ¢ã™ã‚‹"
+#: ../data/ui/application.ui.h:6
+msgid "_Preferences"
+msgstr "è¨å®š(_P)"
-#: ../meld/resources/gtk/help-overlay.ui.h:6
-msgctxt "shortcut window"
-msgid "Refresh comparison"
-msgstr "比較内容を更新ã™ã‚‹"
+#: ../data/ui/application.ui.h:7
+msgid "_Help"
+msgstr "ヘルプ(_H)"
-#: ../meld/resources/gtk/help-overlay.ui.h:7
-msgctxt "shortcut window"
-msgid "Fullscreen"
-msgstr "フルスクリーンã§è¡¨ç¤ºã™ã‚‹"
+#: ../data/ui/application.ui.h:8
+msgid "Keyboard Shortcuts"
+msgstr "ã‚ーボードショートカット"
-#: ../meld/resources/gtk/help-overlay.ui.h:8
-msgctxt "shortcut window"
-msgid "Tabs"
-msgstr "タブ"
+#: ../data/ui/application.ui.h:9
+msgid "_About"
+msgstr "ã“ã®ã‚¢ãƒ—リケーションã«ã¤ã„ã¦(_A)"
-#: ../meld/resources/gtk/help-overlay.ui.h:9
-msgctxt "shortcut window"
-msgid "Go to previous tab"
-msgstr "å‰ã®ã‚¿ãƒ–ã¸ç§»å‹•ã™ã‚‹"
+#: ../data/ui/application.ui.h:10
+msgid "_Quit"
+msgstr "終了(_Q)"
-#: ../meld/resources/gtk/help-overlay.ui.h:10
-msgctxt "shortcut window"
-msgid "Go to next tab"
-msgstr "次ã®ã‚¿ãƒ–ã¸ç§»å‹•ã™ã‚‹"
+#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "比較(_C)"
-#: ../meld/resources/gtk/help-overlay.ui.h:11
-msgctxt "shortcut window"
-msgid "Switch to tab"
-msgstr "タブを切り替ãˆã‚‹"
+#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較ã—ã¾ã™"
-#: ../meld/resources/gtk/help-overlay.ui.h:12
-msgctxt "shortcut window"
-msgid "Move tab left"
-msgstr "タブを左ã¸ç§»å‹•ã™ã‚‹"
+#: ../data/ui/dirdiff.ui.h:3
+msgid "Collapse Recursively"
+msgstr "å†å¸°çš„ã«ç•³ã‚€"
-#: ../meld/resources/gtk/help-overlay.ui.h:13
-msgctxt "shortcut window"
-msgid "Move tab right"
-msgstr "タブをå³ã¸ç§»å‹•ã™ã‚‹"
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Collapse selected folder and all subfolders"
+msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã¨ã™ã¹ã¦ã®ã‚µãƒ–フォルダーを畳ã¿ã¾ã™"
-#: ../meld/resources/gtk/help-overlay.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "変更点"
+#: ../data/ui/dirdiff.ui.h:5
+msgid "Expand Recursively"
+msgstr "å†å¸°çš„ã«å±•é–‹"
-#: ../meld/resources/gtk/help-overlay.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "å‰ã®å¤‰æ›´ç‚¹ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹"
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Expand selected folder and all subfolders"
+msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã¨ã™ã¹ã¦ã®ã‚µãƒ–フォルダーを展開ã—ã¾ã™"
-#: ../meld/resources/gtk/help-overlay.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "次ã®å¤‰æ›´ç‚¹ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹"
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Copy to _Left"
+msgstr "å·¦ã¸ã‚³ãƒ”ー(_L)"
-#: ../meld/resources/gtk/help-overlay.ui.h:17
-msgctxt "shortcut window"
-msgid "Editing"
-msgstr "編集"
+#: ../data/ui/dirdiff.ui.h:8
+msgid "Copy to left"
+msgstr "å·¦ã¸ã‚³ãƒ”ーã—ã¾ã™"
-#: ../meld/resources/gtk/help-overlay.ui.h:18
-msgctxt "shortcut window"
-msgid "Undo"
-msgstr "å…ƒã«æˆ»ã™"
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Copy to _Right"
+msgstr "å³ã¸ã‚³ãƒ”ー(_R)"
-#: ../meld/resources/gtk/help-overlay.ui.h:19
-msgctxt "shortcut window"
-msgid "Redo"
-msgstr "ã‚„ã‚Šç›´ã—"
+#: ../data/ui/dirdiff.ui.h:10
+msgid "Copy to right"
+msgstr "å³ã¸ã‚³ãƒ”ーã—ã¾ã™"
-#: ../meld/resources/gtk/help-overlay.ui.h:20
-msgctxt "shortcut window"
-msgid "Cut"
-msgstr "切りå–ã‚Š"
+#: ../data/ui/dirdiff.ui.h:11
+msgid "Delete selected"
+msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ãªã©ã‚’削除ã—ã¾ã™"
-#: ../meld/resources/gtk/help-overlay.ui.h:21
-msgctxt "shortcut window"
-msgid "Copy"
-msgstr "コピー"
+#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1497
+msgid "Hide"
+msgstr "éš ã™"
-#: ../meld/resources/gtk/help-overlay.ui.h:22
-msgctxt "shortcut window"
-msgid "Paste"
-msgstr "貼り付ã‘"
+#: ../data/ui/dirdiff.ui.h:13
+msgid "Hide selected"
+msgstr "é¸æŠžç¯„å›²ã‚’éš ã—ã¾ã™"
-#: ../meld/resources/gtk/help-overlay.ui.h:23
-msgctxt "shortcut window"
-msgid "Find"
-msgstr "検索"
+#: ../data/ui/dirdiff.ui.h:14
+msgid "Ignore Filename Case"
+msgstr "ファイルåã®å¤§/å°æ–‡å—を無視ã™ã‚‹"
-#: ../meld/resources/gtk/help-overlay.ui.h:24
-msgctxt "shortcut window"
-msgid "Find Next"
-msgstr "次を検索ã™ã‚‹"
+#: ../data/ui/dirdiff.ui.h:15
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
-#: ../meld/resources/gtk/help-overlay.ui.h:25
-msgctxt "shortcut window"
-msgid "Find Previous"
-msgstr "å‰ã‚’検索ã™ã‚‹"
+#: ../data/ui/dirdiff.ui.h:16
+msgid "Same"
+msgstr "åŒã˜éƒ¨åˆ†"
-#: ../meld/resources/gtk/help-overlay.ui.h:26
-msgctxt "shortcut window"
-msgid "Replace"
-msgstr "ç½®æ›"
+#: ../data/ui/dirdiff.ui.h:17
+msgid "Show identical"
+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 "å³ã¸ã‚³ãƒ”ーã™ã‚‹"
-
-#: ../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)"
+#: ../data/ui/dirdiff.ui.h:18
+msgid "New"
+msgstr "æ–°ã—ã„部分"
-#: ../meld/resources/gtk/menus.ui.h:3
-msgid "Keyboard Shortcuts"
-msgstr "ã‚ーボードショートカット"
+#: ../data/ui/dirdiff.ui.h:19
+msgid "Show new"
+msgstr "æ–°è¦ã®éƒ¨åˆ†ã‚’表示ã—ã¾ã™"
-#: ../meld/resources/gtk/menus.ui.h:4
-msgid "_About"
-msgstr "ã“ã®ã‚¢ãƒ—リケーションã«ã¤ã„ã¦(_A)"
+#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
+msgid "Modified"
+msgstr "変更済"
-#: ../meld/resources/gtk/menus.ui.h:5
-msgid "_Quit"
-msgstr "終了(_Q)"
+#: ../data/ui/dirdiff.ui.h:21
+msgid "Show modified"
+msgstr "変更ã®ã‚るファイルを表示ã—ã¾ã™"
-#: ../meld/resources/ui/about-dialog.ui.h:1
-msgid "About Meld"
-msgstr "Meld ã«ã¤ã„ã¦"
+#: ../data/ui/dirdiff.ui.h:22
+msgid "Filters"
+msgstr "フィルター"
-#: ../meld/resources/ui/about-dialog.ui.h:2
-msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
-msgstr ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
+#: ../data/ui/dirdiff.ui.h:23
+msgid "Set active filters"
+msgstr "フィルターをé¸æŠžã—ã¾ã™"
-#: ../meld/resources/ui/about-dialog.ui.h:4
-msgid "Website"
-msgstr "ウェブサイト"
+#: ../data/ui/EditableList.ui.h:1
+msgid "Editable List"
+msgstr "編集å¯èƒ½ãªãƒªã‚¹ãƒˆ"
-#: ../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>"
-
-#: ../meld/resources/ui/column-list.ui.h:1
-#: ../meld/resources/ui/filter-list.ui.h:1
+#: ../data/ui/EditableList.ui.h:2
msgid "Active"
msgstr "有効"
-#: ../meld/resources/ui/column-list.ui.h:2
+#: ../data/ui/EditableList.ui.h:3
msgid "Column Name"
msgstr "カラムå"
-#: ../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
+#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
+msgid "_Add"
+msgstr "è¿½åŠ (_A)"
+
+#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
+#: ../meld/vcview.py:680
msgid "_Remove"
msgstr "削除(_R)"
-#: ../meld/resources/ui/column-list.ui.h:4
-#: ../meld/resources/ui/filter-list.ui.h:8
+#: ../data/ui/EditableList.ui.h:6
msgid "Move item up"
msgstr "アイテムを上ã¸ç§»å‹•ã—ã¾ã™"
-#: ../meld/resources/ui/column-list.ui.h:5
-#: ../meld/resources/ui/filter-list.ui.h:9
+#: ../data/ui/EditableList.ui.h:7
msgid "Move _Up"
msgstr "上ã¸ç§»å‹•ã™ã‚‹(_U)"
-#: ../meld/resources/ui/column-list.ui.h:6
-#: ../meld/resources/ui/filter-list.ui.h:10
+#: ../data/ui/EditableList.ui.h:8
msgid "Move item down"
msgstr "アイテムを下ã¸ç§»å‹•ã—ã¾ã™"
-#: ../meld/resources/ui/column-list.ui.h:7
-#: ../meld/resources/ui/filter-list.ui.h:11
+#: ../data/ui/EditableList.ui.h:9
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 ""
-
-#: ../meld/resources/ui/commit-dialog.ui.h:3
-msgid "Log Message"
-msgstr ""
-
-#: ../meld/resources/ui/commit-dialog.ui.h:4
-msgid "Previous logs:"
-msgstr ""
-
-#: ../meld/resources/ui/commit-dialog.ui.h:5
-msgid "Co_mmit"
-msgstr ""
-
-#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "比較(_C)"
-
-#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2
-msgid "Compare selected files"
-msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較ã—ã¾ã™"
-
-#: ../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/resources/ui/dirdiff.ui.h:8
-msgid "Copy to left"
-msgstr "å·¦ã¸ã‚³ãƒ”ーã—ã¾ã™"
-
-#: ../meld/resources/ui/dirdiff.ui.h:9
-msgid "Copy to _Right"
-msgstr "å³ã¸ã‚³ãƒ”ー(_R)"
-
-#: ../meld/resources/ui/dirdiff.ui.h:10
-msgid "Copy to right"
-msgstr "å³ã¸ã‚³ãƒ”ーã—ã¾ã™"
-
-#: ../meld/resources/ui/dirdiff.ui.h:11
-msgid "Delete selected"
-msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ãªã©ã‚’削除ã—ã¾ã™"
-
-#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958
-#: ../meld/filediff.py:1586
-msgid "Hide"
-msgstr "éš ã™"
-
-#: ../meld/resources/ui/dirdiff.ui.h:13
-msgid "Hide selected"
-msgstr "é¸æŠžç¯„å›²ã‚’éš ã—ã¾ã™"
-
-#: ../meld/resources/ui/dirdiff.ui.h:14
-msgid "Ignore Filename Case"
-msgstr "ファイルåã®å¤§/å°æ–‡å—を無視ã™ã‚‹"
-
-#: ../meld/resources/ui/dirdiff.ui.h:15
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-
-#: ../meld/resources/ui/dirdiff.ui.h:16
-msgid "Same"
-msgstr "åŒã˜éƒ¨åˆ†"
-
-#: ../meld/resources/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "一致ã™ã‚‹éƒ¨åˆ†ã‚’表示ã—ã¾ã™"
-
-#: ../meld/resources/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "æ–°ã—ã„部分"
-
-#: ../meld/resources/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "æ–°è¦ã®éƒ¨åˆ†ã‚’表示ã—ã¾ã™"
-
-#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
-msgid "Modified"
-msgstr "変更済"
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
+#: ../meld/dirdiff.py:407
+msgid "Name"
+msgstr "åå‰"
-#: ../meld/resources/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "変更ã®ã‚るファイルを表示ã—ã¾ã™"
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "パターン"
-#: ../meld/resources/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "フィルター"
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "æ–°ã—ã„ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’è¿½åŠ ã—ã¾ã™"
-#: ../meld/resources/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "フィルターをé¸æŠžã—ã¾ã™"
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "é¸æŠžã—ãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’削除ã—ã¾ã™"
-#: ../meld/resources/ui/encoding-selector.ui.h:1
+#: ../data/ui/encoding-selector.ui.h:1
msgid "Search text encoding…"
-msgstr ""
+msgstr "テã‚ストエンコーディングを検索…"
-#: ../meld/resources/ui/filediff.ui.h:1
+#: ../data/ui/filediff.ui.h:1
msgid "Format as Patch…"
msgstr "パッãƒã‚’生æˆâ€¦"
-#: ../meld/resources/ui/filediff.ui.h:2
+#: ../data/ui/filediff.ui.h:2
msgid "Create a patch using differences between files"
msgstr "ファイル間ã®å·®åˆ†ã‹ã‚‰ãƒ‘ッãƒã‚’生æˆã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:3
+#: ../data/ui/filediff.ui.h:3
msgid "Save A_ll"
msgstr "ã™ã¹ã¦ä¿å˜(_L)"
-#: ../meld/resources/ui/filediff.ui.h:4
+#: ../data/ui/filediff.ui.h:4
msgid "Save all files in the current comparison"
msgstr "比較ä¸ã®ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:5
+#: ../data/ui/filediff.ui.h:5
msgid "Revert files to their saved versions"
msgstr "ファイルをä¿å˜ã•ã‚ŒãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«æˆ»ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:6
+#: ../data/ui/filediff.ui.h:6
msgid "Add Synchronization Point"
msgstr "åŒæœŸç‚¹ã‚’è¿½åŠ "
-#: ../meld/resources/ui/filediff.ui.h:7
+#: ../data/ui/filediff.ui.h:7
msgid "Add a synchronization point for changes between files"
msgstr ""
-#: ../meld/resources/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:8
msgid "Clear Synchronization Points"
msgstr "åŒæœŸç‚¹ã‚’クリア"
-#: ../meld/resources/ui/filediff.ui.h:9
+#: ../data/ui/filediff.ui.h:9
msgid "Clear sychronization points for changes between files"
msgstr ""
-#: ../meld/resources/ui/filediff.ui.h:10
+#: ../data/ui/filediff.ui.h:10
msgid "Previous Conflict"
msgstr "å‰ã®è¡çªç®‡æ‰€"
-#: ../meld/resources/ui/filediff.ui.h:11
+#: ../data/ui/filediff.ui.h:11
msgid "Go to the previous conflict"
msgstr "å‰ã®è¡çªç®‡æ‰€ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:12
+#: ../data/ui/filediff.ui.h:12
msgid "Next Conflict"
msgstr "次ã®è¡çªç®‡æ‰€"
-#: ../meld/resources/ui/filediff.ui.h:13
+#: ../data/ui/filediff.ui.h:13
msgid "Go to the next conflict"
msgstr "次ã®è¡çªç®‡æ‰€ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:14
+#: ../data/ui/filediff.ui.h:14
msgid "Push to Left"
msgstr "å·¦ã¸é©ç”¨"
-#: ../meld/resources/ui/filediff.ui.h:15
+#: ../data/ui/filediff.ui.h:15
msgid "Push current change to the left"
msgstr "ç¾åœ¨ã®å¤‰æ›´ã‚’å·¦ã«ã‚‚é©ç”¨ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:16
+#: ../data/ui/filediff.ui.h:16
msgid "Push to Right"
msgstr "å³ã¸é©ç”¨"
-#: ../meld/resources/ui/filediff.ui.h:17
+#: ../data/ui/filediff.ui.h:17
msgid "Push current change to the right"
msgstr "ç¾åœ¨ã®å¤‰æ›´ã‚’å³ã«ã‚‚é©ç”¨ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:18
+#: ../data/ui/filediff.ui.h:18
msgid "Pull from Left"
msgstr "å·¦ã‹ã‚‰é©ç”¨"
-#: ../meld/resources/ui/filediff.ui.h:19
+#: ../data/ui/filediff.ui.h:19
msgid "Pull change from the left"
msgstr "å·¦ã‹ã‚‰å¤‰æ›´ã‚’é©ç”¨ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:20
+#: ../data/ui/filediff.ui.h:20
msgid "Pull from Right"
msgstr "å³ã‹ã‚‰é©ç”¨"
-#: ../meld/resources/ui/filediff.ui.h:21
+#: ../data/ui/filediff.ui.h:21
msgid "Pull change from the right"
msgstr "å³ã‹ã‚‰å¤‰æ›´ã‚’é©ç”¨ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:22
+#: ../data/ui/filediff.ui.h:22
msgid "Copy Above Left"
msgstr "å·¦ã®ä¸Šã«ã‚³ãƒ”ー"
-#: ../meld/resources/ui/filediff.ui.h:23
+#: ../data/ui/filediff.ui.h:23
msgid "Copy change above the left chunk"
msgstr "å·¦ã®å¤‰æ›´ç‚¹ã®ä¸Šã«ã‚³ãƒ”ーã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:24
+#: ../data/ui/filediff.ui.h:24
msgid "Copy Below Left"
msgstr "å·¦ã®ä¸‹ã«ã‚³ãƒ”ー"
-#: ../meld/resources/ui/filediff.ui.h:25
+#: ../data/ui/filediff.ui.h:25
msgid "Copy change below the left chunk"
msgstr "å·¦ã®å¤‰æ›´ç‚¹ã®ä¸‹ã«ã‚³ãƒ”ーã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:26
+#: ../data/ui/filediff.ui.h:26
msgid "Copy Above Right"
msgstr "å³ã®ä¸Šã«ã‚³ãƒ”ー"
-#: ../meld/resources/ui/filediff.ui.h:27
+#: ../data/ui/filediff.ui.h:27
msgid "Copy change above the right chunk"
msgstr "å³ã®å¤‰æ›´ç‚¹ã®ä¸Šã«ã‚³ãƒ”ーã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:28
+#: ../data/ui/filediff.ui.h:28
msgid "Copy Below Right"
msgstr "å³ã®ä¸‹ã«ã‚³ãƒ”ー"
-#: ../meld/resources/ui/filediff.ui.h:29
+#: ../data/ui/filediff.ui.h:29
msgid "Copy change below the right chunk"
msgstr "å³ã®å¤‰æ›´ç‚¹ã®ä¸‹ã«ã‚³ãƒ”ーã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:30
+#: ../data/ui/filediff.ui.h:30
msgid "Delete"
msgstr "削除"
-#: ../meld/resources/ui/filediff.ui.h:31
+#: ../data/ui/filediff.ui.h:31
msgid "Delete change"
msgstr "変更点を削除ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:32
+#: ../data/ui/filediff.ui.h:32
msgid "Merge All from Left"
msgstr "å·¦ã‹ã‚‰ã™ã¹ã¦ã‚’マージ"
-#: ../meld/resources/ui/filediff.ui.h:33
+#: ../data/ui/filediff.ui.h:33
msgid "Merge all non-conflicting changes from the left"
msgstr ""
-#: ../meld/resources/ui/filediff.ui.h:34
+#: ../data/ui/filediff.ui.h:34
msgid "Merge All from Right"
msgstr "å³ã‹ã‚‰ã™ã¹ã¦ã‚’マージ"
-#: ../meld/resources/ui/filediff.ui.h:35
+#: ../data/ui/filediff.ui.h:35
msgid "Merge all non-conflicting changes from the right"
msgstr ""
-#: ../meld/resources/ui/filediff.ui.h:36
+#: ../data/ui/filediff.ui.h:36
msgid "Merge All"
msgstr "ã™ã¹ã¦ã‚’マージ"
-#: ../meld/resources/ui/filediff.ui.h:37
+#: ../data/ui/filediff.ui.h:37
msgid "Merge all non-conflicting changes from left and right panes"
msgstr ""
-#: ../meld/resources/ui/filediff.ui.h:38
+#: ../data/ui/filediff.ui.h:38
msgid "Previous Pane"
msgstr "å‰ã®ãƒšã‚¤ãƒ³"
-#: ../meld/resources/ui/filediff.ui.h:39
+#: ../data/ui/filediff.ui.h:39
msgid "Move keyboard focus to the previous document in this comparison"
msgstr "ã“ã®æ¯”較ã®ã‚ーボードフォーカスをå‰ã®ãƒ‰ã‚ュメントã«ç§»å‹•ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:40
+#: ../data/ui/filediff.ui.h:40
msgid "Next Pane"
msgstr "次ã®ãƒšã‚¤ãƒ³"
-#: ../meld/resources/ui/filediff.ui.h:41
+#: ../data/ui/filediff.ui.h:41
msgid "Move keyboard focus to the next document in this comparison"
msgstr "ã“ã®æ¯”較ã®ã‚ーボードフォーカスを次ã®ãƒ‰ã‚ュメントã«ç§»å‹•ã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:42
+#: ../data/ui/filediff.ui.h:42
msgid "Lock Scrolling"
msgstr "スクãƒãƒ¼ãƒ«ã‚’ãƒãƒƒã‚¯"
-#: ../meld/resources/ui/filediff.ui.h:43
+#: ../data/ui/filediff.ui.h:43
msgid "Lock scrolling of all panes"
msgstr "ã™ã¹ã¦ã®ãƒšã‚¤ãƒ³ã§ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã‚’åŒæœŸã—ã¾ã™"
-#: ../meld/resources/ui/filediff.ui.h:44
+#: ../data/ui/filediff.ui.h:44
+msgid "Save changes to documents before closing?"
+msgstr "é–‰ã˜ã‚‹å‰ã«ãƒ‰ã‚ュメントã¸ã®å¤‰æ›´ã‚’ä¿å˜ã—ã¾ã™ã‹?"
+
+#: ../data/ui/filediff.ui.h:45
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "ä¿å˜ã—ãªã„å ´åˆã€å¤‰æ›´ã¯æ°¸ä¹…ã«å¤±ã‚ã‚Œã¾ã™ã€‚"
+
+#: ../data/ui/filediff.ui.h:46
+msgid "Close _without Saving"
+msgstr "ä¿å˜ã›ãšã«é–‰ã˜ã‚‹(_W)"
+
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/iohelpers.py:56
+#: ../meld/iohelpers.py:106
+msgid "_Cancel"
+msgstr "ã‚ャンセル(_C)"
+
+#: ../data/ui/filediff.ui.h:48
+msgid "_Save"
+msgstr "ä¿å˜(_S)"
+
+#: ../data/ui/filediff.ui.h:49
msgid ""
"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."
@@ -1074,546 +864,763 @@ msgstr ""
"ルã®ãƒãƒƒã‚¯ã‚’解除ã—ã¦å¤‰æ›´ã‚’åŠ ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ãŒã€ã“れらã®å¤‰æ›´ã¯æ–°ã—ã„ファイ"
"ルã«ä¿å˜ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../meld/resources/ui/filediff.ui.h:45
+#: ../data/ui/filediff.ui.h:50
msgid "File 3"
msgstr "ファイル 3"
-#: ../meld/resources/ui/filediff.ui.h:46
+#: ../data/ui/filediff.ui.h:51
msgid "File 2"
msgstr "ファイル 2"
-#: ../meld/resources/ui/filediff.ui.h:47
+#: ../data/ui/filediff.ui.h:52
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 "æ–°ã—ã„ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’è¿½åŠ ã—ã¾ã™"
+#: ../data/ui/filediff.ui.h:53
+msgid "Discard unsaved changes to documents?"
+msgstr "ドã‚ュメントã¸ã®å¤‰æ›´ã‚’ä¿å˜ã›ãšã«ç ´æ£„ã—ã¾ã™ã‹?"
-#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9
-msgid "_Add"
-msgstr "è¿½åŠ (_A)"
+#: ../data/ui/filediff.ui.h:54
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr "次ã®ãƒ‰ã‚ュメントã¸ã®å¤‰æ›´ã¯æ°¸ä¹…ã«å¤±ã‚ã‚Œã¾ã™:"
-#: ../meld/resources/ui/filter-list.ui.h:6
-msgid "Remove selected filter"
-msgstr "é¸æŠžã—ãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’削除ã—ã¾ã™"
+#: ../data/ui/filediff.ui.h:55
+msgid "_Discard"
+msgstr "ç ´æ£„(_D)"
-#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040
-#: ../meld/iohelpers.py:113
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:107
msgid "_Replace"
msgstr "ç½®æ›(_R)"
-#: ../meld/resources/ui/findbar.ui.h:2
+#: ../data/ui/findbar.ui.h:2
msgid "Replace _All"
msgstr "ã™ã¹ã¦ç½®æ›(_A)"
-#: ../meld/resources/ui/findbar.ui.h:3
+#: ../data/ui/findbar.ui.h:3
msgid "_Previous"
msgstr "å‰ã®çµæžœ(_P)"
-#: ../meld/resources/ui/findbar.ui.h:4
+#: ../data/ui/findbar.ui.h:4
msgid "_Next"
msgstr "次ã®çµæžœ(_N)"
-#: ../meld/resources/ui/findbar.ui.h:5
+#: ../data/ui/findbar.ui.h:5
msgid "Find:"
msgstr "検索:"
-#: ../meld/resources/ui/findbar.ui.h:6
+#: ../data/ui/findbar.ui.h:6
msgid "Replace _with:"
msgstr "次ã§ç½®æ›(_W):"
-#: ../meld/resources/ui/findbar.ui.h:7
+#: ../data/ui/findbar.ui.h:7
msgid "_Match case"
msgstr "大/å°æ–‡å—を区別(_M)"
-#: ../meld/resources/ui/findbar.ui.h:8
+#: ../data/ui/findbar.ui.h:8
msgid "Who_le word"
msgstr "å˜èªžå…¨ä½“(_L)"
-#: ../meld/resources/ui/findbar.ui.h:9
+#: ../data/ui/findbar.ui.h:9
msgid "Regular e_xpression"
msgstr "æ£è¦è¡¨ç¾(_X)"
-#: ../meld/resources/ui/findbar.ui.h:10
+#: ../data/ui/findbar.ui.h:10
msgid "Wrapped"
-msgstr ""
+msgstr "折り返ã—ã¾ã—ãŸ"
-#: ../meld/resources/ui/language-selector.ui.h:1
+#: ../data/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番目ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž"
+msgstr "ãƒã‚¤ãƒ©ã‚¤ãƒˆãƒ¢ãƒ¼ãƒ‰ã‚’検索…"
-#: ../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
+#: ../data/ui/patch-dialog.ui.h:1
msgid "Format as Patch"
msgstr "パッãƒã‚’生æˆ"
-#: ../meld/resources/ui/patch-dialog.ui.h:2
+#: ../data/ui/patch-dialog.ui.h:2
msgid "Copy to Clipboard"
msgstr "クリップボードã¸ã‚³ãƒ”ー"
-#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152
msgid "Save Patch"
msgstr "パッãƒã‚’ä¿å˜"
-#: ../meld/resources/ui/patch-dialog.ui.h:4
+#: ../data/ui/patch-dialog.ui.h:4
msgid "Use differences between:"
msgstr "次ã®ãƒšã‚¤ãƒ³é–“ã®å·®åˆ†ã‚’使用ã™ã‚‹:"
-#: ../meld/resources/ui/patch-dialog.ui.h:5
+#: ../data/ui/patch-dialog.ui.h:5
msgid "Left and middle panes"
msgstr "å·¦ã¨ä¸å¤®ã®ãƒšã‚¤ãƒ³"
-#: ../meld/resources/ui/patch-dialog.ui.h:6
+#: ../data/ui/patch-dialog.ui.h:6
msgid "Middle and right panes"
msgstr "ä¸å¤®ã¨å³ã®ãƒšã‚¤ãƒ³"
-#: ../meld/resources/ui/patch-dialog.ui.h:7
+#: ../data/ui/patch-dialog.ui.h:7
msgid "_Reverse patch direction"
msgstr "パッãƒã®å¯¾è±¡ã‚’逆ã«ã™ã‚‹(_R)"
-#: ../meld/resources/ui/preferences.ui.h:1
-msgid "Preferences"
-msgstr "è¨å®š"
+#: ../data/ui/preferences.ui.h:1
+msgid "Meld Preferences"
+msgstr "Meld ã®è¨å®š"
-#: ../meld/resources/ui/preferences.ui.h:2
+#: ../data/ui/preferences.ui.h:2
msgid "Font"
msgstr "フォント"
-#: ../meld/resources/ui/preferences.ui.h:3
+#: ../data/ui/preferences.ui.h:3
msgid "_Use the system fixed width font"
msgstr "システムã®ç‰å¹…フォントを使用ã™ã‚‹(_U)"
-#: ../meld/resources/ui/preferences.ui.h:4
+#: ../data/ui/preferences.ui.h:4
msgid "_Editor font:"
msgstr "エディターã®ãƒ•ã‚©ãƒ³ãƒˆ(_E):"
-#: ../meld/resources/ui/preferences.ui.h:5
+#: ../data/ui/preferences.ui.h:5
msgid "Display"
msgstr "表示"
-#: ../meld/resources/ui/preferences.ui.h:6
+#: ../data/ui/preferences.ui.h:6
msgid "_Tab width:"
msgstr "タブã®å¹…(_T):"
-#: ../meld/resources/ui/preferences.ui.h:7
+#: ../data/ui/preferences.ui.h:7
msgid "_Insert spaces instead of tabs"
msgstr "タブã®ä»£ã‚ã‚Šã«ç©ºç™½ã‚’挿入ã™ã‚‹(_I)"
-#: ../meld/resources/ui/preferences.ui.h:8
+#: ../data/ui/preferences.ui.h:8
msgid "Enable text _wrapping"
msgstr "æ–‡å—列ã®æŠ˜ã‚Šè¿”ã—を有効ã«ã™ã‚‹(_W)"
-#: ../meld/resources/ui/preferences.ui.h:9
+#: ../data/ui/preferences.ui.h:9
msgid "Do not _split words over two lines"
msgstr "å˜èªžãŒäºŒè¡Œã«è·¨ãŒã‚‰ãªã„よã†ã«ã™ã‚‹(_S)"
-#: ../meld/resources/ui/preferences.ui.h:10
+#: ../data/ui/preferences.ui.h:10
msgid "Highlight _current line"
msgstr "ç¾åœ¨ã®è¡Œã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã™ã‚‹(_C)"
-#: ../meld/resources/ui/preferences.ui.h:11
+#: ../data/ui/preferences.ui.h:11
msgid "Show _line numbers"
msgstr "行番å·ã‚’表示ã™ã‚‹(_L)"
-#: ../meld/resources/ui/preferences.ui.h:12
+#: ../data/ui/preferences.ui.h:12
msgid "Show w_hitespace"
msgstr "空白や改行を表示ã™ã‚‹(_H)"
-#: ../meld/resources/ui/preferences.ui.h:13
+#: ../data/ui/preferences.ui.h:13
msgid "Use s_yntax highlighting"
msgstr "シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆã‚’有効ã«ã™ã‚‹(_Y)"
-#: ../meld/resources/ui/preferences.ui.h:14
+#: ../data/ui/preferences.ui.h:14
msgid "Syntax highlighting color scheme:"
msgstr "シンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆã®ã‚«ãƒ©ãƒ¼ã‚¹ã‚ーマ:"
-#: ../meld/resources/ui/preferences.ui.h:15
+#: ../data/ui/preferences.ui.h:15
msgid "External Editor"
msgstr "外部エディター"
-#: ../meld/resources/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:16
msgid "Use _default system editor"
msgstr "デフォルトã®ã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã‚’使用ã™ã‚‹(_D)"
-#: ../meld/resources/ui/preferences.ui.h:17
+#: ../data/ui/preferences.ui.h:17
msgid "Edito_r command:"
msgstr "エディターをコマンドã§æŒ‡å®šã™ã‚‹(_R):"
-#: ../meld/resources/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:18
msgid "Editor"
msgstr "エディター"
-#: ../meld/resources/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:19
msgid "Shallow Comparison"
msgstr "æµ…ã„比較"
-#: ../meld/resources/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:20
msgid "C_ompare files based only on size and timestamp"
msgstr "サイズã¨ã‚¿ã‚¤ãƒ スタンプã ã‘を基準ã«ã—ã¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較ã™ã‚‹(_O)"
-#: ../meld/resources/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:21
msgid "_Timestamp resolution:"
msgstr "タイムスタンプ分解能(_T):"
-#: ../meld/resources/ui/preferences.ui.h:23
+#: ../data/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
+#: ../data/ui/preferences.ui.h:24
msgid "Symbolic Links"
msgstr "シンボリックリンク"
-#: ../meld/resources/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:26
msgid "Visible Columns"
msgstr "表示ã™ã‚‹ã‚«ãƒ©ãƒ "
-#: ../meld/resources/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:27
msgid "Folder Comparisons"
msgstr "フォルダーã®æ¯”較"
-#: ../meld/resources/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:28
msgid "Version Comparisons"
msgstr ""
-#: ../meld/resources/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:29
msgid "_Order when comparing file revisions:"
msgstr ""
-#: ../meld/resources/ui/preferences.ui.h:30
+#: ../data/ui/preferences.ui.h:30
msgid "Order when _merging files:"
msgstr ""
-#: ../meld/resources/ui/preferences.ui.h:31
-msgid "Commit Messages"
-msgstr "コミットメッセージ"
+#: ../data/ui/preferences.ui.h:31
+msgid "Commit Messages"
+msgstr "コミットメッセージ"
+
+#: ../data/ui/preferences.ui.h:32
+msgid "Show _right margin at:"
+msgstr "å³ãƒžãƒ¼ã‚¸ãƒ³ã‚’表示ã™ã‚‹(_R):"
+
+#: ../data/ui/preferences.ui.h:33
+msgid "Automatically _break lines at right margin on commit"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:34
+msgid "Version Control"
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†"
+
+#: ../data/ui/preferences.ui.h:35
+msgid "Filename filters"
+msgstr "ファイルåフィルター"
+
+#: ../data/ui/preferences.ui.h:36
+msgid ""
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
+msgstr ""
+"フォルダーã®æ¯”較を行ã†éš›ã€ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’åå‰ã§ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°ã§ãã¾"
+"ã™ã€‚フィルタリングã®ãƒ‘ターンã¯ãã‚Œãžã‚Œã€ã‚¹ãƒšãƒ¼ã‚¹ã§åŒºåˆ‡ã£ãŸ SHELL åž‹å¼ã®ãƒ¯ã‚¤ãƒ«"
+"ドカードã®ä¸¦ã³ã§ã™ã€‚"
+
+#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105
+msgid "File Filters"
+msgstr "ファイルフィルター"
+
+#: ../data/ui/preferences.ui.h:38
+msgid "Change trimming"
+msgstr "変更ã®ãƒˆãƒªãƒŸãƒ³ã‚°"
+
+#: ../data/ui/preferences.ui.h:39
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
+"変更点ã®å§‹ã¾ã‚Šã¨çµ‚ã‚ã‚Šã®éƒ¨åˆ†ã‹ã‚‰ã€ç©ºè¡Œã®å·®ç•°ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã—ãªã„よã†ã«é™¤å¤–ã™ã‚‹"
+
+#: ../data/ui/preferences.ui.h:40
+msgid "Text filters"
+msgstr "テã‚ストフィルター"
+
+#: ../data/ui/preferences.ui.h:41
+msgid ""
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
+msgstr ""
+"ファイルã®æ¯”較を行ã†æ™‚ã¯ã€ã‚る種類ã®å¤‰æ›´ã ã‘無視ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚無視ã™ã‚‹"
+"パターンã¯ãã‚Œãžã‚Œ Python å½¢å¼ã®æ£è¦è¡¨ç¾ã§æŒ‡å®šã—ã€ãã®å®Ÿè£…ã¯ç„¡è¦–ã™ã‚‹æ–‡å—列を"
+"空ã®æ–‡å—列ã§ç½®ãæ›ãˆã‚‹ã ã‘ã§ã™ã€‚ã‚‚ã—æ£è¦è¡¨ç¾ãƒ‘ターンã«ã‚°ãƒ«ãƒ¼ãƒ—ãŒå«ã¾ã‚Œã¦ã„ãŸ"
+"らã€è©²å½“ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—ã®æ–‡å—列ã ã‘ç½®ãæ›ãˆã¾ã™ã€‚詳細ã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚ºãƒ»ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’"
+"ã”覧下ã•ã„。"
+
+#: ../data/ui/preferences.ui.h:42
+msgid "Text Filters"
+msgstr "テã‚ストフィルター"
+
+#: ../data/ui/preferences.ui.h:43
+msgid "Left is remote, right is local"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:44
+msgid "Left is local, right is remote"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:45
+msgid "Remote, merge, local"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:46
+msgid "Local, merge, remote"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:47
+msgid "1ns (ext4)"
+msgstr "1ナノ秒 (ext4)"
+
+#: ../data/ui/preferences.ui.h:48
+msgid "100ns (NTFS)"
+msgstr "100ナノ秒 (NTFS)"
+
+#: ../data/ui/preferences.ui.h:49
+msgid "1s (ext2/ext3)"
+msgstr "1秒 (ext2/ext3)"
+
+#: ../data/ui/preferences.ui.h:50
+msgid "2s (VFAT)"
+msgstr "2秒 (VFAT)"
+
+#: ../data/ui/shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "全般"
+
+#: ../data/ui/shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "æ–°ã—ã„比較"
+
+#: ../data/ui/shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "比較を閉ã˜ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Meld を終了ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "ç¾åœ¨é©ç”¨ä¸ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’åœæ¢ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "比較内容を更新ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "フルスクリーンã§è¡¨ç¤ºã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "タブ"
+
+#: ../data/ui/shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "å‰ã®ã‚¿ãƒ–ã¸ç§»å‹•ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "次ã®ã‚¿ãƒ–ã¸ç§»å‹•ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "タブを切り替ãˆã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "タブを左ã¸ç§»å‹•ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "タブをå³ã¸ç§»å‹•ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:14
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "変更点"
+
+#: ../data/ui/shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "å‰ã®å¤‰æ›´ç‚¹ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:16
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "次ã®å¤‰æ›´ç‚¹ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:17
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "編集"
+
+#: ../data/ui/shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "å…ƒã«æˆ»ã™"
+
+#: ../data/ui/shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "ã‚„ã‚Šç›´ã—"
+
+#: ../data/ui/shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "切りå–ã‚Š"
+
+#: ../data/ui/shortcuts.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "コピー"
+
+#: ../data/ui/shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "貼り付ã‘"
+
+#: ../data/ui/shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "検索"
+
+#: ../data/ui/shortcuts.ui.h:24
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "次を検索ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:25
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "å‰ã‚’検索ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:26
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "ç½®æ›"
+
+#: ../data/ui/shortcuts.ui.h:27
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "ファイルã®æ¯”較"
+
+#: ../data/ui/shortcuts.ui.h:28
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:29
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ–°ã—ã„åå‰ã§ä¿å˜ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:30
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "比較ä¸ã®ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã™ã‚‹"
+
+#: ../data/ui/shortcuts.ui.h:31
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "å‰ã®è¡çªç®‡æ‰€"
+
+#: ../data/ui/shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "次ã®è¡çªç®‡æ‰€"
+
+#: ../data/ui/shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "変更点を左ã¸é©ç”¨ã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:32
-msgid "Show _right margin at:"
-msgstr "å³ãƒžãƒ¼ã‚¸ãƒ³ã‚’表示ã™ã‚‹(_R):"
+#: ../data/ui/shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "変更点をå³ã¸é©ç”¨ã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:33
-msgid "Automatically _break lines at right margin on commit"
-msgstr ""
+#: ../data/ui/shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "変更点を左ã‹ã‚‰é©ç”¨ã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:34
-msgid "Version Control"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†"
+#: ../data/ui/shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "変更点をå³ã‹ã‚‰é©ç”¨ã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:35
-msgid "Filename filters"
-msgstr "ファイルåフィルター"
+#: ../data/ui/shortcuts.ui.h:37
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "å·¦ã®å¤‰æ›´ç‚¹ã®ä¸Šã«ã‚³ãƒ”ーã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:36
-msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"separated by spaces."
-msgstr ""
-"フォルダーã®æ¯”較を行ã†éš›ã€ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’åå‰ã§ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°ã§ãã¾"
-"ã™ã€‚フィルタリングã®ãƒ‘ターンã¯ãã‚Œãžã‚Œã€ã‚¹ãƒšãƒ¼ã‚¹ã§åŒºåˆ‡ã£ãŸ SHELL åž‹å¼ã®ãƒ¯ã‚¤ãƒ«"
-"ドカードã®ä¸¦ã³ã§ã™ã€‚"
+#: ../data/ui/shortcuts.ui.h:38
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "å·¦ã®å¤‰æ›´ç‚¹ã®ä¸‹ã«ã‚³ãƒ”ーã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114
-msgid "File Filters"
-msgstr "ファイルフィルター"
+#: ../data/ui/shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "å³ã®å¤‰æ›´ç‚¹ã®ä¸Šã«ã‚³ãƒ”ーã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:38
-msgid "Change trimming"
-msgstr "変更ã®ãƒˆãƒªãƒŸãƒ³ã‚°"
+#: ../data/ui/shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "å³ã®å¤‰æ›´ç‚¹ã®ä¸‹ã«ã‚³ãƒ”ーã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:39
-msgid "Trim blank line differences from the start and end of changes"
-msgstr ""
-"変更点ã®å§‹ã¾ã‚Šã¨çµ‚ã‚ã‚Šã®éƒ¨åˆ†ã‹ã‚‰ã€ç©ºè¡Œã®å·®ç•°ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã—ãªã„よã†ã«é™¤å¤–ã™ã‚‹"
+#: ../data/ui/shortcuts.ui.h:41
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "変更点を削除ã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:40
-msgid "Text filters"
-msgstr "テã‚ストフィルター"
+#: ../data/ui/shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "å‰ã®æ¯”較ペイン"
-#: ../meld/resources/ui/preferences.ui.h:41
-msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
-msgstr ""
-"ファイルã®æ¯”較を行ã†æ™‚ã¯ã€ã‚る種類ã®å¤‰æ›´ã ã‘無視ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚無視ã™ã‚‹"
-"パターンã¯ãã‚Œãžã‚Œ Python å½¢å¼ã®æ£è¦è¡¨ç¾ã§æŒ‡å®šã—ã€ãã®å®Ÿè£…ã¯ç„¡è¦–ã™ã‚‹æ–‡å—列を"
-"空ã®æ–‡å—列ã§ç½®ãæ›ãˆã‚‹ã ã‘ã§ã™ã€‚ã‚‚ã—æ£è¦è¡¨ç¾ãƒ‘ターンã«ã‚°ãƒ«ãƒ¼ãƒ—ãŒå«ã¾ã‚Œã¦ã„ãŸ"
-"らã€è©²å½“ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—ã®æ–‡å—列ã ã‘ç½®ãæ›ãˆã¾ã™ã€‚詳細ã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚ºãƒ»ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’"
-"ã”覧下ã•ã„。"
+#: ../data/ui/shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "次ã®æ¯”較ペイン"
-#: ../meld/resources/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "テã‚ストフィルター"
+#: ../data/ui/shortcuts.ui.h:44
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "フォルダーã®æ¯”較"
-#: ../meld/resources/ui/preferences.ui.h:43
-msgid "Left is remote, right is local"
-msgstr ""
+#: ../data/ui/shortcuts.ui.h:45
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "å·¦ã¸ã‚³ãƒ”ーã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:44
-msgid "Left is local, right is remote"
-msgstr ""
+#: ../data/ui/shortcuts.ui.h:46
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "å³ã¸ã‚³ãƒ”ーã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:45
-msgid "Remote, merge, local"
-msgstr ""
+#: ../data/ui/shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã®æ¯”較"
-#: ../meld/resources/ui/preferences.ui.h:46
-msgid "Local, merge, remote"
-msgstr ""
+#: ../data/ui/shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã¸ã‚³ãƒŸãƒƒãƒˆã™ã‚‹"
-#: ../meld/resources/ui/preferences.ui.h:47
-msgid "1ns (ext4)"
-msgstr "1ナノ秒 (ext4)"
+#: ../data/ui/shortcuts.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "コンソール出力ã®è¡¨ç¤º/éžè¡¨ç¤º"
-#: ../meld/resources/ui/preferences.ui.h:48
-msgid "100ns (NTFS)"
-msgstr "100ナノ秒 (NTFS)"
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567
+#: ../meld/newdifftab.py:49
+msgid "New comparison"
+msgstr "æ–°ã—ã„比較"
-#: ../meld/resources/ui/preferences.ui.h:49
-msgid "1s (ext2/ext3)"
-msgstr "1秒 (ext2/ext3)"
+#: ../data/ui/tab-placeholder.ui.h:2
+msgid "File comparison"
+msgstr "ファイルã®æ¯”較"
-#: ../meld/resources/ui/preferences.ui.h:50
-msgid "2s (VFAT)"
-msgstr "2秒 (VFAT)"
+#: ../data/ui/tab-placeholder.ui.h:3
+msgid "Directory comparison"
+msgstr "フォルダーã®æ¯”較"
-#: ../meld/resources/ui/push-dialog.ui.h:1
-msgid "Push local commits to remote?"
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
msgstr ""
-#: ../meld/resources/ui/push-dialog.ui.h:2
-msgid "The commits to be pushed are determined by your version control system."
-msgstr ""
+#: ../data/ui/tab-placeholder.ui.h:5
+msgid "_3-way comparison"
+msgstr "3ã¤ã‚’比較(_3)"
-#: ../meld/resources/ui/push-dialog.ui.h:3
-msgid "_Push commits"
-msgstr ""
+#: ../data/ui/tab-placeholder.ui.h:6
+msgid "Select Third File"
+msgstr "3番目ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž"
-#: ../meld/resources/ui/revert-dialog.ui.h:1
-msgid "Discard unsaved changes to documents?"
-msgstr "ドã‚ュメントã¸ã®å¤‰æ›´ã‚’ä¿å˜ã›ãšã«ç ´æ£„ã—ã¾ã™ã‹?"
+#: ../data/ui/tab-placeholder.ui.h:7
+msgid "Select Second File"
+msgstr "2番目ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž"
-#: ../meld/resources/ui/revert-dialog.ui.h:2
-msgid "Changes made to the following documents will be permanently lost:"
-msgstr "次ã®ãƒ‰ã‚ュメントã¸ã®å¤‰æ›´ã¯æ°¸ä¹…ã«å¤±ã‚ã‚Œã¾ã™:"
+#: ../data/ui/tab-placeholder.ui.h:8
+msgid "Select First File"
+msgstr "1番目ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž"
-#: ../meld/resources/ui/revert-dialog.ui.h:3
-msgid "_Discard"
-msgstr "ç ´æ£„(_D)"
+#: ../data/ui/tab-placeholder.ui.h:9
+msgid "Select First Folder"
+msgstr "1番目ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’é¸æŠž"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:1
-msgid "Save changes to documents before closing?"
-msgstr "é–‰ã˜ã‚‹å‰ã«ãƒ‰ã‚ュメントã¸ã®å¤‰æ›´ã‚’ä¿å˜ã—ã¾ã™ã‹?"
+#: ../data/ui/tab-placeholder.ui.h:10
+msgid "Select Second Folder"
+msgstr "2番目ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’é¸æŠž"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:2
-msgid "If you don’t save, changes will be permanently lost."
-msgstr "ä¿å˜ã—ãªã„å ´åˆã€å¤‰æ›´ã¯æ°¸ä¹…ã«å¤±ã‚ã‚Œã¾ã™ã€‚"
+#: ../data/ui/tab-placeholder.ui.h:11
+msgid "Select Third Folder"
+msgstr "3番目ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’é¸æŠž"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
-msgid "Close _without Saving"
-msgstr "ä¿å˜ã›ãšã«é–‰ã˜ã‚‹(_W)"
+#: ../data/ui/tab-placeholder.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr ""
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039
-#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112
-msgid "_Cancel"
-msgstr "ã‚ャンセル(_C)"
+#: ../data/ui/tab-placeholder.ui.h:13
+msgid "_Blank comparison"
+msgstr "空ã®æ¯”較(_B)"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
-msgid "_Save"
-msgstr "ä¿å˜(_S)"
+#: ../data/ui/tab-placeholder.ui.h:14
+msgid "C_ompare"
+msgstr "比較(_O)"
-#: ../meld/resources/ui/vcview.ui.h:3
+#: ../data/ui/vcview.ui.h:3
msgid "Co_mmit…"
msgstr "コミット(_M)…"
-#: ../meld/resources/ui/vcview.ui.h:4
+#: ../data/ui/vcview.ui.h:4
msgid "Commit changes to version control"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:5
+#: ../data/ui/vcview.ui.h:5
msgid "_Update"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:6
+#: ../data/ui/vcview.ui.h:6
msgid "Update working copy from version control"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:7
+#: ../data/ui/vcview.ui.h:7
msgid "_Push"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:8
+#: ../data/ui/vcview.ui.h:8
msgid "Push local changes to remote"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:10
+#: ../data/ui/vcview.ui.h:10
msgid "Add to version control"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:12
+#: ../data/ui/vcview.ui.h:12
msgid "Remove from version control"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:13
+#: ../data/ui/vcview.ui.h:13
msgid "Mar_k as Resolved"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:14
+#: ../data/ui/vcview.ui.h:14
msgid "Mark as resolved in version control"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:15
+#: ../data/ui/vcview.ui.h:15
msgid "Re_vert"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:16
+#: ../data/ui/vcview.ui.h:16
msgid "Revert working copy to original state"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:17
+#: ../data/ui/vcview.ui.h:17
msgid "Delete from working copy"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:18
+#: ../data/ui/vcview.ui.h:18
msgid "Console"
msgstr "コンソール"
-#: ../meld/resources/ui/vcview.ui.h:19
+#: ../data/ui/vcview.ui.h:19
msgid "Show or hide the version control console output pane"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:20
+#: ../data/ui/vcview.ui.h:20
msgid "_Flatten"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:21
+#: ../data/ui/vcview.ui.h:21
msgid "Flatten directories"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:22
+#: ../data/ui/vcview.ui.h:22
msgid "_Modified"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:23
+#: ../data/ui/vcview.ui.h:23
msgid "Show modified files"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:24
+#: ../data/ui/vcview.ui.h:24
msgid "_Normal"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:25
+#: ../data/ui/vcview.ui.h:25
msgid "Show normal files"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:26
+#: ../data/ui/vcview.ui.h:26
msgid "Un_versioned"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:27
+#: ../data/ui/vcview.ui.h:27
msgid "Show unversioned files"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
msgid "Ignored"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:29
+#: ../data/ui/vcview.ui.h:29
msgid "Show ignored files"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366
+#: ../data/ui/vcview.ui.h:30
+msgid "Commit"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:31
+msgid "Commit Files"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:32
+msgid "Log Message"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:33
+msgid "Previous logs:"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:34
+msgid "Co_mmit"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331
msgid "Location"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:32
+#: ../data/ui/vcview.ui.h:37
msgid "Status"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:33
+#: ../data/ui/vcview.ui.h:38
msgid "Extra"
msgstr ""
-#: ../meld/resources/ui/vcview.ui.h:34
+#: ../data/ui/vcview.ui.h:39
msgid "Console output"
msgstr "コンソール出力"
+#: ../data/ui/vcview.ui.h:40
+msgid "Push local commits to remote?"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:41
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:42
+msgid "_Push commits"
+msgstr ""
+
#: ../meld/const.py:12
msgid "UNIX (LF)"
msgstr ""
@@ -1627,44 +1634,44 @@ msgid "Mac OS (CR)"
msgstr ""
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:475 ../meld/preferences.py:138
+#: ../meld/dirdiff.py:428 ../meld/preferences.py:81
msgid "Size"
msgstr "サイズ"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:483 ../meld/preferences.py:139
+#: ../meld/dirdiff.py:436 ../meld/preferences.py:82
msgid "Modification time"
msgstr "更新日時"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:491 ../meld/preferences.py:140
+#: ../meld/dirdiff.py:444 ../meld/preferences.py:83
msgid "Permissions"
msgstr "アクセス権"
-#: ../meld/dirdiff.py:625
+#: ../meld/dirdiff.py:575
#, python-format
msgid "Hide %s"
msgstr "%s ã®è¡¨ç¤ºã‚’切り替ãˆã¾ã™"
-#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790
+#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] %s をスã‚ャンä¸"
-#: ../meld/dirdiff.py:925
+#: ../meld/dirdiff.py:874
#, python-format
msgid "[%s] Done"
msgstr "[%s] 完了"
-#: ../meld/dirdiff.py:933
+#: ../meld/dirdiff.py:882
msgid "Folders have no differences"
msgstr "フォルダーã«å·®ç•°ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: ../meld/dirdiff.py:935
+#: ../meld/dirdiff.py:884
msgid "Contents of scanned files in folders are identical."
msgstr "フォルダー内ã®ã‚¹ã‚ャンã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容ã¯åŒä¸€ã§ã™ã€‚"
-#: ../meld/dirdiff.py:937
+#: ../meld/dirdiff.py:886
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
@@ -1672,44 +1679,44 @@ msgstr ""
"フォルダー内ã®ã‚¹ã‚ャンã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯åŒä¸€ã®ã‚ˆã†ã«è¦‹ãˆã¾ã™ãŒã€å†…容ã¯ã‚¹ã‚ャン"
"ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: ../meld/dirdiff.py:940
+#: ../meld/dirdiff.py:889
msgid "File filters are in use, so not all files have been scanned."
msgstr ""
"ファイルフィルターãŒä½¿ç”¨ã•ã‚Œã¦ã„ã‚‹ãŸã‚ã€ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚¹ã‚ャンã•ã‚ŒãŸã‚ã‘"
"ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: ../meld/dirdiff.py:942
+#: ../meld/dirdiff.py:891
msgid "Text filters are in use and may be masking content differences."
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
+#: ../meld/dirdiff.py:909 ../meld/filediff.py:1499 ../meld/filediff.py:1529
+#: ../meld/filediff.py:1531 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
msgid "Hi_de"
msgstr "éš ã™(_D)"
-#: ../meld/dirdiff.py:969
+#: ../meld/dirdiff.py:918
msgid "Multiple errors occurred while scanning this folder"
msgstr "ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®èµ°æŸ»ä¸ã«è¤‡æ•°å›žã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: ../meld/dirdiff.py:970
+#: ../meld/dirdiff.py:919
msgid "Files with invalid encodings found"
msgstr "é–“é•ã£ãŸã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:972
+#: ../meld/dirdiff.py:921
msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr ""
"ã„ãã¤ã‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒé–“é•ã£ãŸã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚’æŒã£ã¦ã„ã¾ã—㟠(次ã®ã‚ˆã†ãªãƒ•ã‚¡"
"イルåã§ã™):"
-#: ../meld/dirdiff.py:974
+#: ../meld/dirdiff.py:923
msgid "Files hidden by case insensitive comparison"
msgstr "大/å°æ–‡å—を区別ã›ãšã«æ¯”較ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:976
+#: ../meld/dirdiff.py:925
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1717,17 +1724,17 @@ msgstr ""
"大/å°æ–‡å—を区別ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã§å¤§/å°æ–‡å—を無視ã—ãŸæ¯”較を行ã£ã¦ã„ã¾"
"ã™ã€‚ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã§ã¯æ¬¡ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“:"
-#: ../meld/dirdiff.py:987
+#: ../meld/dirdiff.py:936
#, python-format
msgid "“%s†hidden by “%sâ€"
msgstr "“%sâ€ã¯â€œ%sâ€ã«ã‚ˆã£ã¦éš ã•ã‚Œã¦ã„ã¾ã™"
-#: ../meld/dirdiff.py:1043
+#: ../meld/dirdiff.py:992
#, python-format
msgid "Replace folder “%s�"
msgstr "“%sâ€ã‚’ç½®ãæ›ãˆã¾ã™ã‹?"
-#: ../meld/dirdiff.py:1045
+#: ../meld/dirdiff.py:994
#, python-format
msgid ""
"Another folder with the same name already exists in “%sâ€.\n"
@@ -1736,11 +1743,11 @@ msgstr ""
"“%sâ€ã«åŒã˜åå‰ã®åˆ¥ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ãŒã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚\n"
"フォルダーを置ãæ›ãˆã‚‹ã¨ã€æ—¢å˜ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã™ã¹ã¦å¤±ã‚ã‚Œã¾ã™ã€‚"
-#: ../meld/dirdiff.py:1058
+#: ../meld/dirdiff.py:1007
msgid "Error copying file"
msgstr "ファイルã®ã‚³ãƒ”ーエラー"
-#: ../meld/dirdiff.py:1059
+#: ../meld/dirdiff.py:1008
#, python-format
msgid ""
"Couldn’t copy %s\n"
@@ -1753,19 +1760,19 @@ msgstr ""
"コピー先: %s\n"
"%s"
-#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720
+#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703
msgid "Error deleting {}"
msgstr "{} ã®å‰Šé™¤ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: ../meld/dirdiff.py:1593
+#: ../meld/dirdiff.py:1546
msgid "No folder"
msgstr ""
-#: ../meld/filediff.py:905
+#: ../meld/filediff.py:834
msgid "Comparison results will be inaccurate"
msgstr "比較çµæžœã¯ä¸æ£ç¢ºã§ã™"
-#: ../meld/filediff.py:907
+#: ../meld/filediff.py:836
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1773,65 +1780,65 @@ msgstr ""
"フィルターãŒãƒ•ã‚¡ã‚¤ãƒ«å†…ã®è¡Œæ•°ã‚’変更ã—ã¾ã—ãŸãŒã€ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ãŸã‚ã€æ¯”較"
"ã¯æ£ç¢ºã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: ../meld/filediff.py:979
+#: ../meld/filediff.py:905
msgid "Mark conflict as resolved?"
msgstr "è¡çªç®‡æ‰€ã‚’解決済ã¿ã¨ã—ã¦ãƒžãƒ¼ã‚¯ã—ã¾ã™ã‹?"
-#: ../meld/filediff.py:981
+#: ../meld/filediff.py:907
msgid ""
"If the conflict was resolved successfully, you may mark it as resolved now."
msgstr ""
"è¡çªç®‡æ‰€ã®è§£æ±ºã«æˆåŠŸã—ãŸå ´åˆã¯ã€è§£æ±ºæ¸ˆã¿ã¨ã—ã¦ãƒžãƒ¼ã‚¯ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: ../meld/filediff.py:983
+#: ../meld/filediff.py:909
msgid "Cancel"
msgstr "ã‚ャンセル"
-#: ../meld/filediff.py:984
+#: ../meld/filediff.py:910
msgid "Mark _Resolved"
msgstr "解決済ã¿ã¨ã—ã¦ãƒžãƒ¼ã‚¯(_R)"
-#: ../meld/filediff.py:1303
+#: ../meld/filediff.py:1214
#, python-format
msgid "There was a problem opening the file “%sâ€."
msgstr "“%sâ€ã‚’é–‹ãéš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
-#: ../meld/filediff.py:1311
+#: ../meld/filediff.py:1222
#, python-format
msgid "File %s appears to be a binary file."
msgstr "%s ã¯ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚ˆã†ã§ã™ã€‚"
-#: ../meld/filediff.py:1313
+#: ../meld/filediff.py:1224
msgid "Do you want to open the file using the default application?"
msgstr "デフォルトã®ã‚¢ãƒ—リケーションを使用ã—ã¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã¾ã™ã‹?"
-#: ../meld/filediff.py:1315
+#: ../meld/filediff.py:1226
msgid "Open"
msgstr "é–‹ã"
-#: ../meld/filediff.py:1331
+#: ../meld/filediff.py:1242
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] 差分ã®è¨ˆç®—ä¸"
-#: ../meld/filediff.py:1392
+#: ../meld/filediff.py:1303
#, python-format
msgid "File %s has changed on disk"
msgstr "%s ã¯ãƒ‡ã‚£ã‚¹ã‚¯ä¸Šã§å¤‰æ›´ã•ã‚Œã¾ã—ãŸ"
-#: ../meld/filediff.py:1393
+#: ../meld/filediff.py:1304
msgid "Do you want to reload the file?"
msgstr "ファイルをå†èªã¿è¾¼ã¿ã—ã¾ã™ã‹?"
-#: ../meld/filediff.py:1395
+#: ../meld/filediff.py:1306
msgid "_Reload"
msgstr "å†èªã¿è¾¼ã¿(_R)"
-#: ../meld/filediff.py:1551
+#: ../meld/filediff.py:1462
msgid "Files are identical"
msgstr "åŒä¸€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™"
-#: ../meld/filediff.py:1564
+#: ../meld/filediff.py:1475
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1839,11 +1846,11 @@ msgstr ""
"テã‚ストフィルターを使用ã—ã¦ã„ã‚‹ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«é–“ã«é•ã„ãŒç”Ÿã˜ã‚‹å ´åˆãŒã‚ã‚Šã¾"
"ã™ã€‚フィルタリングã›ãšã«æ¯”較ã—ã¾ã™ã‹?"
-#: ../meld/filediff.py:1569
+#: ../meld/filediff.py:1480
msgid "Files differ in line endings only"
msgstr "ファイルã¯è¡Œæœ«ã®ã¿ãŒç•°ãªã‚Šã¾ã™"
-#: ../meld/filediff.py:1571
+#: ../meld/filediff.py:1482
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1852,15 +1859,15 @@ msgstr ""
"改行コード以外ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容ã¯åŒä¸€ã§ã™:\n"
"%s"
-#: ../meld/filediff.py:1591
+#: ../meld/filediff.py:1502
msgid "Show without filters"
msgstr "フィルター無ã—ã§è¡¨ç¤ºã™ã‚‹"
-#: ../meld/filediff.py:1613
+#: ../meld/filediff.py:1524
msgid "Change highlighting incomplete"
msgstr "変更点ã®ãƒã‚¤ãƒ©ã‚¤ãƒˆãŒä¸å®Œå…¨ã§ã™"
-#: ../meld/filediff.py:1614
+#: ../meld/filediff.py:1525
msgid ""
"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."
@@ -1868,61 +1875,61 @@ msgstr ""
"変更点ãŒå¤šã™ãŽã‚‹ãŸã‚ã€ä¸€éƒ¨ãŒãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚Meld ã«ãƒã‚¤ãƒ©ã‚¤ãƒˆã‚’å¼·"
"制ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ãŒã€å¤§ããªå¤‰æ›´ç‚¹ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã™ã‚‹ã«ã¯æ™‚é–“ãŒã‹ã‹ã‚Šã¾ã™ã€‚"
-#: ../meld/filediff.py:1622
+#: ../meld/filediff.py:1533
msgid "Keep highlighting"
msgstr "ãƒã‚¤ãƒ©ã‚¤ãƒˆã‚’続ã‘ã‚‹"
-#: ../meld/filediff.py:1624
+#: ../meld/filediff.py:1535
msgid "_Keep highlighting"
msgstr "ãƒã‚¤ãƒ©ã‚¤ãƒˆã‚’続ã‘ã‚‹(_K)"
-#: ../meld/filediff.py:1637
+#: ../meld/filediff.py:1548
msgid "Saving failed"
-msgstr ""
+msgstr "ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../meld/filediff.py:1638
+#: ../meld/filediff.py:1549
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
-msgstr ""
+msgstr "データã®å–ªå¤±ã‚’防ããŸã‚ã«ã€ä»–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚„プãƒã‚°ãƒ©ãƒ ã«é‡è¦ãªå¤‰æ›´ç‚¹ã‚’ä¿å˜ã™ã‚‹ã“ã¨ã‚’検討ã—ã¦ãã ã•ã„。"
-#: ../meld/filediff.py:1647
+#: ../meld/filediff.py:1558
msgid "Save Left Pane As"
msgstr "å·¦ã®ãƒšã‚¤ãƒ³ã‚’別åã§ä¿å˜"
-#: ../meld/filediff.py:1649
+#: ../meld/filediff.py:1560
msgid "Save Middle Pane As"
msgstr "ä¸å¤®ã®ãƒšã‚¤ãƒ³ã‚’別åã§ä¿å˜"
-#: ../meld/filediff.py:1651
+#: ../meld/filediff.py:1562
msgid "Save Right Pane As"
msgstr "å³ã®ãƒšã‚¤ãƒ³ã‚’別åã§ä¿å˜"
-#: ../meld/filediff.py:1664
+#: ../meld/filediff.py:1575
#, python-format
msgid "File %s has changed on disk since it was opened"
msgstr "%s ã¯é–‹ã‹ã‚ŒãŸå¾Œã«ãƒ‡ã‚£ã‚¹ã‚¯ä¸Šã§å¤‰æ›´ã•ã‚Œã¾ã—ãŸ"
-#: ../meld/filediff.py:1666
+#: ../meld/filediff.py:1577
msgid "If you save it, any external changes will be lost."
msgstr "ä¿å˜ã™ã‚‹ã¨ã€å¤–部ã‹ã‚‰ã®å¤‰æ›´ã¯å¤±ã‚ã‚Œã¾ã™ã€‚"
-#: ../meld/filediff.py:1669
+#: ../meld/filediff.py:1580
msgid "Save Anyway"
msgstr "ã¨ã«ã‹ãä¿å˜ã™ã‚‹"
-#: ../meld/filediff.py:1670
+#: ../meld/filediff.py:1581
msgid "Don’t Save"
msgstr "ä¿å˜ã—ãªã„"
-#: ../meld/filediff.py:1712
+#: ../meld/filediff.py:1623
msgid ""
"File “{}†contains characters that can’t be encoded using its current "
"encoding “{}â€."
msgstr ""
"“{}â€ã«ã¯ç¾åœ¨ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°â€œ{}â€ã§ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã§ããªã„æ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../meld/filediff.py:1716 ../meld/patchdialog.py:144
+#: ../meld/filediff.py:1627 ../meld/patchdialog.py:131
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -1931,16 +1938,16 @@ msgstr ""
"次ã®ç†ç”±ã«ã‚ˆã‚Šãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸ:\n"
"%s"
-#: ../meld/filediff.py:1720 ../meld/patchdialog.py:143
+#: ../meld/filediff.py:1631 ../meld/patchdialog.py:130
#, python-format
msgid "Could not save file %s."
msgstr "%s ã‚’ä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../meld/filediff.py:2113
+#: ../meld/filediff.py:2014
msgid "Live comparison updating disabled"
msgstr "比較ã®ãƒ©ã‚¤ãƒ–アップデートã¯ç„¡åŠ¹ã§ã™"
-#: ../meld/filediff.py:2114
+#: ../meld/filediff.py:2015
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -1955,42 +1962,40 @@ msgstr ""
msgid "[%s] Merging files"
msgstr "[%s] ファイルをマージä¸"
-#: ../meld/gutterrendererchunk.py:220
+#: ../meld/gutterrendererchunk.py:216
msgid "Copy _up"
msgstr "上ã«ã‚³ãƒ”ー(_U)"
-#: ../meld/gutterrendererchunk.py:221
+#: ../meld/gutterrendererchunk.py:217
msgid "Copy _down"
msgstr "下ã«ã‚³ãƒ”ー(_D)"
-#: ../meld/iohelpers.py:43
+#: ../meld/iohelpers.py:41
msgid "Deleting remote folders is not supported"
msgstr ""
-#: ../meld/iohelpers.py:45
+#: ../meld/iohelpers.py:43
msgid "Not a file or directory"
-msgstr ""
+msgstr "ファイルやフォルダーã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: ../meld/iohelpers.py:49
+#: ../meld/iohelpers.py:47
msgid "“{}†can’t be put in the trash. Do you want to delete it immediately?"
-msgstr ""
+msgstr "“{}â€ã¯ã‚´ãƒŸç®±ã«ç§»å‹•ã§ãã¾ã›ã‚“。ãŸã ã¡ã«å‰Šé™¤ã—ã¾ã™ã‹?"
-#: ../meld/iohelpers.py:54
+#: ../meld/iohelpers.py:52
msgid "This remote location does not support sending items to the trash."
msgstr ""
-#: ../meld/iohelpers.py:59
-#, fuzzy
-#| msgid "Delete change"
+#: ../meld/iohelpers.py:57
msgid "_Delete Permanently"
-msgstr "変更点を削除ã—ã¾ã™"
+msgstr "永久ã«å‰Šé™¤(_D)"
-#: ../meld/iohelpers.py:106
+#: ../meld/iohelpers.py:100
#, python-format
msgid "Replace file “%s�"
msgstr "“%sâ€ã‚’ç½®ãæ›ãˆã¾ã™ã‹?"
-#: ../meld/iohelpers.py:108
+#: ../meld/iohelpers.py:102
#, python-format
msgid ""
"A file with this name already exists in “%sâ€.\n"
@@ -1999,99 +2004,99 @@ msgstr ""
"“%sâ€ã«åŒã˜åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚\n"
"ファイルを置ãæ›ãˆã‚‹ã¨ã€æ—¢å˜ã®å†…容ã¯å¤±ã‚ã‚Œã¾ã™ã€‚"
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:181
msgid "wrong number of arguments supplied to --diff"
msgstr "--diff オプションã«å¯¾ã™ã‚‹å¼•æ•°ã®æ•°ãŒé–“é•ã£ã¦ã„ã¾ã™"
-#: ../meld/meldapp.py:174
+#: ../meld/meldapp.py:186
msgid "Start with an empty window"
msgstr "空ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§èµ·å‹•ã™ã‚‹"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
+#: ../meld/meldapp.py:187 ../meld/meldapp.py:189
msgid "file"
msgstr "ファイル"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
+#: ../meld/meldapp.py:187 ../meld/meldapp.py:191
msgid "folder"
msgstr "フォルダー"
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:188
msgid "Start a version control comparison"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã®æ¯”較モードã§èµ·å‹•ã™ã‚‹"
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:190
msgid "Start a 2- or 3-way file comparison"
msgstr "2ã¤ã€ã¾ãŸã¯3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較ã™ã‚‹ãƒ¢ãƒ¼ãƒ‰ã§èµ·å‹•ã™ã‚‹"
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:192
msgid "Start a 2- or 3-way folder comparison"
msgstr "2ã¤ã€ã¾ãŸã¯3ã¤ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’比較ã™ã‚‹ãƒ¢ãƒ¼ãƒ‰ã§èµ·å‹•ã™ã‚‹"
-#: ../meld/meldapp.py:223
+#: ../meld/meldapp.py:235
#, python-format
msgid "Error: %s\n"
msgstr "エラー: %s\n"
-#: ../meld/meldapp.py:230
+#: ../meld/meldapp.py:242
msgid "Meld is a file and directory comparison tool."
msgstr "Meld ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®å†…容を比較ã™ã‚‹ãƒ„ールã§ã™ã€‚"
-#: ../meld/meldapp.py:234
+#: ../meld/meldapp.py:246
msgid "Set label to use instead of file name"
msgstr "ファイルåã®ä»£ã‚ã‚Šã«ä½¿ç”¨ã™ã‚‹ãƒ©ãƒ™ãƒ«ã‚’指定ã™ã‚‹"
-#: ../meld/meldapp.py:237
+#: ../meld/meldapp.py:249
msgid "Open a new tab in an already running instance"
msgstr "ã™ã§ã«å®Ÿè¡Œä¸ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã§æ–°ã—ã„タブを開ã"
-#: ../meld/meldapp.py:240
+#: ../meld/meldapp.py:252
msgid "Automatically compare all differing files on startup"
msgstr "起動時ã«ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸ã«ã‚ã‚‹ã™ã¹ã¦ã®å·®åˆ†ã‚’自動的ã«æ¤œå‡ºã™ã‚‹"
-#: ../meld/meldapp.py:243
+#: ../meld/meldapp.py:255
msgid "Ignored for compatibility"
msgstr ""
-#: ../meld/meldapp.py:247
+#: ../meld/meldapp.py:259
msgid "Set the target file for saving a merge result"
msgstr "マージã—ãŸçµæžœã‚’ä¿å˜ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«åを指定ã™ã‚‹"
-#: ../meld/meldapp.py:250
+#: ../meld/meldapp.py:262
msgid "Automatically merge files"
msgstr "自動的ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’マージã™ã‚‹"
-#: ../meld/meldapp.py:254
+#: ../meld/meldapp.py:266
msgid "Load a saved comparison from a Meld comparison file"
msgstr ""
-#: ../meld/meldapp.py:258
+#: ../meld/meldapp.py:270
msgid "Create a diff tab for the supplied files or folders"
msgstr ""
-#: ../meld/meldapp.py:278
+#: ../meld/meldapp.py:290
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr ""
"引数ãŒå¤šã™ãŽã¾ã™ (有効ãªæ•°ã¯ 0 〜 3 ã§ã™ãŒ %d 個ã®å¼•æ•°ã‚’å—ã‘å–ã‚Šã¾ã—ãŸ)"
-#: ../meld/meldapp.py:281
+#: ../meld/meldapp.py:293
msgid "can’t auto-merge less than 3 files"
msgstr "3ã¤æœªæº€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ªãƒ¼ãƒˆãƒžãƒ¼ã‚¸ã§ãã¾ã›ã‚“"
-#: ../meld/meldapp.py:283
+#: ../meld/meldapp.py:295
msgid "can’t auto-merge directories"
msgstr "ディレクトリã¯ã‚ªãƒ¼ãƒˆãƒžãƒ¼ã‚¸ã§ãã¾ã›ã‚“"
-#: ../meld/meldapp.py:297
+#: ../meld/meldapp.py:309
msgid "Error reading saved comparison file"
msgstr "ä¿å˜ã•ã‚ŒãŸæ¯”較ファイルã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼"
-#: ../meld/meldapp.py:314
+#: ../meld/meldapp.py:326
#, python-format
msgid "invalid path or URI “%sâ€"
msgstr "無効ãªãƒ‘スã¾ãŸã¯ URI “%sâ€"
-#: ../meld/meldapp.py:320
+#: ../meld/meldapp.py:332
msgid "remote folder “{}†not supported"
msgstr ""
@@ -2100,214 +2105,258 @@ msgstr ""
msgid "<unnamed>"
msgstr "<åå‰ãªã—>"
-#: ../meld/melddoc.py:63
+#: ../meld/melddoc.py:68
msgid "untitled"
msgstr "タイトルãªã—"
-#: ../meld/meldwindow.py:56
+#: ../meld/meldwindow.py:47
msgid "_File"
msgstr "ファイル(_F)"
-#: ../meld/meldwindow.py:57
+#: ../meld/meldwindow.py:48
msgid "_New Comparison…"
msgstr "æ–°ã—ã„比較(_N)…"
-#: ../meld/meldwindow.py:58
+#: ../meld/meldwindow.py:49
msgid "Start a new comparison"
msgstr "æ–°ã—ã„比較を開始ã—ã¾ã™"
-#: ../meld/meldwindow.py:61
+#: ../meld/meldwindow.py:52
msgid "Save the current file"
msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã—ã¾ã™"
-#: ../meld/meldwindow.py:63
+#: ../meld/meldwindow.py:54
msgid "Save As…"
msgstr "別åã§ä¿å˜â€¦"
-#: ../meld/meldwindow.py:64
+#: ../meld/meldwindow.py:55
msgid "Save the current file with a different name"
msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’別ã®åå‰ã§ä¿å˜ã—ã¾ã™"
-#: ../meld/meldwindow.py:67
+#: ../meld/meldwindow.py:58
msgid "Close the current file"
msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‰ã˜ã¾ã™"
-#: ../meld/meldwindow.py:70
+#: ../meld/meldwindow.py:61
msgid "_Edit"
msgstr "編集(_E)"
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:63
msgid "Undo the last action"
msgstr "最後ã«é©ç”¨ã—ãŸã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã«æˆ»ã—ã¾ã™"
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:66
msgid "Redo the last undone action"
msgstr "最後ã«é©ç”¨ã—ãŸã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’ã‚„ã‚Šç›´ã—ã¾ã™"
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:68
msgid "Cut the selection"
msgstr "é¸æŠžç¯„囲を切りå–ã‚Šã¾ã™"
-#: ../meld/meldwindow.py:79
+#: ../meld/meldwindow.py:70
msgid "Copy the selection"
msgstr "é¸æŠžç¯„囲をコピーã—ã¾ã™"
-#: ../meld/meldwindow.py:81
+#: ../meld/meldwindow.py:72
msgid "Paste the clipboard"
msgstr "クリップボードã®å†…容を貼り付ã‘ã¾ã™"
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:74
msgid "Find…"
msgstr "検索…"
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:74
msgid "Search for text"
msgstr "検索ã™ã‚‹æ–‡å—列"
-#: ../meld/meldwindow.py:85
+#: ../meld/meldwindow.py:76
msgid "Find Ne_xt"
msgstr "次を検索(_X)"
-#: ../meld/meldwindow.py:86
+#: ../meld/meldwindow.py:77
msgid "Search forwards for the same text"
msgstr "åŒã˜æ–‡å—列をå‰æ–¹æ¤œç´¢ã—ã¾ã™"
-#: ../meld/meldwindow.py:88
+#: ../meld/meldwindow.py:79
msgid "Find _Previous"
msgstr "å‰ã‚’検索(_P)"
-#: ../meld/meldwindow.py:89
+#: ../meld/meldwindow.py:80
msgid "Search backwards for the same text"
msgstr "åŒã˜æ–‡å—列を後方検索ã—ã¾ã™"
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:83
msgid "_Replace…"
msgstr "ç½®æ›(_R)…"
-#: ../meld/meldwindow.py:93
+#: ../meld/meldwindow.py:84
msgid "Find and replace text"
msgstr "æ–‡å—列を検索ã—ã¦ç½®æ›ã—ã¾ã™"
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:86
msgid "Go to _Line"
msgstr "指定行ã¸ç§»å‹•(_L)"
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:87
msgid "Go to a specific line"
msgstr "指定ã—ãŸè¡Œã¸ç§»å‹•ã—ã¾ã™"
-#: ../meld/meldwindow.py:99
+#: ../meld/meldwindow.py:90
msgid "_Changes"
msgstr "変更点(_C)"
-#: ../meld/meldwindow.py:100
+#: ../meld/meldwindow.py:91
msgid "Next Change"
msgstr "次ã®å¤‰æ›´ç‚¹"
-#: ../meld/meldwindow.py:101
+#: ../meld/meldwindow.py:92
msgid "Go to the next change"
msgstr "次ã®å¤‰æ›´ç‚¹ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™"
-#: ../meld/meldwindow.py:103
+#: ../meld/meldwindow.py:94
msgid "Previous Change"
msgstr "å‰ã®å¤‰æ›´ç‚¹"
-#: ../meld/meldwindow.py:104
+#: ../meld/meldwindow.py:95
msgid "Go to the previous change"
msgstr "å‰ã®å¤‰æ›´ç‚¹ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã—ã¾ã™"
-#: ../meld/meldwindow.py:106
+#: ../meld/meldwindow.py:97
msgid "Open Externally"
msgstr "別ã®ã‚¢ãƒ—リã§é–‹ã"
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:98
msgid "Open selected file or directory in the default external application"
msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚„フォルダーをデフォルトã®ã‚¢ãƒ—リケーションã§é–‹ãã¾ã™"
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:102
msgid "_View"
msgstr "表示(_V)"
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:103
msgid "File Status"
msgstr "ファイルã®çŠ¶æ…‹"
-#: ../meld/meldwindow.py:113
+#: ../meld/meldwindow.py:104
msgid "Version Status"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®çŠ¶æ…‹"
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:107
msgid "Stop the current action"
msgstr "ç¾åœ¨é©ç”¨ä¸ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’åœæ¢ã—ã¾ã™"
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:110
msgid "Refresh the view"
msgstr "表示を更新ã—ã¾ã™"
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:114
msgid "Fullscreen"
msgstr "フルスクリーン"
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:115
msgid "View the comparison in fullscreen"
msgstr "比較状æ³ã‚’フルスクリーンã§è¡¨ç¤ºã—ã¾ã™"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:117
+msgid "_Toolbar"
+msgstr "ツールãƒãƒ¼(_T)"
+
+#: ../meld/meldwindow.py:118
+msgid "Show or hide the toolbar"
+msgstr "ツールãƒãƒ¼ã‚’表示ã¾ãŸã¯éžè¡¨ç¤ºã«ã—ã¾ã™"
+
+#: ../meld/meldwindow.py:127
msgid "Open Recent"
msgstr "最近ã®æ¯”較"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:128
msgid "Open recent files"
msgstr "最近ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã¾ã™"
-#: ../meld/meldwindow.py:567
+#: ../meld/meldwindow.py:150
+msgid "_Meld"
+msgstr "Meld(_M)"
+
+#: ../meld/meldwindow.py:151
+msgid "Quit the program"
+msgstr "プãƒã‚°ãƒ©ãƒ を終了ã—ã¾ã™"
+
+#: ../meld/meldwindow.py:153
+msgid "Prefere_nces"
+msgstr "è¨å®š(_N)"
+
+#: ../meld/meldwindow.py:154
+msgid "Configure the application"
+msgstr "Meld ã‚’è¨å®šã—ã¾ã™"
+
+#: ../meld/meldwindow.py:156
+msgid "_Contents"
+msgstr "目次(_C)"
+
+#: ../meld/meldwindow.py:157
+msgid "Open the Meld manual"
+msgstr "Meld ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’é–‹ãã¾ã™"
+
+#: ../meld/meldwindow.py:159
+msgid "About this application"
+msgstr "ã“ã®ã‚¢ãƒ—リケーションã«ã¤ã„ã¦"
+
+#: ../meld/meldwindow.py:602
#, python-format
msgid "Need three files to auto-merge, got: %r"
msgstr "オートマージã«ã¯3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¿…è¦ã§ã™: %r"
-#: ../meld/meldwindow.py:588
+#: ../meld/meldwindow.py:623
msgid "Cannot compare a mixture of files and directories"
msgstr "ファイルã¨ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®é–“ã§ã®æ¯”較ã¯ã§ãã¾ã›ã‚“"
-#: ../meld/misc.py:155
+#: ../meld/misc.py:135
msgid ""
"{}\n"
"\n"
"Meld encountered a critical error while running:\n"
"<tt>{}</tt>"
msgstr ""
+"{}\n"
+"\n"
+"Meld ã®å®Ÿè¡Œä¸ã«è‡´å‘½çš„ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ:\n"
+"<tt>{}</tt>"
-#: ../meld/misc.py:237
+#: ../meld/misc.py:254
#, python-format
msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
msgstr ""
"%s-%s ã®ã‚«ãƒ©ãƒ¼ã‚¹ã‚ーマã®è©³ç´°ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ã“ã‚Œã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒæ£å¸¸"
"ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: ../meld/misc.py:311
+#: ../meld/misc.py:325
msgid "[None]"
msgstr "[ãªã—]"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: ../meld/preferences.py:33
msgid "label"
msgstr "(æ–°ã—ã„åå‰)"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: ../meld/preferences.py:33
msgid "pattern"
msgstr "(æ–°ã—ã„パターン)"
-#: ../meld/recent.py:106
+#: ../meld/recent.py:105
msgid "Version control:"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†:"
-#: ../meld/ui/bufferselectors.py:114
+#: ../meld/ui/bufferselectors.py:32
#, python-brace-format
msgid "{name} ({charset})"
msgstr ""
-#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152
+#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73
msgid "Plain Text"
-msgstr ""
+msgstr "プレーンテã‚スト"
+
+#: ../meld/ui/notebooklabel.py:63
+msgid "Close tab"
+msgstr "タブを閉ã˜ã‚‹"
#. Abbreviation for line, column so that it will fit in the status bar
#: ../meld/ui/statusbar.py:124
@@ -2319,7 +2368,7 @@ msgstr "(%iè¡Œã€%i列)"
msgid "Line you want to move the cursor to"
msgstr ""
-#: ../meld/ui/vcdialogs.py:55
+#: ../meld/ui/vcdialogs.py:48
msgid "No files will be committed"
msgstr ""
@@ -2418,121 +2467,106 @@ msgstr ""
#. Translators: This error message is shown when a version
#. control binary isn't installed.
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:248
#, python-format
msgid "%(name)s (%(cmd)s not installed)"
msgstr ""
#. Translators: This error message is shown when a version
#. controlled repository is invalid.
-#: ../meld/vcview.py:286
+#: ../meld/vcview.py:252
#, python-format
msgid "%(name)s (Invalid repository)"
msgstr ""
-#: ../meld/vcview.py:307
+#: ../meld/vcview.py:273
msgid "No valid version control system found in this folder"
msgstr ""
-#: ../meld/vcview.py:309
+#: ../meld/vcview.py:275
msgid "Only one version control system found in this folder"
msgstr ""
-#: ../meld/vcview.py:311
+#: ../meld/vcview.py:277
msgid "Choose which version control system to use"
msgstr ""
#. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:366
+#: ../meld/vcview.py:331
#, python-format
msgid "%s: %s"
msgstr ""
#. Initial yield so when we add this to our tasks, we don't
#. create iterators that may be invalidated.
-#: ../meld/vcview.py:373
+#: ../meld/vcview.py:338
msgid "Scanning repository"
msgstr ""
-#: ../meld/vcview.py:402
+#: ../meld/vcview.py:367
#, python-format
msgid "Scanning %s"
msgstr "%s をスã‚ャンä¸"
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:406
msgid "(Empty)"
msgstr "(空)"
-#: ../meld/vcview.py:487
+#: ../meld/vcview.py:450
#, python-format
msgid "%s — local"
msgstr ""
-#: ../meld/vcview.py:488
+#: ../meld/vcview.py:451
#, python-format
msgid "%s — remote"
msgstr ""
-#: ../meld/vcview.py:496
+#: ../meld/vcview.py:459
#, python-format
msgid "%s (local, merge, remote)"
msgstr ""
-#: ../meld/vcview.py:501
+#: ../meld/vcview.py:464
#, python-format
msgid "%s (remote, merge, local)"
msgstr ""
-#: ../meld/vcview.py:512
+#: ../meld/vcview.py:475
#, python-format
msgid "%s — repository"
msgstr ""
-#: ../meld/vcview.py:518
+#: ../meld/vcview.py:481
#, python-format
msgid "%s (working, repository)"
msgstr ""
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:485
#, python-format
msgid "%s (repository, working)"
msgstr ""
-#: ../meld/vcview.py:688
+#: ../meld/vcview.py:674
msgid "Remove folder and all its files?"
msgstr ""
-#: ../meld/vcview.py:690
+#: ../meld/vcview.py:676
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
msgstr ""
-#: ../meld/vcview.py:804
+#: ../meld/vcview.py:785
msgid "Clear"
msgstr ""
-#~ msgid "Show toolbar"
-#~ msgstr "ツールãƒãƒ¼ã‚’表示ã™ã‚‹"
-
-#~ msgid "If true, the window toolbar is visible."
-#~ msgstr "true ã®å ´åˆã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ãƒ„ールãƒãƒ¼ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
-
-#~ msgid "Show statusbar"
-#~ msgstr "ステータスãƒãƒ¼ã‚’表示ã™ã‚‹"
-
-#~ msgid "If true, the window statusbar is visible."
-#~ msgstr "true ã®å ´åˆã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
-
-#~ msgid "Editable List"
-#~ msgstr "編集å¯èƒ½ãªãƒªã‚¹ãƒˆ"
+#~ msgid "Preferences"
+#~ msgstr "è¨å®š"
#~ msgid "Format as Patch..."
#~ msgstr "パッãƒã‚’生æˆ..."
-#~ msgid "Meld Preferences"
-#~ msgstr "Meld ã®è¨å®š"
-
#~ msgid "INS"
#~ msgstr "[挿入]"
@@ -2550,30 +2584,3 @@ 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 "Configure the application"
-#~ msgstr "Meld ã‚’è¨å®šã—ã¾ã™"
-
-#~ msgid "_Contents"
-#~ msgstr "目次(_C)"
-
-#~ msgid "Open the Meld manual"
-#~ msgstr "Meld ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’é–‹ãã¾ã™"
-
-#~ msgid "About this application"
-#~ msgstr "ã“ã®ã‚¢ãƒ—リケーションã«ã¤ã„ã¦"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]