cross-channel content for 2021-11-23 23:04
authortrybld
Tue, 23 Nov 2021 23:08:49 +0000
changeset 14622 ee23d485c744f68889c4742cf2faaff0d031dcd3
parent 14621 9e763e2d25d6091a397ad1d5d6f4e772a26e8671
child 14623 4b4bc7cb7946617418637503546ad7b2dda37dcc
push id359
push userflodolo@mozilla.com
push dateWed, 24 Nov 2021 13:18:28 +0000
cross-channel content for 2021-11-23 23:04 X-Task-ID: SPE-PyLQR7C8A17vkTvKjA X-Channel-Repo: mozilla-central X-Channel-Revision: 9cd4e2e23e4062375c3d55d8f42f4d05349a2510 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: da54937c0c144b2008dc50bb681f03821fa8a266 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: c6cd3976b9aae918b865d1b95db762571e2a66e1 X-Channel-Repo: releases/mozilla-esr91 X-Channel-Revision: d88fffc5376dce0a8d896588dd7290c6a3404e11 X-Channel-Repo: comm-central X-Channel-Revision: 21b9820cffa4ba9162ad8ee0b92098f7704c783d X-Channel-Repo: releases/comm-beta X-Channel-Revision: 831a77d2b24a5939a39a972efee98edda3b1a663 X-Channel-Repo: releases/comm-esr91 X-Channel-Revision: b648daf2502e090f3c774ba6fa17cc4d2f565a06
browser/browser/migration.ftl
mail/messenger/aboutSupportChat.ftl
mail/messenger/preferences/am-im.ftl
--- a/browser/browser/migration.ftl
+++ b/browser/browser/migration.ftl
@@ -25,16 +25,19 @@ import-from-edge-beta =
     .label = Microsoft Edge Beta
     .accesskey = d
 import-from-nothing =
     .label = Don’t import anything
     .accesskey = D
 import-from-safari =
     .label = Safari
     .accesskey = S
+import-from-brave =
+    .label = Brave
+    .accesskey = r
 import-from-canary =
     .label = Chrome Canary
     .accesskey = n
 import-from-chrome =
     .label = Chrome
     .accesskey = C
 import-from-chrome-beta =
     .label = Chrome Beta
new file mode 100644
--- /dev/null
+++ b/mail/messenger/aboutSupportChat.ftl
@@ -0,0 +1,11 @@
+# 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/.
+
+chat-title = Chat Accounts
+chat-table-heading-account = ID
+chat-table-heading-protocol = Protocol
+chat-table-heading-name = Name
+chat-table-heading-actions = Actions
+chat-table-copy-debug-log = Copy Debug Log
+    .title = Copy errors and other logging from this chat account to the clipboard. May contain personal information like chat messages.
--- a/mail/messenger/preferences/am-im.ftl
+++ b/mail/messenger/preferences/am-im.ftl
@@ -1,15 +1,18 @@
 # 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/.
 
 account-settings-title = Authentication Settings
 account-channel-title = Default Channels
 
+chat-autologin =
+    .label = Sign-on at startup
+
 chat-encryption-generic = Generic
 chat-encryption-log =
     .label = Include end-to-end encrypted messages in conversation logs
 chat-encryption-label = Native End-to-end Encryption
 chat-encryption-description = { $protocol } provides end-to-end encryption for chat messages. This prevents third parties from eavesdropping on a conversation. Additional setup might be required below for the encryption to be operational.
 chat-encryption-status = Encryption Status
 chat-encryption-placeholder = Encryption not initialized.
 chat-encryption-sessions = Sessions