From 9b69c7a2f7344d4c61e0c231fc6dbb0b0f0b7327 Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Fri, 17 Sep 2010 16:58:28 +0200
Subject: [PATCH] Bug 596566 - Sync UI: Text for the Sync Key backup email.
 r=mconnor a=blocking-beta7

---
 browser/base/content/syncUtils.js                | 16 +++++++++++++---
 .../en-US/chrome/browser/syncSetup.properties    | 13 +++++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/syncUtils.js b/browser/base/content/syncUtils.js
index 25bd551eebc..017743cacf0 100644
--- a/browser/base/content/syncUtils.js
+++ b/browser/base/content/syncUtils.js
@@ -153,9 +153,19 @@ let gSyncUtils = {
    */
   passphraseEmail: function(elid) {
     let pp = document.getElementById(elid).value;
-    let subject = this.bundle.GetStringFromName("email.synckey.subject");
-    let body = this.bundle.formatStringFromName("email.synckey.body", [pp], 1);
-    let uri = Weave.Utils.makeURI("mailto:?subject=" + subject + "&body=" + body);
+    let subject = this.bundle.GetStringFromName("email.syncKey.subject");
+    let label = this.bundle.formatStringFromName("email.syncKey.label", [pp], 1);
+    let body = "&body=" + label + "%0A%0A" +
+               this.bundle.GetStringFromName("email.syncKey.description")
+               + "%0A%0A" +
+               this.bundle.GetStringFromName("email.keepItSecret.label") +
+               this.bundle.GetStringFromName("email.keepItSecret.description")
+               + "%0A%0A" +
+               this.bundle.GetStringFromName("email.keepItSafe.label") +
+               this.bundle.GetStringFromName("email.keepItSafe.description")
+               + "%0A%0A" +
+               this.bundle.GetStringFromName("email.findOutMore.label");
+    let uri = Weave.Utils.makeURI("mailto:?subject=" + subject + body);
     let protoSvc = Cc["@mozilla.org/uriloader/external-protocol-service;1"]
                      .getService(Ci.nsIExternalProtocolService);
     protoSvc.loadURI(uri);
diff --git a/browser/locales/en-US/chrome/browser/syncSetup.properties b/browser/locales/en-US/chrome/browser/syncSetup.properties
index 670506f3f21..cd0461b7e2f 100644
--- a/browser/locales/en-US/chrome/browser/syncSetup.properties
+++ b/browser/locales/en-US/chrome/browser/syncSetup.properties
@@ -25,8 +25,17 @@ historyDaysCount.label      = %S day of history;%S days of history
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 passwordsCount.label        = %S password;%S passwords
 
-email.synckey.subject       = Your Firefox Sync Key
-email.synckey.body          = Congratulations for signing up for Firefox Sync! Your secret Firefox Sync key is %S. Do not lose it or share with other people.
+# LOCALIZATION NOTE (email.synckey.*): "Firefox Sync" should match
+# &syncBrand.fullName.label; from syncBrand.dtd
+email.syncKey.subject          = Your Firefox Sync Key
+email.syncKey.label            = Your Firefox Sync Key: %S
+email.syncKey.description      = This key is used to decode the data in your Firefox Sync account. You will need to enter the key each time you configure Firefox Sync on a new computer or device.
+email.keepItSecret.label       = Keep it secret!\u0020
+email.keepItSecret.description = Your Firefox Sync account is encrypted to protect your privacy. Without this key, it would take years for anyone to decode your personal information. You are the only person who holds this key. This means you're the only one who can access your Firefox Sync data.
+email.keepItSafe.label         = Keep it safe!\u0020
+email.keepItSafe.description   = Do not lose this key. We don't keep a copy of your key (that wouldn't be keeping it secret!) so we can't help you recover it if it's lost. You'll need to use this key any time you connect a new computer or device to Firefox Sync.
+email.findOutMore.label        = Find out more about Firefox Sync and your privacy at https://services.mozilla.com.
+
 save.synckey.title = Save Sync Key
 
 newAccount.action.label = Firefox Sync is now set up to automatically sync all of your browser data.