v3.0.20

Strip tracking URL params

.dockerignore

@@ -1,10 +1,8 @@
-node_modules
-.git
-.tox
-.DS_Store
-firefox
-assets
-docs
-test
-coverage
+.circleci
 .nyc_output
+.vscode
+.DS_Store
+coverage
+docs
+firefox
+node_modules

.eslintignore

@@ -2,5 +2,6 @@ dist
 assets
 firefox
 coverage
+android/app/build
 app/locale.js
 app/capabilities.js

.eslintrc.yml

@@ -4,6 +4,7 @@ env:
 
 extends:
   - eslint:recommended
+  - prettier
   - plugin:node/recommended
   - plugin:security/recommended
 
@@ -18,17 +19,10 @@ rules:
   node/no-unsupported-features/es-syntax: off
   node/no-unsupported-features/node-builtins: off
   node/no-unpublished-require: off
+  node/no-unpublished-import: off
 
   security/detect-non-literal-fs-filename: off
   security/detect-object-injection: off
 
-  eol-last: [error, always]
-  eqeqeq: error
-  no-alert: warn
-  no-console: warn
-  no-path-concat: error
   no-unused-vars: [error, {argsIgnorePattern: "^_|err|event|next|reject"}]
-  no-var: error
-  one-var: [error, never]
-  prefer-const: error
-  quotes: [error, single, {avoidEscape: true}]
+  require-atomic-updates: warn

CONTRIBUTORS

@@ -1,18 +1,22 @@
 Abdalrahman Hwoij
 Abhinav Adduri
 Adnan Kičin
+Adolfo Jayme Barrientos
 Alberto Castro
 Alexander Slovesnik
 Alfredos-Panagiotis Damkalis
+Aman Alam
 Amin Mahmudian
 Ander Elortondo
 Andreas Pettersson
 Anesu Chiodza
 Anika Dorn
+Anish Sheela
 Arash Mousavi
 Artem Polivanchuk
 Ashikur Rahman
 Ashok kumar
+Balasankar C
 Balázs Meskó
 Belayet Hossain
 Benjamin Forehand Jr
@@ -20,8 +24,11 @@ Besnik Bleta
 Björn I
 Bjørn I
 Boopesh Mahendran
+Brahim Essaidi
 Brainlulz
 Breana Gonzales
+Christian Elbrianno
+Christoph Kührer
 Christopher Ramírez
 Chuck Harmston
 Cloney 173741
@@ -31,6 +38,7 @@ Cynthia Pereira
 Daniel Thorn
 Daniela Arcese
 Danny Coates
+Davide
 Derek Tamsen
 Dhyey Thakore
 Donovan Preston
@@ -52,11 +60,17 @@ Frederick Villaluna
 G12r
 Gabriela
 Gautam krishna.R
+George Raptis
 Georgianizator
 Gonçalo Matos
+Gwenn
+Hampus
+Hugo
+Hugo Abreu
 Hyeonseok Shin
 Håvar Henriksen
 Ian Neal
+ItielMaN
 Jae Hyeon Park
 Jakob Kappel
 Jakub Rychlý
@@ -65,6 +79,8 @@ Jarmo
 Jim Spentzos
 Jiri Grönroos
 Jobava
+Joe Becher
+Joe ST
 Joergen
 Johann-S
 John Gruen
@@ -79,12 +95,16 @@ Juraj Cigáň
 Kerim Kalamujić
 Khaled Hosny
 Kim Ludvigsen
+Kim Younggeon
 Kohei Yoshino
 Lan Glad
+Lasse Liehu
 Laurent Jouanneau
 Lobodzets
 LuFlo
+Luis A. Sánchez
 Luiz Carlos de Morais
+Luiz Felipe F M Costa
 Luna Jernberg
 Mahay Alam Khan
 Marcelo Ghelman
@@ -94,6 +114,7 @@ Mark Heijl
 Mark Liang
 Mark Liang (You-Wen)
 Marko Andrejić
+Martijn Dekker
 Marwan Mohamad
 Matjaž Horvat
 Maykon Chagas
@@ -106,29 +127,38 @@ Michal Vašíček
 Mikeyy
 Miro Rauhala
 Mozilla Pontoon
+Mozilla-GitHub-Standards
 Mozinet
 Moḥend Belqasem
+Muhend Belkacem
 Muḥend Belqasem
 Myungjae Won
 Nicholas Skinsacos
 Nihad
 Nihad Suljić
+Niksend Mizuhara
 Oscar
+Paulius
+Pedro Burlamaqui Bendahan
 Peter deHaan
 Pierre Neter
 Pin-guang Chen
 Piotr Drąg
+Quentí
 Quế Tùng
+Rachel Tublitz
 Radu Popescu
 Rhoslyn Prys
 RickieES
 Rimas Kudelis
 Rizky Ariestiyansyah
 Rob Powell
+Robert
 Roberto Alvarado
 Rodrigo
 Rodrigo Guerra
 Rok Žerdin
+Romi Hardiyanto
 Rongjian Zhang
 Ruba
 Sahithi
@@ -139,9 +169,13 @@ Sara Todaro
 Sav22999
 Schieck :)
 Selim Şumlu
+Selyan Sliman Amiri
+Sidak Singh Aulakh
 Slimane Amiri
+Slimane Selyan AMIRI
 Soumya Himanish Mohapatra
 Staś Małolepszy
+Suriyaa ✌️️
 Tema
 Thomas Dalichow
 Théo Chevalier
@@ -150,6 +184,7 @@ Tim Visée
 Tomer Cohen
 Tomáš Zelina
 Ton
+Top
 Tymur Faradzhev
 Uccen Marzuq
 Varghese Thomas
@@ -157,8 +192,10 @@ Victor Bychek
 Vimal Raghubir
 Vitaliy Krutko
 Weihang Lo
+Wiktor Furman
 Wil Clouser
 YFdyh000
+Yassine Aït-El-Mouden
 Yongmin H
 You-Wen Liang (Mark)
 aaaaalbert
@@ -169,6 +206,7 @@ alex_mayorga
 ariestiyansyah
 avelper
 chilledfrogs
+clouserw-mozilla-owner
 dgadelha
 dskmori
 ehuggett
@@ -180,25 +218,37 @@ gmontagu
 goofy
 hello
 hi
+ivan.pompa
 jesferman1993
 jlG
 josotrix
 jspam
+julen
 julenx
 kenrick95
+kumincir
+leo.toneff
+m4hdi.pdroid
+mail
 manxmensch
 marigalicer
+marsf
+merianosnikos
 mirzet.omerovic.1992
+mujeebcpy
+p.sanroman.bengoetxea
 passionforlife
 paul.trevor
 pyup.io bot
 ravmn
 rcmainak
 reza.habibi2008
+rgpublic
 risger
 robbp
 ruikunai
 savemore99.sm
+sergio
 shikhar-scs
 siparon
 skystar-p
@@ -210,10 +260,13 @@ victor.gonzalezro
 xcffl
 ybouhamam
 yoshimitsu002
+yusup.ramdani
 Μιχάλης
 Марко Костић (Marko Kostić)
+Ратко Вујановић
 صفا الفليج
 వీవెన్
+ജോയ്സ്
 张无忌
 新垣结衣松冈茉优长泽雅美门胁麦上野树里石原里美
 莫非前世那一眼

Dockerfile

@@ -1,17 +1,59 @@
-FROM node:10 AS builder
-RUN addgroup --gid 10001 app && adduser --disabled-password --gecos '' --gid 10001 --home /app --uid 10001 app
-COPY package*.json /app/
-WORKDIR /app
-RUN npm install --production
+##
+# Firefox Send - Mozilla
+#
+# License https://github.com/mozilla/send/blob/master/LICENSE
+##
 
-FROM node:10-slim
-RUN addgroup --gid 10001 app && adduser --disabled-password --gecos '' --gid 10001 --home /app --uid 10001 app
+
+# Build project
+FROM node:10 AS builder
+RUN set -x \
+    # Add user
+    && addgroup --gid 10001 app \
+    && adduser --disabled-password \
+        --gecos '' \
+        --gid 10001 \
+        --home /app \
+        --uid 10001 \
+        app
+COPY --chown=app:app . /app
 USER app
 WORKDIR /app
-COPY --chown=app:app --from=builder /app .
-COPY --chown=app:app . .
+RUN ls -la
+RUN set -x \
+    # Build
+    && npm ci \
+    && npm run build
+
+
+# Main image
+FROM node:10-slim
+RUN set -x \
+    # Add user
+    && addgroup --gid 10001 app \
+    && adduser --disabled-password \
+        --gecos '' \
+        --gid 10001 \
+        --home /app \
+        --uid 10001 \
+        app
+RUN apt-get update && apt-get -y install git-core
+USER app
+WORKDIR /app
+COPY --chown=app:app package*.json ./
+COPY --chown=app:app app app
+COPY --chown=app:app common common
+COPY --chown=app:app public/locales public/locales
+COPY --chown=app:app server server
+COPY --chown=app:app --from=builder /app/dist dist
+
+RUN ls -la
+RUN npm ci --production && npm cache clean --force
+RUN mkdir -p /app/.config/configstore
+RUN ln -s dist/version.json version.json
 
 ENV PORT=1443
-EXPOSE $PORT
+
+EXPOSE ${PORT}
 
 CMD ["node", "server/bin/prod.js"]

README.md

@@ -1,4 +1,4 @@
-# [![Firefox Send](./assets/logo.svg)](https://send.firefox.com/)
+# [![Firefox Send](./assets/icon.svg)](https://send.firefox.com/) Firefox Send
 
 [![CircleCI](https://img.shields.io/circleci/project/github/mozilla/send.svg)](https://circleci.com/gh/mozilla/send)
 
@@ -16,6 +16,7 @@
 * [Localization](#localization)
 * [Contributing](#contributing)
 * [Testing](#testing)
+* [Deployment](#deployment)
 * [Android](#android)
 * [License](#license)
 
@@ -29,7 +30,7 @@ A file sharing experiment which allows you to send encrypted files to other user
 
 ## Requirements
 
-- [Node.js 10.0+](https://nodejs.org/)
+- [Node.js 10.x](https://nodejs.org/)
 - [Redis server](https://redis.io/) (optional for development)
 - [AWS S3](https://aws.amazon.com/s3/) or compatible service. (optional)
 
@@ -91,6 +92,12 @@ Pull requests are always welcome! Feel free to check out the list of ["good firs
 
 ---
 
+## Deployment
+
+see also [docs/deployment.md](docs/deployment.md)
+
+---
+
 ## Android
 
 The android implementation is contained in the `android` directory, and can be viewed locally for easy testing and editing by running `ANDROID=1 npm start` and then visiting <http://localhost:8080>. CSS and image files are located in the `android/app/src/main/assets` directory.

android/android.js

@@ -1,8 +1,7 @@
-/* global window, navigator */
-import 'fluent-intl-polyfill';
+import 'intl-pluralrules';
 import choo from 'choo';
 import html from 'choo/html';
-import Raven from 'raven-js';
+import * as Sentry from '@sentry/browser';
 
 import { setApiUrlPrefix, getConstants } from '../app/api';
 import metrics from '../app/metrics';
@@ -53,7 +52,7 @@ function body(main) {
 
     const menu = html`<a
         id="hamburger"
-        class="absolute pin-t pin-r z-50"
+        class="absolute top-0 right-0 z-50"
         href="#"
         onclick="${clickPreferences}"
       >
@@ -61,9 +60,7 @@ function body(main) {
       </a>`;
     */
     return html`
-      <body
-        class="flex flex-col items-center font-sans bg-grey-lightest h-screen"
-      >
+      <body class="flex flex-col items-center font-sans bg-grey-10 h-screen">
         ${state.cache(Header, 'header').render()} ${main(state, emit)}
       </body>
     `;
@@ -83,7 +80,7 @@ function body(main) {
     state.archive = new Archive([], DEFAULTS.EXPIRE_SECONDS);
     state.storage = storage;
     state.user = new User(storage, LIMITS);
-    state.raven = Raven;
+    state.sentry = Sentry;
   });
   app.use(metrics);
   app.route('/', body(home));

android/pages/home.js

@@ -25,7 +25,7 @@ module.exports = function(state, emit) {
   let content = '';
   let button = html`
     <div
-      class="bg-blue rounded-full m-4 flex items-center justify-center shadow-lg"
+      class="bg-blue-50 rounded-full m-4 flex items-center justify-center shadow-lg"
       style="width: 56px; height: 56px"
       onclick="${onclick}"
     >
@@ -42,11 +42,7 @@ module.exports = function(state, emit) {
     content =
       archives.length < 1
         ? intro(state)
-        : list(
-            archives,
-            'list-reset h-full overflow-y-auto w-full',
-            'mb-3 w-full'
-          );
+        : list(archives, 'h-full overflow-y-auto w-full', 'mb-3 w-full');
   }
 
   return html`
@@ -57,7 +53,7 @@ module.exports = function(state, emit) {
       >
         ${content}
       </section>
-      <div class="fixed pin-r pin-b z-20">
+      <div class="fixed right-0 bottom-0 z-20">
         ${button}
         <input
           id="file-upload"

android/stores/state.js

@@ -12,7 +12,7 @@ export default function initialState(state, emitter) {
     getAsset(name) {
       return `${state.prefix}/${name}`;
     },
-    raven: {
+    sentry: {
       captureException: e => {
         console.error('ERROR ' + e + ' ' + e.stack);
       }

app/api.js

@@ -11,6 +11,15 @@ if (!fileProtocolWssUrl) {
   fileProtocolWssUrl = 'wss://send.firefox.com/api/ws';
 }
 
+export class ConnectionError extends Error {
+  constructor(cancelled, duration, size) {
+    super(cancelled ? '0' : 'connection closed');
+    this.cancelled = cancelled;
+    this.duration = duration;
+    this.size = size;
+  }
+}
+
 export function setFileProtocolWssUrl(url) {
   localStorage && localStorage.setItem('wssURL', url);
   fileProtocolWssUrl = url;
@@ -137,17 +146,25 @@ export async function setPassword(id, owner_token, keychain) {
 }
 
 function asyncInitWebSocket(server) {
-  return new Promise(resolve => {
-    const ws = new WebSocket(server);
-    ws.onopen = () => {
-      resolve(ws);
-    };
+  return new Promise((resolve, reject) => {
+    try {
+      const ws = new WebSocket(server);
+      ws.addEventListener('open', () => resolve(ws), { once: true });
+    } catch (e) {
+      reject(new ConnectionError(false));
+    }
   });
 }
 
 function listenForResponse(ws, canceller) {
   return new Promise((resolve, reject) => {
+    function handleClose(event) {
+      // a 'close' event before a 'message' event means the request failed
+      ws.removeEventListener('message', handleMessage);
+      reject(new ConnectionError(canceller.cancelled));
+    }
     function handleMessage(msg) {
+      ws.removeEventListener('close', handleClose);
       try {
         const response = JSON.parse(msg.data);
         if (response.error) {
@@ -156,13 +173,11 @@ function listenForResponse(ws, canceller) {
           resolve(response);
         }
       } catch (e) {
-        ws.close();
-        canceller.cancelled = true;
-        canceller.error = e;
         reject(e);
       }
     }
     ws.addEventListener('message', handleMessage, { once: true });
+    ws.addEventListener('close', handleClose, { once: true });
   });
 }
 
@@ -176,6 +191,8 @@ async function upload(
   onprogress,
   canceller
 ) {
+  let size = 0;
+  const start = Date.now();
   const host = window.location.hostname;
   const port = window.location.port;
   const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
@@ -203,31 +220,41 @@ async function upload(
 
     const reader = stream.getReader();
     let state = await reader.read();
-    let size = 0;
     while (!state.done) {
-      const buf = state.value;
       if (canceller.cancelled) {
-        throw canceller.error;
+        ws.close();
       }
-
+      if (ws.readyState !== WebSocket.OPEN) {
+        break;
+      }
+      const buf = state.value;
       ws.send(buf);
-
       onprogress(size);
       size += buf.length;
       state = await reader.read();
-      while (ws.bufferedAmount > ECE_RECORD_SIZE * 2) {
+      while (
+        ws.bufferedAmount > ECE_RECORD_SIZE * 2 &&
+        ws.readyState === WebSocket.OPEN &&
+        !canceller.cancelled
+      ) {
         await delay();
       }
     }
-    const footer = new Uint8Array([0]);
-    ws.send(footer);
+    if (ws.readyState === WebSocket.OPEN) {
+      ws.send(new Uint8Array([0])); //EOF
+    }
 
     await completedResponse;
-    ws.close();
+    uploadInfo.duration = Date.now() - start;
     return uploadInfo;
   } catch (e) {
-    ws.close(4000);
+    e.size = size;
+    e.duration = Date.now() - start;
     throw e;
+  } finally {
+    if (![WebSocket.CLOSED, WebSocket.CLOSING].includes(ws.readyState)) {
+      ws.close();
+    }
   }
 }
 
@@ -244,7 +271,6 @@ export function uploadWs(
 
   return {
     cancel: function() {
-      canceller.error = new Error(0);
       canceller.cancelled = true;
     },
 
@@ -284,7 +310,7 @@ async function downloadS(id, keychain, signal) {
   return response.body;
 }
 
-async function tryDownloadStream(id, keychain, signal, tries = 1) {
+async function tryDownloadStream(id, keychain, signal, tries = 2) {
   try {
     const result = await downloadS(id, keychain, signal);
     return result;
@@ -306,18 +332,19 @@ export function downloadStream(id, keychain) {
   }
   return {
     cancel,
-    result: tryDownloadStream(id, keychain, controller.signal, 2)
+    result: tryDownloadStream(id, keychain, controller.signal)
   };
 }
 
 //////////////////
 
-function download(id, keychain, onprogress, canceller) {
+async function download(id, keychain, onprogress, canceller) {
+  const auth = await keychain.authHeader();
   const xhr = new XMLHttpRequest();
   canceller.oncancel = function() {
     xhr.abort();
   };
-  return new Promise(async function(resolve, reject) {
+  return new Promise(function(resolve, reject) {
     xhr.addEventListener('loadend', function() {
       canceller.oncancel = function() {};
       const authHeader = xhr.getResponseHeader('WWW-Authenticate');
@@ -337,7 +364,6 @@ function download(id, keychain, onprogress, canceller) {
         onprogress(event.loaded);
       }
     });
-    const auth = await keychain.authHeader();
     xhr.open('get', getApiUrl(`/api/download/blob/${id}`));
     xhr.setRequestHeader('Authorization', auth);
     xhr.responseType = 'blob';
@@ -346,7 +372,7 @@ function download(id, keychain, onprogress, canceller) {
   });
 }
 
-async function tryDownload(id, keychain, onprogress, canceller, tries = 1) {
+async function tryDownload(id, keychain, onprogress, canceller, tries = 2) {
   try {
     const result = await download(id, keychain, onprogress, canceller);
     return result;
@@ -367,7 +393,7 @@ export function downloadFile(id, keychain, onprogress) {
   }
   return {
     cancel,
-    result: tryDownload(id, keychain, onprogress, canceller, 2)
+    result: tryDownload(id, keychain, onprogress, canceller)
   };
 }
 

app/capabilities.js

@@ -1,5 +1,5 @@
-/* global AUTH_CONFIG LOCALE */
-import { browserName } from './utils';
+/* global AUTH_CONFIG */
+import { browserName, locale } from './utils';
 
 async function checkCrypto() {
   try {
@@ -76,8 +76,8 @@ async function polyfillStreams() {
 }
 
 export default async function getCapabilities() {
-  const serviceWorker =
-    'serviceWorker' in navigator && browserName() !== 'edge';
+  const browser = browserName();
+  const serviceWorker = 'serviceWorker' in navigator && browser !== 'edge';
   let crypto = await checkCrypto();
   const nativeStreams = checkStreams();
   let polyStreams = false;
@@ -91,19 +91,22 @@ export default async function getCapabilities() {
     account = false;
   }
   const share =
-    typeof navigator.share === 'function' && LOCALE.startsWith('en'); // en until strings merge
+    typeof navigator.share === 'function' && locale().startsWith('en'); // en until strings merge
 
   const standalone =
     window.matchMedia('(display-mode: standalone)').matches ||
     navigator.standalone;
 
+  const mobileFirefox =
+    browser === 'firefox' && /mobile/i.test(navigator.userAgent);
+
   return {
     account,
     crypto,
     serviceWorker,
     streamUpload: nativeStreams || polyStreams,
     streamDownload:
-      nativeStreams && serviceWorker && browserName() !== 'safari',
+      nativeStreams && serviceWorker && browser !== 'safari' && !mobileFirefox,
     multifile: nativeStreams || polyStreams,
     share,
     standalone

app/controller.js

@@ -2,11 +2,12 @@ import FileSender from './fileSender';
 import FileReceiver from './fileReceiver';
 import { copyToClipboard, delay, openLinksInNewTab, percent } from './utils';
 import * as metrics from './metrics';
-import { bytes } from './utils';
+import { bytes, locale } from './utils';
 import okDialog from './ui/okDialog';
 import copyDialog from './ui/copyDialog';
 import shareDialog from './ui/shareDialog';
 import signupDialog from './ui/signupDialog';
+import surveyDialog from './ui/surveyDialog';
 
 export default function(state, emitter) {
   let lastRender = 0;
@@ -75,7 +76,7 @@ export default function(state, emitter) {
       state.storage.remove(ownedFile.id);
       await ownedFile.del();
     } catch (e) {
-      state.raven.captureException(e);
+      state.sentry.captureException(e);
     }
     render();
   });
@@ -175,14 +176,17 @@ export default function(state, emitter) {
     } catch (err) {
       if (err.message === '0') {
         //cancelled. do nothing
-        const duration = Date.now() - start;
-        metrics.cancelledUpload(archive, duration);
+        metrics.cancelledUpload(archive, err.duration);
         render();
       } else {
         // eslint-disable-next-line no-console
         console.error(err);
-        state.raven.captureException(err);
-        metrics.stoppedUpload(archive);
+        state.sentry.withScope(scope => {
+          scope.setExtra('duration', err.duration);
+          scope.setExtra('size', err.size);
+          state.sentry.captureException(err);
+        });
+        metrics.stoppedUpload(archive, err.duration);
         emitter.emit('pushState', '/error');
       }
     } finally {
@@ -261,7 +265,12 @@ export default function(state, emitter) {
         state.transfer = null;
         const location = err.message === '404' ? '/404' : '/error';
         if (location === '/error') {
-          state.raven.captureException(err);
+          state.sentry.withScope(scope => {
+            scope.setExtra('duration', err.duration);
+            scope.setExtra('size', err.size);
+            scope.setExtra('progress', err.progress);
+            state.sentry.captureException(err);
+          });
           const duration = Date.now() - start;
           metrics.stoppedDownload({
             size,
@@ -281,6 +290,22 @@ export default function(state, emitter) {
     // metrics.copiedLink({ location });
   });
 
+  emitter.on('closeModal', () => {
+    if (
+      state.PREFS.surveyUrl &&
+      ['copy', 'share'].includes(state.modal.type) &&
+      locale().startsWith('en') &&
+      (state.storage.totalUploads > 1 || state.storage.totalDownloads > 0) &&
+      !state.user.surveyed
+    ) {
+      state.user.surveyed = true;
+      state.modal = surveyDialog();
+    } else {
+      state.modal = null;
+    }
+    render();
+  });
+
   setInterval(() => {
     // poll for updates of the upload list
     if (!state.modal && state.route === '/') {

app/experiments.js

@@ -1,6 +1,22 @@
 import hash from 'string-hash';
+import Account from './ui/account';
 
-const experiments = {};
+const experiments = {
+  signin_button_color: {
+    eligible: function() {
+      return true;
+    },
+    variant: function() {
+      return ['white-blue', 'blue', 'white-violet', 'violet'][
+        Math.floor(Math.random() * 4)
+      ];
+    },
+    run: function(variant, state) {
+      const account = state.cache(Account, 'account');
+      account.buttonClass = variant;
+    }
+  }
+};
 
 //Returns a number between 0 and 1
 // eslint-disable-next-line no-unused-vars
@@ -25,23 +41,12 @@ export default function initialize(state, emitter) {
       xp.run(+state.query.v, state, emitter);
     }
   });
-
-  if (!state.storage.get('testpilot_ga__cid')) {
-    // first ever visit. check again after cid is assigned.
-    emitter.on('DOMContentLoaded', () => {
-      checkExperiments(state, emitter);
-    });
+  const enrolled = state.storage.enrolled;
+  // single experiment per session for now
+  const id = Object.keys(enrolled)[0];
+  if (Object.keys(experiments).includes(id)) {
+    experiments[id].run(enrolled[id], state, emitter);
   } else {
-    const enrolled = state.storage.enrolled.filter(([id, variant]) => {
-      const xp = experiments[id];
-      if (xp) {
-        xp.run(variant, state, emitter);
-      }
-      return !!xp;
-    });
-    // single experiment per session for now
-    if (enrolled.length === 0) {
-      checkExperiments(state, emitter);
-    }
+    checkExperiments(state, emitter);
   }
 }

app/fileReceiver.js

@@ -112,6 +112,7 @@ export default class FileReceiver extends Nanobus {
   }
 
   async downloadStream(noSave = false) {
+    const start = Date.now();
     const onprogress = p => {
       this.progress = [p, this.fileInfo.size];
       this.emit('progress');
@@ -153,9 +154,7 @@ export default class FileReceiver extends Nanobus {
         const downloadPath = `/api/download/${this.fileInfo.id}`;
         let downloadUrl = getApiUrl(downloadPath);
         if (downloadUrl === downloadPath) {
-          downloadUrl = `${location.protocol}//${location.host}/api/download/${
-            this.fileInfo.id
-          }`;
+          downloadUrl = `${location.protocol}//${location.host}${downloadPath}`;
         }
         const a = document.createElement('a');
         a.href = downloadUrl;
@@ -164,11 +163,29 @@ export default class FileReceiver extends Nanobus {
       }
 
       let prog = 0;
+      let hangs = 0;
       while (prog < this.fileInfo.size) {
         const msg = await this.sendMessageToSw({
           request: 'progress',
           id: this.fileInfo.id
         });
+        if (msg.progress === prog) {
+          hangs++;
+        } else {
+          hangs = 0;
+        }
+        if (hangs > 30) {
+          // TODO: On Chrome we don't get a cancel
+          // signal so one is indistinguishable from
+          // a hang. We may be able to detect
+          // which end is hung in the service worker
+          // to improve on this.
+          const e = new Error('hung download');
+          e.duration = Date.now() - start;
+          e.size = this.fileInfo.size;
+          e.progress = prog;
+          throw e;
+        }
         prog = msg.progress;
         onprogress(prog);
         await delay(1000);

app/fileSender.js

@@ -44,7 +44,6 @@ export default class FileSender extends Nanobus {
   }
 
   async upload(archive, bearerToken) {
-    const start = Date.now();
     if (this.cancelled) {
       throw new Error(0);
     }
@@ -76,7 +75,6 @@ export default class FileSender extends Nanobus {
     this.emit('progress'); // HACK to kick MS Edge
     try {
       const result = await this.uploadRequest.result;
-      const time = Date.now() - start;
       this.msg = 'notifyUploadEncryptDone';
       this.uploadRequest = null;
       this.progress = [1, 1];
@@ -87,8 +85,8 @@ export default class FileSender extends Nanobus {
         name: archive.name,
         size: archive.size,
         manifest: archive.manifest,
-        time: time,
-        speed: archive.size / (time / 1000),
+        time: result.duration,
+        speed: archive.size / (result.duration / 1000),
         createdAt: Date.now(),
         expiresAt: Date.now() + archive.timeLimit * 1000,
         secretKey: secretKey,

app/locale.js

@@ -1,4 +1,4 @@
-import { FluentBundle } from 'fluent';
+import { FluentBundle } from '@fluent/bundle';
 
 function makeBundle(locale, ftl) {
   const bundle = new FluentBundle(locale, { useIsolating: false });
@@ -10,9 +10,9 @@ export async function getTranslator(locale) {
   const bundles = [];
   const { default: en } = await import('../public/locales/en-US/send.ftl');
   if (locale !== 'en-US') {
-    const {
-      default: ftl
-    } = await import(`../public/locales/${locale}/send.ftl`);
+    const { default: ftl } = await import(
+      `../public/locales/${locale}/send.ftl`
+    );
     bundles.push(makeBundle(locale, ftl));
   }
   bundles.push(makeBundle('en-US', en));

app/main.css

@@ -1,4 +1,9 @@
-@tailwind preflight;
+@tailwind base;
+
+html {
+  line-height: 1.15;
+}
+
 @tailwind components;
 
 :not(input) {
@@ -8,6 +13,14 @@
   user-select: none;
 }
 
+:root {
+  --violet-gradient: linear-gradient(
+    -180deg,
+    rgba(144, 89, 255, 0.8) 0%,
+    rgba(144, 89, 255, 0.4) 100%
+  );
+}
+
 a {
   color: inherit;
   text-decoration: none;
@@ -26,19 +39,20 @@ body {
 }
 
 .btn {
-  @apply bg-blue-dark;
+  @apply bg-blue-60;
   @apply text-white;
   @apply cursor-pointer;
   @apply py-4;
   @apply px-6;
+  @apply font-semibold;
 }
 
 .btn:hover {
-  @apply bg-blue-darker;
+  @apply bg-blue-70;
 }
 
 .btn:focus {
-  @apply bg-blue-darker;
+  @apply bg-blue-70;
 }
 
 .checkbox {
@@ -56,7 +70,7 @@ body {
 }
 
 .checkbox > label::before {
-  /* @apply bg-grey-lightest; */
+  /* @apply bg-grey-10; */
   @apply border;
   @apply rounded-sm;
 
@@ -68,16 +82,16 @@ body {
 }
 
 .checkbox > label:hover::before {
-  @apply border-blue-dark;
+  @apply border-blue-50;
 }
 
 .checkbox > input:focus + label::before {
-  @apply border-blue-dark;
+  @apply border-blue-50;
 }
 
 .checkbox > input:checked + label::before {
-  @apply bg-blue-dark;
-  @apply border-blue-dark;
+  @apply bg-blue-50;
+  @apply border-blue-50;
 
   background-image: url('../assets/lock.svg');
   background-position: center;
@@ -90,8 +104,8 @@ body {
 }
 
 .checkbox > input:disabled + label::before {
-  @apply bg-blue-dark;
-  @apply border-blue-dark;
+  @apply bg-blue-50;
+  @apply border-blue-50;
 
   background-image: url('../assets/lock.svg');
   background-position: center;
@@ -139,6 +153,23 @@ footer li:hover {
   white-space: nowrap;
 }
 
+.link-blue {
+  @apply text-blue-60;
+}
+
+.link-blue:hover {
+  @apply text-blue-70;
+}
+
+.link-blue:focus {
+  @apply text-blue-70;
+}
+
+.main-header img {
+  height: 32px;
+  width: auto;
+}
+
 .intro {
   max-width: 100%;
   height: unset;
@@ -159,7 +190,7 @@ footer li:hover {
 .mozilla-logo {
   background-image: url('../assets/mozilla-logo.svg');
   background-repeat: no-repeat;
-  background-size: 100px, 32px;
+  background-size: 100px, 48px;
   overflow: hidden;
   text-indent: 120%;
   white-space: nowrap;
@@ -174,14 +205,14 @@ footer li:hover {
 }
 
 progress {
-  @apply bg-grey-light;
+  @apply bg-grey-30;
   @apply rounded-sm;
   @apply w-full;
   @apply h-1;
 }
 
 progress::-webkit-progress-bar {
-  @apply bg-grey-light;
+  @apply bg-grey-30;
   @apply rounded-sm;
   @apply w-full;
   @apply h-1;
@@ -246,6 +277,11 @@ select {
 }
 
 @screen md {
+  .main-header img {
+    height: 48px;
+    width: auto;
+  }
+
   .intro {
     max-width: unset;
     height: unset;
@@ -261,11 +297,60 @@ select {
     @apply py-8;
 
     min-height: 36rem;
-    max-height: 40rem;
+    max-height: 42rem;
     width: calc(100% - 3rem);
   }
 }
 
+@screen dark {
+  body {
+    @apply text-grey-10;
+
+    background-image: unset;
+  }
+
+  .btn {
+    @apply bg-blue-40;
+    @apply text-white;
+  }
+
+  .btn:hover {
+    @apply bg-blue-50;
+  }
+
+  .btn:focus {
+    @apply bg-blue-50;
+  }
+
+  .link-blue {
+    @apply text-blue-40;
+  }
+
+  .link-blue:hover {
+    @apply text-blue-50;
+  }
+
+  .link-blue:focus {
+    @apply text-blue-50;
+  }
+
+  .main > section {
+    @apply bg-grey-90;
+  }
+
+  .mozilla-logo {
+    background-color: white;
+    border: 1px solid white;
+  }
+
+  @screen md {
+    .main > section {
+      @apply border;
+      @apply border-grey-80;
+    }
+  }
+}
+
 @tailwind utilities;
 
 @responsive {
@@ -274,8 +359,9 @@ select {
   }
 
   .shadow-big {
-    box-shadow: 0 0 32px 0 rgba(12, 12, 13, 0.1),
-      0 2px 16px 0 rgba(12, 12, 13, 0.05);
+    box-shadow: 0 12px 18px 2px rgba(34, 0, 51, 0.04),
+      0 6px 22px 4px rgba(7, 48, 114, 0.12),
+      0 6px 10px -4px rgba(14, 13, 26, 0.12);
   }
 }
 
@@ -287,4 +373,67 @@ select {
 
 .word-break-all {
   word-break: break-all;
+  line-break: anywhere;
 }
+
+.signin {
+  backface-visibility: hidden;
+  border-radius: 6px;
+  transition-property: transform, background-color;
+  transition-duration: 250ms;
+  transition-timing-function: cubic-bezier(0.07, 0.95, 0, 1);
+}
+
+.signin:hover,
+.signin:focus {
+  transform: scale(1.0625);
+}
+
+.signin:hover:active {
+  transform: scale(0.9375);
+}
+
+/* begin signin button color experiment */
+
+.white-blue {
+  @apply border-blue-60;
+  @apply border-2;
+  @apply text-blue-60;
+}
+
+.white-blue:hover,
+.white-blue:focus {
+  @apply bg-blue-60;
+  @apply text-white;
+}
+
+.blue {
+  @apply bg-blue-60;
+  @apply text-white;
+}
+
+.white-violet {
+  @apply border-violet;
+  @apply border-2;
+  @apply text-violet;
+}
+
+.white-violet:hover,
+.white-violet:focus {
+  @apply bg-violet;
+  @apply text-white;
+
+  background-image: var(--violet-gradient);
+}
+
+.violet {
+  @apply bg-violet;
+  @apply text-white;
+}
+
+.violet:hover,
+.violet:focus {
+  background-image: var(--violet-gradient);
+}
+
+/* end signin button color experiment */

app/main.js

@@ -1,7 +1,7 @@
-/* global DEFAULTS LIMITS LOCALE */
+/* global DEFAULTS LIMITS PREFS */
 import 'core-js';
 import 'fast-text-encoding'; // MS Edge support
-import 'fluent-intl-polyfill';
+import 'intl-pluralrules';
 import choo from 'choo';
 import nanotiming from 'nanotiming';
 import routes from './routes';
@@ -12,15 +12,15 @@ import pasteManager from './pasteManager';
 import storage from './storage';
 import metrics from './metrics';
 import experiments from './experiments';
-import Raven from 'raven-js';
+import * as Sentry from '@sentry/browser';
 import './main.css';
 import User from './user';
 import { getTranslator } from './locale';
 import Archive from './archive';
-import { setTranslate } from './utils';
+import { setTranslate, locale } from './utils';
 
-if (navigator.doNotTrack !== '1' && window.RAVEN_CONFIG) {
-  Raven.config(window.SENTRY_ID, window.RAVEN_CONFIG).install();
+if (navigator.doNotTrack !== '1' && window.SENTRY_CONFIG) {
+  Sentry.init(window.SENTRY_CONFIG);
 }
 
 if (process.env.NODE_ENV === 'production') {
@@ -45,27 +45,30 @@ if (process.env.NODE_ENV === 'production') {
     }
   }
 
-  const translate = await getTranslator(LOCALE);
+  const translate = await getTranslator(locale());
   setTranslate(translate);
+  // eslint-disable-next-line require-atomic-updates
   window.initialState = {
     LIMITS,
     DEFAULTS,
+    PREFS,
     archive: new Archive([], DEFAULTS.EXPIRE_SECONDS),
     capabilities,
     translate,
     storage,
-    raven: Raven,
+    sentry: Sentry,
     user: new User(storage, LIMITS, window.AUTH_CONFIG),
     transfer: null,
     fileInfo: null
   };
 
-  const app = routes(choo());
+  const app = routes(choo({ hash: true }));
+  // eslint-disable-next-line require-atomic-updates
   window.app = app;
+  app.use(experiments);
   app.use(metrics);
   app.use(controller);
   app.use(dragManager);
-  app.use(experiments);
   app.use(pasteManager);
   app.mount('body');
 })();

app/metrics.js

@@ -1,21 +1,23 @@
 import storage from './storage';
-import { platform } from './utils';
+import { platform, locale } from './utils';
 import { sendMetrics } from './api';
 
 let appState = null;
-// let experiment = null;
+let experiment = null;
 const HOUR = 1000 * 60 * 60;
 const events = [];
 let session_id = Date.now();
-const lang = document.querySelector('html').lang;
+const lang = locale();
 
 export default function initialize(state, emitter) {
   appState = state;
-  if (!appState.user.firstAction) {
-    appState.user.firstAction = appState.route === '/' ? 'upload' : 'download';
-  }
+
   emitter.on('DOMContentLoaded', () => {
-    // experiment = storage.enrolled[0];
+    experiment = storage.enrolled;
+    if (!appState.user.firstAction) {
+      appState.user.firstAction =
+        appState.route === '/' ? 'upload' : 'download';
+    }
     const query = appState.query;
     addEvent('client_visit', {
       entrypoint: appState.route === '/' ? 'upload' : 'download',
@@ -59,6 +61,11 @@ function submitEvents() {
 async function addEvent(event_type, event_properties) {
   const user_id = await appState.user.metricId();
   const device_id = await appState.user.deviceId();
+  const ab_id = Object.keys(experiment)[0];
+  if (ab_id) {
+    event_properties.experiment = ab_id;
+    event_properties.variant = experiment[ab_id];
+  }
   events.push({
     device_id,
     event_properties,
@@ -100,9 +107,10 @@ function completedUpload(archive, duration) {
   });
 }
 
-function stoppedUpload(archive) {
+function stoppedUpload(archive, duration = 0) {
   return addEvent('client_upload', {
     download_limit: archive.dlimit,
+    duration: sizeOrder(duration),
     file_count: archive.numFiles,
     password_protected: !!archive.password,
     size: sizeOrder(archive.size),

app/routes.js

@@ -2,7 +2,7 @@ const choo = require('choo');
 const download = require('./ui/download');
 const body = require('./ui/body');
 
-module.exports = function(app = choo()) {
+module.exports = function(app = choo({ hash: true })) {
   app.route('/', body(require('./ui/home')));
   app.route('/download/:id', body(download));
   app.route('/download/:id/:key', body(download));
@@ -13,6 +13,7 @@ module.exports = function(app = choo()) {
   app.route('/oauth', function(state, emit) {
     emit('authenticate', state.query.code, state.query.state);
   });
+  app.route('/login', body(require('./ui/home')));
   app.route('*', body(require('./ui/notFound')));
   return app;
 };

app/serviceWorker.js

@@ -11,13 +11,14 @@ const map = new Map();
 const IMAGES = /.*\.(png|svg|jpg)$/;
 const VERSIONED_ASSET = /\.[A-Fa-f0-9]{8}\.(js|css|png|svg|jpg)$/;
 const DOWNLOAD_URL = /\/api\/download\/([A-Fa-f0-9]{4,})/;
+const FONT = /\.woff2?$/;
 
-self.addEventListener('install', event => {
-  event.waitUntil(precache());
+self.addEventListener('install', () => {
+  self.skipWaiting();
 });
 
 self.addEventListener('activate', event => {
-  event.waitUntil(self.clients.claim());
+  event.waitUntil(self.clients.claim().then(precache));
 });
 
 async function decryptStream(id) {
@@ -83,16 +84,28 @@ async function decryptStream(id) {
 }
 
 async function precache() {
+  try {
+    await cleanCache();
+    const cache = await caches.open(version);
+    const images = assets.match(IMAGES);
+    await cache.addAll(images);
+  } catch (e) {
+    console.error(e);
+    // cache will get populated on demand
+  }
+}
+
+async function cleanCache() {
   const oldCaches = await caches.keys();
   for (const c of oldCaches) {
     if (c !== version) {
       await caches.delete(c);
     }
   }
-  const cache = await caches.open(version);
-  const images = assets.match(IMAGES);
-  await cache.addAll(images);
-  return self.skipWaiting();
+}
+
+function cacheable(url) {
+  return VERSIONED_ASSET.test(url) || FONT.test(url);
 }
 
 async function cachedOrFetched(req) {
@@ -102,7 +115,7 @@ async function cachedOrFetched(req) {
     return cached;
   }
   const fetched = await fetch(req);
-  if (fetched.ok && VERSIONED_ASSET.test(req.url)) {
+  if (fetched.ok && cacheable(req.url)) {
     cache.put(req, fetched.clone());
   }
   return fetched;
@@ -115,7 +128,7 @@ self.onfetch = event => {
   const dlmatch = DOWNLOAD_URL.exec(url.pathname);
   if (dlmatch) {
     event.respondWith(decryptStream(dlmatch[1]));
-  } else if (VERSIONED_ASSET.test(url.pathname)) {
+  } else if (cacheable(url.pathname)) {
     event.respondWith(cachedOrFetched(req));
   }
 };

app/storage.js

@@ -86,16 +86,13 @@ class Storage {
     this.engine.setItem('referrer', str);
   }
   get enrolled() {
-    return JSON.parse(this.engine.getItem('experiments') || '[]');
+    return JSON.parse(this.engine.getItem('ab_experiments') || '{}');
   }
 
   enroll(id, variant) {
-    const enrolled = this.enrolled;
-    // eslint-disable-next-line no-unused-vars
-    if (!enrolled.find(([i, v]) => i === id)) {
-      enrolled.push([id, variant]);
-      this.engine.setItem('experiments', JSON.stringify(enrolled));
-    }
+    const enrolled = {};
+    enrolled[id] = variant;
+    this.engine.setItem('ab_experiments', JSON.stringify(enrolled));
   }
 
   get files() {

app/streams.js

@@ -1,4 +1,4 @@
-/* global ReadableStream TransformStream */
+/* global TransformStream */
 
 export function transformStream(readable, transformer, oncancel) {
   try {

app/ui/account.js

@@ -8,7 +8,8 @@ class Account extends Component {
     this.emit = emit;
     this.enabled = state.capabilities.account;
     this.local = state.components[name] = {};
-    this.setState();
+    this.buttonClass = '';
+    this.setLocal();
   }
 
   avatarClick(event) {
@@ -38,7 +39,7 @@ class Account extends Component {
     return this.local.loggedIn !== this.state.user.loggedIn;
   }
 
-  setState() {
+  setLocal() {
     const changed = this.changed();
     if (changed) {
       this.local.loggedIn = this.state.user.loggedIn;
@@ -47,7 +48,7 @@ class Account extends Component {
   }
 
   update() {
-    return this.setState();
+    return this.setLocal();
   }
 
   createElement() {
@@ -58,15 +59,16 @@ class Account extends Component {
     }
     const user = this.state.user;
     const translate = this.state.translate;
+    this.setLocal();
     if (!this.local.loggedIn) {
       return html`
         <send-account>
           <button
-            class="p-2 md:p-4 border rounded-lg text-blue-dark border-blue-dark hover:text-white hover:bg-blue-dark focus:outline"
+            class="px-4 py-2 md:px-8 md:py-4 focus:outline signin border-2 link-blue border-blue-60 hover:border-blue-70 dark:border-blue-40 dark:hover:border-blue-50"
             onclick="${e => this.login(e)}"
-            title="${translate('signInButton')}"
+            title="${translate('signInOnlyButton')}"
           >
-            ${translate('signInButton')}
+            ${translate('signInOnlyButton')}
           </button>
         </send-account>
       `;
@@ -76,19 +78,19 @@ class Account extends Component {
         <input
           type="image"
           alt="${user.email}"
-          class="w-8 h-8 rounded-full border text-blue md:text-white focus:outline"
+          class="w-8 h-8 rounded-full border text-blue-50 md:text-white focus:outline"
           src="${user.avatar}"
           onclick="${e => this.avatarClick(e)}"
         />
         <ul
           id="accountMenu"
-          class="invisible list-reset absolute pin-t pin-r mt-10 pt-2 pb-2 bg-white shadow-md whitespace-no-wrap outline-none z-50"
+          class="invisible absolute top-0 right-0 mt-10 pt-2 pb-2 bg-white shadow-md whitespace-no-wrap outline-none z-50 dark:bg-grey-80"
           onblur="${e => this.hideMenu(e)}"
         >
-          <li class="p-2 text-grey-dark">${user.email}</li>
+          <li class="p-2 text-grey-60 dark:text-grey-50">${user.email}</li>
           <li>
             <button
-              class="block w-full text-left px-4 py-2 text-grey-darkest hover:bg-blue hover:text-white cursor-pointer focus:outline"
+              class="block w-full text-left px-4 py-2 text-grey-80 dark:text-grey-30 hover:bg-blue-50 hover:text-white cursor-pointer focus:outline"
               onclick="${e => this.logout(e)}"
               title="${translate('signOut')}"
             >

app/ui/archiveTile.js

@@ -46,7 +46,7 @@ function password(state) {
         id="password-input"
         class="${state.archive.password
           ? ''
-          : 'invisible'} border rounded focus:border-blue-dark leading-normal my-1 py-1 px-2 h-8"
+          : 'invisible'} border rounded focus:border-blue-60 leading-normal my-1 py-1 px-2 h-8 dark:bg-grey-80"
         autocomplete="off"
         maxlength="${MAX_LENGTH}"
         type="password"
@@ -58,7 +58,7 @@ function password(state) {
       <label
         id="password-msg"
         for="password-input"
-        class="block text-xs text-grey-darker"
+        class="block text-xs text-grey-70"
       ></label>
     </div>
   `;
@@ -106,7 +106,9 @@ function password(state) {
 function fileInfo(file, action) {
   return html`
     <send-file class="flex flex-row items-center p-3 w-full">
-      <img class="h-8" src="${assets.get('blue_file.svg')}"/>
+      <svg class="h-8 w-8 text-white dark:text-grey-90">
+        <use xlink:href="${assets.get('blue_file.svg')}#icon"/>
+      </svg>
       <p class="ml-4 w-full">
         <h1 class="text-base font-medium word-break-all">${file.name}</h1>
         <div class="text-sm font-normal opacity-75 pt-1">${bytes(
@@ -120,7 +122,9 @@ function fileInfo(file, action) {
 function archiveInfo(archive, action) {
   return html`
     <p class="w-full flex items-center">
-      <img class="mr-3 flex-no-shrink" src="${assets.get('blue_file.svg')}"/>
+      <svg class="h-8 w-6 mr-3 flex-shrink-0 text-white dark:text-grey-90">
+        <use xlink:href="${assets.get('blue_file.svg')}#icon"/>
+      </svg>
       <p class="flex-grow">
         <h1 class="text-base font-medium word-break-all">${archive.name}</h1>
         <div class="text-sm font-normal opacity-75 pt-1">${bytes(
@@ -140,7 +144,7 @@ function archiveDetails(translate, archive) {
         ontoggle="${toggled}"
       >
         <summary
-          class="flex items-center text-blue-dark text-sm cursor-pointer outline-none"
+          class="flex items-center link-blue text-sm cursor-pointer outline-none"
         >
           <svg
             class="fill-current w-4 h-4 mr-1"
@@ -155,7 +159,7 @@ function archiveDetails(translate, archive) {
             num: archive.manifest.files.length
           })}
         </summary>
-        ${list(archive.manifest.files.map(f => fileInfo(f)), 'list-reset')}
+        ${list(archive.manifest.files.map(f => fileInfo(f)))}
       </details>
     `;
   }
@@ -170,20 +174,25 @@ module.exports = function(state, emit, archive) {
     state.capabilities.share || platform() === 'android'
       ? html`
           <button
-            class="text-blue-dark hover:text-blue-darker focus:text-blue-darker self-end flex items-end"
+            class="link-blue self-end flex items-start"
             onclick=${share}
             title="Share link"
           >
-            <img src="${assets.get('share-24.svg')}" class="mr-2" />Share link
+            <svg class="h-4 w-4 mr-2">
+              <use xlink:href="${assets.get('share-24.svg')}#icon" />
+            </svg>
+            Share link
           </button>
         `
       : html`
           <button
-            class="text-blue-dark hover:text-blue-darker focus:text-blue-darker focus:outline self-end flex items-center"
+            class="link-blue focus:outline self-end flex items-center"
             onclick=${copy}
             title="${state.translate('copyLinkButton')}"
           >
-            <img src="${assets.get('copy-16.svg')}" class="mr-2" />
+            <svg class="h-4 w-4 mr-2">
+              <use xlink:href="${assets.get('copy-16.svg')}#icon" />
+            </svg>
             ${state.translate('copyLinkButton')}
           </button>
         `;
@@ -191,12 +200,14 @@ module.exports = function(state, emit, archive) {
     platform() === 'web'
       ? html`
           <a
-            class="flex items-baseline text-blue-dark hover:text-blue-darker focus:text-blue-darker"
+            class="flex items-baseline link-blue"
             href="${archive.url}"
             title="${state.translate('downloadButtonLabel')}"
             tabindex="0"
           >
-            <img src="${assets.get('dl.svg')}" class="mr-2" />
+            <svg class="h-4 w-3 mr-2">
+              <use xlink:href="${assets.get('dl.svg')}#icon" />
+            </svg>
             ${state.translate('downloadButtonLabel')}
           </a>
         `
@@ -206,14 +217,14 @@ module.exports = function(state, emit, archive) {
   return html`
     <send-archive
       id="archive-${archive.id}"
-      class="flex flex-col items-start rounded shadow-light bg-white p-4 w-full"
+      class="flex flex-col items-start rounded shadow-light bg-white p-4 w-full dark:bg-grey-90 dark:border dark:border-grey-70"
     >
       ${archiveInfo(
         archive,
         html`
           <input
             type="image"
-            class="self-start flex-no-shrink text-white hover:opacity-75 focus:outline"
+            class="self-start flex-shrink-0 text-white hover:opacity-75 focus:outline"
             alt="${state.translate('deleteButtonHover')}"
             title="${state.translate('deleteButtonHover')}"
             src="${assets.get('close-16.svg')}"
@@ -225,7 +236,7 @@ module.exports = function(state, emit, archive) {
         ${expiryInfo(state.translate, archive)}
       </div>
       ${archiveDetails(state.translate, archive)}
-      <hr class="w-full border-t my-4" />
+      <hr class="w-full border-t my-4 dark:border-grey-70" />
       <div class="flex justify-between w-full">
         ${dl} ${copyOrShare}
       </div>
@@ -256,9 +267,7 @@ module.exports = function(state, emit, archive) {
       try {
         await navigator.share({
           title: state.translate('-send-brand'),
-          text: `Download "${
-            archive.name
-          }" with Firefox Send: simple, safe file sharing`,
+          text: `Download "${archive.name}" with Firefox Send: simple, safe file sharing`,
           //state.translate('shareMessage', { name }),
           url: archive.url
         });
@@ -271,18 +280,21 @@ module.exports = function(state, emit, archive) {
 
 module.exports.wip = function(state, emit) {
   return html`
-    <send-upload-area class="flex flex-col bg-white h-full w-full" id="wip">
+    <send-upload-area
+      class="flex flex-col bg-white h-full w-full dark:bg-grey-90"
+      id="wip"
+    >
       ${list(
         Array.from(state.archive.files)
           .reverse()
           .map(f =>
             fileInfo(f, remove(f, state.translate('deleteButtonHover')))
           ),
-        'flex-shrink bg-grey-lightest rounded-t list-reset overflow-y-auto px-6 py-4 md:h-full md:max-h-half-screen',
-        'bg-white px-2 my-2 shadow-light rounded'
+        'flex-shrink bg-grey-10 rounded-t overflow-y-auto px-6 py-4 md:h-full md:max-h-half-screen dark:bg-black',
+        'bg-white px-2 my-2 shadow-light rounded dark:bg-grey-90 dark:border dark:border-grey-80'
       )}
       <div
-        class="flex-no-shrink flex-grow flex items-end p-4 bg-grey-lightest rounded-b mb-1 font-medium"
+        class="flex-shrink-0 flex-grow flex items-end p-4 bg-grey-10 rounded-b mb-1 font-medium dark:bg-grey-90"
       >
         <input
           id="file-upload"
@@ -302,10 +314,12 @@ module.exports.wip = function(state, emit) {
             class="flex items-center cursor-pointer"
             title="${state.translate('addFilesButton')}"
           >
-            <img src="${assets.get('addfiles.svg')}" class="w-6 h-6 mr-2" />
+            <svg class="w-6 h-6 mr-2 link-blue">
+              <use xlink:href="${assets.get('addfiles.svg')}#plus" />
+            </svg>
             ${state.translate('addFilesButton')}
           </label>
-          <div class="font-normal text-sm text-grey-darker">
+          <div class="font-normal text-sm text-grey-70 dark:text-grey-40">
             ${state.translate('totalSize', {
               size: bytes(state.archive.size)
             })}
@@ -315,7 +329,7 @@ module.exports.wip = function(state, emit) {
       ${expiryOptions(state, emit)} ${password(state, emit)}
       <button
         id="upload-btn"
-        class="btn rounded-lg flex-no-shrink focus:outline"
+        class="btn rounded-lg flex-shrink-0 focus:outline"
         title="${state.translate('uploadButton')}"
         onclick="${upload}"
       >
@@ -380,22 +394,22 @@ module.exports.uploading = function(state, emit) {
   return html`
     <send-upload-area
       id="${archive.id}"
-      class="flex flex-col items-start rounded shadow-light bg-white p-4 w-full"
+      class="flex flex-col items-start rounded shadow-light bg-white p-4 w-full dark:bg-grey-90"
     >
       ${archiveInfo(archive)}
-      <div class="text-xs text-grey-dark w-full mt-2 mb-2">
+      <div class="text-xs opacity-75 w-full mt-2 mb-2">
         ${expiryInfo(state.translate, {
           dlimit: state.archive.dlimit,
           dtotal: 0,
           expiresAt: Date.now() + 500 + state.archive.timeLimit * 1000
         })}
       </div>
-      <div class="text-blue-dark text-sm font-medium mt-2">
+      <div class="link-blue text-sm font-medium mt-2">
         ${progressPercent}
       </div>
       <progress class="my-3" value="${progress}">${progressPercent}</progress>
       <button
-        class="text-blue-dark hover:text-blue-darker focus:text-blue-darker self-end font-medium"
+        class="link-blue self-end font-medium"
         onclick=${cancel}
         title="${state.translate('deletePopupCancel')}"
       >
@@ -417,7 +431,7 @@ module.exports.empty = function(state, emit) {
       ? ''
       : html`
           <button
-            class="center font-medium text-sm text-blue-dark hover:text-blue-darker focus:text-blue-darker mt-4 mb-2"
+            class="center font-medium text-sm link-blue mt-4 mb-2"
             onclick="${event => {
               event.stopPropagation();
               emit('signup-cta', 'drop');
@@ -430,14 +444,16 @@ module.exports.empty = function(state, emit) {
         `;
   return html`
     <send-upload-area
-      class="flex flex-col items-center justify-center border-2 border-dashed border-grey rounded px-6 py-16 h-full w-full"
+      class="flex flex-col items-center justify-center border-2 border-dashed border-grey-transparent rounded px-6 py-16 h-full w-full dark:border-grey-60"
       onclick="${e => {
         if (e.target.tagName !== 'LABEL') {
           document.getElementById('file-upload').click();
         }
       }}"
     >
-      <img src="${assets.get('addfiles.svg')}" width="48" height="48" />
+      <svg class="w-10 h-10 link-blue">
+        <use xlink:href="/${assets.get('addfiles.svg')}#plus" />
+      </svg>
       <div class="pt-6 pb-2 text-center text-lg font-bold tracking-wide">
         ${state.translate('dragAndDropFiles')}
       </div>
@@ -448,7 +464,7 @@ module.exports.empty = function(state, emit) {
       </div>
       <input
         id="file-upload"
-        class="opacity-0 w-0 h-0 appearance-none absolute"
+        class="opacity-0 w-0 h-0 appearance-none absolute overflow-hidden"
         type="file"
         multiple
         onfocus="${focus}"
@@ -471,14 +487,11 @@ module.exports.empty = function(state, emit) {
   `;
 
   function focus(event) {
-    event.target.nextElementSibling.classList.add('bg-blue-darker', 'outline');
+    event.target.nextElementSibling.classList.add('bg-blue-70', 'outline');
   }
 
   function blur(event) {
-    event.target.nextElementSibling.classList.remove(
-      'bg-blue-darker',
-      'outline'
-    );
+    event.target.nextElementSibling.classList.remove('bg-blue-70', 'outline');
   }
 
   function add(event) {
@@ -503,13 +516,15 @@ module.exports.preview = function(state, emit) {
         </div>
       `;
   return html`
-    <send-archive class="flex flex-col max-h-full bg-white p-4 w-full md:w-128">
-      <div class="border rounded py-3 px-6">
+    <send-archive
+      class="flex flex-col max-h-full bg-white p-4 w-full md:w-128 dark:bg-grey-90"
+    >
+      <div class="border rounded py-3 px-6 dark:border-grey-70">
         ${archiveInfo(archive)} ${details}
       </div>
       <button
         id="download-btn"
-        class="btn rounded-lg mt-4 w-full flex-no-shrink focus:outline"
+        class="btn rounded-lg mt-4 w-full flex-shrink-0 focus:outline"
         title="${state.translate('downloadButtonLabel')}"
         onclick=${download}
       >
@@ -531,10 +546,10 @@ module.exports.downloading = function(state) {
   const progressPercent = percent(progress);
   return html`
     <send-archive
-      class="flex flex-col bg-white rounded shadow-light p-4 w-full max-w-sm md:w-128"
+      class="flex flex-col bg-white rounded shadow-light p-4 w-full max-w-sm md:w-128 dark:bg-grey-90"
     >
       ${archiveInfo(archive)}
-      <div class="text-blue-dark text-sm font-medium mt-2">
+      <div class="link-blue text-sm font-medium mt-2">
         ${progressPercent}
       </div>
       <progress class="my-3" value="${progress}">${progressPercent}</progress>

app/ui/blank.js

@@ -4,7 +4,7 @@ module.exports = function() {
   return html`
     <main class="main">
       <section
-        class="h-full w-full p-6 md:flex md:flex-row md:rounded-lg md:shadow-big"
+        class="h-full w-full p-6 md:p-8 md:flex md:flex-row md:rounded-xl md:shadow-big"
       >
         <div class="md:mr-6 md:w-1/2 w-full"></div>
         <div class="md:w-1/2 mt-6 md:mt-0 w-full"></div>

app/ui/body.js

@@ -8,10 +8,7 @@ function banner(state) {
     return; // server side
   }
   const show =
-    !state.capabilities.standalone &&
-    !/firefox/i.test(navigator.userAgent) &&
-    document.querySelector('html').lang.startsWith('en') &&
-    !state.route.startsWith('/unsupported/');
+    !state.capabilities.standalone && !state.route.startsWith('/unsupported/');
   if (show) {
     return state.cache(Promo, 'promo').render();
   }
@@ -21,7 +18,7 @@ module.exports = function body(main) {
   return function(state, emit) {
     const b = html`
       <body
-        class="flex flex-col items-center font-sans md:h-screen md:bg-grey-lightest"
+        class="flex flex-col items-center font-sans md:h-screen md:bg-grey-10 dark:bg-black"
       >
         ${banner(state, emit)} ${state.cache(Header, 'header').render()}
         ${main(state, emit)} ${state.cache(Footer, 'footer').render()}

app/ui/copyDialog.js

@@ -2,34 +2,36 @@ const html = require('choo/html');
 const { copyToClipboard } = require('../utils');
 
 module.exports = function(name, url) {
-  return function(state, emit, close) {
+  const dialog = function(state, emit, close) {
     return html`
       <send-copy-dialog
         class="flex flex-col items-center text-center p-4 max-w-sm m-auto"
       >
-        <h1 class="font-bold my-4">
+        <h1 class="text-3xl font-bold my-4">
           ${state.translate('notifyUploadEncryptDone')}
         </h1>
-        <p class="font-normal leading-normal text-grey-darkest word-break-all">
+        <p
+          class="font-normal leading-normal text-grey-80 word-break-all dark:text-grey-40"
+        >
           ${state.translate('copyLinkDescription')} <br />
           ${name}
         </p>
         <input
           type="text"
           id="share-url"
-          class="w-full my-4 border rounded-lg leading-loose h-12 px-2 py-1"
+          class="w-full my-4 border rounded-lg leading-loose h-12 px-2 py-1 dark:bg-grey-80"
           value="${url}"
           readonly="true"
         />
         <button
-          class="btn rounded-lg w-full flex-no-shrink focus:outline"
+          class="btn rounded-lg w-full flex-shrink-0 focus:outline"
           onclick="${copy}"
           title="${state.translate('copyLinkButton')}"
         >
           ${state.translate('copyLinkButton')}
         </button>
         <button
-          class="text-blue-dark hover:text-blue-darker focus:text-blue-darker my-4 font-medium cursor-pointer focus:outline"
+          class="link-blue my-4 font-medium cursor-pointer focus:outline"
           onclick="${close}"
           title="${state.translate('okButton')}"
         >
@@ -45,4 +47,6 @@ module.exports = function(name, url) {
       setTimeout(close, 1000);
     }
   };
+  dialog.type = 'copy';
+  return dialog;
 };

app/ui/download.js

@@ -22,7 +22,9 @@ function downloading(state, emit) {
     <div
       class="flex flex-col w-full h-full items-center md:justify-center md:-mt-8"
     >
-      <h1 class="mb-4">${state.translate('downloadingTitle')}</h1>
+      <h1 class="text-3xl font-bold mb-4">
+        ${state.translate('downloadingTitle')}
+      </h1>
       ${archiveTile.downloading(state, emit)}
     </div>
   `;
@@ -36,8 +38,12 @@ function preview(state, emit) {
     <div
       class="flex flex-col w-full max-w-md h-full mx-auto items-center justify-center"
     >
-      <h1 class="mb-4">${state.translate('downloadTitle')}</h1>
-      <p class="w-full text-grey-darkest text-center leading-normal">
+      <h1 class="text-3xl font-bold mb-4">
+        ${state.translate('downloadTitle')}
+      </h1>
+      <p
+        class="w-full text-grey-80 text-center leading-normal dark:text-grey-40"
+      >
         ${state.translate('downloadDescription')}
       </p>
       ${archiveTile.preview(state, emit)}
@@ -76,7 +82,9 @@ module.exports = function(state, emit) {
   return html`
     <main class="main">
       ${state.modal && modal(state, emit)}
-      <section class="relative h-full w-full p-6 md:rounded-lg md:shadow-big">
+      <section
+        class="relative h-full w-full p-6 md:p-8 md:rounded-xl md:shadow-big"
+      >
         ${content}
       </section>
     </main>

app/ui/downloadCompleted.js

@@ -5,13 +5,13 @@ module.exports = function(state) {
   return html`
     <div
       id="download-complete"
-      class="flex flex-col items-center justify-center h-full w-full bg-white p-2"
+      class="flex flex-col items-center justify-center h-full w-full bg-white p-2 dark:bg-grey-90"
     >
-      <h1 class="text-center font-bold my-2">
+      <h1 class="text-center text-3xl font-bold my-2">
         ${state.translate('downloadFinish')}
       </h1>
       <img src="${assets.get('completed.svg')}" class="my-12 h-48" />
-      <p class="text-grey-darkest leading-normal">
+      <p class="text-grey-80 leading-normal dark:text-grey-40">
         ${state.translate('trySendDescription')}
       </p>
       <p class="my-5">

app/ui/downloadPassword.js

@@ -6,10 +6,14 @@ module.exports = function(state, emit) {
 
   const div = html`
     <div
-      class="h-full w-full flex flex-col items-center justify-center bg-white py-8 max-w-md mx-auto"
+      class="h-full w-full flex flex-col items-center justify-center bg-white py-8 max-w-md mx-auto dark:bg-grey-90"
     >
-      <h1 class="mb-4">${state.translate('downloadTitle')}</h1>
-      <p class="w-full mb-4 text-center text-grey-darkest leading-normal">
+      <h1 class="text-3xl font-bold mb-4">
+        ${state.translate('downloadTitle')}
+      </h1>
+      <p
+        class="w-full mb-4 text-center text-grey-80 dark:text-grey-40 leading-normal"
+      >
         ${state.translate('downloadDescription')}
       </p>
       <form
@@ -20,8 +24,8 @@ module.exports = function(state, emit) {
         <input
           id="password-input"
           class="w-full border-l border-t border-b rounded-l-lg rounded-r-none ${invalid
-            ? 'border-red'
-            : 'border-grey'} leading-loose px-2 py-1"
+            ? 'border-red dark:border-red-40'
+            : 'border-grey'} leading-loose px-2 py-1 dark:bg-grey-80"
           maxlength="32"
           autocomplete="off"
           placeholder="${state.translate('unlockInputPlaceholder')}"
@@ -32,7 +36,7 @@ module.exports = function(state, emit) {
           type="submit"
           id="password-btn"
           class="btn rounded-r-lg rounded-l-none ${invalid
-            ? 'bg-red hover:bg-red focus:bg-red'
+            ? 'bg-red hover:bg-red focus:bg-red dark:bg-red-40'
             : ''}"
           value="${state.translate('unlockButtonLabel')}"
           title="${state.translate('unlockButtonLabel')}"
@@ -40,7 +44,7 @@ module.exports = function(state, emit) {
       </form>
       <label
         id="password-error"
-        class="${invalid ? '' : 'invisible'} text-red my-4"
+        class="${invalid ? '' : 'invisible'} text-red dark:text-red-40 my-4"
         for="password-input"
       >
         ${state.translate('passwordTryAgain')}
@@ -70,7 +74,9 @@ module.exports = function(state, emit) {
     const password = el.value;
     if (password.length > 0) {
       document.getElementById('password-btn').disabled = true;
-      state.fileInfo.url = window.location.href;
+      // Strip any url parameters between fileId and secretKey
+      const fileInfoUrl = window.location.href.replace(/\?.+#/, '#');
+      state.fileInfo.url = fileInfoUrl;
       state.fileInfo.password = password;
       emit('getMetadata');
     }

app/ui/error.js

@@ -7,13 +7,13 @@ module.exports = function(state, emit) {
     <main class="main">
       ${state.modal && modal(state, emit)}
       <section
-        class="flex flex-col items-center justify-center h-full w-full p-6 overflow-hidden md:rounded-lg md:shadow-big"
+        class="flex flex-col items-center justify-center h-full w-full p-6 md:p-8 overflow-hidden md:rounded-xl md:shadow-big"
       >
-        <h1 class="text-center font-bold my-2">
+        <h1 class="text-center text-3xl font-bold my-2">
           ${state.translate('errorPageHeader')}
         </h1>
         <img class="my-12 h-48" src="${assets.get('error.svg')}" />
-        <p class="max-w-md text-center text-grey-darkest leading-normal">
+        <p class="max-w-md text-center text-grey-80 leading-normal">
           ${state.translate('trySendDescription')}
         </p>
         <p class="my-5">

app/ui/footer.js

@@ -19,16 +19,13 @@ class Footer extends Component {
     const feedbackUrl = `https://qsurvey.mozilla.com/s3/Firefox-Send-Product-Feedback?ver=${version}&browser=${browser}`;
     return html`
       <footer
-        class="flex flex-col md:flex-row items-start w-full flex-none self-start p-6 font-medium text-xs text-grey-dark md:items-center justify-between"
+        class="flex flex-col md:flex-row items-start w-full flex-none self-start p-6 md:p-8 font-medium text-xs text-grey-60 dark:text-grey-40 md:items-center justify-between"
       >
-        <a
-          class="mozilla-logo pb-10 md:pb-0 m-2"
-          href="https://www.mozilla.org/"
-        >
+        <a class="mozilla-logo m-2" href="https://www.mozilla.org/">
           Mozilla
         </a>
         <ul
-          class="list-reset flex flex-col md:flex-row items-start md:items-center md:justify-end"
+          class="flex flex-col md:flex-row items-start md:items-center md:justify-end"
         >
           <li class="m-2">
             <a href="https://www.mozilla.org/about/legal/terms/services/#send">

app/ui/header.js

@@ -16,19 +16,31 @@ class Header extends Component {
     this.account.render();
     return false;
   }
-
   createElement() {
     const title =
       platform() === 'android'
         ? html`
-            <a class=""><img src="${assets.get('logo.svg')}"/></a>
+            <a class="flex flex-row items-center">
+              <img src="${assets.get('icon.svg')}" />
+              <svg class="w-48">
+                <use xlink:href="${assets.get('wordmark.svg')}#logo" />
+              </svg>
+            </a>
           `
         : html`
-            <a class="" href="/"><img src="${assets.get('logo.svg')}"/></a>
+            <a class="flex flex-row items-center" href="/">
+              <img
+                alt="${this.state.translate('title')}"
+                src="${assets.get('icon.svg')}"
+              />
+              <svg class="w-48 md:w-64">
+                <use xlink:href="${assets.get('wordmark.svg')}#logo" />
+              </svg>
+            </a>
           `;
     return html`
       <header
-        class="relative flex-none flex flex-row items-center justify-between w-full px-6 h-16 md:h-24 z-20 bg-transparent"
+        class="main-header relative flex-none flex flex-row items-center justify-between w-full px-6 md:px-8 h-16 md:h-24 z-20 bg-transparent"
       >
         ${title} ${this.account.render()}
       </header>

app/ui/home.js

@@ -20,19 +20,15 @@ module.exports = function(state, emit) {
   const right =
     archives.length === 0
       ? intro(state)
-      : list(
-          archives,
-          'list-reset p-2 h-full overflow-y-auto w-full',
-          'mb-4 w-full'
-        );
+      : list(archives, 'p-2 h-full overflow-y-auto w-full', 'mb-4 w-full');
 
   return html`
     <main class="main">
       ${state.modal && modal(state, emit)}
       <section
-        class="h-full w-full p-6 overflow-hidden md:flex md:flex-row md:rounded-lg md:shadow-big"
+        class="h-full w-full p-6 md:p-8 overflow-hidden md:flex md:flex-row md:rounded-xl md:shadow-big"
       >
-        <div class="px-2 w-full md:px-0 md:mr-6 md:w-1/2">${left}</div>
+        <div class="px-2 w-full md:px-0 md:mr-8 md:w-1/2">${left}</div>
         <div class="mt-6 w-full md:w-1/2 md:-m-2">${right}</div>
       </section>
     </main>

app/ui/intro.js

@@ -4,13 +4,13 @@ const assets = require('../../common/assets');
 module.exports = function intro(state) {
   return html`
     <send-intro
-      class="flex flex-col items-center justify-center bg-white px-6 md:py-0 py-6 mb-0 h-full w-full"
+      class="flex flex-col items-center justify-center bg-white px-6 md:py-0 py-6 mb-0 h-full w-full dark:bg-grey-90"
     >
       <div class="mt-12 flex flex-col h-full">
-        <h1 class="font-bold">
+        <h1 class="text-3xl font-bold md:pb-2">
           ${state.translate('introTitle')}
         </h1>
-        <p class="max-w-sm leading-normal mt-6 md:mt-2 md:pr-16">
+        <p class="max-w-sm leading-loose mt-6 md:mt-2 md:pr-14">
           ${state.translate('introDescription')}
         </p>
         <img class="intro" src="${assets.get('intro.svg')}" />

app/ui/legal.js

@@ -6,18 +6,20 @@ module.exports = function(state, emit) {
     <main class="main">
       ${state.modal && modal(state, emit)}
       <div
-        class="flex flex-col items-center bg-white m-4 px-6 py-8 border border-grey-light md:border-none md:px-12 md:py-16 shadow w-full md:h-full"
+        class="flex flex-col items-center bg-white m-4 px-6 py-8 border border-grey-30 md:border-none md:px-12 md:py-16 shadow w-full md:h-full dark:bg-grey-90"
       >
-        <h1 class="text-center">${state.translate('legalTitle')}</h1>
+        <h1 class="text-center text-3xl font-bold">
+          ${state.translate('legalTitle')}
+        </h1>
         <p class="mt-2">${state.translate('legalDateStamp')}</p>
-        <div class="overflow-scroll py-8 px-12">
+        <div class="overflow-y-scroll py-8 px-12">
           <p class="leading-normal">
             <span>When Mozilla receives information from you, our</span>
             <a
               href="https://www.mozilla.org/privacy/"
               target="__blank"
               rel="noopener noreferrer"
-              class="text-blue-dark hover:underline"
+              class="link-blue hover:underline"
               >Mozilla Privacy Policy</a
             >
             <span
@@ -29,7 +31,7 @@ module.exports = function(state, emit) {
               href="https://github.com/mozilla/send/blob/master/docs/metrics.md"
               target="__blank"
               rel="noopener noreferrer"
-              class="text-blue-dark hover:underline"
+              class="link-blue hover:underline"
               >here</a
             >.
           </p>

app/ui/modal.js

@@ -3,13 +3,12 @@ const html = require('choo/html');
 module.exports = function(state, emit) {
   return html`
     <send-modal
-      class="absolute pin flex items-center justify-center overflow-hidden z-40 bg-white md:rounded-lg md:my-8"
-      onclick="${close}"
+      class="absolute inset-0 flex items-center justify-center overflow-hidden z-40 bg-white md:rounded-xl md:my-8 dark:bg-grey-90"
     >
       <div
-        class="h-full w-full max-h-screen absolute pin-t flex items-center justify-center"
+        class="h-full w-full max-h-screen absolute top-0 flex items-center justify-center"
       >
-        <div class="w-full" onclick="${e => e.stopPropagation()}">
+        <div class="w-full">
           ${state.modal(state, emit, close)}
         </div>
       </div>
@@ -21,7 +20,6 @@ module.exports = function(state, emit) {
       event.preventDefault();
       event.stopPropagation();
     }
-    state.modal = null;
-    emit('render');
+    emit('closeModal');
   }
 };

app/ui/noStreams.js

@@ -8,16 +8,18 @@ module.exports = function(state, emit) {
     <div
       class="flex flex-col w-full max-w-md h-full mx-auto items-center justify-center"
     >
-      <h1 class="mb-4">${state.translate('downloadTitle')}</h1>
+      <h1 class="mb-4 text-3xl font-bold">${state.translate(
+        'downloadTitle'
+      )}</h1>
       <p
-        class="w-full p-2 border border-yellow-light rounded md:w-4/5 text-orange-dark bg-yellow-lighter text-center leading-normal"
+        class="w-full p-2 border border-yellow-50 rounded md:w-4/5 text-orange-60 bg-yellow-40 text-center leading-normal"
       >
         ⚠️ ${state.translate('noStreamsWarning')} ⚠️
       </p>
       <form class="md:w-128" onsubmit=${submit}>
         <fieldset class="border rounded p-4 my-4" onchange=${optionChanged}>
           <div class="flex items-center mb-2">
-            <img class="mr-3 flex-no-shrink" src="${assets.get(
+            <img class="mr-3 flex-shrink-0" src="${assets.get(
               'blue_file.svg'
             )}"/>
             <p class="flex-grow">
@@ -49,7 +51,7 @@ module.exports = function(state, emit) {
           </div>
         </fieldset>
         <input
-            class="btn rounded-lg w-full flex flex-no-shrink items-center justify-center"
+            class="btn rounded-lg w-full flex flex-shrink-0 items-center justify-center"
             value="${state.translate('copyLinkButton')}"
             title="${state.translate('copyLinkButton')}"
             type="submit" />

app/ui/notFound.js

@@ -7,13 +7,13 @@ module.exports = function(state, emit) {
     <main class="main">
       ${state.modal && modal(state, emit)}
       <section
-        class="flex flex-col items-center justify-center h-full w-full p-6 overflow-hidden md:rounded-lg md:shadow-big"
+        class="flex flex-col items-center justify-center h-full w-full p-6 md:p-8 overflow-hidden md:rounded-xl md:shadow-big"
       >
-        <h1 class="text-center font-bold my-2">
+        <h1 class="text-center text-3xl font-bold my-2">
           ${state.translate('expiredTitle')}
         </h1>
         <img src="${assets.get('notFound.svg')}" class="my-12" />
-        <p class="max-w-md text-center text-grey-darkest leading-normal">
+        <p class="max-w-md text-center text-grey-80 leading-normal">
           ${state.translate('trySendDescription')}
         </p>
         <p class="my-5">

app/ui/okDialog.js

@@ -4,9 +4,11 @@ module.exports = function(message) {
   return function(state, emit, close) {
     return html`
       <send-ok-dialog class="flex flex-col max-w-sm p-4 m-auto">
-        <h2 class="text-center m-8 leading-normal">${message}</h2>
+        <h2 class="text-center text-xl font-bold m-8 leading-normal">
+          ${message}
+        </h2>
         <button
-          class="btn rounded-lg w-full flex-no-shrink"
+          class="btn rounded-lg w-full flex-shrink-0"
           onclick="${close}"
           title="${state.translate('okButton')}"
         >

app/ui/promo.js

@@ -3,8 +3,9 @@ const Component = require('choo/component');
 const assets = require('../../common/assets');
 
 class Promo extends Component {
-  constructor(name) {
+  constructor(name, state) {
     super(name);
+    this.state = state;
   }
 
   update() {
@@ -14,21 +15,20 @@ class Promo extends Component {
   createElement() {
     return html`
       <send-promo
-        class="w-full flex-none flex-row items-center content-center justify-center text-sm bg-grey-light leading-tight text-grey-darkest px-4 py-3 hidden md:flex"
+        class="w-full flex-row items-center content-center justify-center bg-white text-grey-80 px-4 py-3 flex border-b border-grey-banner leading-normal dark:bg-grey-90 dark:text-grey-20 dark:border-grey-80"
       >
         <div class="flex items-center mx-auto">
           <img
-            src="${assets.get('firefox_logo-only.svg')}"
-            class="w-6"
+            src="${assets.get('master-logo.svg')}"
+            class="w-6 h-6"
             alt="Firefox"
           />
-          <span class="ml-3"
-            >Send is brought to you by the all-new Firefox.${' '}
+          <span class="ml-2 sm:ml-4 text-xs sm:text-base">
+            ${this.state.translate('trailheadPromo')}${' '}
             <a
-              class="text-blue"
-              href="https://www.mozilla.org/firefox/new/?utm_campaign=send-acquisition&utm_medium=referral&utm_source=send.firefox.com"
-            >
-              Download Firefox now ≫</a
+              class="underline link-blue"
+              href="http://www.mozilla.org/firefox/accounts/?utm_source=send.firefox.com&utm_medium=banner&utm_campaign=trailhead&utm_content=protect-your-privacy"
+              >${this.state.translate('learnMore')}</a
             >
           </span>
         </div>

app/ui/selectbox.js

@@ -6,7 +6,7 @@ module.exports = function(selected, options, translate, changed, htmlId) {
   return html`
     <select
       id="${htmlId}"
-      class="appearance-none cursor-pointer border rounded bg-grey-lightest hover:border-blue-dark focus:border-blue-dark pl-1 pr-8 py-1 my-1 h-8"
+      class="appearance-none cursor-pointer border rounded bg-grey-10 hover:border-blue-50 focus:border-blue-50 pl-1 pr-8 py-1 my-1 h-8 dark:bg-grey-80"
       onchange="${choose}"
     >
       ${options.map(

app/ui/shareDialog.js

@@ -1,40 +1,36 @@
 const html = require('choo/html');
 
-/* Possible strings for l10n
-shareLinkDescription = Share the link to your file:
-shareLinkButton = Share link
-shareMessage = Download "{ $name }" with { -send-brand }: simple, safe file sharing
- */
-
 module.exports = function(name, url) {
-  return function(state, emit, close) {
+  const dialog = function(state, emit, close) {
     return html`
       <send-share-dialog
         class="flex flex-col items-center text-center p-4 max-w-sm m-auto"
       >
-        <h1 class="font-bold my-4">
+        <h1 class="text-3xl font-bold my-4">
           ${state.translate('notifyUploadEncryptDone')}
         </h1>
-        <p class="font-normal leading-normal text-grey-darkest word-break-all">
-          Share the link to your file:<br />
+        <p
+          class="font-normal leading-normal text-grey-80 word-break-all dark:text-grey-40"
+        >
+          ${state.translate('shareLinkDescription')}<br />
           ${name}
         </p>
         <input
           type="text"
           id="share-url"
-          class="w-full my-4 border rounded-lg leading-loose h-12 px-2 py-1"
+          class="w-full my-4 border rounded-lg leading-loose h-12 px-2 py-1 dark:bg-grey-80"
           value="${url}"
           readonly="true"
         />
         <button
-          class="btn rounded-lg w-full flex-no-shrink focus:outline"
+          class="btn rounded-lg w-full flex-shrink-0 focus:outline"
           onclick="${share}"
-          title="Share link"
+          title="${state.translate('shareLinkButton')}"
         >
-          Share link
+          ${state.translate('shareLinkButton')}
         </button>
         <button
-          class="text-blue-dark hover:text-blue-darker focus:text-blue-darker my-4 font-medium cursor-pointer focus:outline"
+          class="link-blue my-4 font-medium cursor-pointer focus:outline"
           onclick="${close}"
           title="${state.translate('okButton')}"
         >
@@ -48,8 +44,7 @@ module.exports = function(name, url) {
       try {
         await navigator.share({
           title: state.translate('-send-brand'),
-          text: `Download "${name}" with Firefox Send: simple, safe file sharing`,
-          //state.translate('shareMessage', { name }),
+          text: state.translate('shareMessage', { name }),
           url
         });
       } catch (e) {
@@ -61,4 +56,6 @@ module.exports = function(name, url) {
       close();
     }
   };
+  dialog.type = 'share';
+  return dialog;
 };

app/ui/signupDialog.js

@@ -12,18 +12,15 @@ module.exports = function(trigger) {
       <send-signup-dialog
         class="flex flex-col lg:flex-row justify-center px-8 md:px-24 w-full h-full"
       >
-        <img
-          src="${assets.get('firefox_logo-only.svg')}"
-          class="h-16 mt-1 mb-4"
-        />
+        <img src="${assets.get('master-logo.svg')}" class="h-16 mt-1 mb-4" />
         <section
-          class="flex flex-col flex-no-shrink self-center lg:mx-6 lg:max-w-xs"
+          class="flex flex-col flex-shrink-0 self-center lg:mx-6 lg:max-w-xs"
         >
-          <h1 class="font-bold text-center lg:text-left">
+          <h1 class="text-3xl font-bold text-center lg:text-left">
             ${state.translate('accountBenefitTitle')}
           </h1>
           <ul
-            class="leading-normal text-grey-darkest my-2 mt-4 pl-4 md:self-center"
+            class="leading-normal list-disc text-grey-80 my-2 mt-4 pl-4 md:self-center dark:text-grey-40"
           >
             <li>
               ${state.translate('accountBenefitLargeFiles', {
@@ -45,19 +42,19 @@ module.exports = function(trigger) {
             <input
               id="email-input"
               type="email"
-              class="${hidden} border rounded-lg w-full px-2 py-1 h-12 mb-3 text-lg text-grey-darker leading-loose"
+              class="${hidden} border rounded-lg w-full px-2 py-1 h-12 mb-3 text-lg text-grey-70 leading-loose dark:bg-grey-80 dark:text-white"
               placeholder=${state.translate('emailPlaceholder')}
             />
             <input
-              class="btn rounded-lg w-full flex flex-no-shrink items-center justify-center"
-              value="${state.translate('signInButton')}"
-              title="${state.translate('signInButton')}"
+              class="btn rounded-lg w-full flex flex-shrink-0 items-center justify-center"
+              value="${state.translate('signInOnlyButton')}"
+              title="${state.translate('signInOnlyButton')}"
               id="email-submit"
               type="submit"
             />
           </form>
           <button
-            class="my-3 text-blue-dark hover:text-blue-darker focus:text-blue-darker font-medium"
+            class="my-3 link-blue font-medium"
             title="${state.translate('deletePopupCancel')}"
             onclick=${cancel}
           >

app/ui/surveyDialog.js

@@ -0,0 +1,42 @@
+const html = require('choo/html');
+const version = require('../../package.json').version;
+const { browserName } = require('../utils');
+
+module.exports = function() {
+  return function(state, emit, close) {
+    const surveyUrl = `${
+      state.PREFS.surveyUrl
+    }?ver=${version}&browser=${browserName()}&anon=${
+      state.user.loggedIn
+    }&active_count=${state.storage.files.length}`;
+    return html`
+      <send-survey-dialog
+        class="flex flex-col items-center text-center p-4 max-w-sm m-auto"
+      >
+        <h1 class="text-3xl font-bold my-4">
+          Tell us what you think.
+        </h1>
+        <p class="font-normal leading-normal text-grey-80 px-4">
+          Love Firefox Send? Take a quick survey to let us know how we can make
+          it better.
+        </p>
+        <a
+          class="btn rounded-lg w-full flex-shrink-0 focus:outline my-5"
+          onclick="${() => emit('closeModal')}"
+          title="Give feedback"
+          href="${surveyUrl}"
+          target="_blank"
+        >
+          Give feedback
+        </a>
+        <button
+          class="link-blue font-medium cursor-pointer focus:outline"
+          onclick="${close}"
+          title="Skip"
+        >
+          Skip
+        </button>
+      </send-survey-dialog>
+    `;
+  };
+};

app/ui/unsupported.js

@@ -27,9 +27,9 @@ module.exports = function(state, emit) {
     <main class="main">
       ${state.modal && modal(state, emit)}
       <section
-        class="flex flex-col items-center justify-center text-center bg-white m-6 px-6 py-8 border border-grey-light md:border-none md:px-12 md:py-16 shadow w-full md:h-full"
+        class="flex flex-col items-center justify-center text-center bg-white m-6 px-6 py-8 border border-grey-30 md:border-none md:px-12 md:py-16 shadow w-full md:h-full dark:bg-grey-90"
       >
-        <h1 class="">${strings.header}</h1>
+        <h1 class="text-3xl font-bold">${strings.header}</h1>
         <p class="mt-4 mb-8 max-w-md leading-normal">${strings.description}</p>
         ${why}
         <a href="${url}" class="btn rounded-lg mt-8 px-8">

app/user.js

@@ -44,6 +44,14 @@ export default class User {
     this.storage.set('firstAction', action);
   }
 
+  get surveyed() {
+    return this.storage.get('surveyed');
+  }
+
+  set surveyed(yes) {
+    this.storage.set('surveyed', yes);
+  }
+
   get avatar() {
     const defaultAvatar = assets.get('user.svg');
     if (this.info.avatarDefault) {

app/utils.js

@@ -14,6 +14,10 @@ function b64ToArray(str) {
   return b64.toByteArray(str + '==='.slice((str.length + 3) % 4));
 }
 
+function locale() {
+  return document.querySelector('html').lang;
+}
+
 function loadShim(polyfill) {
   return new Promise((resolve, reject) => {
     const shim = document.createElement('script');
@@ -67,8 +71,7 @@ function bytes(num) {
   let nStr = n.toFixed(decimalDigits);
   if (LOCALIZE_NUMBERS) {
     try {
-      const locale = document.querySelector('html').lang;
-      nStr = n.toLocaleString(locale, {
+      nStr = n.toLocaleString(locale(), {
         minimumFractionDigits: decimalDigits,
         maximumFractionDigits: decimalDigits
       });
@@ -85,8 +88,7 @@ function bytes(num) {
 function percent(ratio) {
   if (LOCALIZE_NUMBERS) {
     try {
-      const locale = document.querySelector('html').lang;
-      return ratio.toLocaleString(locale, { style: 'percent' });
+      return ratio.toLocaleString(locale(), { style: 'percent' });
     } catch (e) {
       // fall through
     }
@@ -96,8 +98,7 @@ function percent(ratio) {
 
 function number(n) {
   if (LOCALIZE_NUMBERS) {
-    const locale = document.querySelector('html').lang;
-    return n.toLocaleString(locale);
+    return n.toLocaleString(locale());
   }
   return n.toString();
 }
@@ -267,6 +268,7 @@ function setTranslate(t) {
 }
 
 module.exports = {
+  locale,
   fadeOut,
   delay,
   allowedCopy,

assets/addfiles.svg

@@ -1,9 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
-  <defs>
-    <polygon id="addfiles-a" points="11.143 6 11.143 11.143 6 11.143 6 12.857 11.143 12.857 11.143 18 12.857 18 12.857 12.857 18 12.857 18 11.143 12.857 11.143 12.857 6"/>
-  </defs>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<symbol id="plus" viewBox="0 0 24 24">
   <g fill="none" fill-rule="evenodd">
-    <path fill="#0060df" fill-rule="nonzero" d="M12,22.6666667 C17.8910373,22.6666667 22.6666667,17.8910373 22.6666667,12 C22.6666667,6.10896267 17.8910373,1.33333333 12,1.33333333 C6.10896267,1.33333333 1.33333333,6.10896267 1.33333333,12 C1.33333333,17.8910373 6.10896267,22.6666667 12,22.6666667 Z M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z"/>
-    <use fill="#0060df" xlink:href="#addfiles-a"/>
+    <path fill="currentColor" fill-rule="nonzero" d="M12,22.6666667 C17.8910373,22.6666667 22.6666667,17.8910373 22.6666667,12 C22.6666667,6.10896267 17.8910373,1.33333333 12,1.33333333 C6.10896267,1.33333333 1.33333333,6.10896267 1.33333333,12 C1.33333333,17.8910373 6.10896267,22.6666667 12,22.6666667 Z M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z"/>
+    <polygon fill="currentColor" points="11.143 6 11.143 11.143 6 11.143 6 12.857 11.143 12.857 11.143 18 12.857 18 12.857 12.857 18 12.857 18 11.143 12.857 11.143 12.857 6"/>
   </g>
+  </symbol>
+  <use xlink:href="#plus"/>
 </svg>

assets/blue_file.svg

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="26px" height="32px" viewBox="0 0 26 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 53 (72520) - https://sketchapp.com -->
-    <title>6AF7DAB4-6456-44F2-AABE-F001D910B641</title>
-    <desc>Created with sketchtool.</desc>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <symbol id="icon" viewBox="0 0 26 32">
     <defs>
         <path d="M21.848475,31.6653183 L2.89005487,31.6653183 C1.32717435,31.6653183 0.104050469,30.3742431 0.104050469,28.8793139 L0.104050469,2.7860044 C0.104050469,1.22312388 1.39512568,0 2.89005487,0 L14.7135857,0 C15.4610503,0 16.2085149,0.271805307 16.6841742,0.815415921 L23.8190635,7.95030523 C24.3626741,8.49391584 24.6344794,9.17342911 24.6344794,9.9208937 L24.6344794,28.8793139 C24.6344794,30.3742431 23.4113555,31.6653183 21.848475,31.6653183 Z" id="path-1"></path>
     </defs>
@@ -14,14 +12,15 @@
                         <mask id="mask-2" fill="white">
                             <use xlink:href="#path-1"></use>
                         </mask>
-                        <use id="Mask" fill="#45A1FF" opacity="0.6" xlink:href="#path-1"></use>
-                        <path d="M24.3031318,10.6474633 L16.7826187,10.6474633 C15.2742552,10.6474633 14.051485,9.42469306 14.051485,7.91632957 L14.051485,0.395816478" id="Path" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-                        <path d="M7.2830232,8.93885547 L8.91906464,8.93885547" id="Path" stroke="#0060DF" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-                        <path d="M7.2830232,15.7798836 L17.5412669,15.7798836" id="Path" stroke="#0060DF" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-                        <path d="M7.2830232,22.6209117 L17.5412669,22.6209117" id="Path" stroke="#0060DF" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
+                        <use id="Mask" fill="#45a1ff" xlink:href="#path-1"></use>
+                        <path d="M24.3031318,10.6474633 L16.7826187,10.6474633 C15.2742552,10.6474633 14.051485,9.42469306 14.051485,7.91632957 L14.051485,0.395816478" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
+                        <path d="M7.2830232,8.93885547 L8.91906464,8.93885547" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
+                        <path d="M7.2830232,15.7798836 L17.5412669,15.7798836" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
+                        <path d="M7.2830232,22.6209117 L17.5412669,22.6209117" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
                     </g>
                 </g>
             </g>
         </g>
     </g>
+    </symbol>
 </svg>

assets/close-16.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 16 16"><path fill="#4A4A4A" d="M9.414 8l5.293-5.293a1 1 0 0 0-1.414-1.414L8 6.586 2.707 1.293a1 1 0 0 0-1.414 1.414L6.586 8l-5.293 5.293a1 1 0 1 0 1.414 1.414L8 9.414l5.293 5.293a1 1 0 0 0 1.414-1.414z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 16 16"><path fill="#737373" d="M9.414 8l5.293-5.293a1 1 0 0 0-1.414-1.414L8 6.586 2.707 1.293a1 1 0 0 0-1.414 1.414L6.586 8l-5.293 5.293a1 1 0 1 0 1.414 1.414L8 9.414l5.293 5.293a1 1 0 0 0 1.414-1.414z"/></svg>

assets/copy-16.svg

@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="#0060df" d="M14.707 8.293l-3-3A1 1 0 0 0 11 5h-1V4a1 1 0 0 0-.293-.707l-3-3A1 1 0 0 0 6 0H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h3v3a2 2 0 0 0 2 2h5a2 2 0 0 0 2-2V9a1 1 0 0 0-.293-.707zM12.586 9H11V7.414zm-5-5H6V2.414zM6 7v2H3V2h2v2.5a.5.5 0 0 0 .5.5H8a2 2 0 0 0-2 2zm2 7V7h2v2.5a.5.5 0 0 0 .5.5H13v4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg">
+<symbol id="icon" viewBox="0 0 16 16">
+<path fill="currentColor" d="M14.707 8.293l-3-3A1 1 0 0 0 11 5h-1V4a1 1 0 0 0-.293-.707l-3-3A1 1 0 0 0 6 0H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h3v3a2 2 0 0 0 2 2h5a2 2 0 0 0 2-2V9a1 1 0 0 0-.293-.707zM12.586 9H11V7.414zm-5-5H6V2.414zM6 7v2H3V2h2v2.5a.5.5 0 0 0 .5.5H8a2 2 0 0 0-2 2zm2 7V7h2v2.5a.5.5 0 0 0 .5.5H13v4z"/>
+</symbol>
+</svg>

assets/dl.svg

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 53 (72520) - https://sketchapp.com -->
-    <title>728D143F-562C-4AE5-80DA-9DBBD9D647D8</title>
-    <desc>Created with sketchtool.</desc>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Send_Sending" transform="translate(-770.000000, -481.000000)" fill="#0060DF">
-            <g id="List-Item-3" transform="translate(744.000000, 350.000000)">
-                <g id="Download-Icon" transform="translate(26.000000, 131.000000)">
-                    <path d="M5.293,12.707 C5.6835,13.097382 6.316501,13.097383 6.707001,12.707 L11.707,7.707 C12.08597,7.31462 12.08054,6.69092 11.69481,6.305189 C11.30908,5.91946 10.68538,5.91403 10.293,6.293 L7,9.586 L7,1 C7,0.44772 6.552285,0 6,0 C5.447715,0 5,0.44772 5,1 L5,9.586 L1.707,6.293 C1.314621,5.91403 0.690915,5.91945 0.305181,6.305182 C-0.080553,6.690915 -0.085973,7.314622 0.293,7.707001 L5.293,12.707 Z M11,14 L1,14 C0.447715,14 0,14.447715 0,15 C0,15.5522852 0.447715,16 1,16 L11,16 C11.55228,16 12,15.5522852 12,15 C12,14.447715 11.55229,14 11,14 Z" id="Fill-1"></path>
+<svg width="12px" height="16px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <symbol id="icon" viewBox="0 0 12 16">
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-770.000000, -481.000000)" fill="currentColor">
+            <g transform="translate(744.000000, 350.000000)">
+                <g transform="translate(26.000000, 131.000000)">
+                    <path d="M5.293,12.707 C5.6835,13.097382 6.316501,13.097383 6.707001,12.707 L11.707,7.707 C12.08597,7.31462 12.08054,6.69092 11.69481,6.305189 C11.30908,5.91946 10.68538,5.91403 10.293,6.293 L7,9.586 L7,1 C7,0.44772 6.552285,0 6,0 C5.447715,0 5,0.44772 5,1 L5,9.586 L1.707,6.293 C1.314621,5.91403 0.690915,5.91945 0.305181,6.305182 C-0.080553,6.690915 -0.085973,7.314622 0.293,7.707001 L5.293,12.707 Z M11,14 L1,14 C0.447715,14 0,14.447715 0,15 C0,15.5522852 0.447715,16 1,16 L11,16 C11.55228,16 12,15.5522852 12,15 C12,14.447715 11.55229,14 11,14 Z"></path>
                 </g>
             </g>
         </g>
     </g>
+    </symbol>
 </svg>

assets/icon.svg

@@ -0,0 +1,41 @@
+<svg  viewBox="0 0 65 64" height="64" width="65" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<linearGradient id="linear-gradient" x1="46.37" y1="59.71" x2="15.42" y2="6.11" gradientTransform="matrix(1, 0, 0, -1, 0, 64)" gradientUnits="userSpaceOnUse">
+<stop offset="0" stop-color="#ff980e"/>
+<stop offset="0.21" stop-color="#ff7139"/>
+<stop offset="0.36" stop-color="#ff5854"/>
+<stop offset="0.46" stop-color="#ff4f5e"/>
+<stop offset="0.69" stop-color="#ff3750"/>
+<stop offset="0.86" stop-color="#f92261"/>
+<stop offset="1" stop-color="#f5156c"/>
+</linearGradient>
+<linearGradient id="linear-gradient-2" x1="46.37" y1="59.71" x2="15.42" y2="6.11" gradientTransform="matrix(1, 0, 0, -1, 0, 64)" gradientUnits="userSpaceOnUse">
+<stop offset="0" stop-color="#fff44f" stop-opacity="0.8"/>
+<stop offset="0.09" stop-color="#fff44f" stop-opacity="0.7"/>
+<stop offset="0.75" stop-color="#fff44f" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="linear-gradient-3" x1="40.19" y1="26.08" x2="54.32" y2="50.55" gradientTransform="matrix(1, 0, 0, -1, 0, 64)" gradientUnits="userSpaceOnUse">
+<stop offset="0" stop-color="#3a8ee6"/>
+<stop offset="0.24" stop-color="#5c79f0"/>
+<stop offset="0.63" stop-color="#9059ff"/>
+<stop offset="1" stop-color="#c139e6"/>
+</linearGradient>
+<linearGradient id="linear-gradient-4" x1="54.32" y1="50.58" x2="48.39" y2="40.31" gradientTransform="matrix(1, 0, 0, -1, 0, 64)" gradientUnits="userSpaceOnUse">
+<stop offset="0" stop-color="#6e008b" stop-opacity="0.5"/>
+<stop offset="0.5" stop-color="#c846cb" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="linear-gradient-5" x1="56.96" y1="22.5" x2="41.98" y2="37.46" gradientTransform="matrix(1, 0, 0, -1, 0, 64)" gradientUnits="userSpaceOnUse">
+<stop offset="0.14" stop-color="#6a2bea" stop-opacity="0"/>
+<stop offset="0.34" stop-color="#642de4" stop-opacity="0.03"/>
+<stop offset="0.55" stop-color="#5131d3" stop-opacity="0.12"/>
+<stop offset="0.76" stop-color="#3139b7" stop-opacity="0.27"/>
+<stop offset="0.98" stop-color="#054490" stop-opacity="0.48"/>
+<stop offset="1" stop-color="#00458b" stop-opacity="0.5"/>
+</linearGradient>
+</defs>
+<path d="M32.56,0C14.61,0,0,14.33,0,31.94a3.42,3.42,0,0,0,3.42,3.42H29.14V52.3l-8-8a3.42,3.42,0,1,0-4.84,4.84L30.14,63a2.73,2.73,0,0,0,.25.23l.23.17h.05l.24.14.27.13.28.1.29.07L32,64h1.27l.29-.07.29-.1.27-.13.24-.14.24-.17L35,63,48.8,49.18A3.43,3.43,0,0,0,44,44.34l-8,8v-17H61.7a3.42,3.42,0,0,0,3.42-3.42h0C65.12,14.33,50.51,0,32.56,0ZM7.09,28.51A25.54,25.54,0,0,1,32.56,6.85,25.55,25.55,0,0,1,58,28.51Z"  fill="url(#linear-gradient)"/>
+<path d="M32.56,0C14.61,0,0,14.33,0,31.94a3.42,3.42,0,0,0,3.42,3.42H29.14V52.3l-8-8a3.42,3.42,0,1,0-4.84,4.84L30.14,63a2.73,2.73,0,0,0,.25.23l.23.17h.05l.24.14.27.13.28.1.29.07L32,64h1.27l.29-.07.29-.1.27-.13.24-.14.24-.17L35,63,48.8,49.18A3.43,3.43,0,0,0,44,44.34l-8,8v-17H61.7a3.42,3.42,0,0,0,3.42-3.42h0C65.12,14.33,50.51,0,32.56,0ZM7.09,28.51A25.54,25.54,0,0,1,32.56,6.85,25.55,25.55,0,0,1,58,28.51Z"  fill="url(#linear-gradient-2)"/>
+<path d="M36,7.08A25.45,25.45,0,0,1,58,28.51H42.85A6.85,6.85,0,0,0,36,35.36H61.7a3.43,3.43,0,0,0,3.42-3.43c0-12.2-8.63-18.13-16-21.59A35.75,35.75,0,0,0,36,7.08Z" fill="url(#linear-gradient-3)"/>
+<path d="M57.89,27.76c2.31,1.86,4.63,3.71,6.9,5.61a3.27,3.27,0,0,0,.33-1.44c0-12.2-8.63-18.13-16-21.59A35.75,35.75,0,0,0,36,7.08,25.47,25.47,0,0,1,57.89,27.76Z" fill="url(#linear-gradient-4)"/>
+<path d="M57.5,28.51H42.85A6.85,6.85,0,0,0,36,35.36H61.7a3.36,3.36,0,0,0,2.64-1.28C62.09,32.19,59.79,30.36,57.5,28.51Z" opacity=".9" fill="url(#linear-gradient-5)"/>
+</svg>

assets/logo.svg

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="201px" height="36px" viewBox="0 0 201 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 53 (72520) - https://sketchapp.com -->
-    <title>56F8E94A-92C7-41A4-BF32-064D0F1FE0CE</title>
-    <desc>Created with sketchtool.</desc>
-    <defs>
-        <linearGradient x1="71.1627137%" y1="8.3795633%" x2="23.6307692%" y2="89.0750207%" id="linearGradient-1">
-            <stop stop-color="#FF980E" offset="0%"></stop>
-            <stop stop-color="#FF7139" offset="20.75%"></stop>
-            <stop stop-color="#FF5854" offset="36.33%"></stop>
-            <stop stop-color="#FF4F5E" offset="45.63%"></stop>
-            <stop stop-color="#FF3750" offset="69.29%"></stop>
-            <stop stop-color="#F92261" offset="85.75%"></stop>
-            <stop stop-color="#F5156C" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="71.1627137%" y1="8.3795633%" x2="23.6307692%" y2="89.0750207%" id="linearGradient-2">
-            <stop stop-color="#FFF44F" stop-opacity="0.8" offset="0%"></stop>
-            <stop stop-color="#FFF44F" stop-opacity="0" offset="75%"></stop>
-        </linearGradient>
-        <linearGradient x1="14.3945107%" y1="105.534329%" x2="62.8615752%" y2="24.3294529%" id="linearGradient-3">
-            <stop stop-color="#3A8EE6" offset="0%"></stop>
-            <stop stop-color="#5C79F0" offset="23.59%"></stop>
-            <stop stop-color="#9059FF" offset="62.93%"></stop>
-            <stop stop-color="#C139E6" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="62.8713604%" y1="29.0228725%" x2="42.5369928%" y2="60.7429512%" id="linearGradient-4">
-            <stop stop-color="#6E008B" stop-opacity="0.5" offset="0%"></stop>
-            <stop stop-color="#C846CB" stop-opacity="0" offset="50%"></stop>
-        </linearGradient>
-        <linearGradient x1="73.7626536%" y1="58.1514822%" x2="20.9130221%" y2="45.4476366%" id="linearGradient-5">
-            <stop stop-color="#6A2BEA" stop-opacity="0" offset="13.6%"></stop>
-            <stop stop-color="#662CE6" stop-opacity="0.09459748" offset="29.95%"></stop>
-            <stop stop-color="#592FDB" stop-opacity="0.1926" offset="46.89%"></stop>
-            <stop stop-color="#4534C9" stop-opacity="0.2923" offset="64.1%"></stop>
-            <stop stop-color="#283BAF" stop-opacity="0.393" offset="81.5%"></stop>
-            <stop stop-color="#03448D" stop-opacity="0.4936" offset="98.9%"></stop>
-            <stop stop-color="#00458B" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Send_Home-With-Files" transform="translate(-24.000000, -31.000000)">
-            <g id="Header" transform="translate(24.000000, 24.000000)">
-                <g id="Send" transform="translate(0.000000, 7.000000)">
-                    <g id="FF_Send_Logo">
-                        <g id="Group">
-                            <g>
-                                <path d="M18.4801773,0.309677419 C8.4846097,0.309677419 0.34868259,8.28387097 0.34868259,18.0774194 C0.34868259,19.1225806 1.20101781,19.9741935 2.24706558,19.9741935 L16.5817943,19.9741935 L16.5817943,25.1612903 L16.5817943,25.1612903 L16.5817943,29.4193548 L12.1264056,25.0064516 C11.390298,24.2709677 10.1892801,24.2709677 9.41442994,25.0064516 C8.67832225,25.7419355 8.67832225,26.9419355 9.41442994,27.716129 L17.1241894,35.4193548 C17.162932,35.4580645 17.2016745,35.4967742 17.2791595,35.5354839 C17.2791595,35.5354839 17.2791595,35.5354839 17.317902,35.5354839 C17.3566445,35.5741935 17.395387,35.6129032 17.4341295,35.6129032 C17.4341295,35.6129032 17.4341295,35.6129032 17.472872,35.6129032 C17.5116145,35.6516129 17.5503571,35.6516129 17.5890996,35.6903226 C17.5890996,35.6903226 17.5890996,35.6903226 17.6278421,35.6903226 C17.6665846,35.7290323 17.7440696,35.7290323 17.7828121,35.7677419 C17.7828121,35.7677419 17.7828121,35.7677419 17.7828121,35.7677419 C17.8215546,35.8064516 17.8990396,35.8064516 17.9377822,35.8064516 C17.9377822,35.8064516 17.9377822,35.8064516 17.9377822,35.8064516 C17.9765247,35.8064516 18.0540097,35.8451613 18.0927522,35.8451613 C18.0927522,35.8451613 18.1314947,35.8451613 18.1314947,35.8451613 C18.1702372,35.8451613 18.2089797,35.8451613 18.2864647,35.883871 C18.3639498,35.883871 18.4026923,35.883871 18.4801773,35.883871 C18.5576623,35.883871 18.5964048,35.883871 18.6738898,35.883871 C18.7126324,35.883871 18.7513749,35.883871 18.8288599,35.8451613 C18.8288599,35.8451613 18.8676024,35.8451613 18.8676024,35.8451613 C18.9063449,35.8451613 18.9838299,35.8064516 19.0225724,35.8064516 C19.0225724,35.8064516 19.0225724,35.8064516 19.0225724,35.8064516 C19.0613149,35.8064516 19.1388,35.7677419 19.1775425,35.7290323 C19.1775425,35.7290323 19.1775425,35.7290323 19.1775425,35.7290323 C19.216285,35.6903226 19.29377,35.6903226 19.3325125,35.6516129 C19.3325125,35.6516129 19.3325125,35.6516129 19.3325125,35.6516129 C19.371255,35.6129032 19.4099975,35.6129032 19.44874,35.5741935 C19.44874,35.5741935 19.44874,35.5741935 19.4874826,35.5741935 C19.5262251,35.5354839 19.5649676,35.4967742 19.6037101,35.4967742 C19.6037101,35.4967742 19.6037101,35.4967742 19.6424526,35.4967742 C19.6811951,35.4580645 19.7199376,35.4193548 19.7974226,35.3806452 L27.5071821,27.6774194 C28.2432898,26.9419355 28.2432898,25.7419355 27.5071821,24.9677419 C26.7710744,24.2322581 25.5700566,24.2322581 24.7952064,24.9677419 L20.3785603,29.4193548 L20.3785603,20.0129032 L34.713289,20.0129032 C35.7593368,20.0129032 36.611672,19.1612903 36.611672,18.116129 C36.611672,8.28387097 28.4757449,0.309677419 18.4801773,0.309677419 Z M4.26167611,16.1806452 C5.23023886,9.40645161 11.2353279,4.14193548 18.4801773,4.14193548 C25.7250267,4.14193548 31.6913732,9.40645161 32.659936,16.1806452 L4.26167611,16.1806452 Z" id="Shape" fill="url(#linearGradient-1)" fill-rule="nonzero"></path>
-                                <path d="M18.4801773,0.309677419 C8.4846097,0.309677419 0.34868259,8.28387097 0.34868259,18.0774194 C0.34868259,19.1225806 1.20101781,19.9741935 2.24706558,19.9741935 L16.5817943,19.9741935 L16.5817943,25.1612903 L16.5817943,25.1612903 L16.5817943,29.4193548 L12.1264056,25.0064516 C11.390298,24.2709677 10.1892801,24.2709677 9.41442994,25.0064516 C8.67832225,25.7419355 8.67832225,26.9419355 9.41442994,27.716129 L17.1241894,35.4193548 C17.162932,35.4580645 17.2016745,35.4967742 17.2791595,35.5354839 C17.2791595,35.5354839 17.2791595,35.5354839 17.317902,35.5354839 C17.3566445,35.5741935 17.395387,35.6129032 17.4341295,35.6129032 C17.4341295,35.6129032 17.4341295,35.6129032 17.472872,35.6129032 C17.5116145,35.6516129 17.5503571,35.6516129 17.5890996,35.6903226 C17.5890996,35.6903226 17.5890996,35.6903226 17.6278421,35.6903226 C17.6665846,35.7290323 17.7440696,35.7290323 17.7828121,35.7677419 C17.7828121,35.7677419 17.7828121,35.7677419 17.7828121,35.7677419 C17.8215546,35.8064516 17.8990396,35.8064516 17.9377822,35.8064516 C17.9377822,35.8064516 17.9377822,35.8064516 17.9377822,35.8064516 C17.9765247,35.8064516 18.0540097,35.8451613 18.0927522,35.8451613 C18.0927522,35.8451613 18.1314947,35.8451613 18.1314947,35.8451613 C18.1702372,35.8451613 18.2089797,35.8451613 18.2864647,35.883871 C18.3639498,35.883871 18.4026923,35.883871 18.4801773,35.883871 C18.5576623,35.883871 18.5964048,35.883871 18.6738898,35.883871 C18.7126324,35.883871 18.7513749,35.883871 18.8288599,35.8451613 C18.8288599,35.8451613 18.8676024,35.8451613 18.8676024,35.8451613 C18.9063449,35.8451613 18.9838299,35.8064516 19.0225724,35.8064516 C19.0225724,35.8064516 19.0225724,35.8064516 19.0225724,35.8064516 C19.0613149,35.8064516 19.1388,35.7677419 19.1775425,35.7290323 C19.1775425,35.7290323 19.1775425,35.7290323 19.1775425,35.7290323 C19.216285,35.6903226 19.29377,35.6903226 19.3325125,35.6516129 C19.3325125,35.6516129 19.3325125,35.6516129 19.3325125,35.6516129 C19.371255,35.6129032 19.4099975,35.6129032 19.44874,35.5741935 C19.44874,35.5741935 19.44874,35.5741935 19.4874826,35.5741935 C19.5262251,35.5354839 19.5649676,35.4967742 19.6037101,35.4967742 C19.6037101,35.4967742 19.6037101,35.4967742 19.6424526,35.4967742 C19.6811951,35.4580645 19.7199376,35.4193548 19.7974226,35.3806452 L27.5071821,27.6774194 C28.2432898,26.9419355 28.2432898,25.7419355 27.5071821,24.9677419 C26.7710744,24.2322581 25.5700566,24.2322581 24.7952064,24.9677419 L20.3785603,29.4193548 L20.3785603,20.0129032 L34.713289,20.0129032 C35.7593368,20.0129032 36.611672,19.1612903 36.611672,18.116129 C36.611672,8.28387097 28.4757449,0.309677419 18.4801773,0.309677419 Z M4.26167611,16.1806452 C5.23023886,9.40645161 11.2353279,4.14193548 18.4801773,4.14193548 C25.7250267,4.14193548 31.6913732,9.40645161 32.659936,16.1806452 L4.26167611,16.1806452 Z" id="Shape" fill="url(#linearGradient-2)" fill-rule="nonzero"></path>
-                                <path d="M20.3785603,4.25806452 C26.7323319,5.10967742 31.7688582,9.98709677 32.659936,16.1806452 L24.2140688,16.1806452 C22.1219732,16.1806452 20.4173028,17.883871 20.4173028,19.9741935 L20.4173028,19.9741935 L34.713289,19.9741935 C35.7593368,19.9741935 36.611672,19.1225806 36.611672,18.0774194 C36.611672,11.3032258 31.8076008,7.97419355 27.7396372,6.07741935 C23.9816137,4.33548387 20.3785603,4.25806452 20.3785603,4.25806452 Z" id="Path" fill="url(#linearGradient-3)"></path>
-                                <path d="M32.582451,15.7548387 C33.8609538,16.8 35.1781991,17.8064516 36.4179595,18.8903226 C36.534187,18.6580645 36.611672,18.3870968 36.611672,18.0774194 C36.611672,11.3032258 31.8076008,7.97419355 27.7396372,6.07741935 C23.9816137,4.33548387 20.3785603,4.25806452 20.3785603,4.25806452 C26.5773619,5.07096774 31.5364032,9.79354839 32.582451,15.7548387 Z" id="Path" fill="url(#linearGradient-4)"></path>
-                            </g>
-                            <path d="M32.3499959,16.1806452 L24.2140688,16.1806452 C22.1219732,16.1806452 20.4173028,17.883871 20.4173028,19.9741935 L34.713289,19.9741935 C35.2944267,19.9741935 35.8368218,19.7032258 36.1855044,19.2774194 C34.9070016,18.2322581 33.6284987,17.2258065 32.3499959,16.1806452 Z" id="Path" fill="url(#linearGradient-5)" opacity="0.9"></path>
-                        </g>
-                        <g id="Group" transform="translate(50.365263, 8.129032)" fill="#220033">
-                            <polygon id="Path" points="0.30994008 1.74193548 11.6614955 1.74193548 11.6614955 4.99354839 3.71928097 4.99354839 3.71928097 9.09677419 11.6614955 9.09677419 11.6614955 12.2709677 3.71928097 12.2709677 3.71928097 19.3935484 0.27119757 19.3935484 0.27119757 1.74193548"></polygon>
-                            <path d="M13.7535911,2.67096774 C13.7535911,2.0516129 13.9473036,1.50967742 14.3734712,1.12258065 C14.7608963,0.696774194 15.3032915,0.503225806 15.8844291,0.503225806 C16.5430518,0.503225806 17.0467044,0.696774194 17.4341295,1.12258065 C17.8215546,1.5483871 18.0152672,2.0516129 18.0152672,2.67096774 C18.0152672,3.29032258 17.8215546,3.79354839 17.4341295,4.18064516 C17.0467044,4.56774194 16.5043093,4.8 15.8844291,4.8 C15.264549,4.8 14.7608963,4.60645161 14.3347287,4.18064516 C13.9473036,3.79354839 13.7535911,3.2516129 13.7535911,2.67096774 Z M14.1797587,6.3483871 L17.5890996,6.3483871 L17.5890996,19.3935484 L14.1797587,19.3935484 L14.1797587,6.3483871 Z" id="Shape" fill-rule="nonzero"></path>
-                            <path d="M20.2623328,6.3483871 L23.5554461,6.3483871 L23.5554461,8.36129032 C23.8653862,7.58709677 24.3302963,7.00645161 24.988919,6.65806452 C25.6087991,6.30967742 26.3449068,6.11612903 27.1584995,6.11612903 C27.5846672,6.11612903 28.0108348,6.15483871 28.3982599,6.27096774 C28.785685,6.3483871 29.0956251,6.50322581 29.3668226,6.61935484 L28.1658048,9.90967742 C27.9720923,9.79354839 27.7396372,9.67741935 27.4296971,9.6 C27.119757,9.52258065 26.7710744,9.48387097 26.4223919,9.48387097 C25.5700566,9.48387097 24.8726915,9.71612903 24.3690388,10.1806452 C23.8653862,10.6451613 23.5941886,11.4580645 23.5941886,12.5419355 L23.5941886,19.4322581 L20.2623328,19.4322581 L20.2623328,6.3483871 L20.2623328,6.3483871 Z" id="Path"></path>
-                            <path d="M36.4954445,19.6645161 C35.4493967,19.6645161 34.4808339,19.5096774 33.6284987,19.1612903 C32.7761635,18.8129032 32.0400558,18.3483871 31.4589182,17.7290323 C30.839038,17.1096774 30.3741279,16.4129032 30.0641878,15.5612903 C29.7542477,14.7483871 29.5992777,13.8580645 29.5992777,12.8903226 C29.5992777,11.9225806 29.7542477,11.0322581 30.1029303,10.2193548 C30.4516129,9.40645161 30.916523,8.67096774 31.5364032,8.0516129 C32.1562833,7.43225806 32.892391,6.96774194 33.7059837,6.61935484 C34.558319,6.27096774 35.4493967,6.07741935 36.4179595,6.07741935 C37.3865222,6.07741935 38.3163424,6.23225806 39.1299352,6.58064516 C39.9435279,6.92903226 40.6796356,7.39354839 41.2607732,7.97419355 C41.8419109,8.55483871 42.306821,9.2516129 42.6555036,10.1032258 C43.0041862,10.916129 43.1591562,11.8064516 43.1591562,12.7741935 L43.1591562,14.0129032 L32.7761635,14.0129032 C33.0086186,14.8645161 33.4347862,15.5225806 34.0934088,16.0258065 C34.7520315,16.5290323 35.5656242,16.7612903 36.534187,16.7612903 C37.3090372,16.7612903 37.9676599,16.6064516 38.510055,16.2967742 C39.0524501,15.9870968 39.4786177,15.5612903 39.7885578,15.0193548 L42.539276,16.6064516 C41.8806534,17.5354839 41.0670607,18.2709677 40.1372404,18.8129032 C39.1299352,19.3548387 37.9289173,19.6645161 36.4954445,19.6645161 Z M36.4179595,8.90322581 C35.5656242,8.90322581 34.8295165,9.13548387 34.2096364,9.56129032 C33.5897562,10.0258065 33.1635886,10.6064516 32.892391,11.3806452 L39.8660428,11.3806452 C39.6335878,10.5677419 39.2461627,9.9483871 38.6262825,9.52258065 C38.0064024,9.09677419 37.2702947,8.90322581 36.4179595,8.90322581 Z" id="Shape" fill-rule="nonzero"></path>
-                            <path d="M44.127719,6.3483871 L46.2972995,6.3483871 L46.2972995,5.88387097 C46.2972995,4.83870968 46.3747845,3.9483871 46.5684971,3.21290323 C46.7622096,2.51612903 47.0721497,1.93548387 47.4983173,1.50967742 C47.9244849,1.08387097 48.5056226,0.774193548 49.2029878,0.619354839 C49.9390955,0.425806452 50.8301732,0.348387097 51.876221,0.348387097 L52.7285562,0.348387097 L52.7285562,3.40645161 L52.186161,3.40645161 C51.6050234,3.40645161 51.1401133,3.44516129 50.7914307,3.48387097 C50.4427481,3.52258065 50.1715505,3.63870968 50.0165805,3.83225806 C49.8228679,3.98709677 49.7066404,4.21935484 49.6678979,4.52903226 C49.6291554,4.83870968 49.5904129,5.22580645 49.5904129,5.72903226 L49.5904129,6.3483871 L52.7285562,6.3483871 L52.7285562,9.32903226 L49.5904129,9.32903226 L49.5904129,19.3935484 L46.258557,19.3935484 L46.258557,9.32903226 L44.0889764,9.32903226 L44.0889764,6.3483871 L44.127719,6.3483871 Z" id="Path"></path>
-                            <path d="M60.3995732,19.6645161 C59.4310104,19.6645161 58.5011902,19.4709677 57.648855,19.1225806 C56.7965197,18.7741935 56.0991546,18.2709677 55.4792744,17.6516129 C54.8593942,17.0322581 54.3557416,16.2967742 54.0458015,15.483871 C53.6971189,14.6709677 53.5421489,13.7806452 53.5421489,12.8516129 C53.5421489,11.9225806 53.6971189,11.0322581 54.0458015,10.2193548 C54.3944841,9.40645161 54.8593942,8.67096774 55.4792744,8.0516129 C56.0991546,7.43225806 56.8352623,6.96774194 57.648855,6.61935484 C58.5011902,6.27096774 59.3922679,6.07741935 60.3995732,6.07741935 C61.3681359,6.07741935 62.2592137,6.27096774 63.1115489,6.61935484 C63.9638841,6.96774194 64.6999918,7.47096774 65.319872,8.0516129 C65.9397521,8.67096774 66.4434047,9.36774194 66.7920873,10.2193548 C67.1407699,11.0322581 67.3344825,11.9225806 67.3344825,12.8516129 C67.3344825,13.7806452 67.1407699,14.6709677 66.7920873,15.483871 C66.4434047,16.2967742 65.9397521,17.0322581 65.3586145,17.6516129 C64.7387343,18.2709677 64.0026266,18.7741935 63.1890339,19.1225806 C62.2979562,19.4709677 61.4068784,19.6645161 60.3995732,19.6645161 Z M60.4383157,16.4903226 C60.9419683,16.4903226 61.4068784,16.4129032 61.833046,16.2193548 C62.2592137,16.0258065 62.6466388,15.7548387 62.9565788,15.4451613 C63.2665189,15.1354839 63.5377165,14.7483871 63.731429,14.283871 C63.9251416,13.8580645 64.0026266,13.3548387 64.0026266,12.8516129 C64.0026266,12.3483871 63.9251416,11.883871 63.731429,11.4193548 C63.5377165,10.9548387 63.3052614,10.5677419 62.9565788,10.2580645 C62.6466388,9.9483871 62.2592137,9.67741935 61.833046,9.48387097 C61.4068784,9.29032258 60.9419683,9.21290323 60.4383157,9.21290323 C59.9346631,9.21290323 59.4697529,9.29032258 59.0435853,9.48387097 C58.6174177,9.67741935 58.2299926,9.9483871 57.9200525,10.2580645 C57.6101125,10.5677419 57.3389149,10.9548387 57.1452023,11.4193548 C56.9514898,11.883871 56.8740048,12.3483871 56.8740048,12.8516129 C56.8740048,13.3548387 56.9514898,13.8580645 57.1452023,14.283871 C57.3389149,14.7096774 57.5713699,15.0967742 57.9200525,15.4451613 C58.2299926,15.7548387 58.6174177,16.0258065 59.0435853,16.2193548 C59.4697529,16.3741935 59.9346631,16.4903226 60.4383157,16.4903226 Z" id="Shape" fill-rule="nonzero"></path>
-                            <polygon id="Path" points="72.3322663 12.6967742 67.7219076 6.3483871 71.6736436 6.3483871 74.4243618 10.2193548 77.17508 6.3483871 81.0880735 6.3483871 76.4389723 12.7354839 81.4367561 19.3935484 77.4075351 19.3935484 74.3856193 15.2903226 71.4411885 19.3935484 67.4119675 19.3935484"></polygon>
-                            <g transform="translate(89.107773, 0.000000)">
-                                <path d="M7.78724452,19.6258065 C6.00508906,19.6258065 4.49413117,19.2774194 3.25437084,18.6193548 C2.01461052,17.9612903 1.00730526,17.0709677 0.15497004,15.9483871 L1.89838299,14.5548387 C3.25437084,16.683871 5.19149635,17.7290323 7.7097595,17.7290323 C9.06574735,17.7290323 10.1117951,17.4193548 10.8479028,16.8 C11.545268,16.1806452 11.8939506,15.3677419 11.8939506,14.4 C11.8939506,13.8193548 11.7389805,13.3548387 11.467783,12.9677419 C11.1965854,12.5806452 10.8091603,12.3096774 10.3055077,12.0387097 C9.84059755,11.8064516 9.29820241,11.6129032 8.67832225,11.4580645 C8.05844209,11.3032258 7.39981942,11.1870968 6.74119675,11.0322581 C6.04383157,10.8774194 5.3852089,10.7225806 4.68784372,10.5290323 C4.02922105,10.3354839 3.40934088,10.0645161 2.90568825,9.75483871 C2.40203562,9.44516129 1.9371255,8.98064516 1.62718542,8.43870968 C1.27850283,7.89677419 1.12353279,7.2 1.12353279,6.3483871 C1.12353279,5.69032258 1.27850283,5.03225806 1.5497004,4.4516129 C1.82089797,3.87096774 2.24706558,3.32903226 2.75071821,2.90322581 C3.29311335,2.47741935 3.91299352,2.12903226 4.6103587,1.85806452 C5.34646639,1.58709677 6.1600591,1.47096774 7.05113683,1.47096774 C8.60083723,1.47096774 9.87934006,1.74193548 10.9253878,2.32258065 C11.9714356,2.90322581 12.9012558,3.63870968 13.676106,4.60645161 L12.0489206,5.88387097 C11.5065255,5.07096774 10.8479028,4.4516129 10.0730526,3.98709677 C9.29820241,3.52258065 8.29089715,3.29032258 7.08987934,3.29032258 C5.73389149,3.29032258 4.76532874,3.56129032 4.14544858,4.14193548 C3.52556842,4.72258065 3.21562833,5.41935484 3.21562833,6.30967742 C3.21562833,6.8516129 3.33185586,7.27741935 3.56431093,7.58709677 C3.79676599,7.93548387 4.14544858,8.20645161 4.57161619,8.4 C4.9977838,8.59354839 5.50143643,8.78709677 6.04383157,8.90322581 C6.62496922,9.01935484 7.20610687,9.17419355 7.86472954,9.32903226 C8.56209472,9.48387097 9.2594599,9.63870968 9.99556759,9.83225806 C10.7316753,10.0258065 11.390298,10.2967742 11.9714356,10.683871 C12.5525733,11.0322581 13.0562259,11.5354839 13.4049085,12.116129 C13.7923336,12.6967742 13.9860461,13.4322581 13.9860461,14.3612903 C13.9860461,15.0580645 13.8310761,15.716129 13.5598785,16.3354839 C13.2886809,16.9548387 12.8625133,17.5354839 12.3201182,18 C11.7777231,18.4645161 11.1578429,18.8516129 10.3829927,19.1612903 C9.60814249,19.4709677 8.75580727,19.6258065 7.78724452,19.6258065 Z" id="Path"></path>
-                                <path d="M23.4779611,19.6645161 C22.4319133,19.6645161 21.5020931,19.5096774 20.6497579,19.1612903 C19.7974226,18.8129032 19.0613149,18.3483871 18.4801773,17.7290323 C17.8602971,17.1096774 17.395387,16.4129032 17.0854469,15.6 C16.7755069,14.7870968 16.6205368,13.8967742 16.6205368,12.9290323 C16.6205368,11.9612903 16.7755069,11.0709677 17.1241894,10.2193548 C17.472872,9.40645161 17.9377822,8.67096774 18.5576623,8.0516129 C19.1775425,7.43225806 19.8749077,6.96774194 20.7272429,6.61935484 C21.5408356,6.27096774 22.4706558,6.07741935 23.4392186,6.07741935 C24.4077813,6.07741935 25.2601166,6.23225806 26.0737093,6.58064516 C26.887302,6.92903226 27.5846672,7.35483871 28.1658048,7.97419355 C28.7469425,8.55483871 29.2118526,9.2516129 29.5605352,10.0645161 C29.9092178,10.8774194 30.0641878,11.7677419 30.0641878,12.7354839 L30.0641878,13.6258065 L18.5189198,13.6258065 C18.5964048,14.2451613 18.7513749,14.8258065 19.0225724,15.3290323 C19.29377,15.8322581 19.6424526,16.2967742 20.0686202,16.683871 C20.4947878,17.0709677 20.9984404,17.3419355 21.5795781,17.5741935 C22.1607158,17.7677419 22.7805959,17.883871 23.4779611,17.883871 C24.5240089,17.883871 25.4150866,17.6516129 26.1124518,17.2258065 C26.809817,16.8 27.3909546,16.1806452 27.8558647,15.3677419 L29.5605352,16.3741935 C28.9019125,17.4193548 28.0495773,18.2322581 27.0810145,18.8129032 C26.1124518,19.3935484 24.9501765,19.6645161 23.4779611,19.6645161 Z M23.4392186,7.81935484 C22.8193384,7.81935484 22.2382008,7.93548387 21.6958056,8.12903226 C21.1534105,8.32258065 20.6885004,8.59354839 20.2623328,8.98064516 C19.8361651,9.32903226 19.4874826,9.75483871 19.216285,10.2580645 C18.9450874,10.7612903 18.7513749,11.3032258 18.6351473,11.883871 L28.0883198,11.883871 C27.9333497,10.6451613 27.4296971,9.67741935 26.6161044,8.94193548 C25.7637692,8.20645161 24.6789789,7.81935484 23.4392186,7.81935484 Z" id="Shape" fill-rule="nonzero"></path>
-                                <path d="M33.0473611,6.3483871 L34.9844866,6.3483871 L34.9844866,8.51612903 C35.4493967,7.78064516 36.0692769,7.2 36.8441271,6.73548387 C37.6189773,6.27096774 38.510055,6.07741935 39.5561028,6.07741935 C40.408438,6.07741935 41.1832882,6.19354839 41.8806534,6.46451613 C42.5780186,6.73548387 43.1591562,7.12258065 43.6240663,7.62580645 C44.0889764,8.12903226 44.4764015,8.7483871 44.7475991,9.48387097 C45.0187967,10.2193548 45.1350242,11.0322581 45.1350242,11.9612903 L45.1350242,19.3935484 L43.1204137,19.3935484 L43.1204137,12.0387097 C43.1204137,10.7612903 42.7717311,9.75483871 42.1131084,8.98064516 C41.4544858,8.20645161 40.4471805,7.85806452 39.1686777,7.85806452 C38.58754,7.85806452 38.0451449,7.97419355 37.5414922,8.16774194 C37.0378396,8.36129032 36.611672,8.67096774 36.2242469,9.05806452 C35.8368218,9.44516129 35.5656242,9.87096774 35.3719117,10.4129032 C35.1781991,10.9548387 35.0619716,11.4967742 35.0619716,12.1548387 L35.0619716,19.3935484 L33.0861036,19.3935484 L33.0861036,6.3483871 L33.0473611,6.3483871 Z" id="Path"></path>
-                                <path d="M54.5881967,19.6645161 C53.6583764,19.6645161 52.8060412,19.5096774 51.9924485,19.1612903 C51.1788558,18.8129032 50.4814906,18.3483871 49.8616104,17.7677419 C49.2804728,17.1483871 48.7768202,16.4516129 48.4281376,15.6 C48.079455,14.7870968 47.9244849,13.8580645 47.9244849,12.8516129 C47.9244849,11.8451613 48.079455,10.9548387 48.4281376,10.1032258 C48.7768202,9.29032258 49.2417303,8.55483871 49.8616104,7.93548387 C50.4814906,7.31612903 51.1788558,6.8516129 51.9924485,6.54193548 C52.8060412,6.19354839 53.6583764,6.03870968 54.5881967,6.03870968 C55.0531068,6.03870968 55.5180169,6.07741935 56.0216695,6.19354839 C56.4865797,6.30967742 56.9514898,6.46451613 57.3776574,6.69677419 C57.803825,6.92903226 58.1912501,7.16129032 58.5786752,7.50967742 C58.9273578,7.81935484 59.2372979,8.16774194 59.5084954,8.59354839 L59.5084954,0.309677419 L61.4843635,0.309677419 L61.4843635,19.3548387 L59.5084954,19.3548387 L59.5084954,17.0322581 C59.2372979,17.4193548 58.9273578,17.8064516 58.5786752,18.116129 C58.2299926,18.4258065 57.803825,18.6967742 57.3776574,18.9290323 C56.9514898,19.1612903 56.4865797,19.316129 56.0216695,19.4322581 C55.5180169,19.5870968 55.0531068,19.6645161 54.5881967,19.6645161 Z M54.7431667,17.7677419 C55.4405319,17.7677419 56.0991546,17.6516129 56.6802922,17.3806452 C57.2614299,17.1096774 57.803825,16.7612903 58.2299926,16.3354839 C58.6561602,15.9096774 59.0048428,15.3677419 59.2372979,14.7483871 C59.4697529,14.1290323 59.5859805,13.5096774 59.5859805,12.8129032 C59.5859805,12.1548387 59.4697529,11.4967742 59.2372979,10.8774194 C59.0048428,10.2580645 58.6561602,9.75483871 58.2299926,9.29032258 C57.803825,8.86451613 57.2614299,8.47741935 56.6802922,8.24516129 C56.0991546,7.97419355 55.4405319,7.85806452 54.7431667,7.85806452 C54.084544,7.85806452 53.4259214,7.97419355 52.8447837,8.24516129 C52.2636461,8.51612903 51.7599934,8.86451613 51.2950833,9.29032258 C50.8689157,9.71612903 50.5202331,10.2580645 50.2877781,10.8774194 C50.055323,11.4967742 49.9390955,12.116129 49.9390955,12.8129032 C49.9390955,13.5096774 50.055323,14.1677419 50.2877781,14.7870968 C50.5202331,15.4064516 50.8689157,15.9096774 51.2950833,16.3741935 C51.7212509,16.8 52.2249036,17.1483871 52.8447837,17.4193548 C53.4646639,17.6516129 54.084544,17.7677419 54.7431667,17.7677419 Z" id="Shape" fill-rule="nonzero"></path>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

assets/master-logo.svg

@@ -0,0 +1,99 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80">
+  <defs>
+    <radialGradient id="a" cx="-1186.91" cy="-517.676" r="90.78" gradientTransform="translate(1258.441 534.061)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff36e"/>
+      <stop offset=".5" stop-color="#fc4055"/>
+      <stop offset="1" stop-color="#e31587"/>
+    </radialGradient>
+    <radialGradient id="b" cx="-1251.812" cy="-513.921" r="53.726" gradientTransform="translate(1258.441 534.061)" gradientUnits="userSpaceOnUse">
+      <stop offset=".001" stop-color="#c60084"/>
+      <stop offset="1" stop-color="#fc4055" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="c" cx="-1179.15" cy="-522.842" r="106.599" gradientTransform="translate(1258.441 534.061)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ffde67" stop-opacity=".6"/>
+      <stop offset=".093" stop-color="#ffd966" stop-opacity=".581"/>
+      <stop offset=".203" stop-color="#ffca65" stop-opacity=".525"/>
+      <stop offset=".321" stop-color="#feb262" stop-opacity=".432"/>
+      <stop offset=".446" stop-color="#fe8f5e" stop-opacity=".302"/>
+      <stop offset=".573" stop-color="#fd6459" stop-opacity=".137"/>
+      <stop offset=".664" stop-color="#fc4055" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="d" cx="42.285" cy="44.499" r="137.521" gradientTransform="translate(0 -.095)" gradientUnits="userSpaceOnUse">
+      <stop offset=".153" stop-color="#810220"/>
+      <stop offset=".167" stop-color="#920b27" stop-opacity=".861"/>
+      <stop offset=".216" stop-color="#cb2740" stop-opacity=".398"/>
+      <stop offset=".253" stop-color="#ef394f" stop-opacity=".11"/>
+      <stop offset=".272" stop-color="#fc4055" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="e" cx="31.878" cy="42.77" r="137.521" gradientTransform="translate(0 -.095)" gradientUnits="userSpaceOnUse">
+      <stop offset=".113" stop-color="#810220"/>
+      <stop offset=".133" stop-color="#920b27" stop-opacity=".861"/>
+      <stop offset=".204" stop-color="#cb2740" stop-opacity=".398"/>
+      <stop offset=".257" stop-color="#ef394f" stop-opacity=".11"/>
+      <stop offset=".284" stop-color="#fc4055" stop-opacity="0"/>
+    </radialGradient>
+    <linearGradient id="f" x1="-1212.61" y1="-525.103" x2="-1189.052" y2="-484.299" gradientTransform="translate(1258.441 532.89)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ffbd4f"/>
+      <stop offset=".508" stop-color="#ff9640" stop-opacity="0"/>
+    </linearGradient>
+    <radialGradient id="g" cx="-1255.933" cy="-77.395" r="88.863" gradientTransform="matrix(.959 0 0 .961 1273.896 86.468)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ff9640"/>
+      <stop offset=".8" stop-color="#fc4055"/>
+    </radialGradient>
+    <radialGradient id="h" cx="-1255.933" cy="-77.395" r="88.863" gradientTransform="matrix(.959 0 0 .961 1273.896 86.468)" gradientUnits="userSpaceOnUse">
+      <stop offset=".084" stop-color="#ffde67"/>
+      <stop offset=".147" stop-color="#ffdc66" stop-opacity=".968"/>
+      <stop offset=".246" stop-color="#ffd562" stop-opacity=".879"/>
+      <stop offset=".369" stop-color="#ffcb5d" stop-opacity=".734"/>
+      <stop offset=".511" stop-color="#ffbc55" stop-opacity=".533"/>
+      <stop offset=".667" stop-color="#ffaa4b" stop-opacity=".28"/>
+      <stop offset=".822" stop-color="#ff9640" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="i" cx="49.941" cy="38.654" r="41.79" gradientTransform="matrix(.247 .971 -1.011 .259 76.681 -19.851)" gradientUnits="userSpaceOnUse">
+      <stop offset=".363" stop-color="#fc4055"/>
+      <stop offset=".443" stop-color="#fd604d" stop-opacity=".633"/>
+      <stop offset=".545" stop-color="#fe8644" stop-opacity=".181"/>
+      <stop offset=".59" stop-color="#ff9640" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="j" cx="42.737" cy="42.193" r="41.79" gradientTransform="translate(0 -.095)" gradientUnits="userSpaceOnUse">
+      <stop offset=".216" stop-color="#fc4055" stop-opacity=".8"/>
+      <stop offset=".267" stop-color="#fd5251" stop-opacity=".633"/>
+      <stop offset=".41" stop-color="#fe8345" stop-opacity=".181"/>
+      <stop offset=".474" stop-color="#ff9640" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="k" cx="-1238.198" cy="-87.433" r="150.195" gradientTransform="matrix(.959 0 0 .961 1273.896 86.468)" gradientUnits="userSpaceOnUse">
+      <stop offset=".054" stop-color="#fff36e"/>
+      <stop offset=".457" stop-color="#ff9640"/>
+      <stop offset=".639" stop-color="#ff9640"/>
+    </radialGradient>
+    <linearGradient id="l" x1="59.052" y1="7.083" x2="18.155" y2="77.92" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff36e" stop-opacity=".8"/>
+      <stop offset=".094" stop-color="#fff36e" stop-opacity=".699"/>
+      <stop offset=".752" stop-color="#fff36e" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="m" x1="40.585" y1="-.67" x2="62.3" y2="62.203" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#b833e1"/>
+      <stop offset=".371" stop-color="#9059ff"/>
+      <stop offset=".614" stop-color="#5b6df8"/>
+      <stop offset="1" stop-color="#0090ed"/>
+    </linearGradient>
+    <linearGradient id="n" x1="-1230.731" y1="-532.566" x2="-1190.37" y2="-492.205" gradientTransform="translate(1258.441 532.89)" gradientUnits="userSpaceOnUse">
+      <stop offset=".805" stop-color="#722291" stop-opacity="0"/>
+      <stop offset="1" stop-color="#592acb" stop-opacity=".5"/>
+    </linearGradient>
+  </defs>
+  <path d="M71.944 15.7A39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522c15.83.2 32.832 10.981 35.357 30.413 2.9 22.306-12.637 40.923-34.493 40.98-24.045.061-38.67-21.229-34.847-40.352a19.735 19.735 0 0 1 .413-2.787 37.815 37.815 0 0 1 4.193-14.018c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7zm-63.4 3.487z" fill="url(#a)"/>
+  <path d="M71.944 15.7A39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522c15.83.2 32.832 10.981 35.357 30.413 2.9 22.306-12.637 40.923-34.493 40.98-24.045.061-38.67-21.229-34.847-40.352a19.735 19.735 0 0 1 .413-2.787 37.815 37.815 0 0 1 4.193-14.018c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7zm-63.4 3.487z" fill="url(#b)" opacity=".67"/>
+  <path d="M71.944 15.7A39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522c15.83.2 32.832 10.981 35.357 30.413 2.9 22.306-12.637 40.923-34.493 40.98-24.045.061-38.67-21.229-34.847-40.352a19.735 19.735 0 0 1 .413-2.787 37.815 37.815 0 0 1 4.193-14.018c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7zm-63.4 3.487z" fill="url(#c)"/>
+  <path d="M71.944 15.7A39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522c15.83.2 32.832 10.981 35.357 30.413 2.9 22.306-12.637 40.923-34.493 40.98-24.045.061-38.67-21.229-34.847-40.352a19.735 19.735 0 0 1 .413-2.787 37.815 37.815 0 0 1 4.193-14.018c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7zm-63.4 3.487z" fill="url(#d)"/>
+  <path d="M71.944 15.7A39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522c15.83.2 32.832 10.981 35.357 30.413 2.9 22.306-12.637 40.923-34.493 40.98-24.045.061-38.67-21.229-34.847-40.352a19.735 19.735 0 0 1 .413-2.787 37.815 37.815 0 0 1 4.193-14.018c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7zm-63.4 3.487z" fill="url(#e)"/>
+  <path d="M75.651 30.935a41.01 41.01 0 0 1 .3 7.247q1.99-.3 3.987-.53A40.01 40.01 0 0 0 71.944 15.7 39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522 56.124.724 73.126 11.5 75.651 30.935z" fill="url(#f)"/>
+  <path d="M76.625 29.826C74.374 9.518 56.263.39 40.294.522c-6.155.05-13.183 1.519-18.04 4.336a19.7 19.7 0 0 0-3.56 2.7c.129-.107.514-.424 1.152-.862l.063-.043.056-.038a26.655 26.655 0 0 1 7.692-3.572A43.5 43.5 0 0 1 40.84 1.5a33.254 33.254 0 0 1 31.25 31.993C72.457 46.7 61.648 57.23 49.188 57.84c-9.062.444-17.6-3.941-21.77-12.713a21.68 21.68 0 0 1-1.964-6.333c-1.976-13.35 6.989-24.735 15.21-27.554-4.435-3.874-15.548-3.611-23.819 2.474-5.956 4.382-9.82 11.049-11.1 19a32.945 32.945 0 0 0 2.34 18 35.3 35.3 0 0 0 30.089 21.443q1.489.114 2.984.113c26.462 0 37.942-20.087 35.467-42.444z" fill="url(#g)"/>
+  <path d="M76.625 29.826C74.374 9.518 56.263.39 40.294.522c-6.155.05-13.183 1.519-18.04 4.336a19.7 19.7 0 0 0-3.56 2.7c.129-.107.514-.424 1.152-.862l.063-.043.056-.038a26.655 26.655 0 0 1 7.692-3.572A43.5 43.5 0 0 1 40.84 1.5a33.254 33.254 0 0 1 31.25 31.993C72.457 46.7 61.648 57.23 49.188 57.84c-9.062.444-17.6-3.941-21.77-12.713a21.68 21.68 0 0 1-1.964-6.333c-1.976-13.35 6.989-24.735 15.21-27.554-4.435-3.874-15.548-3.611-23.819 2.474-5.956 4.382-9.82 11.049-11.1 19a32.945 32.945 0 0 0 2.34 18 35.3 35.3 0 0 0 30.089 21.443q1.489.114 2.984.113c26.462 0 37.942-20.087 35.467-42.444z" fill="url(#h)"/>
+  <path d="M76.625 29.826C74.374 9.518 56.263.39 40.294.522c-6.155.05-13.183 1.519-18.04 4.336a19.7 19.7 0 0 0-3.56 2.7c.129-.107.514-.424 1.152-.862l.063-.043.056-.038a26.655 26.655 0 0 1 7.692-3.572A43.5 43.5 0 0 1 40.84 1.5a33.254 33.254 0 0 1 31.25 31.993C72.457 46.7 61.648 57.23 49.188 57.84c-9.062.444-17.6-3.941-21.77-12.713a21.68 21.68 0 0 1-1.964-6.333c-1.976-13.35 6.989-24.735 15.21-27.554-4.435-3.874-15.548-3.611-23.819 2.474-5.956 4.382-9.82 11.049-11.1 19a32.945 32.945 0 0 0 2.34 18 35.3 35.3 0 0 0 30.089 21.443q1.489.114 2.984.113c26.462 0 37.942-20.087 35.467-42.444z" style="mix-blend-mode:multiply" opacity=".53" fill="url(#i)"/>
+  <path d="M76.625 29.826C74.374 9.518 56.263.39 40.294.522c-6.155.05-13.183 1.519-18.04 4.336a19.7 19.7 0 0 0-3.56 2.7c.129-.107.514-.424 1.152-.862l.063-.043.056-.038a26.655 26.655 0 0 1 7.692-3.572A43.5 43.5 0 0 1 40.84 1.5a33.254 33.254 0 0 1 31.25 31.993C72.457 46.7 61.648 57.23 49.188 57.84c-9.062.444-17.6-3.941-21.77-12.713a21.68 21.68 0 0 1-1.964-6.333c-1.976-13.35 6.989-24.735 15.21-27.554-4.435-3.874-15.548-3.611-23.819 2.474-5.956 4.382-9.82 11.049-11.1 19a32.945 32.945 0 0 0 2.34 18 35.3 35.3 0 0 0 30.089 21.443q1.489.114 2.984.113c26.462 0 37.942-20.087 35.467-42.444z" style="mix-blend-mode:multiply" opacity=".53" fill="url(#j)"/>
+  <path d="M49.188 57.84c17.1-1.04 24.42-15.2 24.879-25.245C74.783 16.9 65.472-.02 40.84 1.5a43.5 43.5 0 0 0-13.183 1.546 28.855 28.855 0 0 0-7.692 3.572l-.056.038-.063.043q-.574.4-1.123.842A33.482 33.482 0 0 1 39.7 3.605c14.142 1.856 27.072 12.857 27.072 27.373 0 11.169-8.631 19.7-18.738 19.087-15.015-.9-18.8-16.3-10.989-22.954-2.106-.453-6.064.435-8.82 4.555-2.473 3.7-2.333 9.41-.807 13.461a22.118 22.118 0 0 0 21.77 12.713z" fill="url(#k)"/>
+  <path d="M71.944 15.7a39.958 39.958 0 0 0-3.482-3.982 31.342 31.342 0 0 0-3.177-2.926 24.393 24.393 0 0 1 1.849 1.79 22.466 22.466 0 0 1 4.882 8.144c2.089 6.329 1.953 14.25-2.036 20.471a23.539 23.539 0 0 1-20.855 10.895c-.361 0-.725 0-1.091-.027-15.015-.9-18.8-16.3-10.988-22.954-2.107-.453-6.065.435-8.821 4.555-2.473 3.7-2.333 9.41-.807 13.461a21.679 21.679 0 0 1-1.963-6.333c-1.977-13.35 6.988-24.735 15.209-27.554-4.435-3.874-15.548-3.611-23.819 2.474a27.845 27.845 0 0 0-10.087 14.6 38.5 38.5 0 0 1 4.159-13.553c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7z" fill="url(#l)"/>
+  <path d="M72.016 18.726a22.458 22.458 0 0 0-4.882-8.144 30.224 30.224 0 0 0-9.094-6.493A40.518 40.518 0 0 0 49.1.92a39.834 39.834 0 0 0-16.565-.1c-5.683 1.2-10.68 3.659-13.841 6.733a32.1 32.1 0 0 1 8.031-3.2 33.565 33.565 0 0 1 31.173 8.1 27.01 27.01 0 0 1 4.329 5.3c4.895 7.959 4.432 17.965.615 23.866-2.835 4.384-8.907 8.5-14.572 8.452A23.629 23.629 0 0 0 69.98 39.2c3.989-6.224 4.125-14.145 2.036-20.474z" fill="url(#m)"/>
+  <path d="M72.016 18.726a22.458 22.458 0 0 0-4.882-8.144 30.224 30.224 0 0 0-9.094-6.493A40.518 40.518 0 0 0 49.1.92a39.834 39.834 0 0 0-16.565-.1c-5.683 1.2-10.68 3.659-13.841 6.733a32.1 32.1 0 0 1 8.031-3.2 33.565 33.565 0 0 1 31.173 8.1 27.01 27.01 0 0 1 4.329 5.3c4.895 7.959 4.432 17.965.615 23.866-2.835 4.384-8.907 8.5-14.572 8.452A23.629 23.629 0 0 0 69.98 39.2c3.989-6.224 4.125-14.145 2.036-20.474z" fill="url(#n)"/>
+</svg>

assets/select-arrow.svg

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="8px" height="6px" viewBox="0 0 8 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 53 (72520) - https://sketchapp.com -->
-    <title>37845F0A-2932-4C2D-98E1-89BE1B168092</title>
-    <desc>Created with sketchtool.</desc>
     <defs>
         <path d="M6,8.48771202 C5.73480519,8.48765538 5.48049273,8.3822614 5.293,8.19471202 L2.293,5.19471202 C1.91402779,4.80233313 1.91944763,4.17862724 2.30518142,3.79289345 C2.69091522,3.40715965 3.31462111,3.40173981 3.707,3.78071202 L6,6.07371202 L8.293,3.78071202 C8.68537889,3.40173981 9.30908478,3.40715965 9.69481858,3.79289345 C10.0805524,4.17862724 10.0859722,4.80233313 9.707,5.19471202 L6.707,8.19471202 C6.51950727,8.3822614 6.26519481,8.48765538 6,8.48771202 Z" id="path-1"></path>
     </defs>
@@ -14,7 +11,7 @@
                     <mask id="mask-2" fill="white">
                         <use xlink:href="#path-1"></use>
                     </mask>
-                    <use id="Shape" fill="#0C0C0D" fill-rule="nonzero" opacity="0.599283854" xlink:href="#path-1"></use>
+                    <use id="Shape" fill="#b1b1b3" fill-rule="nonzero" opacity="0.599283854" xlink:href="#path-1"></use>
                 </g>
             </g>
         </g>

assets/share-24.svg

@@ -1,4 +1,5 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M18 9a3 3 0 1 0-2.977-2.63l-6.94 3.47a3 3 0 1 0 0 4.319l6.94 3.47a3 3 0 1 0 .895-1.789l-6.94-3.47a3.03 3.03 0 0 0 0-.74l6.94-3.47C16.456 8.68 17.19 9 18 9z" fill="#0060df" fill-opacity=".8"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg">
+<symbol id="icon" viewBox="0 0 24 24"><path fill-rule="evenodd" clip-rule="evenodd" d="M18 9a3 3 0 1 0-2.977-2.63l-6.94 3.47a3 3 0 1 0 0 4.319l6.94 3.47a3 3 0 1 0 .895-1.789l-6.94-3.47a3.03 3.03 0 0 0 0-.74l6.94-3.47C16.456 8.68 17.19 9 18 9z" fill="currentColor"></path></symbol></svg>

assets/wordmark.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<symbol id="logo" viewBox="66 0 340 64">
+<path d="M84,48h5.83V35.87H103.3V30.45H89.83V23.51H103.3V18H84Zm23.57,0h5.79V25.81h-5.79Zm2.88-32.12a3.46,3.46,0,0,0-2.59,1,3.62,3.62,0,0,0-1,2.65,3.57,3.57,0,0,0,1,2.59,3.52,3.52,0,0,0,2.61,1,3.46,3.46,0,0,0,3.65-3.26c0-.12,0-.23,0-.35a3.71,3.71,0,0,0-1-2.65,3.5,3.5,0,0,0-2.67-1Zm19.14,9.53a7.22,7.22,0,0,0-3.72.93,5.82,5.82,0,0,0-2.4,2.89V25.81h-5.59V48h5.63V36.29a5.27,5.27,0,0,1,1.31-4,4.94,4.94,0,0,1,3.49-1.21,6.33,6.33,0,0,1,1.73.23,4,4,0,0,1,1.23.55l2-5.59a7.51,7.51,0,0,0-1.66-.61,8.11,8.11,0,0,0-2-.26Zm23.94,3.19a11.15,11.15,0,0,0-3.61-2.37,12.08,12.08,0,0,0-4.6-.86,11.62,11.62,0,0,0-8.3,3.37,11.17,11.17,0,0,0-2.44,3.67,11.59,11.59,0,0,0-.89,4.54,12.24,12.24,0,0,0,.83,4.52,10.52,10.52,0,0,0,2.36,3.66,10.93,10.93,0,0,0,3.71,2.44,12.75,12.75,0,0,0,4.85.88,12.15,12.15,0,0,0,6.12-1.39,13.25,13.25,0,0,0,4.11-3.74L151,40.6a6.23,6.23,0,0,1-2.18,2.15,6.36,6.36,0,0,1-3.33.8,6.7,6.7,0,0,1-4.13-1.25,6,6,0,0,1-2.23-3.43h17.62V36.74a11.71,11.71,0,0,0-.87-4.56,10.5,10.5,0,0,0-2.35-3.59Zm-14.21,5.85a6.38,6.38,0,0,1,2.26-3.12,6.11,6.11,0,0,1,3.74-1.15,6.26,6.26,0,0,1,3.73,1.08,5.56,5.56,0,0,1,2.1,3.19ZM167,16.08a6.05,6.05,0,0,0-2.91,1.54,6.15,6.15,0,0,0-1.56,2.89,18.1,18.1,0,0,0-.48,4.52v.78H158.4v5.1h3.65V48h5.63V30.91H173v-5.1h-5.3V24.75a13.34,13.34,0,0,1,.12-2,2,2,0,0,1,.6-1.19,2.45,2.45,0,0,1,1.33-.57,15.25,15.25,0,0,1,2.34-.15H173V15.63h-1.48A19.06,19.06,0,0,0,167,16.08Zm27.4,12.65a12,12,0,0,0-16.72,0,10.87,10.87,0,0,0-2.46,3.67,11.61,11.61,0,0,0-.89,4.5,11.46,11.46,0,0,0,7.07,10.64,11.73,11.73,0,0,0,4.64.9,12,12,0,0,0,4.66-.9,11.26,11.26,0,0,0,3.72-2.49,11.83,11.83,0,0,0,2.46-3.67,11.31,11.31,0,0,0,.9-4.48A11.43,11.43,0,0,0,194.4,28.73ZM191.7,39.3a5.88,5.88,0,0,1-1.29,2,6.53,6.53,0,0,1-1.93,1.31,6,6,0,0,1-4.76,0,6.34,6.34,0,0,1-1.93-1.31,6.06,6.06,0,0,1-1.3-2,6.48,6.48,0,0,1,0-4.86,5.76,5.76,0,0,1,1.3-2,6.08,6.08,0,0,1,1.93-1.32,6,6,0,0,1,4.76,0,6.37,6.37,0,0,1,1.93,1.32,5.73,5.73,0,0,1,1.29,2A6.39,6.39,0,0,1,191.7,39.3Zm29.47-13.49h-6.65l-4.68,6.57-4.64-6.57h-6.74l7.84,10.8L198,48h6.82l5-6.94L214.89,48h6.86l-8.46-11.34Zm34,7.46a12.88,12.88,0,0,0-3.37-1.44c-1.25-.34-2.46-.63-3.63-.88l-3.08-.7a10.64,10.64,0,0,1-2.51-.86A4.54,4.54,0,0,1,240.87,28a3.61,3.61,0,0,1-.62-2.19,4.8,4.8,0,0,1,1.58-3.7c1.06-1,2.73-1.44,5-1.44a9.84,9.84,0,0,1,5.07,1.17,10.47,10.47,0,0,1,3.39,3.23l2.79-2.18A15.22,15.22,0,0,0,253.45,19a13.8,13.8,0,0,0-6.59-1.44,12.13,12.13,0,0,0-4.14.66A10.33,10.33,0,0,0,239.53,20a7.53,7.53,0,0,0-2.05,2.63,7.41,7.41,0,0,0-.72,3.24,6.7,6.7,0,0,0,.84,3.53,7.06,7.06,0,0,0,2.2,2.22A11.11,11.11,0,0,0,242.86,33c1.13.32,2.29.6,3.47.84l3.26.74a12.63,12.63,0,0,1,2.8,1,5.86,5.86,0,0,1,2,1.56,3.88,3.88,0,0,1,.74,2.42,5.2,5.2,0,0,1-1.81,4.09A7.83,7.83,0,0,1,248,45.2a11,11,0,0,1-9.89-5.38l-3,2.34a15.86,15.86,0,0,0,5.23,4.54,16.06,16.06,0,0,0,7.7,1.7,12.58,12.58,0,0,0,4.38-.72,10.14,10.14,0,0,0,3.3-2,8.79,8.79,0,0,0,2.1-2.85,8.09,8.09,0,0,0,.74-3.39,6.94,6.94,0,0,0-1-3.8,7.71,7.71,0,0,0-2.42-2.37Zm27.51-4.72a10.53,10.53,0,0,0-3.58-2.34,11.89,11.89,0,0,0-4.49-.84,11.6,11.6,0,0,0-4.62.9,11.35,11.35,0,0,0-3.66,2.46A11.84,11.84,0,0,0,263,37a12.21,12.21,0,0,0,.82,4.51,10.53,10.53,0,0,0,2.36,3.64,11.24,11.24,0,0,0,3.7,2.42,12.41,12.41,0,0,0,4.82.88A11.68,11.68,0,0,0,280.82,47,12.84,12.84,0,0,0,285,42.82l-2.88-1.69a7.85,7.85,0,0,1-7.43,4.27,9,9,0,0,1-3.22-.53,8.21,8.21,0,0,1-2.55-1.5,8,8,0,0,1-1.78-2.28,7.79,7.79,0,0,1-.87-2.91h19.59V36.66a11.75,11.75,0,0,0-.86-4.54,10.92,10.92,0,0,0-2.35-3.57ZM266.4,35.22a8.88,8.88,0,0,1,1-2.73,8.55,8.55,0,0,1,1.79-2.18,8,8,0,0,1,2.44-1.43,8.31,8.31,0,0,1,3-.52,7.45,7.45,0,0,1,7.84,6.86ZM308.82,28a8.11,8.11,0,0,0-3-2,10.89,10.89,0,0,0-3.92-.67,9.06,9.06,0,0,0-4.58,1.14,8.76,8.76,0,0,0-3.14,3V25.82h-3.29V48h3.37V35.67a7.92,7.92,0,0,1,.53-2.93,7,7,0,0,1,1.48-2.3,6.46,6.46,0,0,1,2.22-1.5,7,7,0,0,1,2.75-.54,6.33,6.33,0,0,1,5,1.93A7.46,7.46,0,0,1,308,35.51V48h3.41V35.34a12.46,12.46,0,0,0-.66-4.19A8.68,8.68,0,0,0,308.82,28Zm27-12.42v14.1a8.14,8.14,0,0,0-1.58-1.83,10.08,10.08,0,0,0-2-1.36,10.39,10.39,0,0,0-2.3-.84,10.22,10.22,0,0,0-2.4-.28,11.63,11.63,0,0,0-4.4.84,11.09,11.09,0,0,0-3.59,2.38,11.3,11.3,0,0,0-2.42,3.65,12.81,12.81,0,0,0,0,9.32,11.56,11.56,0,0,0,2.4,3.66,10.58,10.58,0,0,0,3.59,2.38,11.77,11.77,0,0,0,4.42.84,9.69,9.69,0,0,0,2.4-.31,11,11,0,0,0,2.3-.86,9.72,9.72,0,0,0,2-1.37,8.75,8.75,0,0,0,1.58-1.85v4h3.33V15.59Zm-.37,24.58a8.3,8.3,0,0,1-10.85,4.47h0a7.68,7.68,0,0,1-2.6-1.76,7.88,7.88,0,0,1-1.73-2.67,8.93,8.93,0,0,1-.62-3.35,8.67,8.67,0,0,1,.62-3.3A8,8,0,0,1,322,30.89a8.17,8.17,0,0,1,2.6-1.79,8.27,8.27,0,0,1,6.51,0,8.64,8.64,0,0,1,2.63,1.81,7.85,7.85,0,0,1,1.72,2.67,8.67,8.67,0,0,1,.62,3.26,8.86,8.86,0,0,1-.65,3.33Z" fill="currentColor"/>
+</symbol>
+<use xlink:href="#logo"/>
+</svg>

build/readme.md

@@ -1,8 +1,8 @@
 # Custom Loaders
 
-## Generate Asset Map
+## Android Index Plugin
 
-This loader enumerates all the files in `assets/` so that `common/assets.js` can provide mappings from the source filename to the hashed filename used on the site.
+Generates the `index.html` page for the native android client
 
 ## Version Plugin
 

common/assets.js

@@ -1,4 +1,4 @@
-const genmap = require('../build/generate_asset_map');
+const genmap = require('./generate_asset_map');
 const isServer = typeof genmap === 'function';
 let prefix = '';
 let manifest = {};

common/readme.md

@@ -1,3 +1,7 @@
 # Common Code
 
-This directory contains code loaded by both the frontend `app` and backend `server`. The code here can be challenging to understand at first because the contexts for the two (three counting the dev server) environments that include them are quite different, but the purpose of these modules are quite simple, to provide mappings from the source assets (`copy-16.png`) to the concrete production assets (`copy-16.db66e0bf.svg`).
+This directory contains code loaded by both the frontend `app` and backend `server`. The code here can be challenging to understand at first because the contexts for the two (three counting the dev server) environments that include them are quite different, but the purpose of these modules are quite simple, to provide mappings from the source assets (`copy-16.png`) to the concrete production assets (`copy-16.db66e0bf.svg`).
+
+## Generate Asset Map
+
+This loader enumerates all the files in `assets/` so that `common/assets.js` can provide mappings from the source filename to the hashed filename used on the site.

docs/deployment.md

@@ -0,0 +1,68 @@
+## Requirements
+This document describes how to do a full deployment of Firefox Send on your own Linux server. You will need:
+
+* A working (and ideally somewhat recent) installation of NodeJS and NPM
+* GIT
+* An Apache webserver
+* Optionally telnet, to be able to quickly check your installation
+
+For Debian/Ubuntu systems this probably just means something like this:
+
+* apt install git apache2 nodejs npm telnet
+
+## Building
+* We assume an already configured virtual-host on your webserver with an existing empty htdocs folder
+* First, remove that htdocs folder - we will replace it with Firefox Send's version now
+* git clone https://github.com/mozilla/send.git htdocs
+* Make now sure you are NOT root but rather the user your webserver is serving files under (e.g. "su www-data" or whoever the owner of your htdocs folder is)
+* npm install
+* npm run build
+
+## Running
+To have a permanently running version of Firefox Send as a background process:
+
+* Create a file "run.sh" with:
+```
+#!/bin/bash
+nohup su www-data -c "npm run prod" 2>/dev/null &
+```
+* chmod +x run.sh
+* ./run.sh
+
+Now the Firefox Send backend should be running on port 1443. You can check with:
+* telnet localhost 1443
+
+## Reverse Proxy
+Of course, we don't want to expose the service on port 1443. Instead we want our normal webserver to forward all requests to Firefox send ("Reverse proxy").
+
+# Apache webserver
+
+* a2enmod proxy
+* a2enmod proxy_http
+* a2enmod proxy_wstunnel
+
+In your Apache virtual host configuration file, insert this:
+
+```
+    # Enable rewrite engine
+    RewriteEngine on
+
+    # Make sure the original domain name is forwarded to Send
+    # Otherwise the generated URLs will be wrong
+    ProxyPreserveHost on
+
+    # Make sure the generated URL is https://
+    RequestHeader set X-Forwarded-Proto https
+
+    # If it's a normal file (e.g. PNG, CSS) just return it
+    RewriteCond %{REQUEST_FILENAME} -f
+    RewriteRule .* - [L]
+
+    # If it's a websocket connection, redirect it to a Send WS connection
+    RewriteCond %{HTTP:Upgrade} =websocket [NC]
+    RewriteRule /(.*) ws://127.0.0.1:1443/$1 [P,L]
+
+    # Otherwise redirect it to a normal HTTP connection
+    RewriteRule ^/(.*)$ http://127.0.0.1:1443/$1 [P,QSA]
+    ProxyPassReverse  "/" "http://127.0.0.1:1443"
+```

docs/docker.md

@@ -1,13 +1,6 @@
 ## Setup
 
-Before building the Docker image, you must build the production assets:
-
-```sh
-npm run build
-```
-
-Then you can run either `docker build` or `docker-compose up`.
-
+Run `docker build -t send:latest .` to create an image or `docker-compose up` to run a full testable stack. *We don't recommend using docker-compose for production.*
 
 ## Environment variables:
 

docs/metrics.md

@@ -68,6 +68,7 @@ Server events allow us to aggregate data about file lifecycle without collecting
 * `event_properties`
   * `download_count` downloads completed
   * `ttl` time remaining before expiry truncated to hour
+  * `agent` the browser name or first 6 characters of the user agent that made the request
 
 ### Client Events
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "firefox-send",
   "description": "File Sharing Experiment",
-  "version": "3.0.10",
+  "version": "3.0.20",
   "author": "Mozilla (https://mozilla.org)",
   "repository": "mozilla/send",
   "homepage": "https://github.com/mozilla/send/",
@@ -35,7 +35,8 @@
     "hooks": {
       "pre-commit": "lint-staged",
       "pre-push": "npm test",
-      "post-merge": "npm install"
+      "post-merge": "npm install",
+      "post-checkout": "scripts/sync-npm-dependencies.sh"
     }
   },
   "lint-staged": {
@@ -57,69 +58,69 @@
     "cache": true
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=10.0.0 <11.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.4.3",
-    "@babel/plugin-proposal-class-properties": "^7.4.0",
+    "@babel/core": "^7.6.4",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/preset-env": "^7.4.3",
+    "@babel/preset-env": "^7.6.3",
     "@dannycoates/webcrypto-liner": "^0.1.37",
-    "@dannycoates/webpack-dev-server": "^3.1.4",
-    "@fullhuman/postcss-purgecss": "^1.1.0",
+    "@fullhuman/postcss-purgecss": "^1.3.0",
     "@mattiasbuelens/web-streams-polyfill": "0.2.1",
+    "@sentry/browser": "^5.7.1",
     "asmcrypto.js": "^0.22.0",
-    "babel-loader": "^8.0.5",
-    "babel-plugin-istanbul": "^5.1.2",
-    "base64-js": "^1.3.0",
+    "babel-loader": "^8.0.6",
+    "babel-plugin-istanbul": "^5.2.0",
+    "base64-js": "^1.3.1",
     "content-disposition": "^0.5.3",
-    "copy-webpack-plugin": "^5.0.2",
-    "core-js": "^3.0.1",
+    "copy-webpack-plugin": "^5.0.4",
+    "core-js": "^3.3.3",
     "crc": "^3.8.0",
-    "cross-env": "^5.2.0",
-    "css-loader": "^2.1.1",
+    "cross-env": "^6.0.3",
+    "css-loader": "^3.2.0",
     "css-mqpacker": "^7.0.0",
     "cssnano": "^4.1.10",
-    "eslint": "^5.16.0",
-    "eslint-plugin-mocha": "^5.3.0",
-    "eslint-plugin-node": "^8.0.1",
+    "eslint": "^6.5.1",
+    "eslint-config-prettier": "^6.4.0",
+    "eslint-plugin-mocha": "^6.2.0",
+    "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-security": "^1.4.0",
     "expose-loader": "^0.7.5",
     "extract-loader": "^3.1.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "fast-text-encoding": "^1.0.0",
-    "file-loader": "^3.0.1",
-    "fluent-intl-polyfill": "^0.1.0",
+    "file-loader": "^4.2.0",
     "git-rev-sync": "^1.12.0",
     "html-loader": "^0.5.5",
     "http_ece": "^1.1.0",
-    "husky": "^1.3.1",
-    "lint-staged": "^8.1.5",
-    "mocha": "^6.1.3",
+    "husky": "^3.0.9",
+    "intl-pluralrules": "^1.1.1",
+    "lint-staged": "^9.4.2",
+    "mocha": "^6.2.2",
     "morgan": "^1.9.1",
     "nanobus": "^4.4.0",
-    "nanohtml": "^1.5.0",
+    "nanohtml": "^1.8.1",
     "nanotiming": "^7.3.1",
     "npm-run-all": "^4.1.5",
-    "nyc": "^14.0.0",
+    "nyc": "^14.1.1",
     "postcss-loader": "^3.0.0",
-    "postcss-preset-env": "^6.6.0",
-    "prettier": "^1.17.0",
-    "proxyquire": "^2.1.0",
-    "puppeteer": "1.11.0",
-    "raven-js": "^3.27.0",
-    "raw-loader": "^2.0.0",
-    "redis-mock": "^0.43.0",
-    "rimraf": "^2.6.3",
+    "postcss-preset-env": "^6.7.0",
+    "prettier": "^1.18.2",
+    "proxyquire": "^2.1.3",
+    "puppeteer": "^1.20.0",
+    "raw-loader": "^3.1.0",
+    "redis-mock": "^0.46.0",
+    "rimraf": "^3.0.0",
     "script-loader": "^0.7.2",
-    "sinon": "^7.3.2",
+    "sinon": "^7.5.0",
     "string-hash": "^1.1.3",
-    "stylelint": "^10.0.1",
-    "stylelint-config-standard": "^18.3.0",
+    "stylelint": "^11.1.1",
+    "stylelint-config-standard": "^19.0.0",
     "stylelint-no-unsupported-browser-features": "^3.0.2",
-    "svgo": "^1.2.2",
-    "svgo-loader": "^2.2.0",
-    "tailwindcss": "^0.7.4",
+    "svgo": "^1.3.0",
+    "svgo-loader": "^2.2.1",
+    "tailwindcss": "^1.1.2",
     "val-loader": "^1.1.1",
     "wdio-docker-service": "^1.4.2",
     "wdio-dot-reporter": "0.0.10",
@@ -129,38 +130,41 @@
     "wdio-selenium-standalone-service": "0.0.12",
     "wdio-spec-reporter": "^0.1.5",
     "webdriverio": "^4.14.4",
-    "webpack": "4.28.4",
-    "webpack-cli": "^3.3.0",
-    "webpack-dev-middleware": "^3.6.2",
-    "webpack-manifest-plugin": "^2.0.4",
+    "webpack": "4.38.0",
+    "webpack-cli": "^3.3.9",
+    "webpack-dev-middleware": "^3.7.2",
+    "webpack-dev-server": "^3.8.2",
+    "webpack-manifest-plugin": "^2.2.0",
     "webpack-unassert-loader": "^1.2.0"
   },
   "dependencies": {
-    "@google-cloud/storage": "^2.5.0",
-    "aws-sdk": "^2.438.0",
-    "body-parser": "^1.18.3",
-    "choo": "^6.13.3",
-    "cldr-core": "^35.0.0",
-    "convict": "^4.4.1",
-    "express": "^4.16.3",
-    "express-ws": "github:dannycoates/express-ws",
-    "fluent": "^0.12.0",
-    "fluent-langneg": "^0.1.1",
+    "@dannycoates/express-ws": "^5.0.3",
+    "@fluent/bundle": "^0.13.0",
+    "@fluent/langneg": "^0.3.0",
+    "@google-cloud/storage": "^4.0.0",
+    "@sentry/node": "^5.7.1",
+    "aws-sdk": "^2.553.0",
+    "body-parser": "^1.19.0",
+    "choo": "^7.0.0",
+    "cldr-core": "^35.1.0",
+    "configstore": "github:dannycoates/configstore#master",
+    "convict": "^5.2.0",
+    "express": "^4.17.1",
     "fxa-geodb": "^1.0.4",
-    "helmet": "^3.16.0",
+    "helmet": "^3.21.1",
     "mkdirp": "^0.5.1",
     "mozlog": "^2.2.0",
-    "node-fetch": "^2.3.0",
-    "raven": "^2.6.4",
+    "node-fetch": "^2.6.0",
     "redis": "^2.8.0",
     "selenium-standalone": "^6.15.6",
-    "ua-parser-js": "^0.7.19",
-    "websocket-stream": "^5.4.0"
+    "ua-parser-js": "^0.7.20"
   },
   "availableLanguages": [
     "en-US",
+    "ar",
     "ast",
-    "bn-BD",
+    "bn",
+    "br",
     "ca",
     "cak",
     "cs",
@@ -175,9 +179,12 @@
     "es-CL",
     "es-ES",
     "es-MX",
+    "et",
+    "eu",
     "fi",
     "fr",
     "fy-NL",
+    "he",
     "hr",
     "hsb",
     "hu",
@@ -189,8 +196,12 @@
     "kab",
     "ko",
     "lt",
+    "ml",
+    "nb-NO",
     "nl",
     "nn-NO",
+    "oc",
+    "pa-IN",
     "pl",
     "pt-BR",
     "pt-PT",
@@ -200,10 +211,14 @@
     "sl",
     "sq",
     "sr",
+    "su",
     "sv-SE",
+    "te",
+    "th",
     "tr",
     "uk",
     "vi",
+    "zgh",
     "zh-CN",
     "zh-TW"
   ]

postcss.config.js

@@ -6,7 +6,7 @@ class TailwindExtractor {
 
 const options = {
   plugins: [
-    require('tailwindcss')('./tailwind.js'),
+    require('tailwindcss')('./tailwind.config.js'),
     require('postcss-preset-env')
   ]
 };

public/locales/ar/send.ftl

@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = فَيَرفُكس سِنْد
-siteSubtitle = تجربة وِبّيّة
 siteFeedback = الانطباعات
-uploadPageHeader = شارِك ملفاتك بخصوصية وتعمية
-uploadPageExplainer = أرسل الملفات عبر رابط آمن خاص ومعمّى تنتهي صلاحيته تلقائيا لتضمن عدم بقاء ما ترسله إلى الأبد.
-uploadPageLearnMore = اطّلع على المزيد
-uploadPageDropMessage = أسقِط ملفّك هنا لبدء الرفع
-uploadPageSizeMessage = لتتحصل على أفضل تجربة، من المستحسن أن يكون الملف أصغر من 1 غ.بايت
-uploadPageBrowseButton = اختر ملفًا على حاسوبك
-uploadPageBrowseButton1 = اختر ملفّا لرفعه
-uploadPageMultipleFilesAlert = رفع عدة ملفات (أو رفع مجلد) ليس مدعوما حاليا.
-uploadPageBrowseButtonTitle = ارفع ملفًا
-uploadingPageProgress = يرفع { $filename } ({ $size })
 importingFile = يستورد…
-verifyingFile = يتحقق…
 encryptingFile = يعمّي…
 decryptingFile = يفك التعمية…
-notifyUploadDone = انتهى الرفع.
-uploadingPageMessage = ما إن يُرفع الملف سيُتاح ضبط خيارات انتهاء صلاحيته.
-uploadingPageCancel = ألغِ الرفع
-uploadCancelNotification = أُلغي الرفع.
-uploadingPageLargeFileMessage = هذا الملف كبير الحجم وسيأخذ رفعه وقتا. انتظر رجاءً.
-uploadingFileNotification = أعلِمني عندما يكتمل الرفع.
-uploadSuccessConfirmHeader = جاهز للإرسال
-uploadSvgAlt = ارفع
-uploadSuccessTimingHeader = ستنتهي صلاحية الرابط الذي يشير إلى الملف في حال: نُزِّل لأول مرة، أو مرّ ٢٤ ساعة على رفعه.
-expireInfo = ستنتهي صلاحية رابط الملف بعد { $downloadCount } أو { $timespan }.
 downloadCount =
     { $num ->
         [zero] لا تنزيلات
@@ -44,76 +22,26 @@ timespanHours =
         [many] { $num } ساعة
        *[other] { $num } ساعة
     }
-copyUrlFormLabelWithName = انسخ الرابط وشاركه لإرسال الملف: { $filename }
-copyUrlFormButton = انسخ إلى الحافظة
 copiedUrl = نُسخ!
-deleteFileButton = احذف الملف
-sendAnotherFileLink = أرسِل ملفًا آخر
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = نزّل
-downloadsFileList = التنزيلات
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = الوقت
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = نزّل { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = أدخل كلمة السر
 unlockInputPlaceholder = كلمة السر
 unlockButtonLabel = افتح القفل
-downloadFileTitle = نزِّل الملف المعمّى
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = يُرسل إليك صديقك ملفا عبر «فَيَرفُكس سِنْد»، وهي خدمة تتيح لك مشاركة الملفات عبر رابط آمن وخاص ومعمّى، حيث تنتهي صلاحياتها تلقائيا لتضمن عدم بقاء ما ترسله إلى الأبد.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = نزّل
-downloadNotification = لقد اكتمل التنزيل.
 downloadFinish = اكتمل التنزيل
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } من أصل { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = جرِّب «فَيَرفُكس سِنْد»
-downloadingPageProgress = ينزّل { $filename } ({ $size })
-downloadingPageMessage = رجاء أبقِ هذا اللسان مفتوحا حتى نجلب الملف ونفك تعميته.
-errorAltText = خطأ أثناء الرفع
 errorPageHeader = حدث خطب ما.
-errorPageMessage = حدث خطب ما أثناء رفع الملف.
-errorPageLink = أرسل ملفا آخر
 fileTooBig = حجم الملف كبير للغاية لرفعه. يجب أن يكون أصغر من { $size }.
 linkExpiredAlt = انتهت صلاحية الرابط
-expiredPageHeader = انتهت صلاحية هذا الرابط أو لم يكن موجودا في المقام الأول!
 notSupportedHeader = متصفحك غير مدعوم.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = للأسف فإن متصفحك لا يدعم تقنية الوِب التي يعتمد عليها «فَيَرفُكس سِنْد». عليك تجربة متصفح آخر، ونحن ننصحك بِفَيَرفُكس!
 notSupportedLink = لماذا متصفحي غير مدعوم؟
 notSupportedOutdatedDetail = للأسف فإن إصدارة فَيَرفُكس هذه لا تدعم تقنية الوِب التي يعتمد عليها «فَيَرفُكس سِنْد». عليك تحديث متصفحك.
 updateFirefox = حدّث فَيَرفُكس
-downloadFirefoxButtonSub = تنزيل مجاني
-uploadedFile = ملف
-copyFileList = انسخ الرابط
-# expiryFileList is used as a column header
-expiryFileList = ينتهي في
-deleteFileList = احذف
-nevermindButton = لا بأس
-legalHeader = الشروط والخصوصية
-legalNoticeTestPilot = «فَيَرفُكس سِنْد» جزء من اختبار تجريبي حاليًا و يخضع <a>لبنود خدمة</a> الاختبار التجريبي و <a>تنويه الخصوصية</a>. يمكنك التعرف على مزيد من المعلومات حول هذه التجربة وجمع البيانات<a>هنا</a>.
-legalNoticeMozilla = يخضع استخدام موقع «فَيَرفُكس سِنْد» إلى<a>تنويه خصوصية المواقع</a> و <a>بنود خدمة المواقع</a>.
-deletePopupText = أأحذف هذا الملف؟
-deletePopupYes = نعم
 deletePopupCancel = ألغِ
 deleteButtonHover = احذف
-copyUrlHover = انسخ الرابط
 footerLinkLegal = القانونية
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = حول الاختبار التجريبي
 footerLinkPrivacy = الخصوصية
-footerLinkTerms = الشروط
 footerLinkCookies = الكعكات
-requirePasswordCheckbox = اطلب كلمة سر لتنزيل هذا الملف
-addPasswordButton = أضِف كلمة سر
-changePasswordButton = غيّر
 passwordTryAgain = كلمة السر خاطئة. أعِد المحاولة.
-reportIPInfringement = أبلغ عن انتهاك للملكية الفكرية
 javascriptRequired = يتطلب فَيَرفُكس سِنْد جافاسكربت
 whyJavascript = لماذا يتطلب فَيَرفُكس سِنْد جافاسكربت؟
 enableJavascript = رجاء فعّل جافاسكربت ثم أعد المحاولة.
@@ -121,9 +49,138 @@ enableJavascript = رجاء فعّل جافاسكربت ثم أعد المحاو
 expiresHoursMinutes = { $hours }س { $minutes }د
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
 expiresMinutes = { $minutes }د
-# A short status message shown when a password is successfully set
-passwordIsSet = ضُبطت كلمة السر
 # A short status message shown when the user enters a long password
 maxPasswordLength = أقصر طول لكلمة السر: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = يجب ألا تُضبط كلمة السر هذه
+
+## Send version 2 strings
+
+introTitle = شارِك ملفاتك بلا عناء وبخصوصية تامة
+introDescription = يتيح لك { -send-brand } مشاركة الملفات عبر تعميتها من الطرفين وإتاحتها في رابط ينقضي أجله تلقائيا. هكذا يمكنك إبقاء ما شاركته خاصًا فتضمن بأن ملفاتك لن تبقى في الوِب أبد الدهر.
+notifyUploadEncryptDone = اكتملت تعمية الملف وأصبح جاهزًا لإرساله
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = ينقضي بعد { $downloadCount } أو { $timespan }
+timespanMinutes =
+    { $num ->
+        [zero] أقل من دقيقة
+        [one] دقيقة واحدة
+        [two] دقيقتين اثنتين
+        [few] { $num } دقائق
+        [many] { $num } دقيقة
+       *[other] { $num } دقيقة
+    }
+timespanDays =
+    { $num ->
+        [zero] أقل من يوم
+        [one] يوم واحد
+        [two] يومين اثنين
+        [few] { $num } أيام
+        [many] { $num } يومًا
+       *[other] { $num } يوم
+    }
+timespanWeeks =
+    { $num ->
+        [zero] أقل من أسبوع
+        [one] أسبوع واحد
+        [two] أسبوعين اثنين
+        [few] { $num } أسابيع
+        [many] { $num } أسبوعًا
+       *[other] { $num } أسبوع
+    }
+fileCount =
+    { $num ->
+        [zero] { $num } ملف
+        [one] ملف واحد
+        [two] ملفان اثنان
+        [few] { $num } ملفات
+        [many] { $num } ملفًا
+       *[other] { $num } ملف
+    }
+# byte abbreviation
+bytes = بايت
+# kibibyte abbreviation
+kb = ك.بايت
+# mebibyte abbreviation
+mb = م.بايت
+# gibibyte abbreviation
+gb = ج.بايت
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num } { $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = إجمالي الحجم: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = انسخ هذا الرابط لتُشارك الملف:
+copyLinkButton = انسخ الرابط
+downloadTitle = نزّل الملفات
+downloadDescription = شارك أحد هذا الملف معك عبر { -send-brand } وعمّاه بتعمية من الطرفين وبرابط ينقضي أجله تلقائيا.
+trySendDescription = جرِّب { -send-brand } وشارِك ملفاتك بلا عناء وبخصوصية تامة.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [zero] لا يمكنك تنزيل أي ملف في آن واحد.
+        [one] لا يمكنك تنزيل ما يزيد على ملف واحد في آن واحد.
+        [two] لا يمكنك تنزيل ما يزيد على ملفين اثنين في آن واحد.
+        [few] لا يمكنك تنزيل ما يزيد على { $count } ملفات في آن واحد.
+        [many] لا يمكنك تنزيل ما يزيد على { $count } ملفًا في آن واحد.
+       *[other] لا يمكنك تنزيل ما يزيد على { $count } ملف في آن واحد.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [zero] الأرشيفات ممنوعة.
+        [one] لا يُسمح إلا بأرشيف واحد.
+        [two] لا يُسمح إلا بأرشيفين اثنين.
+        [few] لا يُسمح إلا ب‍ { $count } أرشيفات.
+        [many] لا يُسمح إلا ب‍ { $count } أرشيفًا.
+       *[other] لا يُسمح إلا ب‍ { $count } أرشيف.
+    }
+expiredTitle = انقضى وقت الرابط.
+notSupportedDescription = لن يعمل { -send-brand } في هذا المتصفح. أفضل المتصفحات التي يعمل معها { -send-short-brand } هو { -firefox } بآخر إصدارة، كما وأحدث إصدارة من أغلب المتصفحات الموجودة.
+downloadFirefox = نزِّل { -firefox }
+legalTitle = تنويه خصوصية { -send-short-brand }
+legalDateStamp = الإصدارة ١٫٠ بتاريخ ١٢ مارس ٢٠١٩
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days }يوم { $hours }سا { $minutes }دق
+addFilesButton = حدّد الملفات التي تريد رفعها
+uploadButton = ارفع
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = اسحب الملفات وأفلِتها هنا
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = أو انقر لإرسال ملفات يصل حجمها { $size }
+addPassword = احمِه بكلمة سر
+emailPlaceholder = أدخل بريدك الإلكتروني
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = لِج وأرسِل ملفات يصل حجمها { $size }
+signInOnlyButton = لِج
+accountBenefitTitle = أنشِئ حساب { -firefox } أو لِج إلى حسابك
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = شارِك ملفات يصل حجمها { $size }
+accountBenefitDownloadCount = شارِك الملفات مع أناس أكثر وأكثر
+accountBenefitTimeLimit =
+    { $count ->
+        [zero] لا تُبقِ أي روابط نشطة
+        [one] أبقِ الروابط نشطة لمدة تصل إلى يوم واحد
+        [two] أبقِ الروابط نشطة لمدة تصل إلى يومين اثنين
+        [few] أبقِ الروابط نشطة لمدة تصل إلى { $count } أيام
+        [many] أبقِ الروابط نشطة لمدة تصل إلى { $count } يومًا
+       *[other] أبقِ الروابط نشطة لمدة تصل إلى { $count } يوم
+    }
+accountBenefitSync = أدِر ملفاتك التي شاركتها من أيّ جهاز تريد
+accountBenefitMoz = اطّلع على المزيد حول خدمات { -mozilla }
+signOut = اخرج
+okButton = حسنًا
+downloadingTitle = يجري التنزيل
+noStreamsWarning = هناك احتمال بألا يقدر هذا المتصفح على فكّ تعمية الملفات الكبيرة كهذا.
+noStreamsOptionCopy = انسخ الرابط لتفتحه في متصفح آخر
+noStreamsOptionFirefox = جرّب متصفّحنا المفضل
+noStreamsOptionDownload = واصِل بهذا المتصفح
+downloadFirefoxPromo = ‏{ -send-short-brand } تقدمة { -firefox } الجديد الأنيق.
+# the next line after the colon contains a file name
+shareLinkDescription = شارِك الرابط الذي يصل إلى الملف:
+shareLinkButton = شارِك الرابط
+# $name is the name of the file
+shareMessage = نزِّل ”{ $name }“ عبر { -send-brand }: خدمة لمشاركة الملفات بلا عناء وبخصوصية تامة
+trailheadPromo = يمكنك حماية خصوصيتك، طبعا. انضم إلى فَيَرفُكس.
+learnMore = اطّلع على المزيد.

public/locales/bn/send.ftl

@@ -126,7 +126,7 @@ addPassword = পাসওয়ার্ড দ্বারা সুরক্ষ
 emailPlaceholder = আপনার ইমেইল দিন
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = সর্বোচ্চ { $size } আকারের ফাইল প্রেরণ করতে সাইন ইন করুন
-signInButton = সাইন ইন/আপ
+signInOnlyButton = সাইন ইন
 accountBenefitTitle = { -firefox } অ্যাকাউন্ট তৈরি অথবা সাইন ইন করুন
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = সর্বোচ্চ { $size } আকারের ফাইল শেয়ার করুন
@@ -145,3 +145,11 @@ noStreamsWarning = এই ব্রাউজার এতো বড় একট
 noStreamsOptionCopy = অন্য ব্রাউজারে খুলতে লিঙ্ক অনুলিপি করুন
 noStreamsOptionFirefox = আমাদের জনপ্রিয় ব্রাউজার ব্যবহার করুন
 noStreamsOptionDownload = এই ব্রাউজার ব্যবহার অব্যহত রাখুন
+downloadFirefoxPromo = { -send-short-brand } আপনারদের জন্য নিয়ে এসেছে একেবারে নতুন { -firefox }।
+# the next line after the colon contains a file name
+shareLinkDescription = আপনার ফাইলে লিঙ্ক শেয়ার করুন:
+shareLinkButton = লিঙ্ক শেয়ার করুন
+# $name is the name of the file
+shareMessage = { -send-brand } এর মাধ্যমে "{ $name }" ডাউনলোড করুন: সরল, নিরাপদ ফাইল শেয়ারিং
+trailheadPromo = আপনার গোপনীয়তা রক্ষা করার একটি উপায় আছে। Firefox এ যোগ দিন।
+learnMore = আরও জানুন।

public/locales/br/send.ftl

@@ -0,0 +1,182 @@
+# Firefox Send is a brand name and should not be localized.
+title = Firefox Send
+siteFeedback = Roit hoc'h ali
+importingFile = Oc'h enporzhiañ …
+encryptingFile = Oc'h enrinegañ..
+decryptingFile = Oc'h ezrinegañ...
+downloadCount =
+    { $num ->
+        [one] { $num } bellgargadenn
+        [two] { $num } bellgargadenn
+        [few] { $num } fellgargadenn
+        [many] { $num } a bellgargadennoù
+       *[other] { $num } pellgargadenn
+    }
+timespanHours =
+    { $num ->
+        [one] { $num } eur
+        [two] { $num } eur
+        [few] { $num } eur
+        [many] { $num } a eurioù
+       *[other] { $num } eur
+    }
+copiedUrl = Eilet!
+unlockInputPlaceholder = Ger-tremen
+unlockButtonLabel = Dibrennañ
+downloadButtonLabel = Pellgargañ
+downloadFinish = Pellgargadur echu
+fileSizeProgress = ({ $partialSize } war { $totalSize })
+sendYourFilesLink = Esaeit Firefox Send
+errorPageHeader = Degouezhet ez eus bet ur fazi!
+fileTooBig = Re vras eo ar restr-mañ evit e pellgas. Rankout a ra bezañ nebeutoc'h eget { $size }
+linkExpiredAlt = Ere diamzeret
+notSupportedHeader = N'eo ket skoret ho merdeer.
+notSupportedLink = Perak n'eo ket skoret ma merdeer?
+notSupportedOutdatedDetail = Siwazh n'eo ket skoret ar c'halvezerezhioù implijet evit Firefox Send gant an handelv-mañ eus Firefox. Ret e vo deoc'h hizivaat ho merdeer.
+updateFirefox = Hizivaat Firefox
+deletePopupCancel = Nullañ
+deleteButtonHover = Dilemel
+footerLinkLegal = Lezennel
+footerLinkPrivacy = Buhez prevez
+footerLinkCookies = Toupinoù
+passwordTryAgain = Ger-tremen direizh. Klaskit en-dro.
+javascriptRequired = Firefox Send a azgoulenn Javascript
+whyJavascript = Perak e azgoulenn Firefox Send Javascript?
+enableJavascript = Gweredekait Javascript ha klaskit en-dro.
+# A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
+expiresHoursMinutes = { $hours }e { $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 = Hirder brasañ aotreet evit ar ger-tremen: { $length }
+# A short status message shown when there was an error setting the password
+passwordSetError = N'haller ket despizañ ar ger-tremen
+
+## 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 = Rannañ restroù en un doare eeun ha prevez
+introDescription = A-drugarez da { -send-brand } a c'hallit rannañ restroù gant un enrinegañ penn-ouzh-penn hag un ere a ziamzero ent emgefreek. Evel-se e c'hallit mirout ar pezh a rannit prevez ha bezañ sur ne chomo ket ho traoù enlinenn da viken.
+notifyUploadEncryptDone = Enrineget eo ho restr ha prest eo da vezañ kaset
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Diamzeriñ a raio goude { $downloadCount } pe { $timespan }
+timespanMinutes =
+    { $num ->
+        [one] { $num } vunutenn
+        [two] { $num } vunutenn
+        [few] { $num } munutenn
+        [many] { $num } a vunutennoù
+       *[other] { $num } munutenn
+    }
+timespanDays =
+    { $num ->
+        [one] { $num } devezh
+        [two] { $num } zevezh
+        [few] { $num } devezh
+        [many] { $num } a zevezhioù
+       *[other] { $num } devezh
+    }
+timespanWeeks =
+    { $num ->
+        [one] { $num } sizhun
+        [two] { $num } sizhun
+        [few] { $num } sizhun
+        [many] { $num } a sizhunioù
+       *[other] { $num } sizhun
+    }
+fileCount =
+    { $num ->
+        [one] { $num } restr
+        [two] { $num } restr
+        [few] { $num } restr
+        [many] { $num } a restroù
+       *[other] { $num } restr
+    }
+# byte abbreviation
+bytes = e
+# kibibyte abbreviation
+kb = Ke
+# mebibyte abbreviation
+mb = Me
+# gibibyte abbreviation
+gb = Ge
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num }{ $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = Ment hollek: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Eilit an ere evit rannañ ho restr
+copyLinkButton = Eilañ an ere
+downloadTitle = Pellgargañ ar restroù
+downloadDescription = Dre { -send-brand } eo bet rannet ar restr-mañ, gant un enrinegañ penn-ouzh-penn hag un ere a ziamzer ent emgefreek.
+trySendDescription = Esaeit { -send-brand } evit rannañ restroù en un doare eeun ha prevez.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] N'haller pellgas nemet { $count } restr er memes mare.
+        [two] N'haller pellgas nemet { $count } restr er memes mare.
+        [few] N'haller pellgas nemet { $count } restr er memes mare.
+        [many] N'haller pellgas nemet { $count } a restroù er memes mare.
+       *[other] N'haller pellgas nemet { $count } restr er memes mare.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Aotreet eo{ $count } diell nemetken.
+        [two] Aotreet eo{ $count } ziell nemetken.
+        [few] Aotreet eo{ $count } diell nemetken.
+        [many] Aotreet eo{ $count } a zielloù nemetken.
+       *[other] Aotreet eo{ $count } diell nemetken.
+    }
+expiredTitle = Diamzeret eo an ere.
+notSupportedDescription = { -send-brand } n'aio ket en-dro war ar merdeer-mañ. { -send-short-brand } a za en-dro gwelloc'h gant handelv diwezhañ { -firefox }, ha mont a raio en-dro gant handelv bremanel lodenn vrasañ ar merdeerioù.
+downloadFirefox = Pellgargañ { -firefox }
+legalTitle = Evezhiadenn a fed buhez prevez { -send-short-brand }
+legalDateStamp = Handelv 1.0, d'an 12 a viz Meurzh 2019
+# 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 }e { $minutes }m
+addFilesButton = Diuzit ur restr da bellgas
+uploadButton = Pellgas
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Riklit ha laoskit restroù
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = pe klikit evit kas betek { $size }
+addPassword = Gwareziñ gant ur ger-tremen
+emailPlaceholder = Enankit ho chomlec'h postel
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = Kennaskit evit kas betek { $size }
+signInOnlyButton = Kennaskañ
+accountBenefitTitle = Krouit ur gont { -firefox } pe kennaskit
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = Rannit restroù betek { $size }
+accountBenefitDownloadCount = Rannit restroù gant muioc'h a dud
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Dalc'hit an ereoù oberiant e-pad { $count } devezh
+        [two] Dalc'hit an ereoù oberiant e-pad { $count } zevezh
+        [few] Dalc'hit an ereoù oberiant e-pad { $count } devezh
+        [many] Dalc'hit an ereoù oberiant e-pad { $count } a zevezhioù
+       *[other] Dalc'hit an ereoù oberiant e-pad { $count } devezh
+    }
+accountBenefitSync = Merit ar restroù rannet gant forzh peseurt trevnad
+accountBenefitMoz = Gouzout hiroc'h a-zivout gwazerezhioù all { -mozilla }
+signOut = Digennaskañ
+okButton = Mat eo
+downloadingTitle = O pellgargañ
+noStreamsWarning = Posupl eo ne vefe ket gouest ar merdeer-mañ da ezrinegañ ur restr ken bras.
+noStreamsOptionCopy = Eilit an ere evit digeriñ anezhañ en ur merdeer all
+noStreamsOptionFirefox = Esaeit hor merdeer karetañ
+noStreamsOptionDownload = Kenderc'hel gant ar merdeer-mañ
+downloadFirefoxPromo = { -send-short-brand } a zo kinniget deoc'h gant ar { -firefox } nevez-flamm.
+# the next line after the colon contains a file name
+shareLinkDescription = Rannit an ere etrezek ho restr:
+shareLinkButton = Rannañ an ere
+# $name is the name of the file
+shareMessage = Pellgargañ "{ $name }" gant { -send-brand }: rannañ restroù en un doare eeun ha prevez
+trailheadPromo = Un doare a zo da wareziñ ho puhez prevez. Tremenit da Firefox.
+learnMore = Gouzout hiroc'h.

public/locales/ca/send.ftl

@@ -126,7 +126,7 @@ addPassword = Protegeix amb contrasenya
 emailPlaceholder = Introduïu la vostra adreça electrònica
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Inicieu la sessió per enviar fins a { $size }
-signInButton = Inicieu la sessió o registreu-vos
+signInOnlyButton = Inicia la sessió
 accountBenefitTitle = Creeu un compte del { -firefox } o inicieu la sessió
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Compartiu fitxers fins a { $size }
@@ -145,3 +145,11 @@ noStreamsWarning = Pot ser que aquest navegador no pugui desxifrar un fitxer tan
 noStreamsOptionCopy = Copieu l'enllaç per obrir-lo en un altre navegador
 noStreamsOptionFirefox = Proveu el nostre navegador preferit
 noStreamsOptionDownload = Segueix amb aquest navegador
+downloadFirefoxPromo = El nou { -firefox } us ofereix el { -send-short-brand }
+# the next line after the colon contains a file name
+shareLinkDescription = Compartiu l'enllaç al vostre fitxer:
+shareLinkButton = Comparteix l'enllaç
+# $name is the name of the file
+shareMessage = Baixeu «{ $name }» amb el { -send-brand }: compartició de fitxers senzilla i segura
+trailheadPromo = Hi ha una manera de protegir la vostra privadesa. Uniu-vos al Firefox.
+learnMore = Més informació.

public/locales/cak/send.ftl

@@ -126,7 +126,7 @@ addPassword = Tichajïx rik'in ewan tzij
 emailPlaceholder = Tatz'ib'aj ataqoya'l
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Tatikirisaj molojri'ïl richin natäq k'a { $size }
-signInButton = Tatikirisaj molojri'ïl/tatz'ib'aj ab'i'
+signInOnlyButton = Titikirisäx molojri'ïl
 accountBenefitTitle = Tatz'uku' jun { -firefox } Rub'i' Ataqoy'al o Tatikirisaj molojri'ïl
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Ke'akomonij taq yakb'äl k'a { $size }
@@ -145,3 +145,11 @@ noStreamsWarning = Rik'in jub'a' re okik'amaya'l re' man nitikïr ta nretamaj ru
 noStreamsOptionCopy = Tiwachib'ëx ri ximonel richin nijaq pa jun chik okik'amaya'l
 noStreamsOptionFirefox = Tatojtob'ej ri jeb'ël qokik'amaya'l
 noStreamsOptionDownload = Kisamäj na rik'in re okik'amaya'l re'
+downloadFirefoxPromo = Ja ri k'ak'a' { -firefox } nusüj ri { -send-short-brand } chawe.
+# the next line after the colon contains a file name
+shareLinkDescription = Nakomonij ri ximonel rik'in ri awokisab'al:
+shareLinkButton = Tikomonïx ximonel
+# $name is the name of the file
+shareMessage = Tiqasäx "{ $name }" rik'in { -send-brand }: man k'ayew ta chuqa' ütz kikomonik ri yakb'äl
+trailheadPromo = K'o jun rub'anikil richin nachajij ri awichinanem. Tatunu' awi' rik'in ri Firefox.
+learnMore = Tetamäx ch'aqa' chik.

public/locales/cs/send.ftl

@@ -170,7 +170,7 @@ addPassword = Ochránit heslem
 emailPlaceholder = Zadejte svoji e-mailovou adresu
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Pro odesílání souborů o velikosti až { $size } se prosím přihlaste
-signInButton = Přihlásit/Registrovat se
+signInOnlyButton = Přihlásit se
 accountBenefitTitle = Vytvořte si účet { -firefox(case: "gen") } nebo se přihlaste
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Sdílejte soubory o velikosti až { $size }
@@ -190,3 +190,11 @@ noStreamsWarning = Dešifrování tak velikého souboru se v tomto prohlížeči
 noStreamsOptionCopy = Zkopírujte odkaz pro otevření v jiném prohlížeči
 noStreamsOptionFirefox = Vyzkoušejte náš oblíbený prohlížeč
 noStreamsOptionDownload = Pokračovat v tomto prohlížeči
+downloadFirefoxPromo = { -send-short-brand } od aplikace { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Sdílet odkaz na soubor:
+shareLinkButton = Sdílet odkaz
+# $name is the name of the file
+shareMessage = Stáhněte si soubor „{ $name }“ s { -send-brand(case: "ins") } - jednoduché a bezpečné sdílení souborů
+trailheadPromo = Existuje způsob, jak ochránit své soukromí. Používejte Firefox.
+learnMore = Zjistit více.

public/locales/cy/send.ftl

@@ -6,21 +6,21 @@ encryptingFile = Wrthi'n amgryptio…
 decryptingFile = Wrthi'n dadgryptio…
 downloadCount =
     { $num ->
-        [zero] Llwythi i lawr
-        [one] Llwyth i lawr
-        [two] Lwyth i lawr
-        [few] Llwyth i lawr
-        [many] Llwyth i lawr
-       *[other] Llwyth i lawr
+        [zero] Dim llwythi i lawr
+        [one] 1 llwyth i lawr
+        [two] { $num } llwyth i lawr
+        [few] { $num } llwyth i lawr
+        [many] { $num } llwyth i lawr
+       *[other] { $num } llwyth i lawr
     }
 timespanHours =
     { $num ->
         [zero] awr
-        [one] awr
-        [two] awr
-        [few] awr
-        [many] awr
-       *[other] awr
+        [one] 1 awr
+        [two] { $num } awr
+        [few] { $num } awr
+        [many] { $num } awr
+       *[other] { $num } awr
     }
 copiedUrl = Wedi eu copïo!
 unlockInputPlaceholder = Cyfrinair
@@ -78,7 +78,7 @@ timespanMinutes =
 timespanDays =
     { $num ->
         [zero] 0 diwrnod
-        [one] 1 dwrnod
+        [one] 1 diwrnod
         [two] { $num } diwrnod
         [few] { $num } diwrnod
         [many] { $num } diwrnod
@@ -158,7 +158,7 @@ addPassword = Diogelu gyda chyfrinair
 emailPlaceholder = Rhowch eich e-bost
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Mewngofnodi i anfon hyd at { $size }
-signInButton = Mewngofnodi/Cofrestru
+signInOnlyButton = Mewngofnodi
 accountBenefitTitle = Creu Cyfrif { -firefox } neu fewngofnodi
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Rhannu ffeiliau hyd at { $size }
@@ -181,3 +181,11 @@ noStreamsWarning = Efallai na fydd y porwr hwn yn gallu dadgryptio ffeil mor faw
 noStreamsOptionCopy = Copïwch y ddolen i'w agor mewn porwr arall
 noStreamsOptionFirefox = Rhowch gynnig ar ein hoff porwr
 noStreamsOptionDownload = Parhau gyda'r porwr hwn
+downloadFirefoxPromo = Mae { -send-short-brand } yn cael ei gynnig i ci gan y { -firefox } newydd.
+# the next line after the colon contains a file name
+shareLinkDescription = Rhannu'r ddolen i'ch ffeil:
+shareLinkButton = Rhannu'r ddolen
+# $name is the name of the file
+shareMessage = Llwytho i lawr “{ $name }” gyda { -send-brand }: rhannu ffeiliau syml a diogel
+trailheadPromo = Mae ffordd o ddiogelu eich preifatrwydd. Ymunwch â Firefox.
+learnMore = Dysgu rhagor.

public/locales/da/send.ftl

@@ -126,7 +126,7 @@ addPassword = Beskyt med adgangskode
 emailPlaceholder = Indtast din mailadresse
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Log ind for at sende filer på op til { $size }
-signInButton = Log ind/tilmeld dig
+signInOnlyButton = Log ind
 accountBenefitTitle = Opret en { -firefox }-konto eller log ind
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Del filer på op til { $size }
@@ -145,3 +145,11 @@ noStreamsWarning = Denne browser kan muligvis ikke dekryptere en fil, der er så
 noStreamsOptionCopy = Kopier linket for at åbne det i en anden browser
 noStreamsOptionFirefox = Prøv vores favorit-browser
 noStreamsOptionDownload = Fortsæt med denne browser
+downloadFirefoxPromo = { -send-short-brand } præsenteres af den nye { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Del linket til din fil:
+shareLinkButton = Del link
+# $name is the name of the file
+shareMessage = Hent { $name } med { -send-brand } - simpel og sikker fildeling
+trailheadPromo = Beskyt dine digitale rettigheder. Slut dig til Firefox.
+learnMore = Læs mere.

public/locales/de/send.ftl

@@ -126,7 +126,7 @@ addPassword = Mit Passwort schützen
 emailPlaceholder = E-Mail-Adresse eingeben
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Melde dich an, um Dateien bis { $size } zu senden
-signInButton = Anmelden/Registrieren
+signInOnlyButton = Anmelden
 accountBenefitTitle = Erstelle ein { -firefox }-Konto oder melde dich an
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Dateien bis zu { $size } teilen
@@ -145,3 +145,11 @@ noStreamsWarning = Dieser Browser kann eine so große Datei möglicherweise nich
 noStreamsOptionCopy = Kopiere den Link, um ihn in einem anderen Browser zu öffnen
 noStreamsOptionFirefox = Probiere unseren Lieblingsbrowser aus
 noStreamsOptionDownload = Mit diesem Browser weitermachen
+downloadFirefoxPromo = { -send-short-brand } wird Ihnen präsentiert vom brandneuen { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Teilen Sie den Link zu Ihrer Datei:
+shareLinkButton = Link teilen
+# $name is the name of the file
+shareMessage = Laden Sie „{ $name }“ mit { -send-brand } herunter: einfaches, sicheres Teilen von Dateien
+trailheadPromo = Es gibt einen Weg, deine Privatsphäre zu schützen. Komm zu Firefox.
+learnMore = Mehr erfahren.

public/locales/dsb/send.ftl

@@ -142,7 +142,7 @@ addPassword = Z gronidłom šćitaś
 emailPlaceholder = Zapódajśo swóju e-mailowu adresu
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Pśizjawśo se, aby do { $size } pósłał
-signInButton = Pśizjawiś/Registrěrowaś
+signInOnlyButton = Pśizjawiś
 accountBenefitTitle = Załožćo konto { -firefox } abo pśizjawśo se
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Dataje do { $size } źěliś
@@ -163,3 +163,11 @@ noStreamsWarning = Toś ten wobglědowak njamógał taku wjeliku dataju dešifr
 noStreamsOptionCopy = Kopěrujśo wótkaz, aby jen w drugim wobglědowaku wócynił
 noStreamsOptionFirefox = Wopytajśo naš nejlubšy wobglědowak
 noStreamsOptionDownload = Z toś tym wobglědowakom pókšacowaś
+downloadFirefoxPromo = { -send-short-brand } se wam pśez cele nowy { -firefox } pśinjaso.
+# the next line after the colon contains a file name
+shareLinkDescription = Źělśo wótkaz k swójej dataji:
+shareLinkButton = Wótkaz źěliś
+# $name is the name of the file
+shareMessage = Ześěgniśo „{ $name }“ z { -send-brand }: jadnore, wěste źělenje datajow
+trailheadPromo = Jo móžnosć, wašu priwatnosć šćitaś. Pśiźćo k Firefox.
+learnMore = Dalšne informacije.

public/locales/el/send.ftl

@@ -126,7 +126,7 @@ addPassword = Προστασία με κωδικό πρόσβασης
 emailPlaceholder = Εισάγετε το email σας
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Συνδεθείτε για να στείλετε μέχρι { $size }
-signInButton = Σύνδεση/εγγραφή
+signInOnlyButton = Σύνδεση
 accountBenefitTitle = Δημιουργία λογαριασμού { -firefox } ή σύνδεση
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Μοιραστείτε αρχεία έως { $size }
@@ -145,3 +145,11 @@ noStreamsWarning = Αυτό το πρόγραμμα περιήγησης ενδ
 noStreamsOptionCopy = Αντιγράψτε το σύνδεσμο για άνοιγμα σε άλλο πρόγραμμα περιήγησης
 noStreamsOptionFirefox = Δοκιμάστε το αγαπημένο μας πρόγραμμα περιήγησης
 noStreamsOptionDownload = Συνέχεια με αυτό το πρόγραμμα περιήγησης
+downloadFirefoxPromo = Το { -send-short-brand } παρέχεται σε εσάς από το ολοκαίνουριο { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Μοιραστείτε το σύνδεσμο του αρχείου σας:
+shareLinkButton = Κοινή χρήση συνδέσμου
+# $name is the name of the file
+shareMessage = Λήψη του “{ $name }” με το { -send-brand }: απλός και ασφαλής διαμοιρασμός αρχείων
+trailheadPromo = Υπάρχει τρόπος να προστατέψετε το απόρρητό σας. Γίνετε μέλος του Firefox.
+learnMore = Μάθετε περισσότερα.

public/locales/en-CA/send.ftl

@@ -126,7 +126,7 @@ addPassword = Protect with password
 emailPlaceholder = Enter your email
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Sign in to send up to { $size }
-signInButton = Sign in/up
+signInOnlyButton = Sign in
 accountBenefitTitle = Create a { -firefox } Account or sign in
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Share files up to { $size }
@@ -145,3 +145,11 @@ 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 favourite browser
 noStreamsOptionDownload = Continue with this browser
+downloadFirefoxPromo = { -send-short-brand } is brought to you by the all-new { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Share the link to your file:
+shareLinkButton = Share link
+# $name is the name of the file
+shareMessage = Download “{ $name }” with { -send-brand }: simple, safe file sharing
+trailheadPromo = There is a way to protect your privacy. Join Firefox.
+learnMore = Learn more.

public/locales/en-GB/send.ftl

@@ -126,7 +126,7 @@ addPassword = Protect with password
 emailPlaceholder = Enter your email
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Sign in to send up to { $size }
-signInButton = Sign in/up
+signInOnlyButton = Sign in
 accountBenefitTitle = Create a { -firefox } Account or sign in
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Share files up to { $size }
@@ -145,3 +145,11 @@ 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 favourite browser
 noStreamsOptionDownload = Continue with this browser
+downloadFirefoxPromo = { -send-short-brand } is brought to you by the all-new { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Share the link to your file:
+shareLinkButton = Share link
+# $name is the name of the file
+shareMessage = Download “{ $name }” with { -send-brand }: simple, safe file sharing
+trailheadPromo = There is a way to protect your privacy. Join Firefox.
+learnMore = Learn more.

public/locales/en-US/send.ftl

@@ -119,7 +119,7 @@ addPassword = Protect with password
 emailPlaceholder = Enter your email
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Sign in to send up to { $size }
-signInButton = Sign in/up
+signInOnlyButton = Sign in
 accountBenefitTitle = Create a { -firefox } Account or sign in
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Share files up to { $size }
@@ -137,3 +137,11 @@ 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
+downloadFirefoxPromo = { -send-short-brand } is brought to you by the all-new { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Share the link to your file:
+shareLinkButton = Share link
+# $name is the name of the file
+shareMessage = Download “{ $name }” with { -send-brand }: simple, safe file sharing
+trailheadPromo = There is a way to protect your privacy. Join Firefox.
+learnMore = Learn more.

public/locales/es-AR/send.ftl

@@ -126,7 +126,7 @@ addPassword = Proteger con contraseña
 emailPlaceholder = Ingrese su correo electrónico
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Inicie sesión para enviar hasta { $size }
-signInButton = Iniciar sesión/registrarse
+signInOnlyButton = Iniciar sesión
 accountBenefitTitle = Cree una cuenta de { -firefox } o inicie la sesión
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Compartir archivos hasta { $size }
@@ -145,3 +145,11 @@ noStreamsWarning = Es posible que este navegador no pueda descifrar un archivo t
 noStreamsOptionCopy = Copiar el enlace para abrir en otro navegador.
 noStreamsOptionFirefox = Pruebe nuestro navegador favorito
 noStreamsOptionDownload = Continuar con este navegador
+downloadFirefoxPromo = El nuevo { -firefox } te ofrece { -send-short-brand }.
+# the next line after the colon contains a file name
+shareLinkDescription = Compartir el enlace con tu dispositivo:
+shareLinkButton = Compartir el enlace
+# $name is the name of the file
+shareMessage = Descargar "{ $name }" con { -send-brand }: compartir archivos de forma simple y segura
+trailheadPromo = Hay una forma de proteger tu privacidad. Unite a Firefox.
+learnMore = Conocer más.

public/locales/es-CL/send.ftl

@@ -126,7 +126,7 @@ addPassword = Protegido con contraseña
 emailPlaceholder = Ingresa tu correo
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Conéctate para enviar hasta { $size }
-signInButton = Conectarse/registrarse
+signInOnlyButton = Conectarse
 accountBenefitTitle = Crea una cuenta de { -firefox } o conéctate
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Comparte archivos de hasta { $size }
@@ -145,3 +145,11 @@ noStreamsWarning = Es posible que este navegador no pueda descifrar un archivo t
 noStreamsOptionCopy = Copiar el enlace para abrirlo en otro navegador
 noStreamsOptionFirefox = Prueba nuestro navegador favorito
 noStreamsOptionDownload = Continuar con este navegador
+downloadFirefoxPromo = { -send-short-brand } es traído a ti por el renovado { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Comparte el enlace a tu dispositivo:
+shareLinkButton = Compartir enlace
+# $name is the name of the file
+shareMessage = Baja "{ $name }" con { -send-brand }: compartir archivos de forma simple y segura
+trailheadPromo = Hay una forma de proteger tu privacidad. Únete a Firefox.
+learnMore = Aprender más.

public/locales/es-ES/send.ftl

@@ -126,7 +126,7 @@ addPassword = Proteger con contraseña
 emailPlaceholder = Introducir dirección de correo
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Iniciar sesión para enviar hasta { $size }
-signInButton = Iniciar sesión/registrarse
+signInOnlyButton = Iniciar sesión
 accountBenefitTitle = Crear una cuenta { -firefox } o iniciar sesión
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Compartir archivos de hasta { $size }
@@ -145,3 +145,11 @@ noStreamsWarning = Puede que este navegador no pueda descifrar un archivo tan gr
 noStreamsOptionCopy = Copiar el enlace para abrirlo en otro navegador
 noStreamsOptionFirefox = Probar nuestro navegador favorito
 noStreamsOptionDownload = Continuar en este navegador
+downloadFirefoxPromo = El nuevo { -firefox } te ofrece { -send-short-brand }.
+# the next line after the colon contains a file name
+shareLinkDescription = Compartir el enlace a tu archivo:
+shareLinkButton = Compartir enlace
+# $name is the name of the file
+shareMessage = Descargar “{ $name }” con { -send-brand }: comparte archivos de forma segura y sencilla
+trailheadPromo = Existe la forma de proteger tu privacidad. Únete a Firefox.
+learnMore = Saber más.

public/locales/es-MX/send.ftl

@@ -6,7 +6,8 @@ encryptingFile = Encriptando...
 decryptingFile = Desencriptando...
 downloadCount =
     { $num ->
-       *[one] 1 descarga
+        [one] 1 descarga
+       *[other] { $num } descargas
     }
 timespanHours =
     { $num ->
@@ -125,7 +126,7 @@ addPassword = Protegido con contraseña
 emailPlaceholder = Ingresa tu correo electrónico
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Iniciar sesión para enviar hasta { $size }
-signInButton = Iniciar sesión/registrarse
+signInOnlyButton = Iniciar sesión
 accountBenefitTitle = Crear una cuenta de { -firefox } o iniciar sesión
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Compartir archivos de hasta { $size }
@@ -144,3 +145,11 @@ noStreamsWarning = Puede que este navegador no pueda descifrar un archivo tan gr
 noStreamsOptionCopy = Copiar el enlace para abrir en otro navegador
 noStreamsOptionFirefox = Prueba nuestro navegador favorito
 noStreamsOptionDownload = Continuar con este navegador
+downloadFirefoxPromo = { -send-short-brand } te lo ofrece el nuevo { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Comparte el enlace a tu archivo:
+shareLinkButton = Enlace para compartir
+# $name is the name of the file
+shareMessage = Descarga «{ $name }» con { -send-brand }: es sencillo y seguro
+trailheadPromo = Existe una forma de proteger tu privacidad. Únete a Firefox.
+learnMore = Saber más.

public/locales/et/send.ftl

@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = veebieksperiment
 siteFeedback = Tagasiside
-uploadPageHeader = Privaatne ja krüpteeritud failiedastus
-uploadPageExplainer = Firefox Send võimaldab saata faile üle ohutu, privaatse ja krüpteeritud kanali. Failid kustutatakse automaatselt, et need ei jääks internetti igaveseks.
-uploadPageLearnMore = Rohkem teavet
-uploadPageDropMessage = Faili üleslaadimiseks lohista see siia
-uploadPageSizeMessage = Parima kogemuse saamiseks tasub faili suurus hoida alla 1GB
-uploadPageBrowseButton = Vali fail arvutist
-uploadPageBrowseButton1 = Vali fail üleslaadimiseks
-uploadPageMultipleFilesAlert = Mitme faili või kausta üleslaadimine pole praegu toetatud.
-uploadPageBrowseButtonTitle = Laadi fail üles
-uploadingPageProgress = Faili { $filename } ({ $size }) üleslaadimine
 importingFile = Importimine...
-verifyingFile = Kontrollimine…
 encryptingFile = Krüptimine…
 decryptingFile = Dekrüptimine...
-notifyUploadDone = Üleslaadimine on lõpetatud.
-uploadingPageMessage = Aegumise sätteid saab muuta siis, kui faili üles laaditakse.
-uploadingPageCancel = Katkesta üleslaadimine
-uploadCancelNotification = Üleslaadimine katkestati
-uploadingPageLargeFileMessage = Fail on suur ja selle üleslaadimine võib aega võtta.
-uploadingFileNotification = Teavita mind üleslaadimise lõppemisest.
-uploadSuccessConfirmHeader = Saatmiseks valmis
-uploadSvgAlt = Laadi üles
-uploadSuccessTimingHeader = Link failile aegub pärast 1. allalaadimist või 24 tunni möödumisel.
-expireInfo = Link failile aegub peale { $downloadCount } või { $timespan }.
 downloadCount =
     { $num ->
         [one] üht allalaadimist
@@ -33,79 +11,29 @@ downloadCount =
     }
 timespanHours =
     { $num ->
-        [one] üht tundi
-       *[other] { $num } tundi
+        [one] 1 tunni
+       *[other] { $num } tunni
     }
-copyUrlFormLabelWithName = Kopeeri ja jaga linki faili allalaadimiseks: { $filename }
-copyUrlFormButton = Kopeeri vahemällu
 copiedUrl = Kopeeritud!
-deleteFileButton = Kustuta fail
-sendAnotherFileLink = Saada järgmine fail
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Laadi alla
-downloadsFileList = Allalaadimised
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Aega jäänud
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Laadi fail { $filename } alla
-downloadFileSize = ({ $size })
-unlockInputLabel = Sisesta parool
 unlockInputPlaceholder = Parool
 unlockButtonLabel = Ava
-downloadFileTitle = Krüptitud faili allalaadimine
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Sulle on saadetud fail Firefox Sendiga - teenusega, mis lubab faile ohutult, privaatselt ja krüpteeritult jagada. Failid kustutatakse automaatselt, et need ei jääks internetti igaveseks.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Laadi alla
-downloadNotification = Allalaadimine on lõpetatud.
 downloadFinish = Allalaadimine lõpetati
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize }/{ $totalSize })
-# Firefox Send is a brand name and should not be localized.
-sendYourFilesLink = Proovi Firefox Sendi
-downloadingPageProgress = Faili { $filename } ({ $size }) allalaadimine
-downloadingPageMessage = Palun jäta see kaart lahti, kuni fail on alla laaditud ja dekrüptitud.
-errorAltText = Viga üleslaadimisel
+sendYourFilesLink = Proovi Firefox Send'i
 errorPageHeader = Midagi läks valesti!
-errorPageMessage = Faili üleslaadimisel esines viga.
-errorPageLink = Saada järgmine fail
 fileTooBig = Fail on üleslaadimiseks liiga suur. See peaks olema väiksem kui { $size }.
 linkExpiredAlt = Link on aegunud
-expiredPageHeader = See link on aegunud või seda pole kunagi olnudki!
 notSupportedHeader = Sinu brauser pole toetatud.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Kahjuks ei toeta see brauser veebitehnoloogiaid, mis teevad Firefox Sendi toimimise võimalikuks. Sa pead proovima teise brauseriga. Me soovitame Firefoxi!
 notSupportedLink = Miks mu brauser toetatud pole?
 notSupportedOutdatedDetail = Kahjuks ei toeta see Firefoxi versioon veebitehnoloogiaid, mis teevad Firefox Sendi toimimise võimalikuks. Sa pead oma brauserit uuendama.
 updateFirefox = Uuenda Firefox
-downloadFirefoxButtonSub = Laadi alla tasuta
-uploadedFile = Fail
-copyFileList = Kopeeri URL
-# expiryFileList is used as a column header
-expiryFileList = Aegub
-deleteFileList = Kustuta
-nevermindButton = Ära pane tähele
-legalHeader = Tingimused ja privaatsusreeglid
-legalNoticeTestPilot = Firefox Send on praegu Test Piloti eksperiment ja sellele rakenduvad Test Piloti <a>teenusetingimused</a> ning <a>privaatsusreeglid</a>. Rohkem teavet selle eksperimendi ja kogutavate andmete kohta leiab <a>siit</a>.
-legalNoticeMozilla = Firefox Sendi veebilehe kasutamisele rakenduvad ka Mozilla <a>veebilehtede privaatsusreeglid</a> ja <a>veebilehtede teenusetingimused</a>.
-deletePopupText = Kas kustutada see fail?
-deletePopupYes = Jah
 deletePopupCancel = Loobu
 deleteButtonHover = Kustuta
-copyUrlHover = Kopeeri URL
 footerLinkLegal = Õiguslik teave
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Test Pilotist
 footerLinkPrivacy = Privaatsusest
-footerLinkTerms = Teenusetingimused
 footerLinkCookies = Küpsistest
-requirePasswordCheckbox = Selle faili allalaadimiseks nõutakse parooli
-addPasswordButton = Lisa parool
-changePasswordButton = Muuda
 passwordTryAgain = Vale parool. Palun proovi uuesti.
-reportIPInfringement = Intellektuaalomandi keelatud kasutamise raporteerimine
 javascriptRequired = Firefox Send'i kasutamiseks tuleb JavaScript lubada
 whyJavascript = Miks Firefox Send JavaScripti vajab?
 enableJavascript = Palun luba JavaScript ja proovi uuesti.
@@ -113,9 +41,115 @@ enableJavascript = Palun luba JavaScript ja proovi uuesti.
 expiresHoursMinutes = { $hours }t { $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 = Parool on muudetud
 # A short status message shown when the user enters a long password
 maxPasswordLength = Maksimaalne parooli pikkus: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Parooli muutmine ebaõnnestus
+
+## 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 = Lihtne ja privaatne failijagamine
+introDescription = { -send-brand } võimaldab sul faile jagada otspunktkrüpteerimise ning automaatselt aeguva lingiga. Nii saad jagatava privaatsena hoida ja kindlustada, et su asjad igavesti internetti vedelema ei jää.
+notifyUploadEncryptDone = Sinu fail on krüptitud ja saatmiseks valmis
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Aegub peale { $downloadCount } või { $timespan } järel
+timespanMinutes =
+    { $num ->
+        [one] 1 minuti
+       *[other] { $num } minuti
+    }
+timespanDays =
+    { $num ->
+        [one] 1 päeva
+       *[other] { $num } päeva
+    }
+timespanWeeks =
+    { $num ->
+        [one] 1 nädala
+       *[other] { $num } nädala
+    }
+fileCount =
+    { $num ->
+        [one] 1 fail
+       *[other] { $num } faili
+    }
+# byte abbreviation
+bytes = B
+# kibibyte abbreviation
+kb = kB
+# mebibyte abbreviation
+mb = MB
+# gibibyte abbreviation
+gb = GB
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num }{ $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = Kogusuurus: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Faili jagamiseks kopeeri link:
+copyLinkButton = Kopeeri link
+downloadTitle = Failide allalaadimine
+downloadDescription = See fail jagati teenuse { -send-brand } kaudu otspunktkrüpteeritult ja automaatselt aeguva lingiga.
+trySendDescription = Proovi lihtsaks ja turvaliseks failijagamiseks { -send-brand } teenust.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] Korraga saab üles laadida vaid 1 faili.
+       *[other] Korraga saab üles laadida vaid { $count } faili.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Vaid 1 arhiveerimine on lubatud.
+       *[other] Vaid { $count } arhiveerimist on lubatud.
+    }
+expiredTitle = Link on aegunud.
+notSupportedDescription = { -send-brand } ei tööta selle veebilehitsejaga. Kõige paremini töötab { -send-short-brand } uusima { -firefox }iga ja töötab ka enamikes teistes uuendatud brauserites.
+downloadFirefox = Laadi { -firefox } alla
+legalTitle = { -send-short-brand } privaatsusteade
+legalDateStamp = Versioon 1.0, alates 12. märts 2019
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days }p { $hours }t { $minutes }m
+addFilesButton = Vali failid üleslaadimiseks
+uploadButton = Laadi üles
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Lohista failid siia
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = või klõpsa kuni { $size } suuruste failide saatmiseks
+addPassword = Kaitse parooliga
+emailPlaceholder = Sisesta e-posti aadress
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = Logi sisse ning saad saata kuni { $size } suuruseid faile
+signInOnlyButton = Logi sisse
+accountBenefitTitle = Loo { -firefox }i konto või logi sisse
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = Jaga kuni { $size } suuruseid faile
+accountBenefitDownloadCount = Jaga faile enamate inimestega
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Hoia linke aktiivsena 1 päev
+       *[other] Hoia linke aktiivsena kuni { $count } päeva
+    }
+accountBenefitSync = Jagatud faile saad hallata mis tahes seadmes
+accountBenefitMoz = Rohkem teavet teistest { -mozilla } teenustest
+signOut = Logi välja
+okButton = Olgu
+downloadingTitle = Allalaadimine
+noStreamsWarning = Sinu veebilehitseja ei pruugi suuta nii suurt faili dekrüptida.
+noStreamsOptionCopy = Kopeeri link teises brauseris avamiseks
+noStreamsOptionFirefox = Proovi meie lemmikbrauserit
+noStreamsOptionDownload = Jätka selle brauseriga
+downloadFirefoxPromo = { -send-short-brand } toob sinuni uhiuus { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Jaga linki failile:
+shareLinkButton = Jaga linki
+# $name is the name of the file
+shareMessage = Laadi “{ $name }” alla teenusega { -send-brand }, mis pakub lihtsat ja turvalist failijagamist
+trailheadPromo = Oma privaatsust on võimalik kaitsta. Liitu Firefoxiga.
+learnMore = Rohkem teavet.

public/locales/eu/send.ftl

@@ -23,7 +23,7 @@ fileSizeProgress = ({ $totalSize } / { $partialSize })
 sendYourFilesLink = Probatu Firefox Send
 errorPageHeader = Zerbait gaizki joan da!
 fileTooBig = Fitxategia handiegia da kargatzeko. { $size } baino txikiagoa izan behar du.
-linkExpiredAlt = Lotura iraungita
+linkExpiredAlt = Lotura iraungi da
 notSupportedHeader = Zure nabigatzailea ez da onartzen.
 notSupportedLink = Zergatik ez da nire nabigatzailea onartzen?
 notSupportedOutdatedDetail = Zoritxarrez Firefox bertsio honek ez du Firefox Send-ek behar duen web teknologia onartzen. Zure nabigatzailea eguneratu behar duzu.
@@ -50,10 +50,34 @@ passwordSetError = Pasahitz hau ezin da ezarri
 
 # 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 = Partekatu fitxategiak modu sinple eta pribatuan
+introDescription = { -send-brand } tresna fitxategiak partekatzeko da, muturretik muturrera zifratuta eta automatikoki iraungitzen diren loturekin. Hortaz, partekatzen duzuna pribatua izango da eta ziur egon zaitezke zure fitxategiak ez direla online egongo betirako.
 notifyUploadEncryptDone = Zure fitxategia zifratuta eta bidaltzeko prest dago
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = { $downloadCount } edo { $timespan } ondoren iraungiko da
+timespanMinutes =
+    { $num ->
+        [one] minutu 1
+       *[other] { $num } minutu
+    }
+timespanDays =
+    { $num ->
+        [one] egun 1
+       *[other] { $num } egun
+    }
+timespanWeeks =
+    { $num ->
+        [one] aste 1
+       *[other] { $num } aste
+    }
+fileCount =
+    { $num ->
+        [one] fitxategi 1
+       *[other] { $num } fitxategi
+    }
 # byte abbreviation
 bytes = B
 # kibibyte abbreviation
@@ -64,9 +88,33 @@ mb = MB
 gb = GB
 # localized number and byte abbreviation. example "2.5MB"
 fileSize = { $num }{ $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = Tamaina guztira: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Kopiatu fitxategia partekatzeko lotura:
+copyLinkButton = Kopiatu lotura
 downloadTitle = Deskargatu fitxategiak
+downloadDescription = { -send-brand } bidez partekatu da fitxategia muturretik muturrera zifratuta eta automatikoki iraungitzen den lotura batekin.
+trySendDescription = Probatu { -send-brand } fitxategiak partekatzeko modu sinple eta segururako.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] Soilik fitxategi bakarra igo daiteke aldi berean.
+       *[other] Soilik { $count } fitxategi igo daitezke aldi berean.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Soilik artxibo bakarra onartzen da.
+       *[other] Soilik { $count } artxibo onartzen dira.
+    }
+expiredTitle = Lotura hau iraungi da.
+notSupportedDescription = { -send-brand } ez da nabigatzaile honetan ibiliko. { -send-short-brand } hobeto dabil { -firefox }(r)en azken bertsioarekin; halaber, nabigatzaile gehienen azken bertsioarekin ibiliko da.
 downloadFirefox = Deskargatu { -firefox }
+legalTitle = { -send-short-brand } pribatutasun-oharra
 legalDateStamp = 1.0 bertsioa, 2019ko martxoaren 12koa.
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days }e { $hours }h { $minutes }m
 addFilesButton = Hautatu igotzeko fitxategiak
 uploadButton = Igo
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
@@ -76,8 +124,32 @@ dragAndDropFiles = Arrastatu eta jaregin fitxategiak
 orClickWithSize = edo egin klik { $size } arte igotzeko
 addPassword = Babestu pasahitzarekin
 emailPlaceholder = Idatzi zure helbide elektronikoa
-signInButton = Hasi saioa/eman izena
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = Hasi saioa { $size } arte bidaltzeko
+signInOnlyButton = Hasi saioa
 accountBenefitTitle = Sortu { -firefox } kontu bat edo hasi saioa
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Partekatu { $size } arteko fitxategiak
 accountBenefitDownloadCount = Partekatu fitxategiak jende gehiagorekin
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Utzi loturak erabilgarri egun batez
+       *[other] Utzi loturak erabilgarri { $count } egunez
+    }
+accountBenefitSync = Kudeatu partekatutako fitxategiak edozein gailutatik
+accountBenefitMoz = { -mozilla }ren beste zerbitzuei buruzko argibide gehiago
+signOut = Amaitu saioa
+okButton = Ados
+downloadingTitle = Deskargatzen
+noStreamsWarning = Baliteke nabigatzailea gai ez izatea horrelako tamaina handiko fitxategiak deszifratzeko.
+noStreamsOptionCopy = Kopiatu lotura beste nabigatzaile batean irekitzeko
+noStreamsOptionFirefox = Probatu gure nabigatzaile gogokoena
+noStreamsOptionDownload = Jarraitu nabigatzaile honekin
+downloadFirefoxPromo = Erabat berritutako { -firefox }(e)k eskaintzen dizu { -send-short-brand }
+# the next line after the colon contains a file name
+shareLinkDescription = Partekatu zure fitxategirako lotura:
+shareLinkButton = Partekatu lotura
+# $name is the name of the file
+shareMessage = Deskargatu "{ $name }" { -send-brand } erabiliz: fitxategi-partekatze sinple eta segurua
+trailheadPromo = Badago zure pribatutasuna babesteko modua. Egizu bat Firefoxekin.
+learnMore = Argibide gehiago.

public/locales/fa/send.ftl

@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = آزمایش وب
 siteFeedback = بازخورد
-uploadPageHeader = اشتراک‌گذاری پرونده‌ها، رمزنگاری شده و خصوصی
-uploadPageExplainer = پرونده های خود را به صورت ایمن، خصوصی و رمزنگاری شده با تعیین تاریخ انقضا خودکار ارسال کنید تا اطمینان پیدا کنید چیزهای شما همیشه آنلاین باقی نماند.
-uploadPageLearnMore = بیشتر بدانید
-uploadPageDropMessage = برای شروع بارگذاری پرونده‌های خود را اینجا بیاندازید
-uploadPageSizeMessage = برای بیشترین قابلیت اطمینان، بهتر است که پرونده‌تان کمتر از ۱ گیگابایت باشد
-uploadPageBrowseButton = یک پرونده را از روی کامپیوتر خود انتخاب کنید
-uploadPageBrowseButton1 = یک پرونده را برای بارگذاری انتخاب کنید
-uploadPageMultipleFilesAlert = بارگذاری چندین پرونده یا یک پوشه در حال حاضر پشتیبانی نمی‌شود.
-uploadPageBrowseButtonTitle = بارگذاری پرونده
-uploadingPageProgress = در حال بارگذاری پرونده { $filename } ({ $size })
 importingFile = در حال وارد کردن…
-verifyingFile = در حال تایید…
 encryptingFile = در حال رمزنگاری…
 decryptingFile = در حال رمزگشایی…
-notifyUploadDone = بارگذاری شما پایان یافت.
-uploadingPageMessage = به محض بارگذاری پرونده شما قادر خواهید بود برای آن گزینه انقضا تعیین کنید.
-uploadingPageCancel = لغو بارگذاری
-uploadCancelNotification = بارگذاری شما لغو شد
-uploadingPageLargeFileMessage = پرونده بزرگ است و ممکن است بارگذاری آن مدتی طول بکشد. محکم بشینید!
-uploadingFileNotification = هر وقت بارگذاری تمام شد به من اطلاع بده.
-uploadSuccessConfirmHeader = آماده برای ارسال
-uploadSvgAlt = بارگذاری
-uploadSuccessTimingHeader = پیوند به پرونده شما بعد از ۱ بار دانلود یا ۲۴ ساعت حذف خواهد شد.
-expireInfo = این پیوند به فایل شما پس از { $downloadCount } یا { $timespan } منقضی خواهد شد.
 downloadCount =
     { $num ->
         [one] ۱ بارگیری
@@ -36,76 +14,26 @@ timespanHours =
         [one] ۱ ساعت
        *[other] { $num } ساعت
     }
-copyUrlFormLabelWithName = برای ارسال پرونده پیوند آن را رونوشت و به اشتراک بگذارید: { $filename }
-copyUrlFormButton = رونوشت به کلیپ‌بورد
 copiedUrl = رونوشت شد!
-deleteFileButton = حذف پرونده
-sendAnotherFileLink = ارسال پرونده دیگر
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = دریافت
-downloadsFileList = دریافت‌ها
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = زمان
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = بارگیری { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = گذرواژه را وارد کنید
 unlockInputPlaceholder = گذرواژه
 unlockButtonLabel = باز کردن
-downloadFileTitle = دریافت پروندهٔ رمزنگاری شده
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = دوست شما درحال ارسال پرونده ای به وسیله Firefox Send است،‌ این سرویس این امکان را به شما می‌دهد تا پرونده‌های خود را به صورت ایمن،‌خصوصی و رمزنگاری شده به همراه پیوند انقضا خودکار همرسانی کنید تا اطمینان حاصل کنید چیزهای شما برای همیشه آنلاین باقی نخواهد ماند.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = بارگیری
-downloadNotification = بارگیری شما کامل شد.
 downloadFinish = بارگیری کامل شد
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } از { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Firefox Send را امتحان کنید
-downloadingPageProgress = دریافت { $filename } ({ $size })
-downloadingPageMessage = لطفا این زبانه را باز بگذارید در حالی که ما فایل شما را دریافت می‌کنیم و کدگذاری می‌کنیم.
-errorAltText = خطا در بارگذاری
 errorPageHeader = چیزی دچار اشکال شده است!
-errorPageMessage = خطایی در هنگام بارگذاری پرونده شما رخ داده است.
-errorPageLink = پرونده دیگری ارسال کنید.
 fileTooBig = این پرونده بسیار حجیم است. حجم آن می‌بایستی کم تر { $size } باشد.
 linkExpiredAlt = پیوند منقضی شده است
-expiredPageHeader = پیوند منقضی شده است یا در از همان ابتدا وجود نداشته است!
 notSupportedHeader = مرورگر شما پشتیبانی نمی‌کند.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = متاسفانه این مرورگر این تکنولوژی وب را که به Firefox Send قدرت می‌بخشد را پشتیبانی نمی‌کند. شما بایستی مرورگری دیگری را امتحان کنید. پیشنهاد ما به شما فایرفاکس است !
 notSupportedLink = چرا مرورگر من پشتیبانی نمی‌کند؟
 notSupportedOutdatedDetail = متاسفانه این نسخه از فایرفاکس این تکنولوژی وب که به Firefox Send قدرت می‌بخشد را پشتیبانی نمی‌کند. شما نیاز دارید تا مرورگر خود را بروز کنید.
 updateFirefox = بروزرسانی فایرفاکس
-downloadFirefoxButtonSub = دریافت رایگان
-uploadedFile = پرونده‌
-copyFileList = رونوشت از نشانی
-# expiryFileList is used as a column header
-expiryFileList = زمان انقضا
-deleteFileList = حذف
-nevermindButton = بیخیال
-legalHeader = شرایط و حریم‌خصوصی
-legalNoticeTestPilot = Firefox Send در حال حاضر در نسخه آزمایشی خود به صورت می‌دهد و تحت عنوان خلبان آموزشی <a>شرایط و خدمات</a> و <a>موارد حریم خصوصی </a> کار می‌کند. شما می‌توانید اطلاعات بیشتر در مورد این آزمایش و اطلاعات که ذخیره می‌کنید را از <a> اینجا </a> کسب کنید.
-legalNoticeMozilla = استفاده از Firefox Send همچنین منصوب به موزیلا است.  <a>پایگاه اینترنتی نکات حریم شخصی </a> و <a> پایگاه اطلاع رسانی شرایط خدمات و استفاده </a>.
-deletePopupText = حذف این پرونده؟
-deletePopupYes = بله
 deletePopupCancel = انصراف
 deleteButtonHover = حذف
-copyUrlHover = رونوشت از نشانی
 footerLinkLegal = ملاحظات حقوقی
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = درباره Test Pilot
 footerLinkPrivacy = حریم‌خصوصی
-footerLinkTerms = شرایط
 footerLinkCookies = کوکی‌ها
-requirePasswordCheckbox = دریافت این پرونده نیاز به گذرواژه دارد
-addPasswordButton = افزودن گذرواژه
-changePasswordButton = تغییر
 passwordTryAgain = کلمه عبور اشتباه است. مجدد تلاش کنید.
-reportIPInfringement = گزارش تخلف IP
 javascriptRequired = Firefox Send نیازمند جاوااسکریپت است
 whyJavascript = چرا Firefox Send جاوااسکریپت لازم داد؟
 enableJavascript = لطفا جاوااسکریپت را فعال کنید و مجددا تلاش کنید.
@@ -113,9 +41,26 @@ enableJavascript = لطفا جاوااسکریپت را فعال کنید و م
 expiresHoursMinutes = { $hours }ساعت { $minutes }دقیقه
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
 expiresMinutes = { $minutes } دقیقه
-# A short status message shown when a password is successfully set
-passwordIsSet = گذرواژه تنظیم شد
 # A short status message shown when the user enters a long password
 maxPasswordLength = حداکثر اندازهٔ گذرواژه: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = امکان ثبت این گذواژه نیست
+
+## Send version 2 strings
+
+# Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
+-send-brand = Firefox Send
+-send-short-brand = ارسال
+-firefox = فایرفاکس
+-mozilla = موزیلا
+introTitle = اشتراک‌گذاری ساده و خصوصیِ پرونده‌ها
+# byte abbreviation
+bytes = B
+# kibibyte abbreviation
+kb = KB
+# mebibyte abbreviation
+mb = MB
+# gibibyte abbreviation
+gb = GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = حجم کل: { $size }

public/locales/fi/send.ftl

@@ -65,13 +65,13 @@ timespanMinutes =
     }
 timespanDays =
     { $num ->
-        [one] 1 päivä
-       *[other] { $num } päivää
+        [one] 1 päivän
+       *[other] { $num } päivän
     }
 timespanWeeks =
     { $num ->
-        [one] 1 viikko
-       *[other] { $num } viikkoa
+        [one] 1 viikon
+       *[other] { $num } viikon
     }
 fileCount =
     { $num ->
@@ -126,7 +126,7 @@ addPassword = Suojaa salasanalla
 emailPlaceholder = Kirjoita sähköpostiosoitteesi
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Kirjautumalla voit lähettää jopa { $size } kokoisia tiedostoja
-signInButton = Kirjaudu tai rekisteröidy
+signInOnlyButton = Kirjaudu sisään
 accountBenefitTitle = Luo { -firefox }-tili tai kirjaudu sisään
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Jaa jopa { $size } kokoisia tiedostoja
@@ -145,3 +145,11 @@ noStreamsWarning = Tämä selain ei välttämättä osaa purkaa salausta näin s
 noStreamsOptionCopy = Kopioi linkki avataksesi sen toisessa selaimessa
 noStreamsOptionFirefox = Kokeile suosikkiselaintamme
 noStreamsOptionDownload = Jatka tällä selaimella
+downloadFirefoxPromo = { -send-short-brand } on olemassa kiitos uuden { -firefox }in.
+# the next line after the colon contains a file name
+shareLinkDescription = Jaa linkki tiedostoosi:
+shareLinkButton = Jaa linkki
+# $name is the name of the file
+shareMessage = Lataa tiedosto ”{ $name }” { -send-brand } -palvelusta: yksinkertaista ja turvallista tiedostonjakoa
+trailheadPromo = On tapa suojata yksityisyyttään. Liity Firefoxiin.
+learnMore = Lue lisää.

public/locales/fr/send.ftl

@@ -126,7 +126,7 @@ addPassword = Protéger par mot de passe
 emailPlaceholder = Votre adresse électronique
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Connectez-vous pour envoyer jusqu’à { $size }
-signInButton = Se connecter/S’inscrire
+signInOnlyButton = Connexion
 accountBenefitTitle = Créez un compte { -firefox } ou connectez-vous
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Partagez des fichiers jusqu’à { $size }
@@ -145,3 +145,11 @@ noStreamsWarning = Ce navigateur pourrait ne pas être en mesure de déchiffrer
 noStreamsOptionCopy = Copiez le lien pour l’ouvrir dans un autre navigateur
 noStreamsOptionFirefox = Essayez notre navigateur préféré
 noStreamsOptionDownload = Continuer avec ce navigateur
+downloadFirefoxPromo = { -send-short-brand } vous est proposé par le tout nouveau { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Partagez le lien vers votre fichier :
+shareLinkButton = Partager le lien
+# $name is the name of the file
+shareMessage = Télécharger « { $name } » avec { -send-brand } : un moyen simple et sûr de partager des fichiers
+trailheadPromo = Il existe un moyen de protéger votre vie privée. Rejoignez Firefox.
+learnMore = En savoir plus.

public/locales/fy-NL/send.ftl

@@ -126,7 +126,7 @@ addPassword = Mei wachtwurd beskermje
 emailPlaceholder = Fier jo e-mailadres yn
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Meld jo oan, om bestannen oant { $size } te stjoeren
-signInButton = Oanmelde/Registrearje
+signInOnlyButton = Oanmelde
 accountBenefitTitle = Meitsje in { -firefox }-account of meld jo oan
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Diel bestannen oant { $size }
@@ -145,3 +145,11 @@ noStreamsWarning = Dizze browser kin in sa'n grut bestân mooglik net fersiferje
 noStreamsOptionCopy = Kopiearje de koppeling om yn in oare browser te iepenjen
 noStreamsOptionFirefox = Probearje ús favorite browser
 noStreamsOptionDownload = Trochgean mei dizze browser
+downloadFirefoxPromo = { -send-short-brand } wurdt jo oanbean troch it folslein fernijde { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Diel de keppeling nei jo bestân:
+shareLinkButton = Keppeling diele
+# $name is the name of the file
+shareMessage = Download ‘{ $name }’ mei { -send-brand }: ienfâldich, feilich bestannen diele
+trailheadPromo = Der is in manier om jo privacy te beskermjen. Doch mei mei Firefox.
+learnMore = Mear ynfo.

public/locales/he/send.ftl

@@ -1,66 +1,158 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = ניסוי אינטרנט
 siteFeedback = משוב
-uploadPageHeader = שיתוף קבצים פרטי, מוצפן
-uploadPageExplainer = לשלוח קבצים דרך קישור בטוח, פרטי ומוצפן שפג אוטומטית, כדי לוודא שהתכנים הפרטיים שלך לא יהיו ברשת לנצח.
-uploadPageLearnMore = מידע נוסף
-uploadPageDropMessage = יש לגרור קבצים לכאן כדי להתחיל בהעלאה
-uploadPageSizeMessage = להשגת ביצועים מיטביים, מוטב לשמור על הקובץ מתחת לגודל של 1 ג״ב
-uploadPageBrowseButton1 = נא לבחור קובץ להעלאה
-uploadPageMultipleFilesAlert = העלאה של מספר קבצים או ספריה אינה נתמכת כרגע.
-uploadPageBrowseButtonTitle = העלאת קובץ
-uploadingPageProgress = { $filename } ({ $size }) בהעלאה
-importingFile = מתבצע ייבוא...
-verifyingFile = מתבצע אימות…
+importingFile = מתבצע ייבוא…
 encryptingFile = מתבצעת הצפנה...
 decryptingFile = מתבצע פענוח...
-notifyUploadDone = ההעלאה שלך הסתיימה
-uploadingPageMessage = אחרי שהקובץ שלך יעלה, ניתן יהיה להגדיר אפשרויות תפוגה.
-uploadCancelNotification = ההעלאה שלך בוטלה.
-uploadingPageLargeFileMessage = קובץ זה גדול ועלול לקחת זמן להעלות אותו. סבלנות!
-uploadingFileNotification = נא להודיע לי כשתסתיים ההעלאה.
-uploadSuccessConfirmHeader = מוכן לשליחה
-uploadSvgAlt = העלאה
-uploadSuccessTimingHeader = הקישור לקובץ שלך יפוג אחרי הורדה אחת או בעוד 24 שעות.
-copyUrlFormLabelWithName = ניתן להעתיק ולשתף את הקישור כדי לשלוח את הקובץ שלך: { $filename }
+downloadCount =
+    { $num ->
+        [one] הורדה אחת
+       *[other] { $num } הורדות
+    }
+timespanHours =
+    { $num ->
+        [one] שעה אחת
+        [two] שעתיים
+       *[other] { $num } שעות
+    }
 copiedUrl = הועתק!
-deleteFileButton = מחיקת קובץ
-sendAnotherFileLink = שליחת קובץ נוסף
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = הורדה
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = ההורדה נכשלה
-downloadFileSize = ({ $size })
-# Text and title used on the download link/button (indicates an action).
+unlockInputPlaceholder = ססמה
+unlockButtonLabel = שחרור נעילה
 downloadButtonLabel = הורדה
-downloadNotification = ההורדה הושלמה.
 downloadFinish = ההורדה הושלמה
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } מתוך { $totalSize })
-downloadingPageProgress = בהורדה: { $filename } ({ $size })
-errorAltText = תקלה בהעלאה
+sendYourFilesLink = נסו את Firefox Send
 errorPageHeader = משהו השתבש!
-errorPageLink = שליחת קובץ נוסף
 fileTooBig = הקובץ הזה גדול מידי להעלאה. עליו להיות קטן מ־{ $size }.
 linkExpiredAlt = הקישור פג
 notSupportedHeader = הדפדפן שלך לא נתמך.
 notSupportedLink = למה אין תמיכה בדפדפן שלי?
-downloadFirefoxButtonSub = הורדה בחינם
-uploadedFile = קובץ
-copyFileList = העתקת כתובת
-# expiryFileList is used as a column header
-expiryFileList = יפוג בעוד
-deleteFileList = מחיקה
-nevermindButton = לא משנה
-legalHeader = תנאי שירות ופרטיות
-deletePopupText = למחוק דף זה?
-deletePopupYes = כן
+notSupportedOutdatedDetail = לצערנו גרסת Firefox זו לא תומכת בטכנולוגית הרשת שמפעילה את Firefox Send. יש לעדכן את הגרסה של הדפדפן שלך.
+updateFirefox = עדכון Firefox
 deletePopupCancel = ביטול
 deleteButtonHover = מחיקה
-copyUrlHover = העתקת קישור
 footerLinkLegal = מידע משפטי
 footerLinkPrivacy = פרטיות
-footerLinkTerms = תנאי שימוש
 footerLinkCookies = קובצי עוגיות
+passwordTryAgain = סיסמה שגויה. נא לנסות שוב.
+javascriptRequired = ל־Firefox Send דרוש JavaScript
+whyJavascript = למה ל־Firefox Send דרוש JavaScript?
+enableJavascript = נא להפעיל JavaScript ולנסות שוב.
+# A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
+expiresHoursMinutes = { $hours } שע׳ { $minutes } דק׳
+# A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
+expiresMinutes = { $minutes } דק׳
+# A short status message shown when the user enters a long password
+maxPasswordLength = אורך הססמה המרבי: { $length }
+# A short status message shown when there was an error setting the password
+passwordSetError = לא ניתן להגדיר את הססמה הזאת
+
+## 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 = שיתוף קבצים פרטי ופשוט
+introDescription = { -send-brand } מאפשר לך לשתף קבצים עם הצפנה מקצה לקצה וקישור עם תפוגה אוטומטית. בצורה זו תוכלו לשתף קבצים באופן פרטי ולהבטיח שהדברים שלכם לא נשארים ברשת לנצח.
+notifyUploadEncryptDone = הקובץ שלך מוצפן ומוכן לשליחה
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = יפוג לאחר { $downloadCount } או { $timespan }
+timespanMinutes =
+    { $num ->
+        [one] דקה אחת
+       *[other] { $num } דקות
+    }
+timespanDays =
+    { $num ->
+        [one] יום אחד
+        [two] יומיים
+       *[other] { $num } ימים
+    }
+timespanWeeks =
+    { $num ->
+        [one] שבוע אחד
+        [two] שבועיים
+       *[other] { $num } שבועות
+    }
+fileCount =
+    { $num ->
+        [one] קובץ אחד
+       *[other] { $num } קבצים
+    }
+# byte abbreviation
+bytes = בתים
+# kibibyte abbreviation
+kb = ק״ב
+# mebibyte abbreviation
+mb = מ״ב
+# gibibyte abbreviation
+gb = ג״ב
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num } { $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = גודל כולל: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = יש להעתיק את הקישור כדי לשתף את הקובץ שלך:
+copyLinkButton = העתקת קישור
+downloadTitle = הורדת קבצים
+downloadDescription = קובץ זה שותף באמצעות { -send-brand } עם הצפנה מקצה לקצה וקישור שפג באופן אוטומטי.
+trySendDescription = כדאי לנסות את { -send-brand } לשיתוף קבצים פשוט ומאובטח.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] ניתן להעלות רק קובץ אחד בכל פעם.
+       *[other] ניתן להעלות רק { $count } קבצים בכל פעם.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] רק ארכיון אחד מורשה.
+       *[other] רק { $count } ארכיונים מורשים.
+    }
+expiredTitle = פג תוקפו של קישור זה.
+notSupportedDescription = ‏{ -send-brand } לא יפעל עם דפדפן זה. { -send-short-brand } פועל בצורה הטובה ביותר עם הגרסה העדכנית ביותר של { -firefox }, ויעבוד עם הגרסה הנוכחית של רוב הדפדפנים.
+downloadFirefox = הורדת { -firefox }
+legalTitle = הצהרת פרטיות של { -send-short-brand }
+legalDateStamp = גרסה 1.0, בתאריך 12 במרץ 2019
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days } ימים { $hours } שעות { $minutes } דקות
+addFilesButton = בחירת קבצים להעלאה
+uploadButton = העלאה
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = גרירה והשלכת קבצים
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = או ללחוץ כדי לשלוח קבצים עד לגודל של { $size }
+addPassword = הגנה באמצעות ססמה
+emailPlaceholder = נא להכניס כתובת דוא״ל
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = נא להירשם כדי לשלוח קבצים עד גודל של { $size }
+signInOnlyButton = כניסה
+accountBenefitTitle = נא ליצור חשבון { -firefox } או להיכנס לחשבון
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = שיתוף קבצים עד גודל של { $size }
+accountBenefitDownloadCount = שיתוף קבצים עם יותר אנשים
+accountBenefitTimeLimit =
+    { $count ->
+        [one] שמירה על קישורים פעילים עד ליום אחד
+       *[other] שמירה על קישורים פעילים עד ל־{ $count } ימים
+    }
+accountBenefitSync = ניהול קבצים משותפים מכל מכשיר
+accountBenefitMoz = מידע נוסף על שירותי { -mozilla } אחרים
+signOut = יציאה
+okButton = אישור
+downloadingTitle = בהורדה
+noStreamsWarning = ייתכן שדפדפן זה לא יוכל לפענח קובץ בגודל כזה.
+noStreamsOptionCopy = העתקת הקישור לפתיחה בדפדפן אחר
+noStreamsOptionFirefox = נסו את הדפדפן המועדף עלינו
+noStreamsOptionDownload = המשך בדפדפן זה
+downloadFirefoxPromo = { -send-short-brand } מובא אליך בחסות { -firefox }
+# the next line after the colon contains a file name
+shareLinkDescription = שיתוף הקישור לקובץ שלך:
+shareLinkButton = שיתוף קישור
+# $name is the name of the file
+shareMessage = הורדת ״{ $name }״ עם { -send-brand }: שיתוף קבצים פשוט ובטוח
+trailheadPromo = ישנן דרכים נוספות להגן על הפרטיות שלכם. הצטרפו אל Firefox.
+learnMore = מידע נוסף.

public/locales/hr/send.ftl

@@ -134,7 +134,7 @@ addPassword = Zaštitite lozinkom
 emailPlaceholder = Unesite svoju adresu e-pošte
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Prijavite se za slanje do { $size }
-signInButton = Prijavite se
+signInOnlyButton = Prijavi se
 accountBenefitTitle = Stvorite { -firefox } račun ili se prijavite
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Dijelite datoteke do { $size }
@@ -154,3 +154,11 @@ noStreamsWarning = Ovaj preglednik možda neće moći dekriptirati datoteku ove
 noStreamsOptionCopy = Kopirajte poveznicu kako biste je otvorili u drugom pregledniku
 noStreamsOptionFirefox = Isprobajte naš omiljeni preglednik
 noStreamsOptionDownload = Nastavite s ovim preglednikom
+downloadFirefoxPromo = Potpuno novi { -firefox } vam donosi { -send-short-brand }.
+# the next line after the colon contains a file name
+shareLinkDescription = Dijelite poveznicu na svoju datoteku:
+shareLinkButton = Dijeli poveznicu
+# $name is the name of the file
+shareMessage = Preuzmite “{ $name }” sa { -send-brand }: jednostavno i sigurno dijeljenje datoteka
+trailheadPromo = Postoji način da zaštitite svoju privatnost. Pridružite se Firefoxu.
+learnMore = Saznajte više.

public/locales/hsb/send.ftl

@@ -142,7 +142,7 @@ addPassword = Z hesłom škitać
 emailPlaceholder = Zapodajće swoju e-mejlowu adresu
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Přizjewće so, zo byšće do { $size } pósłał
-signInButton = Přizjewić/Registrować
+signInOnlyButton = Přizjewić
 accountBenefitTitle = Załožće konto { -firefox } abo přizjewće so
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Dataje do { $size } dźělić
@@ -163,3 +163,11 @@ noStreamsWarning = Tutón wobhladowak njemóhł tajku wulku dataju dešifrować.
 noStreamsOptionCopy = Kopěrujće wotkaz, zo byšće jón w druhim wobhladowaku wočinił
 noStreamsOptionFirefox = Wupruwujće naš najlubši wobhladowak
 noStreamsOptionDownload = Z tutym wobhladowakom pokročować
+downloadFirefoxPromo = { -send-short-brand } so wam přez cyle nowy { -firefox } přinjese.
+# the next line after the colon contains a file name
+shareLinkDescription = Dźělće wotkaz k swojej dataji:
+shareLinkButton = Wotkaz dźělić
+# $name is the name of the file
+shareMessage = Sćehńće „{ $name }“ z { -send-brand }: jednore, wěste dźělenje datajow
+trailheadPromo = Je móžnosć, wašu priwatnosć škitać. Přińdźće k Firefox.
+learnMore = Dalše informacije.

public/locales/hu/send.ftl

@@ -126,7 +126,7 @@ addPassword = Jelszavas védelem
 emailPlaceholder = Adja meg az e-mail címét
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Jelentkezzen be, és küldjön legfeljebb { $size }-ot
-signInButton = Bejelentkezés/regisztráció
+signInOnlyButton = Bejelentkezés
 accountBenefitTitle = Hozzon létre egy { -firefox } fiókot vagy jelentkezzen be
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Osszon meg fájlokat { $size }-ig
@@ -145,3 +145,11 @@ noStreamsWarning = Előfordulhat, hogy a böngésző nem fog tudni visszafejteni
 noStreamsOptionCopy = Másolja a hivatkozást, és nyissa meg egy másik böngészőben
 noStreamsOptionFirefox = Próbálja ki a kedvenc böngészőnket
 noStreamsOptionDownload = Folytatás ezzel a böngészővel
+downloadFirefoxPromo = A { -send-short-brand }et a vadonatúj { -firefox } hozza el Önnek.
+# the next line after the colon contains a file name
+shareLinkDescription = Ossza meg a fájlja hivatkozását:
+shareLinkButton = Hivatkozás megosztása
+# $name is the name of the file
+shareMessage = „{ $name }” letöltése a { -send-brand } segítségével: egyszerű, biztonságos fájlmegosztás
+trailheadPromo = Védje meg a magánszféráját. Csatlakozzon a Firefoxhoz.
+learnMore = További tudnivalók.

public/locales/ia/send.ftl

@@ -54,6 +54,7 @@ passwordSetError = Iste contrasigno non pote ser definite
 -firefox = Firefox
 -mozilla = Mozilla
 introTitle = Comparti file in maniera confidential
+introDescription = { -send-brand } te pone in grado de compartir files con cryptographia bilateral e un ligamine que automaticamente expira. Assi que tu pote mantener private lo que tu comparti e liberar te del anxietate que tu problema resta online per sempre.
 notifyUploadEncryptDone = Tu file es cryptate e preste pro ser inviate.
 # downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
 archiveExpiryInfo = Expira post { $downloadCount } o { $timespan }
@@ -93,6 +94,8 @@ totalSize = Dimension total: { $size }
 copyLinkDescription = Copia le ligamine pro compartir le file:
 copyLinkButton = Copiar ligamine
 downloadTitle = Discargar files
+downloadDescription = Iste file era compartite via { -send-brand } con cryptographia bilateral e un ligamine que expira automaticamente.
+trySendDescription = Prova { -send-brand } pro le compartimento de file simple e secur.
 # count will always be > 10
 tooManyFiles =
     { $count ->
@@ -106,6 +109,7 @@ tooManyArchives =
        *[other] Solo { $count } archivos es consentite.
     }
 expiredTitle = Iste ligamine ha expirate.
+notSupportedDescription = { -send-brand } non functionara con iste navigator. { -send-short-brand } functiona melio con le ultime version de { -firefox }, e functionara con le version actual de plure navigatores.
 downloadFirefox = Discargar { -firefox }
 legalTitle = Politica de confidentialitate de { -send-short-brand }
 legalDateStamp = Version 1.0 del 12 martio 2019
@@ -119,10 +123,10 @@ dragAndDropFiles = Traher e deponer files
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = o cliccar pro inviar usque { $size }
 addPassword = Proteger per contrasigno
-emailPlaceholder = Insere tu adresse email
+emailPlaceholder = Insere tu adresse de e-mail
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Accede pro inviar usque { $size }
-signInButton = Authentica/registra te
+signInOnlyButton = Authentica te
 accountBenefitTitle = Crea un conto { -firefox } o registra te
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Comparti files usque { $size }
@@ -137,6 +141,15 @@ accountBenefitMoz = Discoperi altere servicios de { -mozilla }
 signOut = Disconnecter
 okButton = OK
 downloadingTitle = Discargamento
+noStreamsWarning = Iste navigator pote non pote decifrar un file assi grande.
 noStreamsOptionCopy = Copiar le ligamine e aperir lo in un altere navigator
 noStreamsOptionFirefox = Prova nostre navigator favorite
 noStreamsOptionDownload = Continuar con iste navigator
+downloadFirefoxPromo = { -send-short-brand } es portate a te per le novissime { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Condivide le ligamine a tu file:
+shareLinkButton = Condivide ligamine
+# $name is the name of the file
+shareMessage = Discarga “{ $name }” con { -send-brand }: condivide files in modo simple e secur
+trailheadPromo = Il ha un via pro proteger tu confidentialitate. Junge te a Firefox!
+learnMore = Saper plus.