Bug 1621445 - Part 3: Rename privacy.item. prefs to privacy.clearOnShutdown. r=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 02 May 2020 17:00:56 +0200
changeset 14131 753e6352ea0527fe716202c8fde0c277c2636b15
parent 14130 9f5663d097f922815fe0b086aa452fae4cba242b
child 14132 43ca3deabdbe59d6059abd27ed33ca10b76e1e17
push id311
push userflodolo@mozilla.com
push dateTue, 16 Mar 2021 13:55:38 +0000
reviewersIanN
bugs1621445
Bug 1621445 - Part 3: Rename privacy.item. prefs to privacy.clearOnShutdown. r=IanN Preferences migration and ui part. X-Channel-Repo: comm-central X-Channel-Converted-Revision: 6e80d37104e2e6929afa35655b8f6c4bca74e015 X-Channel-Repo: releases/comm-beta X-Channel-Revision: 596432f495ed8406940287cf8651dffb4c7d6d90 X-Channel-Repo: releases/comm-release X-Channel-Revision: d7bed2318efd8d0dccb8eecb37af8ee9d0e0ab17 X-Channel-Repo: releases/comm-esr78 X-Channel-Revision: ab6fc3070b8d0721ce94d7fc934dc5f85edd9a3b
suite/chrome/common/pref/pref-privatedata.dtd
suite/chrome/common/sanitize.dtd
--- a/suite/chrome/common/pref/pref-privatedata.dtd
+++ b/suite/chrome/common/pref/pref-privatedata.dtd
@@ -8,20 +8,28 @@
 <!ENTITY pref.privatedata.title           "Private Data">
 
 
 <!ENTITY clearPrivateData.label           "Clear Private Data">
 
 <!ENTITY alwaysClear.label                "Always clear my private data when I close &brandShortName;">
 <!ENTITY alwaysClear.accesskey            "w">
 
+<!--LOCALIZATION NOTE : The askBeforeClear label is
+    no longer used but we might bring it back later
+-->
 <!ENTITY askBeforeClear.label             "Ask me before clearing private data">
 <!ENTITY askBeforeClear.accesskey         "k">
 
 <!ENTITY clearDataSettings.label          "When I ask &brandShortName; to clear my private data, it should erase:">
 
+<!ENTITY clearData.label "Clear these private data items:">
+<!ENTITY clearData.cpd.label "Manually">
+<!ENTITY clearData.onShutdown.label "When closing">
+
+
 <!--LOCALIZATION NOTE (clearDataDialog.label, clearDataSilent.label, clearDataDialog.accesskey):
   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 Now…">
 <!ENTITY clearDataSilent.label            "Clear Now">
 <!ENTITY clearDataDialog.accesskey        "N">
--- a/suite/chrome/common/sanitize.dtd
+++ b/suite/chrome/common/sanitize.dtd
@@ -1,27 +1,41 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY sanitizeDialog.title            "Clear Private Data">
 <!ENTITY sanitizeItems.label             "Clear the following items now:">
 
+<!--LOCALIZATION NOTE : Make sure to not have overlapped  accesskeys with
+    pref-privatedata.dtd. These entities are also used in the private data
+    preferences dialog.
+-->
 <!ENTITY itemHistory.label               "Browsing History">
 <!ENTITY itemHistory.accesskey           "B">
+<!ENTITY itemHistoryS.accesskey          "r">
 <!ENTITY itemUrlBar.label                "Location Bar History">
 <!ENTITY itemUrlBar.accesskey            "L">
+<!ENTITY itemUrlBarS.accesskey           "t">
 <!ENTITY itemDownloads.label             "Download History">
 <!ENTITY itemDownloads.accesskey         "D">
+<!ENTITY itemDownloadsS.accesskey        "y">
 <!ENTITY itemFormSearchHistory.label     "Saved Form and Search History">
 <!ENTITY itemFormSearchHistory.accesskey "F">
+<!ENTITY itemFormSearchHistoryS.accesskey "m">
 <!ENTITY itemCache.label                 "Cache">
 <!ENTITY itemCache.accesskey             "a">
+<!ENTITY itemCacheS.accesskey            "e">
 <!ENTITY itemCookies.label               "Cookies">
 <!ENTITY itemCookies.accesskey           "C">
+<!ENTITY itemCookiesS.accesskey          "k">
 <!ENTITY itemOfflineApps.label           "Offline Website Data">
 <!ENTITY itemOfflineApps.accesskey       "O">
+<!ENTITY itemOfflineAppsS.accesskey      "i">
 <!ENTITY itemPasswords.label             "Saved Passwords">
 <!ENTITY itemPasswords.accesskey         "P">
+<!ENTITY itemPasswordsS.accesskey        "v">
 <!ENTITY itemSessions.label              "Authenticated Sessions">
 <!ENTITY itemSessions.accesskey          "S">
 
+<!ENTITY itemSessionsS.accesskey         "u">
+
 <!ENTITY sanitizeButton.label            "Clear Private Data Now">