From 96791f01aa707543c3a0ae54b02bc65190606d68 Mon Sep 17 00:00:00 2001
From: Masahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Date: Sun, 27 Nov 2022 14:33:22 +0900
Subject: [PATCH] remove Clear and CleaAll filters from ja.filters (issue #208)

---
 ja.filters                                                  | 3 ---
 ja/browser/extensions/formautofill/formautofill.properties  | 2 +-
 ja/mail/chrome/messenger/am-smime.dtd                       | 4 ++--
 ja/mail/chrome/messenger/junkLog.dtd                        | 2 +-
 ja/mail/chrome/messenger/messengercompose/editor.properties | 2 +-
 ja/mail/chrome/messenger/viewLog.dtd                        | 2 +-
 ja/suite/chrome/common/pref/pref-history.dtd                | 6 +++---
 ja/suite/chrome/common/pref/pref-privatedata.dtd            | 6 +++---
 ja/suite/chrome/editor/editor.properties                    | 2 +-
 ja/suite/chrome/mailnews/junkLog.dtd                        | 2 +-
 ja/suite/chrome/mailnews/smime/am-smime.dtd                 | 4 ++--
 ja/suite/chrome/mailnews/viewLog.dtd                        | 2 +-
 12 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/ja.filters b/ja.filters
index 741bacbd5..6c701f53b 100644
--- a/ja.filters
+++ b/ja.filters
@@ -71,9 +71,6 @@ ja-JP-mac.NextButton			= 続ける
 #
 # コマンドやメニュー名(またはそれを指す場合)にのみ使用。
 Revert					= 入力の取り消し
-Clear					= 消去
-ClearAll				= すべてを消去
-
 
 ja.Browse				= 参照
 # ウィンドウを対象とした閉じるコマンドのみ
diff --git a/ja/browser/extensions/formautofill/formautofill.properties b/ja/browser/extensions/formautofill/formautofill.properties
index 45f1a5eba..448f96819 100644
--- a/ja/browser/extensions/formautofill/formautofill.properties
+++ b/ja/browser/extensions/formautofill/formautofill.properties
@@ -84,7 +84,7 @@ phishingWarningMessage2		=%S を自動入力します
 insecureFieldWarningDescription	=%S が安全でないサイトを検出しました。フォームの自動入力は一時的に無効化されます。
 # LOCALIZATION NOTE (clearFormBtnLabel2): Label for the button in the dropdown menu that used to clear the populated
 # form.
-clearFormBtnLabel2		=フォームの自動入力情報を@@Clear@@
+clearFormBtnLabel2		=フォームの自動入力情報を消去
 
 autofillHeader			=フォームと自動入力
 # LOCALIZATION NOTE (autofillAddressesCheckbox): Label for the checkbox that enables autofilling addresses.
diff --git a/ja/mail/chrome/messenger/am-smime.dtd b/ja/mail/chrome/messenger/am-smime.dtd
index 3cd8ea1b4..e5ab333c7 100644
--- a/ja/mail/chrome/messenger/am-smime.dtd
+++ b/ja/mail/chrome/messenger/am-smime.dtd
@@ -11,11 +11,11 @@
 <!ENTITY encryptionCert2.message		"暗号化のための個人証明書:">
 <!ENTITY digitalSign.certificate.button		"選択...">
 <!ENTITY digitalSign.certificate.accesskey	"S">
-<!ENTITY digitalSign.certificate_clear.button	"@@Clear@@">
+<!ENTITY digitalSign.certificate_clear.button	"消去">
 <!ENTITY digitalSign.certificate_clear.accesskey	"C">
 <!ENTITY encryption.certificate.button		"選択...">
 <!ENTITY encryption.certificate.accesskey	"t">
-<!ENTITY encryption.certificate_clear.button	"@@Clear@@">
+<!ENTITY encryption.certificate_clear.button	"消去">
 <!ENTITY encryption.certificate_clear.accesskey	"e">
 <!ENTITY signingGroupTitle.label		"デジタル署名">
 <!ENTITY signingCert2.message			"デジタル署名のための個人証明書:">
diff --git a/ja/mail/chrome/messenger/junkLog.dtd b/ja/mail/chrome/messenger/junkLog.dtd
index c52121f77..46234c197 100644
--- a/ja/mail/chrome/messenger/junkLog.dtd
+++ b/ja/mail/chrome/messenger/junkLog.dtd
@@ -4,7 +4,7 @@
 
 <!ENTITY adaptiveJunkLog.title	"迷惑メールログ"><!-- en-US: "Adaptive Junk Mail Log" -->
 <!ENTITY adaptiveJunkLogInfo.label	"迷惑メール適応フィルターの動作を記録したログです。">
-<!ENTITY clearLog.label		"ログを@@Clear@@">
+<!ENTITY clearLog.label		"ログを消去">
 <!ENTITY clearLog.accesskey	"C">
 <!ENTITY closeLog.label		"閉じる">
 <!ENTITY closeLog.accesskey	"o">
diff --git a/ja/mail/chrome/messenger/messengercompose/editor.properties b/ja/mail/chrome/messenger/messengercompose/editor.properties
index 35eb46cee..7769829a5 100644
--- a/ja/mail/chrome/messenger/messengercompose/editor.properties
+++ b/ja/mail/chrome/messenger/messengercompose/editor.properties
@@ -183,7 +183,7 @@ Delete			=削除
 DeleteCells		=セルを削除
 DeleteTableTitle	=行または列を削除
 DeleteTableMsg		=列数や行数を減らすと表のセルやその内容も削除されます。本当に減らしてもよろしいですか？
-Clear			=@@Clear@@
+Clear			=消去
 #Mouse actions
 Click			=クリック
 Drag			=ドラッグ
diff --git a/ja/mail/chrome/messenger/viewLog.dtd b/ja/mail/chrome/messenger/viewLog.dtd
index 4b7b144cd..a74a455c8 100644
--- a/ja/mail/chrome/messenger/viewLog.dtd
+++ b/ja/mail/chrome/messenger/viewLog.dtd
@@ -4,7 +4,7 @@
 
 <!ENTITY viewLog.title		"フィルターログ">
 <!ENTITY viewLogInfo.text	"フィルターログではどのフィルターが使われたか記録します。"><!-- (^^; "Use the check box below to enable logging." はチェックボックスのラベルから自明なので削除 -->
-<!ENTITY clearLog.label		"ログの@@Clear@@">
+<!ENTITY clearLog.label		"ログの消去">
 <!ENTITY clearLog.accesskey	"C">
 <!ENTITY enableLog.label	"フィルターログを有効にする">
 <!ENTITY enableLog.accesskey	"E">
diff --git a/ja/suite/chrome/common/pref/pref-history.dtd b/ja/suite/chrome/common/pref/pref-history.dtd
index 77c86b5c3..1eb5abf97 100644
--- a/ja/suite/chrome/common/pref/pref-history.dtd
+++ b/ja/suite/chrome/common/pref/pref-history.dtd
@@ -8,14 +8,14 @@
 <!ENTITY  historyPages.label                "履歴は過去に訪問したページの一覧です。">
 <!ENTITY  enableHistory.label               "履歴を記憶させる">
 <!ENTITY  enableHistory.accesskey           "R">
-<!ENTITY  clearHistory.label                "履歴を@@Clear@@">
+<!ENTITY  clearHistory.label                "履歴を消去">
 <!ENTITY  clearHistory.accesskey            "s">
 
 <!ENTITY  locationBarHistory.caption        "アドレスバーの履歴"><!-- en-US: "Location Bar History" -->
 <!ENTITY  urlBarHistoryEnabled.caption      "アドレスバーの履歴を有効にする">
 <!ENTITY  urlBarHistoryEnabled.accesskey    "E">
-<!ENTITY  clearLocationBar.label            "アドレスバーメニューに保存されているサイト一覧を@@Clear@@します。">
-<!ENTITY  clearLocationBarButton.label      "アドレスバーの履歴を@@Clear@@">
+<!ENTITY  clearLocationBar.label            "アドレスバーメニューに保存されているサイト一覧を消去します。">
+<!ENTITY  clearLocationBarButton.label      "アドレスバーの履歴を消去">
 <!ENTITY  clearLocationBarButton.accesskey  "L">
 <!ENTITY  formfillHistory.caption           "フォームと検索の履歴">
 <!ENTITY  enableFormfill.label              "フォームと検索の入力履歴を記憶させる">
diff --git a/ja/suite/chrome/common/pref/pref-privatedata.dtd b/ja/suite/chrome/common/pref/pref-privatedata.dtd
index 4c791124b..b09e31ab9 100644
--- a/ja/suite/chrome/common/pref/pref-privatedata.dtd
+++ b/ja/suite/chrome/common/pref/pref-privatedata.dtd
@@ -7,7 +7,7 @@
 -->
 <!ENTITY pref.privatedata.title           "プライバシー情報">
 
-<!ENTITY clearPrivateData.label           "プライバシー情報の@@Clear@@">
+<!ENTITY clearPrivateData.label           "プライバシー情報の消去">
 
 <!ENTITY alwaysClear.label                "&brandShortName; の終了時にプライバシー情報を消去する">
 <!ENTITY alwaysClear.accesskey            "w">
@@ -28,6 +28,6 @@
   The only difference bettween the two labels is that one calls a dialog, the other doesn't.
   The same accesskey is used for both labels.
 -->
-<!ENTITY clearDataDialog.label            "今すぐ@@Clear@@...">
-<!ENTITY clearDataSilent.label            "今すぐ@@Clear@@">
+<!ENTITY clearDataDialog.label            "今すぐ消去...">
+<!ENTITY clearDataSilent.label            "今すぐ消去">
 <!ENTITY clearDataDialog.accesskey        "N">
diff --git a/ja/suite/chrome/editor/editor.properties b/ja/suite/chrome/editor/editor.properties
index 35eb46cee..7769829a5 100644
--- a/ja/suite/chrome/editor/editor.properties
+++ b/ja/suite/chrome/editor/editor.properties
@@ -183,7 +183,7 @@ Delete			=削除
 DeleteCells		=セルを削除
 DeleteTableTitle	=行または列を削除
 DeleteTableMsg		=列数や行数を減らすと表のセルやその内容も削除されます。本当に減らしてもよろしいですか？
-Clear			=@@Clear@@
+Clear			=消去
 #Mouse actions
 Click			=クリック
 Drag			=ドラッグ
diff --git a/ja/suite/chrome/mailnews/junkLog.dtd b/ja/suite/chrome/mailnews/junkLog.dtd
index 77372dcda..96b00d4d9 100644
--- a/ja/suite/chrome/mailnews/junkLog.dtd
+++ b/ja/suite/chrome/mailnews/junkLog.dtd
@@ -4,7 +4,7 @@
 
 <!ENTITY adaptiveJunkLog.title "迷惑メールログ"><!-- en-US: "Adaptive Junk Mail Log" -->
 <!ENTITY adaptiveJunkLogInfo.label "迷惑メール適応フィルターの動作を記録したログです。">
-<!ENTITY clearLog.label "ログを@@Clear@@">
+<!ENTITY clearLog.label "ログを消去">
 <!ENTITY clearLog.accesskey "C">
 <!ENTITY closeLog.label "閉じる">
 <!ENTITY closeLog.accesskey "o">
diff --git a/ja/suite/chrome/mailnews/smime/am-smime.dtd b/ja/suite/chrome/mailnews/smime/am-smime.dtd
index 9b635861c..0f6964f6d 100644
--- a/ja/suite/chrome/mailnews/smime/am-smime.dtd
+++ b/ja/suite/chrome/mailnews/smime/am-smime.dtd
@@ -14,11 +14,11 @@
 <!ENTITY encryptionCert.message "あなたへのメッセージの暗号化と復号に使用する証明書:">
 <!ENTITY digitalSign.certificate.button "選択...">
 <!ENTITY digitalSign.certificate.accesskey "S">
-<!ENTITY digitalSign.certificate_clear.button "@@Clear@@">
+<!ENTITY digitalSign.certificate_clear.button "消去">
 <!ENTITY digitalSign.certificate_clear.accesskey "C">
 <!ENTITY encryption.certificate.button "選択...">
 <!ENTITY encryption.certificate.accesskey "t">
-<!ENTITY encryption.certificate_clear.button "@@Clear@@">
+<!ENTITY encryption.certificate_clear.button "消去">
 <!ENTITY encryption.certificate_clear.accesskey "e">
 <!ENTITY signingGroupTitle.label "デジタル署名">
 <!ENTITY signMessage.label "メッセージにデジタル署名する (標準の動作)">
diff --git a/ja/suite/chrome/mailnews/viewLog.dtd b/ja/suite/chrome/mailnews/viewLog.dtd
index 892fbc6ec..358fb3010 100644
--- a/ja/suite/chrome/mailnews/viewLog.dtd
+++ b/ja/suite/chrome/mailnews/viewLog.dtd
@@ -4,7 +4,7 @@
 
 <!ENTITY viewLog.title "フィルターログ">
 <!ENTITY viewLogInfo.text	"フィルターログではどのフィルターが使われたか記録します。"><!-- (^^; "Use the check box below to enable logging." はチェックボックスのラベルから自明なので削除 -->
-<!ENTITY clearLog.label "ログの@@Clear@@">
+<!ENTITY clearLog.label "ログの消去">
 <!ENTITY clearLog.accesskey "C">
 <!ENTITY enableLog.label "フィルターログを有効にする">
 <!ENTITY enableLog.accesskey "E">