Bug 966150: adjust wording/layout of new-sync preferences pane, r=ttaubert
authorGavin Sharp <gavin@gavinsharp.com>
Thu, 30 Jan 2014 20:37:43 -0800
changeset 182247 260266bdf0cace14ed04197e9417405281bafd43
parent 182246 14d515084a878eb2adcc37f6b5db24412a859fd6
child 182248 d70e66df236348f66e9b24f234848de040fddf96
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersttaubert
bugs966150
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 966150: adjust wording/layout of new-sync preferences pane, r=ttaubert
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
@@ -248,19 +248,18 @@
                          onclick="gSyncPane.unlinkFirefoxAccount(true);"
                          value="&forget.label;"/>
                 </vbox>
               </hbox>
             </deck>
           </groupbox>
 
           <groupbox id="syncOptions">
-            <caption label="&syncBrand.fullName.label;"/>
+            <caption label="&syncBrand.shortName.label;"/>
             <vbox>
-              <label value="&syncMy.label;" />
               <richlistbox id="fxaSyncEnginesList"
                            orient="vertical"
                            onselect="if (this.selectedCount) this.clearSelection();">
                 <richlistitem>
                   <checkbox label="&engine.addons.label;"
                             accesskey="&engine.addons.accesskey;"
                             preference="engine.addons"/>
                 </richlistitem>
--- a/browser/locales/en-US/chrome/browser/preferences/sync.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
@@ -53,15 +53,15 @@
 <!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">
 <!ENTITY manage.label                "Manage">
-<!ENTITY unlink.label                "Unlink This Browser…">
+<!ENTITY unlink.label                "Unlink this Browser…">
 <!ENTITY verify.label                "Verify Email">
 <!ENTITY forget.label                "Forget this Email">
 
 <!ENTITY welcome.description "Access your tabs, bookmarks, passwords and more wherever you use &brandShortName;.">
 <!ENTITY welcome.startButton.label "Sign in or Create an Account">
 <!ENTITY welcome.useOldSync.label "Using an older version of Sync?">