summaryrefslogtreecommitdiffstats
path: root/po/ja.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po81
1 files changed, 16 insertions, 65 deletions
diff --git a/po/ja.po b/po/ja.po
index 508c79c..9b8ed92 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3\n"
-"POT-Creation-Date: 2018-12-27 20:04+0100\n"
+"POT-Creation-Date: 2019-01-13 19:08+0100\n"
"PO-Revision-Date: 2006-04-14 21:25+0900\n"
"Last-Translator: Yukiko Bando <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -142,11 +142,6 @@ msgstr ""
"今ディレクトリマージ中です. 本当にマージを中止し、ディレクトリを再スキャンし"
"ますか?"
-#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622
-#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732
-msgid "Warning"
-msgstr ""
-
#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930
msgid "Rescan"
msgstr "再スキャン"
@@ -251,11 +246,6 @@ msgstr "すべてのマージ操作を更新中"
msgid "C&ontinue"
msgstr "続行(&O)"
-#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287
-#: smalldialogs.cpp:169 smalldialogs.cpp:381
-msgid "&Cancel"
-msgstr ""
-
#: directorymergewindow.cpp:1236
msgid "Processing "
msgstr "処理中"
@@ -349,13 +339,6 @@ msgstr "プログラムエラー"
msgid "An error occurred while copying.\n"
msgstr "コピー中にエラー発生\n"
-#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034
-#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112
-#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371
-#, fuzzy
-msgid "Error"
-msgstr "エラー"
-
#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372
msgid "Merge Error"
msgstr "マージエラー"
@@ -586,11 +569,6 @@ msgstr "最終更新"
msgid "Link-Destination"
msgstr "リンク先"
-#: directorymergewindow.cpp:2712
-#, fuzzy
-msgid "File"
-msgstr "ファイル..."
-
#: directorymergewindow.cpp:2729
msgid "not available"
msgstr "利用不可"
@@ -843,10 +821,6 @@ msgstr "ファイルを開く際にエラー"
msgid "Opens documents for comparison..."
msgstr "比較のために文書を開いています..."
-#: kdiff3.cpp:436
-msgid "Reload"
-msgstr ""
-
#: kdiff3.cpp:439
msgid "Saves the merge result. All conflicts must be solved!"
msgstr "マージ結果を保存. すべての衝突を回避しなければなりません!"
@@ -1115,10 +1089,6 @@ msgid ""
"You are currently doing a directory merge. Are you sure, you want to abort?"
msgstr "ディレクトリマージ実行中です. 本当に中止しますか?"
-#: kdiff3.cpp:622
-msgid "Quit"
-msgstr ""
-
#: kdiff3.cpp:644
msgid "Saving file..."
msgstr "ファイルを保存中..."
@@ -1127,10 +1097,6 @@ msgstr "ファイルを保存中..."
msgid "Saving file with a new filename..."
msgstr "名前を付けてファイルを保存中..."
-#: kdiff3.cpp:663
-msgid "Save As..."
-msgstr ""
-
#: kdiff3.cpp:751
msgid "Printing..."
msgstr "印刷中..."
@@ -1397,15 +1363,6 @@ msgstr "Latin1"
msgid "Change this if non-ASCII characters are not displayed correctly."
msgstr "非 ASCII 文字が適切に表示されなければ、これを変更してください。"
-#: optiondialog.cpp:455
-#, fuzzy
-msgid "Configure"
-msgstr "設定..."
-
-#: optiondialog.cpp:510
-msgid "Font"
-msgstr ""
-
#: optiondialog.cpp:510
msgid "Editor & Diff Output Font"
msgstr "エディタ/Diff 出力フォント"
@@ -2364,10 +2321,6 @@ msgstr "出力 (オプション):"
msgid "Configure..."
msgstr "設定..."
-#: smalldialogs.cpp:164
-msgid "&OK"
-msgstr ""
-
#: smalldialogs.cpp:347
msgid "Search text:"
msgstr "検索テキスト:"
@@ -2440,14 +2393,6 @@ msgstr ""
msgid "Sort key result:"
msgstr ""
-#: smalldialogs.cpp:493
-msgid "OK"
-msgstr ""
-
-#: smalldialogs.cpp:497
-msgid "Cancel"
-msgstr ""
-
#: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568
msgid "Match success."
msgstr ""
@@ -2471,11 +2416,6 @@ msgstr "KDiff3(&K)"
msgid "Configure KDiff3"
msgstr "KDiff3 を設定"
-#: kdiff3_shell.rc:4
-#, fuzzy, no-c-format
-msgid "&File"
-msgstr "ファイル..."
-
#: kdiff3_shell.rc:7
#, no-c-format
msgid "&Directory"
@@ -2511,10 +2451,21 @@ msgstr "マージ(&M)"
msgid "&Window"
msgstr "ウィンドウ(&W)"
-#: kdiff3_shell.rc:106
-#, no-c-format
-msgid "Main Toolbar"
-msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "エラー"
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "ファイル..."
+
+#, fuzzy
+#~ msgid "Configure"
+#~ msgstr "設定..."
+
+#, fuzzy
+#~ msgid "&File"
+#~ msgstr "ファイル..."
#~ msgid "Files A and B are binary equal.\n"
#~ msgstr "ファイル A と B は同じバイナリです\n"