Bug 965113: remove reference to "Firefox Accounts" in sync settings, r=markh
authorGavin Sharp <gavin@gavinsharp.com>
Sun, 02 Feb 2014 20:27:26 -0800
changeset 166576 44ba69cacd7eb21066ed40ad23cab9b54b657d25
parent 166575 89c6374e6618a7609d6fd74b96177989aae3ebaa
child 166588 01a67765dbc7b9bc23afd8d3d30f9dac0053dff7
push id26136
push usergsharp@mozilla.com
push dateMon, 03 Feb 2014 04:28:05 +0000
treeherdermozilla-central@44ba69cacd7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh
bugs965113
milestone29.0a1
first release with
nightly linux32
44ba69cacd7e / 29.0a1 / 20140203030203 / files
nightly linux64
44ba69cacd7e / 29.0a1 / 20140203030203 / files
nightly mac
44ba69cacd7e / 29.0a1 / 20140203030203 / files
nightly win32
44ba69cacd7e / 29.0a1 / 20140203030203 / files
nightly win64
44ba69cacd7e / 29.0a1 / 20140203030203 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 965113: remove reference to "Firefox Accounts" in sync settings, r=markh
browser/components/preferences/sync.xul
browser/locales/en-US/chrome/browser/preferences/sync.dtd
--- a/browser/components/preferences/sync.xul
+++ b/browser/components/preferences/sync.xul
@@ -176,17 +176,17 @@
           <label class="text-link"
                  onclick="gSyncPane.startOver(true); return false;"
                  value="&unlinkDevice.label;"/>
         </vbox>
 
         <!-- These panels are for the Firefox Accounts identity provider -->
         <vbox id="fxaDeterminingStatus" align="center">
           <spacer flex="1"/>
-          <p>&determiningStatus.label;</p>
+          <p>&determiningAcctStatus.label;</p>
           <spacer flex="1"/>
         </vbox>
 
         <vbox id="noFxaAccount">
           <description>&welcome.description;</description>
           <label class="text-link"
                  onclick="gSyncPane.signIn(); return false;"
                  value="&welcome.createAccount.label;"/>
--- a/browser/locales/en-US/chrome/browser/preferences/sync.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
@@ -43,17 +43,17 @@
 <!ENTITY unlinkDevice.label           "Unlink This Device">
 
 <!-- Footer stuff -->
 <!ENTITY prefs.tosLink.label        "Terms of Service">
 <!ENTITY prefs.ppLink.label         "Privacy Policy">
 
 <!-- Firefox Accounts stuff -->
 <!ENTITY fxaPrivacyNotice.link.label "Privacy Notice">
-<!ENTITY determiningStatus.label     "Determining your Firefox Account status…">
+<!ENTITY determiningAcctStatus.label     "Determining your account status…">
 <!ENTITY signedInUnverified.beforename.label "">
 <!ENTITY signedInUnverified.aftername.label "is not verified.">
 
 <!ENTITY signedInLoginFailure.beforename.label "Please sign in to reconnect">
 <!ENTITY signedInLoginFailure.aftername.label "">
 
 <!ENTITY notSignedIn.label           "You are not signed in.">
 <!ENTITY signIn.label                "Sign in">