updated vnext strings with latest merge to master

public/locales/en-US/send.ftl

@@ -1,13 +1,11 @@
+## strings inherited from Send version 1
+
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
 siteFeedback = Feedback
-introTitle = Simple, private file sharing
-introDescription = Firefox Send lets you share files with end-to-end encryption and a link that automatically expires. So you can keep what you share private and make sure your stuff doesn't stay online forever.
 importingFile = Importing…
 encryptingFile = Encrypting…
 decryptingFile = Decrypting…
-notifyUploadEncryptDone = Your file is encrypted and ready to send
-archiveExpiryInfo = Expires after { $downloadCount } or { $timespan }
 downloadCount = { $num ->
         [one] 1 download
        *[other] { $num } downloads
@@ -16,6 +14,51 @@ timespanHours = { $num ->
         [one] 1 hour
        *[other] { $num } hours
     }
+copiedUrl = Copied!
+unlockInputPlaceholder = Password
+unlockButtonLabel = Unlock
+downloadButtonLabel = Download
+downloadFinish = Download complete
+fileSizeProgress = ({ $partialSize } of { $totalSize })
+sendYourFilesLink = Try Firefox Send
+errorPageHeader = Something went wrong!
+fileTooBig = That file is too big to upload. It should be less than { $size }
+linkExpiredAlt = Link expired
+notSupportedHeader = Your browser is not supported.
+notSupportedLink = Why is my browser not supported?
+notSupportedOutdatedDetail = Unfortunately this version of Firefox does not port the web technology that powers Firefox Send. You’ll need to update your wser.
+updateFirefox = Update Firefox
+deletePopupCancel = Cancel
+deleteButtonHover = Delete
+footerLinkLegal = Legal
+footerLinkPrivacy = Privacy
+footerLinkCookies = Cookies
+passwordTryAgain = Incorrect password. Try again.
+javascriptRequired = Firefox Send requires JavaScript
+whyJavascript = Why does Firefox Send require JavaScript?
+enableJavascript = Please enable JavaScript and try again.
+# A short representation of a countdown timer containing the number of hours  minutes remaining as digits, example "13h 47m"
+expiresHoursMinutes = { $hours }h { $minutes }m
+# A short representation of a countdown timer containing the number of utes remaining as digits, example "56m"
+expiresMinutes = { $minutes }m
+# A short status message shown when the user enters a long password
+maxPasswordLength = Maximum password length: { $length }
+# A short status message shown when there was an error setting the password
+passwordSetError = This password could not be set
+
+## Send version 2 strings
+
+# Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
+-send-brand = Firefox Send
+-send-short-brand = Send
+-firefox = Firefox
+-mozilla = Mozilla
+
+introTitle = Simple, private file sharing
+introDescription = { -send-brand } lets you share files with end-to-end encryption and a link that automatically expires. So you can keep what you share private and make sure your stuff doesn’t stay online forever.
+notifyUploadEncryptDone = Your file is encrypted and ready to send
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Expires after { $downloadCount } or { $timespan }
 timespanMinutes = { $num ->
         [one] 1 minute
        *[other] { $num } minutes
@@ -32,102 +75,57 @@ fileCount = { $num ->
     [one] 1 file
    *[other] { $num } files
 }
+# size is a localized number followed by a unit of bytes, ex. 2.5GB
 totalSize = Total size: { $size }
+# the next line after the colon contains a file name
 copyLinkDescription = Copy the link to share your file:
 copyLinkButton = Copy link
-copiedUrl = Copied!
-unlockInputPlaceholder = Password
-unlockButtonLabel = Unlock
 downloadTitle = Download files
-# Firefox Send is a brand name and should not be localized.
+downloadDescription = This file was shared via { -send-brand } with end-to-end encryption and a link that automatically expires.
-downloadDescription = This file was shared via Firefox Send with end-to-end encryption and a link that automatically expires.
+trySendDescription = Try { -send-brand } for simple, safe file sharing.
-# Text and title used on the download link/button (indicates an action).
-downloadButtonLabel = Download
-downloadFinish = Download complete
-trySendDescription = Try Firefox Send for simple, safe file sharing.
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
-fileSizeProgress = ({ $partialSize } of { $totalSize })
-# Firefox Send is a brand name and should not be localized.
-sendYourFilesLink = Try Firefox Send
-errorPageHeader = Something went wrong!
-fileTooBig = That file is too big to upload. It should be less than { $size }.
 # count will always be > 10
 tooManyFiles = { $count ->
+     [one] Only 1 file can be uploaded at a time.
     *[other] Only { $count } files can be uploaded at a time.
 }
 # count will always be > 10
 tooManyArchives = { $count ->
+     [one] Only 1 archive is allowed.
     *[other] Only { $count } archives are allowed.
 }
-linkExpiredAlt = Link expired
 expiredTitle = This link has expired.
-notSupportedHeader = Your browser is not supported.
+notSupportedDescription = { -send-brand } will not work with this browser. { -send-short-brand } works best with the latest version of { -firefox }, and will work with the current version of most browsers.
-# Firefox Send is a brand name and should not be localized.
+downloadFirefox = Download { -firefox }
-notSupportedDescription = Firefox Send will not work with this browser. Send works best with the latest version of Firefox, and will work with the current version of most browsers.
+legalTitle = { -send-short-brand } Privacy Notice
-notSupportedLink = Why is my browser not supported?
-notSupportedOutdatedDetail = Unfortunately this version of Firefox does not support the web technology that powers Firefox Send. You’ll need to update your browser.
-updateFirefox = Update Firefox
-downloadFirefox = Download Firefox
-legalTitle = Send Privacy Notice
 legalDateStamp = Version 1.0, dated March 12, 2019
-legalNoticeSend = When Mozilla receives information from you, our <a>Mozilla Privacy Policy</a> describes how we handle that information. Below are the top things you should know about Firefox Send.  You can also view the code <a>here</a>.
-legalNoticeSendContentHeader = Content
-legalNoticeSendContent = Mozilla receives an encrypted copy of the file you upload but we cannot access the content or name of your encrypted file.  Depending on how you use Send, files are stored for a maximum of either 24 hours or 7 days.  If you choose a download cap, the file may be deleted sooner.
-legalNoticeSendDataHeader = Data on your device
-legalNoticeSendData = So that you can check status or delete files, basic information about your uploaded files is stored on your local device.  This includes our identifier for the file, the filename, and the file’s download URL. This is cleared if you delete your uploaded file or upon visiting Send after the file expires.
-legalNoticeSendPersonalHeader = Personal data
-legalNoticeSendPersonal = The following is necessary to provide the service
-legalNoticeSendNonPersonalHeader = Non-personal data
-legalNoticeSendNonPersonal = We receive the following to improve our service and performance
-legalNoticeSendThirdPartyHeader = Third Party Services
-legalNoticeSendThirdParty = We use Google Cloud Platform
-legalNoticeSendIPHeader = IP addresses
-legalNoticeSendIP = We receive IP addresses of downloaders and uploaders as part of our standard server logs.  These are retained for 90 days, and for that period, may be connected to activity of a file’s download URL.  Although we develop our services in ways that minimize identification, you should know that it may be possible to correlate the IP address of a Send user to the IP address of other Mozilla services with accounts; and if there is a match, this could identify the account email address.
-legalNoticeSendFXAHeader = Firefox Account
-legalNoticeSendFXA = This is required for authentication only if you wish to upload larger file sizes.  Your Firefox Account record will retain aggregate data on your usage of Send: for example, if you created a Firefox Account in connection with Send, number of files sent and approximate file sizes, and how many times you’ve used the service.
-legalNoticeSendInteractionHeader = Interaction data
-legalNoticeSendInteraction = This includes information such as number of people sending and receiving files, number of files uploaded and approximate file sizes, percentage of file downloaders who become uploaders, how people engage with the website (time spent, clicks, referrer information, site exit path, use of passwords)
-legalNoticeSendTechnicalHeader = Technical data
-legalNoticeSendTechnical = This includes information such as operating system, browser, language preference, country, timestamps, duration for file transfer, reasons for errors, reasons for file expiration.
-deletePopupCancel = Cancel
-deleteButtonHover = Delete
-footerLinkLegal = Legal
-footerLinkPrivacy = Privacy
-footerLinkCookies = Cookies
-passwordTryAgain = Incorrect password. Try again.
-javascriptRequired = Firefox Send requires JavaScript
-whyJavascript = Why does Firefox Send require JavaScript?
-enableJavascript = Please enable JavaScript and try again.
 # A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
 expiresDaysHoursMinutes = { $days }d { $hours }h { $minutes }m
-# A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
-expiresHoursMinutes = { $hours }h { $minutes }m
-# A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
-expiresMinutes = { $minutes }m
-# A short status message shown when the user enters a long password
-maxPasswordLength = Maximum password length: { $length }
-# A short status message shown when there was an error setting the password
-passwordSetError = This password could not be set
 addFilesButton = Select files to upload
 uploadButton = Upload
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Drag and drop files
-orClickWithSize = or click to to send up to { $size }
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# size is a localized number followed by a unit of bytes, ex. 2.5GB
+orClickWithSize = or click to send up to { $size }
 addPassword = Protect with password
 emailPlaceholder = Enter your email
+# size is a localized number followed by a unit of bytes, ex. 2.5GB
 signInSizeBump = Sign in to send up to { $size }
 signInButton = Sign in/up
-accountBenefitTitle = Create a Firefox Account or sign in
+accountBenefitTitle = Create a { -firefox } Account or sign in
+# size is a localized number followed by a unit of bytes, ex. 2.5GB
 accountBenefitLargeFiles = Share files up to { $size }
 accountBenefitDownloadCount = Share files with more people
 accountBenefitTimeLimit = { $count ->
+     [one] Keep links active for up to 1 day
     *[other] Keep links active for up to { $count } days
 }
 accountBenefitSync = Manage shared files from any device
-accountBenefitMoz = Learn about other Mozilla services
+accountBenefitMoz = Learn about other { -mozilla } services
-signOut = Sign Out
+signOut = Sign out
 okButton = OK
 downloadingTitle = Downloading
 noStreamsWarning = This browser might not be able to decrypt a file this big.
 noStreamsOptionCopy = Copy the link to open in another browser
 noStreamsOptionFirefox = Try our favorite browser
-noStreamsOptionDownload = Continue with this browser
+noStreamsOptionDownload = Continue with this browser