Merge mozilla-central to mozilla-inbound. CLOSED TREE
authorDorel Luca <dluca@mozilla.com>
Fri, 22 Feb 2019 09:27:34 +0200
changeset 11146 9c4e5919162c422cacd5fed571393c7ce8085401
parent 11145 022d19dc0ac445203d660e883bf151d8513f7c0b (current diff)
parent 11144 7232b28f1324bce5afea5d470a33b792c171fbe0 (diff)
child 11148 ab1913225d29be8a0d057ab33cc1338efcb8913c
push id118
push userflodolo@mozilla.com
push dateMon, 25 Feb 2019 09:09:37 +0000
Merge mozilla-central to mozilla-inbound. CLOSED TREE X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 02aebe5267552208953599fbdf2879030227a2c6 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 373e61d5d56f98a293423d7662a4de7a1534ef68 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: c2fca1944d8c54d01a5e2d7e13d965e4a6597307
browser/browser/preferences/preferences.ftl
new file mode 100644
--- /dev/null
+++ b/browser/browser/preferences/fxaPairDevice.ftl
@@ -0,0 +1,15 @@
+# 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/.
+
+fxa-pair-device-dialog =
+    .title = Connect Another Device
+    .style = width: 26em; min-height: 35em;
+
+fxa-qrcode-heading-phase1 = 1. If you haven’t already, install <a data-l10n-name="connect-another-device">Firefox on your mobile device</a>.
+
+fxa-qrcode-heading-phase2 = 2. Then sign in to { -sync-brand-short-name }, or on Android scan the pairing code from inside the { -sync-brand-short-name } settings.
+
+fxa-qrcode-error-title = Pairing unsuccessful.
+
+fxa-qrcode-error-body = Try again.
--- a/browser/browser/preferences/preferences.ftl
+++ b/browser/browser/preferences/preferences.ftl
@@ -667,16 +667,22 @@ sync-device-name-cancel =
 sync-device-name-save =
     .label = Save
     .accesskey = v
 
 sync-mobilepromo-single = Connect another device
 
 sync-mobilepromo-multi = Manage devices
 
+sync-connect-another-device = Connect another device
+
+sync-manage-devices = Manage devices
+
+sync-fxa-begin-pairing = Pair a device
+
 sync-tos-link = Terms of Service
 
 sync-fxa-privacy-notice = Privacy Notice
 
 ## Privacy Section
 
 privacy-header = Browser Privacy