Backed out changeset 586a0cf2202e (bug 1549806) for causing browser_noLoginsView.js and browser_masterPassword.js failures CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Fri, 02 Aug 2019 01:46:01 +0300
changeset 11851 84a1175d8a018797f4b6d85b2f37b033588f306b
parent 11850 2017c7fdd428f29b96573cb5476165bb5d816053
child 11852 c4c57ebd09c3c1cda49439a88dd4fbb713f60eeb
push id157
push userflodolo@mozilla.com
push dateFri, 02 Aug 2019 11:41:38 +0000
bugs1549806
Backed out changeset 586a0cf2202e (bug 1549806) for causing browser_noLoginsView.js and browser_masterPassword.js failures CLOSED TREE X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 1ecf3a9c22ade0952075a3a44aa3d4917e61ce34 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: e5d98eda2ec359a0968c567076b1a625cb6c99ce X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 2fb19d0466d2f61674c0af80813645cccd510593 X-Channel-Repo: releases/mozilla-esr68 X-Channel-Revision: a8da73ce90a4110e14caaba3e93d8a086b3a0669
browser/browser/aboutLogins.ftl
browser/browser/branding/brandings.ftl
--- a/browser/browser/aboutLogins.ftl
+++ b/browser/browser/aboutLogins.ftl
@@ -20,46 +20,36 @@ menu =
 menu-menuitem-import = Import Passwords…
 menu-menuitem-preferences =
   { PLATFORM() ->
       [windows] Options
      *[other] Preferences
   }
 menu-menuitem-feedback = Send Feedback
 menu-menuitem-faq = Frequently Asked Questions
-menu-menuitem-android-app = { -lockwise-brand-short-name } for Android
-menu-menuitem-iphone-app = { -lockwise-brand-short-name } for iPhone and iPad
+menu-menuitem-download-android = Lockwise for Android
+menu-menuitem-download-iphone = Lockwise for iPhone and iPad
 
 ## Login List
 
 login-list =
   .aria-label = Logins matching search query
 login-list-count =
   { $count ->
       [one] { $count } login
      *[other] { $count } logins
   }
 login-list-sort-label-text = Sort by:
 login-list-name-option = Name (A-Z)
 login-list-last-changed-option = Last Modified
 login-list-last-used-option = Last Used
-login-list-intro-title = No logins found
-login-list-intro-description = When you save a password in { -brand-product-name }, it will show up here.
 login-list-item-title-new-login = New Login
 login-list-item-subtitle-new-login = Enter your login credentials
 login-list-item-subtitle-missing-username = (no username)
 
-## Introduction screen
-
-login-intro-heading = Looking for your saved logins? Set up { -sync-brand-short-name }.
-login-intro-description = If you saved your logins to { -brand-product-name } on a different device, here’s how to get them here:
-login-intro-instruction-fxa = Create or sign in to your { -fxaccount-brand-name } on the device where your logins are saved
-login-intro-instruction-fxa-settings = Make sure you’ve selected the Logins checkbox in { -sync-brand-short-name } Settings
-login-intro-instruction-faq = Visit { -lockwise-brand-short-name } <a data-l10n-name="faq">frequently asked questions</a> for more help
-
 ## Login
 
 login-item-new-login-title = Create New Login
 login-item-edit-button = Edit
 login-item-delete-button = Delete
 login-item-origin-label = Website Address
 login-item-origin =
   .placeholder = https://www.example.com
--- a/browser/browser/branding/brandings.ftl
+++ b/browser/browser/branding/brandings.ftl
@@ -5,13 +5,12 @@
 ## The following feature names must be treated as a brand, and kept in English.
 ## They cannot be:
 ## - Declined to adapt to grammatical case.
 ## - Transliterated.
 ## - Translated.
 
 -facebook-container-brand-name = Facebook Container
 -lockwise-brand-name = Firefox Lockwise
--lockwise-brand-short-name = Lockwise
 -monitor-brand-name = Firefox Monitor
 -monitor-brand-short-name = Monitor
 -pocket-brand-name = Pocket
 -send-brand-name = Firefox Send