Merge pull request #1198 from mozilla/vnext

Merge vnext into master

public/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

public/inter.css

@@ -0,0 +1,161 @@
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 100;
+  font-display: optional;
+  src: url('Inter-Thin.woff2') format('woff2'),
+    url('Inter-Thin.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: italic;
+  font-weight: 100;
+  font-display: optional;
+  src: url('Inter-ThinItalic.woff2') format('woff2'),
+    url('Inter-ThinItalic.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 200;
+  font-display: optional;
+  src: url('Inter-ExtraLight.woff2') format('woff2'),
+    url('Inter-ExtraLight.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: italic;
+  font-weight: 200;
+  font-display: optional;
+  src: url('Inter-ExtraLightItalic.woff2') format('woff2'),
+    url('Inter-ExtraLightItalic.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 300;
+  font-display: optional;
+  src: url('Inter-Light.woff2') format('woff2'),
+    url('Inter-Light.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: italic;
+  font-weight: 300;
+  font-display: optional;
+  src: url('Inter-LightItalic.woff2') format('woff2'),
+    url('Inter-LightItalic.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 400;
+  font-display: optional;
+  src: url('Inter-Regular.woff2') format('woff2'),
+    url('Inter-Regular.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: italic;
+  font-weight: 400;
+  font-display: optional;
+  src: url('Inter-Italic.woff2') format('woff2'),
+    url('Inter-Italic.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 500;
+  font-display: optional;
+  src: url('Inter-Medium.woff2') format('woff2'),
+    url('Inter-Medium.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: italic;
+  font-weight: 500;
+  font-display: optional;
+  src: url('Inter-MediumItalic.woff2') format('woff2'),
+    url('Inter-MediumItalic.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 600;
+  font-display: optional;
+  src: url('Inter-SemiBold.woff2') format('woff2'),
+    url('Inter-SemiBold.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: italic;
+  font-weight: 600;
+  font-display: optional;
+  src: url('Inter-SemiBoldItalic.woff2') format('woff2'),
+    url('Inter-SemiBoldItalic.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 700;
+  font-display: optional;
+  src: url('Inter-Bold.woff2') format('woff2'),
+    url('Inter-Bold.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: italic;
+  font-weight: 700;
+  font-display: optional;
+  src: url('Inter-BoldItalic.woff2') format('woff2'),
+    url('Inter-BoldItalic.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 800;
+  font-display: optional;
+  src: url('Inter-ExtraBold.woff2') format('woff2'),
+    url('Inter-ExtraBold.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: italic;
+  font-weight: 800;
+  font-display: optional;
+  src: url('Inter-ExtraBoldItalic.woff2') format('woff2'),
+    url('Inter-ExtraBoldItalic.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 900;
+  font-display: optional;
+  src: url('Inter-Black.woff2') format('woff2'),
+    url('Inter-Black.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: italic;
+  font-weight: 900;
+  font-display: optional;
+  src: url('Inter-BlackItalic.woff2') format('woff2'),
+    url('Inter-BlackItalic.woff') format('woff');
+}

public/locales/en-US/send.ftl

@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = web experiment
 siteFeedback = Feedback
-uploadPageHeader = Private, Encrypted File Sharing
-uploadPageExplainer = Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
-uploadPageLearnMore = Learn more
-uploadPageDropMessage = Drop your file here to start uploading
-uploadPageSizeMessage = For the most reliable operation, it’s best to keep your file under 1GB
-uploadPageBrowseButton = Select a file on your computer
-uploadPageBrowseButton1 = Select a file to upload
-uploadPageMultipleFilesAlert = Uploading multiple files or a folder is currently not supported.
-uploadPageBrowseButtonTitle = Upload file
-uploadingPageProgress = Uploading { $filename } ({ $size })
 importingFile = Importing…
-verifyingFile = Verifying…
 encryptingFile = Encrypting…
 decryptingFile = Decrypting…
-notifyUploadDone = Your upload has finished.
-uploadingPageMessage = Once your file uploads you will be able to set expiry options.
-uploadingPageCancel = Cancel upload
-uploadCancelNotification = Your upload was cancelled.
-uploadingPageLargeFileMessage = This file is large and may take a while to upload. Sit tight!
-uploadingFileNotification = Notify me when the upload is complete.
-uploadSuccessConfirmHeader = Ready to Send
-uploadSvgAlt = Upload
-uploadSuccessTimingHeader = The link to your file will expire after 1 download or in 24 hours.
-expireInfo = The link to your file will expire after { $downloadCount } or { $timespan }.
 downloadCount = { $num ->
         [one] 1 download
        *[other] { $num } downloads
@@ -34,76 +12,26 @@ timespanHours = { $num ->
         [one] 1 hour
        *[other] { $num } hours
     }
-copyUrlFormLabelWithName = Copy and share the link to send your file: { $filename }
-copyUrlFormButton = Copy to clipboard
 copiedUrl = Copied!
-deleteFileButton = Delete file
-sendAnotherFileLink = Send another file
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Download
-downloadsFileList = Downloads
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Time
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Download { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Enter Password
 unlockInputPlaceholder = Password
 unlockButtonLabel = Unlock
-downloadFileTitle = Download Encrypted File
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Your friend is sending you a file with Firefox Send, a service that allows you to share files with a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Download
-downloadNotification = Your download has completed.
-downloadFinish = Download Complete
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
+downloadFinish = Download complete
 fileSizeProgress = ({ $partialSize } of { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Try Firefox Send
-downloadingPageProgress = Downloading { $filename } ({ $size })
-downloadingPageMessage = Please leave this tab open while we fetch your file and decrypt it.
-errorAltText = Upload error
 errorPageHeader = Something went wrong!
-errorPageMessage = There has been an error uploading the file.
-errorPageLink = Send another file
-fileTooBig = That file is too big to upload. It should be less than { $size }.
+fileTooBig = That file is too big to upload. It should be less than { $size }
 linkExpiredAlt = Link expired
-expiredPageHeader = This link has expired or never existed in the first place!
 notSupportedHeader = Your browser is not supported.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Unfortunately this browser does not support the web technology that powers Firefox Send. You’ll need to try another browser. We recommend Firefox!
 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
-downloadFirefoxButtonSub = Free Download
-uploadedFile = File
-copyFileList = Copy URL
-# expiryFileList is used as a column header
-expiryFileList = Expires In
-deleteFileList = Delete
-nevermindButton = Never mind
-legalHeader = Terms & Privacy
-legalNoticeTestPilot = Firefox Send is currently a Test Pilot experiment, and subject to the Test Pilot <a>Terms of Service</a> and <a>Privacy Notice</a>. You can learn more about this experiment and its data collection <a>here</a>.
-legalNoticeMozilla = Use of the Firefox Send website is also subject to Mozilla’s <a>Websites Privacy Notice</a> and <a>Websites Terms of Use</a>.
-deletePopupText = Delete this file?
-deletePopupYes = Yes
 deletePopupCancel = Cancel
 deleteButtonHover = Delete
-copyUrlHover = Copy URL
 footerLinkLegal = Legal
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = About Test Pilot
 footerLinkPrivacy = Privacy
-footerLinkTerms = Terms
 footerLinkCookies = Cookies
-requirePasswordCheckbox = Require a password to download this file
-addPasswordButton = Add password
-changePasswordButton = Change
 passwordTryAgain = Incorrect password. Try again.
-reportIPInfringement = Report IP Infringement
 javascriptRequired = Firefox Send requires JavaScript
 whyJavascript = Why does Firefox Send require JavaScript?
 enableJavascript = Please enable JavaScript and try again.
@@ -111,14 +39,12 @@ enableJavascript = Please enable JavaScript and try again.
 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 a password is successfully set
-passwordIsSet = Password set
 # 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
 
-## New strings for the vNext version of Firefox Send
+## Send version 2 strings
 
 # Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
 -send-brand = Firefox Send