Bug 1275383 - Change the copy of Sync disconnection warning. r?markh
MozReview-Commit-ID: 6WuxnRaYo7X
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@@ -632,37 +632,34 @@ var gSyncPane = {
let url = Services.urlFormatter.formatURLPref("app.support.baseURL") + "old-sync";
this.openContentInBrowser(url);
},
unlinkFirefoxAccount: function(confirm) {
if (confirm) {
// We use a string bundle shared with aboutAccounts.
let sb = Services.strings.createBundle("chrome://browser/locale/syncSetup.properties");
- let continueLabel = sb.GetStringFromName("continue.label");
+ let disconnectLabel = sb.GetStringFromName("disconnect.label");
let title = sb.GetStringFromName("disconnect.verify.title");
- let brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
- let brandShortName = brandBundle.GetStringFromName("brandShortName");
- let body = sb.GetStringFromName("disconnect.verify.heading") +
+ let body = sb.GetStringFromName("disconnect.verify.bodyHeading") +
"\n\n" +
- sb.formatStringFromName("disconnect.verify.description",
- [brandShortName], 1);
+ sb.GetStringFromName("disconnect.verify.bodyText");
let ps = Services.prompt;
let buttonFlags = (ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING) +
(ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL) +
ps.BUTTON_POS_1_DEFAULT;
let factory = Cc["@mozilla.org/prompter;1"]
.getService(Ci.nsIPromptFactory);
let prompt = factory.getPrompt(window, Ci.nsIPrompt);
let bag = prompt.QueryInterface(Ci.nsIWritablePropertyBag2);
bag.setPropertyAsBool("allowTabModal", true);
let pressed = prompt.confirmEx(title, body, buttonFlags,
- continueLabel, null, null, null, {});
+ disconnectLabel, null, null, null, {});
if (pressed != 0) { // 0 is the "continue" button
return;
}
}
fxAccounts.signOut().then(() => {
this.updateWeavePrefs();
});
--- a/browser/locales/en-US/chrome/browser/syncSetup.properties
+++ b/browser/locales/en-US/chrome/browser/syncSetup.properties
@@ -47,18 +47,21 @@ wipeClient.change2.label = Firefox Sync
wipeRemote.change2.label = Firefox Sync will now replace all of the browser data in your Sync account with the data on this device.
existingAccount.change.label = You can change this preference by selecting Sync Options below.
# Several other strings are used (via Weave.Status.login), but they come from
# /services/sync
# Firefox Accounts based setup.
continue.label = Continue
+
+# LOCALIZATION NOTE (disconnect.label, disconnect.verify.title, disconnect.verify.bodyHeading, disconnect.verify.bodyText):
+# These strings are used in the confirmation dialog shown when the user hits the disconnect button
+# LOCALIZATION NOTE (disconnect.label): This is the label for the disconnect button
+disconnect.label = Disconnect
disconnect.verify.title = Disconnect
-disconnect.verify.heading = Are you sure?
-# LOCALIZATION NOTE (disconnect.verify.description): %S will be replaced with
-# brandShortName
-disconnect.verify.description = %S will stop syncing with your account, but won’t delete any of your browsing data on this computer.
+disconnect.verify.bodyHeading = Disconnect from Sync?
+disconnect.verify.bodyText = Your browsing data will remain on this computer, but it will no longer sync with your account.
relinkVerify.title = Merge Warning
relinkVerify.heading = Are you sure you want to sign in to Sync?
# LOCALIZATION NOTE (relinkVerify.description): Email address of a user previously signed into sync.
relinkVerify.description = A different user was previously signed in to Sync on this computer. Signing in will merge this browser’s bookmarks, passwords and other settings with %S