1 files changed, 144 insertions, 144 deletions

diff --git a/translations/messages/kdiff3/ja.po b/translations/messages/kdiff3/ja.po
index 80613a4..1e67461 100644
--- a/translations/messages/kdiff3/ja.po
+++ b/translations/messages/kdiff3/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3\n"
-"POT-Creation-Date: 2021-07-07 18:26+0000\n"
+"POT-Creation-Date: 2023-08-24 18:16+0000\n"
 "PO-Revision-Date: 2006-04-14 21:25+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -35,7 +35,7 @@ msgstr "クリップボードのデータを一時ファイルに書き込めま
 msgid "From Clipboard"
 msgstr "クリップボードから"
 
-#: diff.cpp:493
+#: diff.cpp:492
 msgid ""
 "Preprocessing possibly failed. Check this command:\n"
 "\n"
@@ -44,7 +44,7 @@ msgid ""
 "The preprocessing command will be disabled now."
 msgstr ""
 
-#: diff.cpp:528
+#: diff.cpp:527
 msgid ""
 "The line-matching-preprocessing possibly failed. Check this command:\n"
 "\n"
@@ -53,7 +53,7 @@ msgid ""
 "The line-matching-preprocessing command will be disabled now."
 msgstr ""
 
-#: diff.cpp:1633 diff.cpp:1647
+#: diff.cpp:1632 diff.cpp:1646
 msgid ""
 "Data loss error:\n"
 "If it is reproducable please contact the author.\n"
@@ -61,15 +61,15 @@ msgstr ""
 "データ損失エラー:\n"
 "もし再現するようなら作者にコンタクトをとってください\n"
 
-#: diff.cpp:1635 diff.cpp:1649
+#: diff.cpp:1634 diff.cpp:1648
 msgid "Severe Internal Error"
 msgstr "深刻な内部エラー"
 
-#: difftextwindow.cpp:1644 kdiff3.cpp:772
+#: difftextwindow.cpp:1643 kdiff3.cpp:772
 msgid "Top line"
 msgstr "上部行"
 
-#: difftextwindow.cpp:1654
+#: difftextwindow.cpp:1653
 msgid "End"
 msgstr "最後"
 
@@ -101,40 +101,40 @@ msgstr "%1 を開けません"
 msgid "Comparing file..."
 msgstr "ファイルを比較中..."
 
-#: directorymergewindow.cpp:233 directorymergewindow.cpp:239
+#: directorymergewindow.cpp:229 directorymergewindow.cpp:235
 #, c-format
 msgid "Error reading from %1"
 msgstr "%1 から読み込み時にエラー"
 
-#: directorymergewindow.cpp:297
+#: directorymergewindow.cpp:293
 msgid "Name"
 msgstr "名前"
 
-#: directorymergewindow.cpp:301
+#: directorymergewindow.cpp:297
 msgid "Operation"
 msgstr "操作"
 
-#: directorymergewindow.cpp:302
+#: directorymergewindow.cpp:298
 msgid "Status"
 msgstr "状態"
 
-#: directorymergewindow.cpp:303
+#: directorymergewindow.cpp:299
 msgid "Unsolved"
 msgstr "未解決"
 
-#: directorymergewindow.cpp:304
+#: directorymergewindow.cpp:300
 msgid "Solved"
 msgstr "解決済み"
 
-#: directorymergewindow.cpp:305
+#: directorymergewindow.cpp:301
 msgid "Nonwhite"
 msgstr "空白以外"
 
-#: directorymergewindow.cpp:306
+#: directorymergewindow.cpp:302
 msgid "White"
 msgstr "空白"
 
-#: directorymergewindow.cpp:334
+#: directorymergewindow.cpp:330
 msgid ""
 "You are currently doing a directory merge. Are you sure, you want to abort "
 "the merge and rescan the directory?"
@@ -142,35 +142,35 @@ msgstr ""
 "今ディレクトリマージ中です. 本当にマージを中止し、ディレクトリを再スキャンし"
 "ますか?"
 
-#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930
+#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926
 msgid "Rescan"
 msgstr "再スキャン"
 
-#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981
+#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981
 msgid "Continue Merging"
 msgstr "マージを続行"
 
-#: directorymergewindow.cpp:507
+#: directorymergewindow.cpp:503
 msgid "Opening of directories failed:"
 msgstr "ディレクトリオープンに失敗:"
 
-#: directorymergewindow.cpp:510
+#: directorymergewindow.cpp:506
 msgid "Dir A \"%1\" does not exist or is not a directory.\n"
 msgstr "ディレクトリ A %1 は存在しないか、ディレクトリではありません\n"
 
-#: directorymergewindow.cpp:513
+#: directorymergewindow.cpp:509
 msgid "Dir B \"%1\" does not exist or is not a directory.\n"
 msgstr "ディレクトリ B %1 は存在しないか、ディレクトリではありません\n"
 
-#: directorymergewindow.cpp:516
+#: directorymergewindow.cpp:512
 msgid "Dir C \"%1\" does not exist or is not a directory.\n"
 msgstr "ディレクトリ C %1 は存在しないか、ディレクトリではありません\n"
 
-#: directorymergewindow.cpp:518
+#: directorymergewindow.cpp:514
 msgid "Directory Open Error"
 msgstr "ディレクトリオープンエラー"
 
-#: directorymergewindow.cpp:526
+#: directorymergewindow.cpp:522
 msgid ""
 "The destination directory must not be the same as A or B when three "
 "directories are merged.\n"
@@ -180,144 +180,144 @@ msgstr ""
 "はいけません.\n"
 "続行する前にもう一度調べてください"
 
-#: directorymergewindow.cpp:528
+#: directorymergewindow.cpp:524
 msgid "Parameter Warning"
 msgstr "パラメータ警告"
 
-#: directorymergewindow.cpp:533
+#: directorymergewindow.cpp:529
 msgid "Scanning directories..."
 msgstr "ディレクトリをスキャン中..."
 
-#: directorymergewindow.cpp:582
+#: directorymergewindow.cpp:578
 msgid "Reading Directory A"
 msgstr "ディレクトリ A を読み込み中"
 
-#: directorymergewindow.cpp:604
+#: directorymergewindow.cpp:600
 msgid "Reading Directory B"
 msgstr "ディレクトリ B を読み込み中"
 
-#: directorymergewindow.cpp:626
+#: directorymergewindow.cpp:622
 msgid "Reading Directory C"
 msgstr "ディレクトリ C を読み込み中"
 
-#: directorymergewindow.cpp:652
+#: directorymergewindow.cpp:648
 msgid "Some subdirectories were not readable in"
 msgstr "いくつかのサブディレクトリが読み込み不可でした"
 
-#: directorymergewindow.cpp:657
+#: directorymergewindow.cpp:653
 msgid "Check the permissions of the subdirectories."
 msgstr "サブディレクトリの許可属性を確かめてください"
 
-#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680
+#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680
 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180
 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237
 msgid "Ready."
 msgstr "準備完了."
 
-#: directorymergewindow.cpp:705
+#: directorymergewindow.cpp:701
 msgid "Directory Comparison Status"
 msgstr "ディレクトリ比較状態"
 
-#: directorymergewindow.cpp:706
+#: directorymergewindow.cpp:702
 msgid "Number of subdirectories:"
 msgstr "サブディレクトリ数:"
 
-#: directorymergewindow.cpp:707
+#: directorymergewindow.cpp:703
 msgid "Number of equal files:"
 msgstr "等しいファイルの数:"
 
-#: directorymergewindow.cpp:708
+#: directorymergewindow.cpp:704
 msgid "Number of different files:"
 msgstr "異なるファイルの数:"
 
-#: directorymergewindow.cpp:711
+#: directorymergewindow.cpp:707
 msgid "Number of manual merges:"
 msgstr "手作業でのマージ数:"
 
-#: directorymergewindow.cpp:867
+#: directorymergewindow.cpp:863
 msgid "This affects all merge operations."
 msgstr "これはすべてのマージ操作に影響します"
 
-#: directorymergewindow.cpp:868
+#: directorymergewindow.cpp:864
 msgid "Changing All Merge Operations"
 msgstr "すべてのマージ操作を更新中"
 
-#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287
+#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287
 msgid "C&ontinue"
 msgstr "続行(&O)"
 
-#: directorymergewindow.cpp:1236
+#: directorymergewindow.cpp:1232
 msgid "Processing "
 msgstr "処理中"
 
-#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716
+#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712
 msgid "To do."
 msgstr "To do."
 
-#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961
+#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957
 msgid "Copy A to B"
 msgstr "A を B にコピー"
 
-#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962
+#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958
 msgid "Copy B to A"
 msgstr "B を A にコピー"
 
-#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963
+#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959
 msgid "Delete A"
 msgstr "A を削除"
 
-#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964
+#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960
 msgid "Delete B"
 msgstr "B を削除"
 
-#: directorymergewindow.cpp:1823
+#: directorymergewindow.cpp:1819
 msgid "Delete A & B"
 msgstr "A と B を削除"
 
-#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966
+#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962
 msgid "Merge to A"
 msgstr "A にマージ"
 
-#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967
+#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963
 msgid "Merge to B"
 msgstr "B にマージ"
 
-#: directorymergewindow.cpp:1826
+#: directorymergewindow.cpp:1822
 msgid "Merge to A & B"
 msgstr "A と B にマージ"
 
-#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958
+#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954
 msgid "Delete (if exists)"
 msgstr "(存在すれば)削除"
 
-#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832
-#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102
+#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828
+#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102
 msgid "Merge"
 msgstr "マージ"
 
-#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832
+#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828
 msgid "Merge (manual)"
 msgstr "マージ (手作業)"
 
-#: directorymergewindow.cpp:1833
+#: directorymergewindow.cpp:1829
 msgid "Error: Conflicting File Types"
 msgstr "エラー: ファイルタイプが衝突しています"
 
-#: directorymergewindow.cpp:1834
+#: directorymergewindow.cpp:1830
 msgid "Error: Dates are equal but files are not."
 msgstr "エラー: 日付は等しいですがファイルはそうでありません"
 
-#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890
-#: directorymergewindow.cpp:1915
+#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886
+#: directorymergewindow.cpp:1911
 msgid "This operation is currently not possible."
 msgstr "この操作は今はできません"
 
-#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890
-#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172
+#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886
+#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168
 msgid "Operation Not Possible"
 msgstr "操作不可"
 
-#: directorymergewindow.cpp:1954
+#: directorymergewindow.cpp:1950
 msgid ""
 "This should never happen: \n"
 "\n"
@@ -331,40 +331,40 @@ msgstr ""
 "\n"
 "再現方法がわかったならプログラム作者にコンタクトを取ってください"
 
-#: directorymergewindow.cpp:1954
+#: directorymergewindow.cpp:1950
 msgid "Program Error"
 msgstr "プログラムエラー"
 
-#: directorymergewindow.cpp:1965
+#: directorymergewindow.cpp:1961
 msgid "An error occurred while copying.\n"
 msgstr "コピー中にエラー発生\n"
 
-#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372
+#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368
 msgid "Merge Error"
 msgstr "マージエラー"
 
-#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377
+#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373
 msgid "Error."
 msgstr "エラー"
 
-#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268
-#: directorymergewindow.cpp:2308
+#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264
+#: directorymergewindow.cpp:2304
 msgid "Done."
 msgstr "完了"
 
-#: directorymergewindow.cpp:1999
+#: directorymergewindow.cpp:1995
 msgid "Not saved."
 msgstr "未保存"
 
-#: directorymergewindow.cpp:2034
+#: directorymergewindow.cpp:2030
 msgid "Unknown merge operation. (This must never happen!)"
 msgstr "不明なマージ操作 (起り得ないはず!)"
 
-#: directorymergewindow.cpp:2066
+#: directorymergewindow.cpp:2062
 msgid "Unknown merge operation."
 msgstr "不明なマージ操作"
 
-#: directorymergewindow.cpp:2081
+#: directorymergewindow.cpp:2077
 msgid ""
 "The merge is about to begin.\n"
 "\n"
@@ -384,19 +384,19 @@ msgstr ""
 "このプログラムはまだβ段階で何が起きても無保証だということに注意してください!"
 "重要なデータはバックアップをとってください!"
 
-#: directorymergewindow.cpp:2086
+#: directorymergewindow.cpp:2082
 msgid "Starting Merge"
 msgstr "マージ開始"
 
-#: directorymergewindow.cpp:2086
+#: directorymergewindow.cpp:2082
 msgid "Do It"
 msgstr "実行"
 
-#: directorymergewindow.cpp:2086
+#: directorymergewindow.cpp:2082
 msgid "Simulate It"
 msgstr "試行"
 
-#: directorymergewindow.cpp:2112
+#: directorymergewindow.cpp:2108
 msgid ""
 "The highlighted item has a different type in the different directories. "
 "Select what to do."
@@ -404,7 +404,7 @@ msgstr ""
 "強調表示された項目は異なるディレクトリの異なるタイプです.何をするか選択してく"
 "ださい"
 
-#: directorymergewindow.cpp:2121
+#: directorymergewindow.cpp:2117
 msgid ""
 "The modification dates of the file are equal but the files are not. Select "
 "what to do."
@@ -412,13 +412,13 @@ msgstr ""
 "ファイルの更新日時は等しいですがファイルは異なっています. 何をするか選択して"
 "ください"
 
-#: directorymergewindow.cpp:2172
+#: directorymergewindow.cpp:2168
 msgid ""
 "This operation is currently not possible because directory merge is "
 "currently running."
 msgstr "ディレクトリマージ中なのでこの操作を実行することはできません"
 
-#: directorymergewindow.cpp:2232
+#: directorymergewindow.cpp:2228
 msgid ""
 "There was an error in the last step.\n"
 "Do you want to continue with the item that caused the error or do you want "
@@ -427,270 +427,270 @@ msgstr ""
 "最終段階でエラー発生.\n"
 "エラーを起した項目について続行しますか? それともスキップしますか?"
 
-#: directorymergewindow.cpp:2234
+#: directorymergewindow.cpp:2230
 msgid "Continue merge after an error"
 msgstr "エラー後にもマージ続行"
 
-#: directorymergewindow.cpp:2234
+#: directorymergewindow.cpp:2230
 msgid "Continue With Last Item"
 msgstr "最後の項目について続行"
 
-#: directorymergewindow.cpp:2234
+#: directorymergewindow.cpp:2230
 msgid "Skip Item"
 msgstr "項目をスキップ"
 
-#: directorymergewindow.cpp:2268
+#: directorymergewindow.cpp:2264
 msgid "Skipped."
 msgstr "スキップされました"
 
-#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501
+#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497
 msgid "In progress..."
 msgstr "進行中..."
 
-#: directorymergewindow.cpp:2323
+#: directorymergewindow.cpp:2319
 msgid "Merge operation complete."
 msgstr "マージ操作完了"
 
-#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326
+#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322
 msgid "Merge Complete"
 msgstr "マージ完了"
 
-#: directorymergewindow.cpp:2335
+#: directorymergewindow.cpp:2331
 msgid ""
 "Simulated merge complete: Check if you agree with the proposed operations."
 msgstr "マージ試行完了: 先の操作をしてもよいか確認してください."
 
-#: directorymergewindow.cpp:2371
+#: directorymergewindow.cpp:2367
 msgid "An error occurred. Press OK to see detailed information.\n"
 msgstr "エラー発生. 詳細情報を見るには OK をクリックしてください\n"
 
-#: directorymergewindow.cpp:2414
+#: directorymergewindow.cpp:2410
 msgid "Error: While deleting %1: Creating backup failed."
 msgstr "エラー: %1 削除中: バックアップ作成失敗"
 
-#: directorymergewindow.cpp:2421
+#: directorymergewindow.cpp:2417
 msgid "delete directory recursively( %1 )"
 msgstr "再帰的にディレクトリを削除 ( %1 )"
 
-#: directorymergewindow.cpp:2423
+#: directorymergewindow.cpp:2419
 msgid "delete( %1 )"
 msgstr "削除( %1 )"
 
-#: directorymergewindow.cpp:2438
+#: directorymergewindow.cpp:2434
 msgid "Error: delete dir operation failed while trying to read the directory."
 msgstr "エラー: ディレクトリ読み込み中にディレクトリ削除失敗"
 
-#: directorymergewindow.cpp:2457
+#: directorymergewindow.cpp:2453
 msgid "Error: rmdir( %1 ) operation failed."
 msgstr "エラー: rmdir( %1 ) 操作失敗"
 
-#: directorymergewindow.cpp:2467
+#: directorymergewindow.cpp:2463
 msgid "Error: delete operation failed."
 msgstr "エラー: 削除失敗"
 
-#: directorymergewindow.cpp:2493
+#: directorymergewindow.cpp:2489
 msgid "manual merge( %1, %2, %3 -> %4)"
 msgstr "手作業でのマージ( %1, %2, %3 -> %4)"
 
-#: directorymergewindow.cpp:2496
+#: directorymergewindow.cpp:2492
 msgid ""
 "     Note: After a manual merge the user should continue by pressing F7."
 msgstr "     注意: 手作業でのマージ後に続行するには F7 を押してください"
 
-#: directorymergewindow.cpp:2519
+#: directorymergewindow.cpp:2515
 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed."
 msgstr "エラー: copy( %1 -> %2 )失敗. 既存のコピー先の削除に失敗"
 
-#: directorymergewindow.cpp:2529
+#: directorymergewindow.cpp:2525
 msgid "copyLink( %1 -> %2 )"
 msgstr "copyLink( %1 -> %2 )"
 
-#: directorymergewindow.cpp:2540
+#: directorymergewindow.cpp:2536
 msgid "Error: copyLink failed: Remote links are not yet supported."
 msgstr "エラー: copyLink 失敗: リモートリンクは未サポートです"
 
-#: directorymergewindow.cpp:2546
+#: directorymergewindow.cpp:2542
 msgid "Error: copyLink failed."
 msgstr "エラー: copyLink 失敗"
 
-#: directorymergewindow.cpp:2566
+#: directorymergewindow.cpp:2562
 msgid "copy( %1 -> %2 )"
 msgstr "copy( %1 -> %2 )"
 
-#: directorymergewindow.cpp:2592
+#: directorymergewindow.cpp:2588
 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination."
 msgstr "rename( %1 -> %2 ) 中にエラー: 既存のコピー先を削除できません"
 
-#: directorymergewindow.cpp:2598
+#: directorymergewindow.cpp:2594
 msgid "rename( %1 -> %2 )"
 msgstr "rename( %1 -> %2 )"
 
-#: directorymergewindow.cpp:2607
+#: directorymergewindow.cpp:2603
 msgid "Error: Rename failed."
 msgstr "エラー: 名称変更失敗"
 
-#: directorymergewindow.cpp:2625
+#: directorymergewindow.cpp:2621
 msgid "Error during makeDir of %1. Cannot delete existing file."
 msgstr "makeDir %1 中にエラー. 既存ファイルを削除できません"
 
-#: directorymergewindow.cpp:2641
+#: directorymergewindow.cpp:2637
 msgid "makeDir( %1 )"
 msgstr "makeDir( %1 )"
 
-#: directorymergewindow.cpp:2651
+#: directorymergewindow.cpp:2647
 msgid "Error while creating directory."
 msgstr "ディレクトリ作成中にエラー"
 
-#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787
+#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783
 msgid "Dest"
 msgstr "先"
 
-#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712
+#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708
 msgid "Dir"
 msgstr "ディレクトリ"
 
-#: directorymergewindow.cpp:2679
+#: directorymergewindow.cpp:2675
 msgid "Type"
 msgstr "タイプ"
 
-#: directorymergewindow.cpp:2680
+#: directorymergewindow.cpp:2676
 msgid "Size"
 msgstr "容量"
 
-#: directorymergewindow.cpp:2681
+#: directorymergewindow.cpp:2677
 msgid "Attr"
 msgstr "属性"
 
-#: directorymergewindow.cpp:2682
+#: directorymergewindow.cpp:2678
 msgid "Last Modification"
 msgstr "最終更新"
 
-#: directorymergewindow.cpp:2683
+#: directorymergewindow.cpp:2679
 msgid "Link-Destination"
 msgstr "リンク先"
 
-#: directorymergewindow.cpp:2729
+#: directorymergewindow.cpp:2725
 msgid "not available"
 msgstr "利用不可"
 
-#: directorymergewindow.cpp:2749
+#: directorymergewindow.cpp:2745
 msgid "A (Dest): "
 msgstr "A (先): "
 
-#: directorymergewindow.cpp:2752
+#: directorymergewindow.cpp:2748
 msgid "A (Base): "
 msgstr "A (元): "
 
-#: directorymergewindow.cpp:2758
+#: directorymergewindow.cpp:2754
 msgid "B (Dest): "
 msgstr "B (先): "
 
-#: directorymergewindow.cpp:2766
+#: directorymergewindow.cpp:2762
 msgid "C (Dest): "
 msgstr "C (先): "
 
-#: directorymergewindow.cpp:2772
+#: directorymergewindow.cpp:2768
 msgid "Dest: "
 msgstr "先: "
 
-#: directorymergewindow.cpp:2837
+#: directorymergewindow.cpp:2833
 #, fuzzy
 msgid "Save Directory Merge State As..."
 msgstr "ディレクトリマージ"
 
-#: directorymergewindow.cpp:2924
+#: directorymergewindow.cpp:2920
 msgid "Start/Continue Directory Merge"
 msgstr "ディレクトリマージを開始/続行"
 
-#: directorymergewindow.cpp:2925
+#: directorymergewindow.cpp:2921
 msgid "Run Operation for Current Item"
 msgstr "現在の項目について操作を実行"
 
-#: directorymergewindow.cpp:2926
+#: directorymergewindow.cpp:2922
 msgid "Compare Selected File"
 msgstr "選択ファイルを比較 "
 
-#: directorymergewindow.cpp:2927
+#: directorymergewindow.cpp:2923
 msgid "Merge Current File"
 msgstr "現在のファイルをマージ "
 
-#: directorymergewindow.cpp:2928
+#: directorymergewindow.cpp:2924
 msgid "Fold All Subdirs"
 msgstr "すべてのサブディレクトリをたたみ込み"
 
-#: directorymergewindow.cpp:2929
+#: directorymergewindow.cpp:2925
 msgid "Unfold All Subdirs"
 msgstr "すべてのサブディレクトリを展開"
 
-#: directorymergewindow.cpp:2933
+#: directorymergewindow.cpp:2929
 msgid "Choose A for All Items"
 msgstr "すべての項目について A を選択"
 
-#: directorymergewindow.cpp:2934
+#: directorymergewindow.cpp:2930
 msgid "Choose B for All Items"
 msgstr "すべての項目について B を選択"
 
-#: directorymergewindow.cpp:2935
+#: directorymergewindow.cpp:2931
 msgid "Choose C for All Items"
 msgstr "すべての項目について C を選択"
 
-#: directorymergewindow.cpp:2936
+#: directorymergewindow.cpp:2932
 msgid "Auto-Choose Operation for All Items"
 msgstr "すべての項目について自動選択"
 
-#: directorymergewindow.cpp:2937
+#: directorymergewindow.cpp:2933
 msgid "No Operation for All Items"
 msgstr "すべての項目について操作なし"
 
-#: directorymergewindow.cpp:2942
+#: directorymergewindow.cpp:2938
 msgid "Show Identical Files"
 msgstr "等しいファイルを表示"
 
-#: directorymergewindow.cpp:2943
+#: directorymergewindow.cpp:2939
 msgid "Show Different Files"
 msgstr "異なるファイルを表示"
 
-#: directorymergewindow.cpp:2944
+#: directorymergewindow.cpp:2940
 msgid "Show Files only in A"
 msgstr "A にのみ存在するファイルを表示"
 
-#: directorymergewindow.cpp:2945
+#: directorymergewindow.cpp:2941
 msgid "Show Files only in B"
 msgstr "B にのみ存在するファイルを表示"
 
-#: directorymergewindow.cpp:2946
+#: directorymergewindow.cpp:2942
 msgid "Show Files only in C"
 msgstr "C にのみ存在するファイルを表示"
 
-#: directorymergewindow.cpp:2950
+#: directorymergewindow.cpp:2946
 msgid "Compare Explicitly Selected Files"
 msgstr "明示的に選択したファイルを比較 "
 
-#: directorymergewindow.cpp:2951
+#: directorymergewindow.cpp:2947
 msgid "Merge Explicitly Selected Files"
 msgstr "明示的に選択したファイルをマージ "
 
-#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960
+#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956
 msgid "Do Nothing"
 msgstr "何もしない"
 
-#: directorymergewindow.cpp:2954
+#: directorymergewindow.cpp:2950
 msgid "A"
 msgstr "A"
 
-#: directorymergewindow.cpp:2955
+#: directorymergewindow.cpp:2951
 msgid "B"
 msgstr "B"
 
-#: directorymergewindow.cpp:2956
+#: directorymergewindow.cpp:2952
 msgid "C"
 msgstr "C"
 
-#: directorymergewindow.cpp:2965
+#: directorymergewindow.cpp:2961
 msgid "Delete A && B"
 msgstr "A と B を削除"
 
-#: directorymergewindow.cpp:2968
+#: directorymergewindow.cpp:2964
 msgid "Merge to A && B"
 msgstr "A と B にマージ"