cross-channel content for 2021-11-10 23:04
authortrybld
Wed, 10 Nov 2021 23:08:45 +0000
changeset 14612 03cbebc3a50ec246c7462daa63155bb5d93aa401
parent 14611 35a6582660295e0cf65e27c761ae7d61a914ea09
child 14613 b441bcf63760ac730aa7a1eeab7718ff4bb23604
push id358
push userflodolo@mozilla.com
push dateMon, 22 Nov 2021 06:45:32 +0000
cross-channel content for 2021-11-10 23:04 X-Task-ID: JkB4oFCgS_ifNiQP3hPLzw X-Channel-Repo: mozilla-central X-Channel-Revision: 333f08065c8c5470603b9d50b4dd45f8da8bfff5 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 540bb2110afc9220037e299ac96652952841c640 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: e87cf51145f02f2248525a29608f0d7636b9fcf8 X-Channel-Repo: releases/mozilla-esr91 X-Channel-Revision: daa65d44963e88bcc4c4c295aa54116560087e5d X-Channel-Repo: comm-central X-Channel-Revision: 954c06bf686fa0eb656fd0beea96b094f752097a X-Channel-Repo: releases/comm-beta X-Channel-Revision: 005f34d7e27c635bc9cfb7b430b2e5252fa83547 X-Channel-Repo: releases/comm-esr91 X-Channel-Revision: 53076449f953e49522aaf9556a7a77c2e0888f34
mail/chrome/messenger/preferences/preferences.properties
mail/messenger/preferences/preferences.ftl
--- a/mail/chrome/messenger/preferences/preferences.properties
+++ b/mail/chrome/messenger/preferences/preferences.properties
@@ -50,20 +50,16 @@ typeDetailsWithTypeOrExt=(%1$S)
 # LOCALIZATION NOTE (typeDetailsWithTypeAndExt):
 # %1$S = type (for example "application/pdf")
 # %2$S = extensions (for example ".pdf, .pdfx")
 typeDetailsWithTypeAndExt=(%1$S: %2$S)
 
 #### Sound Notifications
 soundFilePickerTitle=Choose Sound
 
-#### Search Engine Picker
-searchEnginePickerTitle=Choose Search Engine
-searchEngineType2=Search Engines
-
 #### Remote content
 imagepermissionstext=You can specify from which web sites images and other remote content are allowed to load. You can also allow all remote content based on sender e-mail address. Type the address of the site or e-mail you want to manage and then click Block or Allow.
 imagepermissionstitle=Exceptions - Remote Content
 
 #### Cookies
 cookiepermissionstitle=Exceptions - Cookies
 cookiepermissionstext=You can specify which web sites are always or never allowed to use cookies.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
 
--- a/mail/messenger/preferences/preferences.ftl
+++ b/mail/messenger/preferences/preferences.ftl
@@ -162,19 +162,16 @@ start-page-label =
 location-label =
     .value = Location:
     .accesskey = o
 restore-default-label =
     .label = Restore Default
     .accesskey = R
 
 default-search-engine = Default Search Engine
-add-search-engine =
-    .label = Add from file
-    .accesskey = A
 add-web-search-engine =
     .label = Add…
     .accesskey = A
 remove-search-engine =
     .label = Remove
     .accesskey = v
 
 add-opensearch-provider-title = Add OpenSearch Provider