Bug 1520560: Rename 'Firefox Account' to 'Sync' by using '{ -sync-brand-short-name }' in Preferences. r=lina,flod
authorAdam <adam.czyzewski@mail.utoronto.ca>
Wed, 20 Feb 2019 18:00:31 -0500
changeset 460375 d4d8f0d1f542d7e7b9bd148db416ed258d7b07ba
parent 460374 d80b681a68e6a273d1663d5048c3dfcd7b4debd1
child 460376 21dcc5f55dca9153a32c89dd0f000d5add8ebdfd
push id112083
push userncsoregi@mozilla.com
push dateFri, 22 Feb 2019 02:49:31 +0000
treeherdermozilla-inbound@21dcc5f55dca [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslina, flod
bugs1520560
milestone67.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 1520560: Rename 'Firefox Account' to 'Sync' by using '{ -sync-brand-short-name }' in Preferences. r=lina,flod
browser/components/preferences/in-content/preferences.xul
browser/components/preferences/in-content/sync.xul
browser/locales/en-US/browser/preferences/preferences.ftl
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -127,21 +127,21 @@
           <label class="category-name" flex="1" data-l10n-id="pane-privacy-title"></label>
         </richlistitem>
 
         <richlistitem id="category-sync"
                       class="category"
                       hidden="true"
                       value="paneSync"
                       helpTopic="prefs-weave"
-                      data-l10n-id="category-sync"
+                      data-l10n-id="category-sync2"
                       data-l10n-attrs="tooltiptext"
                       align="center">
           <image class="category-icon"/>
-          <label class="category-name" flex="1" data-l10n-id="pane-sync-title"></label>
+          <label class="category-name" flex="1" data-l10n-id="pane-sync-title2"></label>
         </richlistitem>
       </richlistbox>
 
       <spacer flex="1"/>
 
       <hbox class="sidebar-footer-button" pack="center">
         <label id="addonsButton" is="text-link">
           <hbox align="center">
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -6,17 +6,17 @@
 
 <script type="application/javascript"
         src="chrome://browser/content/preferences/in-content/sync.js"/>
 <box id="template-paneSync" hidden="true"><![CDATA[
 <hbox id="firefoxAccountCategory"
       class="subcategory"
       hidden="true"
       data-category="paneSync">
-  <html:h1 data-l10n-id="pane-sync-title"/>
+  <html:h1 data-l10n-id="pane-sync-title2"/>
 </hbox>
 
 <deck id="weavePrefsDeck" data-category="paneSync" hidden="true"
       data-hidden-from-search="true">
   <groupbox id="noFxaAccount">
     <hbox>
       <vbox flex="1">
         <label id="noFxaCaption"><html:h2 data-l10n-id="sync-signedout-caption"/></label>
@@ -65,17 +65,17 @@
         class="text-link" target="_blank"/>
     </label>
   </groupbox>
 
   <vbox id="hasFxaAccount">
     <hbox>
       <vbox id="fxaContentWrapper" flex="1">
         <groupbox id="fxaGroup">
-          <label class="search-header" hidden="true"><html:h2 data-l10n-id="pane-sync-title"/></label>
+          <label class="search-header" hidden="true"><html:h2 data-l10n-id="pane-sync-title2"/></label>
 
           <deck id="fxaLoginStatus" flex="1">
 
             <!-- logged in and verified and all is good -->
             <hbox id="fxaLoginVerified" align="center" flex="1">
               <image class="fxaProfileImage actionable"
                      role="button"
                      onclick="gSyncPane.openChangeProfileImage(event);"
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -49,20 +49,19 @@ category-home =
 pane-search-title = Search
 category-search =
     .tooltiptext = { pane-search-title }
 
 pane-privacy-title = Privacy & Security
 category-privacy =
     .tooltiptext = { pane-privacy-title }
 
-# The word "account" can be translated, do not translate or transliterate "Firefox".
-pane-sync-title = Firefox Account
-category-sync =
-    .tooltiptext = { pane-sync-title }
+pane-sync-title2 = { -sync-brand-short-name }
+category-sync2 =
+    .tooltiptext = { pane-sync-title2 }
 
 help-button-label = { -brand-short-name } Support
 addons-button-label = Extensions & Themes
 
 focus-search =
     .key = f
 
 close-button =