v3.0.8

updated CONTRIBUTORS
Merge pull request #1259 from co16353sidak/patch-1
2025-12-07 14:40:55 +03:00 · 2019-03-18 16:26:12 -07:00 · 2019-03-18 15:38:28 -07:00 · 2019-03-18 15:33:35 -07:00 · 2019-03-18 15:26:06 -07:00 · 2019-03-18 15:01:01 -07:00
38 changed files with 1095 additions and 893 deletions
--- a/62
+++ b/62
@@ -5,17 +5,26 @@ Alberto Castro
 Alexander Slovesnik
 Alfredos-Panagiotis Damkalis
 Amin Mahmudian
+Ander Elortondo
 Andreas Pettersson
+Anesu Chiodza
+Anika Dorn
 Arash Mousavi
 Artem Polivanchuk
 Ashikur Rahman
+Ashok kumar
 Balázs Meskó
 Belayet Hossain
+Benjamin Forehand Jr
 Besnik Bleta
+Björn I
 Bjørn I
 Boopesh Mahendran
+Brainlulz
 Breana Gonzales
+Christopher Ramírez
 Chuck Harmston
+Cloney 173741
 Cláudio Esperança
 Cristian Silaghi
 Cynthia Pereira
@@ -23,38 +32,53 @@ Daniel Thorn
 Daniela Arcese
 Danny Coates
 Derek Tamsen
+Dhyey Thakore
+Donovan Preston
+Edi Santoso
 Edmund Huggett
 Elisa X
+Emily
+Emily Hou
 Emin Mastizada
 Enol
 Erica
 Erica Wright
+Fauzan Alfi
 Filip Hruška
 Fjoerfoks
 Francesco Lodolo
 Francesco Lodolo [:flod]
 Frederick Villaluna
+G12r
 Gabriela
 Gautam krishna.R
 Georgianizator
 Gonçalo Matos
 Hyeonseok Shin
 Håvar Henriksen
+Ian Neal
 Jae Hyeon Park
+Jakob Kappel
 Jakub Rychlý
 Jamie
+Jarmo
 Jim Spentzos
+Jiri Grönroos
 Jobava
+Joergen
 Johann-S
 John Gruen
+Jon Buckley
 Jon Vadillo
 Jonathan Claudius
 Jordi Cuevas
 Jordi Serratosa
 Juan Esteban Ajsivinac Sián
+Juan Sián
 Juraj Cigáň
 Kerim Kalamujić
 Khaled Hosny
+Kim Ludvigsen
 Kohei Yoshino
 Lan Glad
 Laurent Jouanneau
@@ -62,11 +86,15 @@ Lobodzets
 LuFlo
 Luiz Carlos de Morais
 Luna Jernberg
+Mahay Alam Khan
+Marcelo Ghelman
 Marcelo Poli
 Marco Aurélio
 Mark Heijl
 Mark Liang
+Mark Liang (You-Wen)
 Marko Andrejić
+Marwan Mohamad
 Matjaž Horvat
 Maykon Chagas
 Melo46
@@ -75,9 +103,13 @@ Michael Köhler
 Michael Wolf
 Michal Stanke
 Michal Vašíček
+Mikeyy
+Miro Rauhala
 Mozilla Pontoon
+Mozinet
 Moḥend Belqasem
 Muḥend Belqasem
+Myungjae Won
 Nicholas Skinsacos
 Nihad
 Nihad Suljić
@@ -85,14 +117,20 @@ Oscar
 Peter deHaan
 Pierre Neter
 Pin-guang Chen
+Piotr Drąg
+Quế Tùng
 Radu Popescu
 Rhoslyn Prys
 RickieES
+Rimas Kudelis
 Rizky Ariestiyansyah
+Rob Powell
 Roberto Alvarado
 Rodrigo
 Rodrigo Guerra
 Rok Žerdin
+Rongjian Zhang
+Ruba
 Sahithi
 Sairam Raavi
 Sander Lepik
@@ -108,25 +146,34 @@ Tema
 Thomas Dalichow
 Théo Chevalier
 Tiago Morais Morgado
+Tim Visée
+Tomer Cohen
 Tomáš Zelina
 Ton
 Tymur Faradzhev
 Uccen Marzuq
 Varghese Thomas
 Victor Bychek
+Vimal Raghubir
 Vitaliy Krutko
 Weihang Lo
 Wil Clouser
 YFdyh000
+Yongmin H
 You-Wen Liang (Mark)
+aaaaalbert
 aefgh39622
+alamanda
 albertdcastro
 alex_mayorga
 ariestiyansyah
 avelper
+chilledfrogs
 dgadelha
+dskmori
 ehuggett
 eljuno
+emily-hou1
 erdem cobanoglu
 gautamkrishnar
 gmontagu
@@ -137,21 +184,36 @@ jesferman1993
 jlG
 josotrix
 jspam
+julenx
 kenrick95
 manxmensch
+marigalicer
 mirzet.omerovic.1992
+passionforlife
+paul.trevor
+pyup.io bot
 ravmn
 rcmainak
 reza.habibi2008
+risger
+robbp
+ruikunai
 savemore99.sm
 shikhar-scs
 siparon
 skystar-p
+stripTM
+tatalmondmush
 tiagomoraismorgado
 timvisee
+victor.gonzalezro
 xcffl
 ybouhamam
+yoshimitsu002
 Μιχάλης
 Марко Костић (Marko Kostić)
 صفا الفليج
 వీవెన్
+张无忌
+新垣结衣松冈茉优长泽雅美门胁麦上野树里石原里美
+莫非前世那一眼
--- a/app/user.js
+++ b/app/user.js
@@ -94,10 +94,12 @@ export default class User {
    return this.loggedIn ? hashId(this.storage.id) : hashId(anonId);
  }

-  async startAuthFlow(source, utms = {}) {
+  async startAuthFlow(trigger, utms = {}) {
+    this.utms = utms;
+    this.trigger = trigger;
    try {
      const params = new URLSearchParams({
-        entrypoint: `send-${source}`,
+        entrypoint: `send-${trigger}`,
        form_type: 'email',
        utm_source: utms.source || 'send',
        utm_campaign: utms.campaign || 'none'
@@ -111,12 +113,10 @@ export default class User {
      const { flowId, flowBeginTime } = await res.json();
      this.flowId = flowId;
      this.flowBeginTime = flowBeginTime;
-      this.utms = utms;
    } catch (e) {
      console.error(e);
      this.flowId = null;
      this.flowBeginTime = null;
-      this.utms = null;
    }
  }

@@ -142,6 +142,9 @@ export default class User {
      options.flow_id = this.flowId;
      options.flow_begin_time = this.flowBeginTime;
    }
+    if (this.trigger) {
+      options.endpoint = `send-${this.trigger}`;
+    }
    if (this.utms) {
      options.utm_campaign = this.utms.campaign || 'none';
      options.utm_content = this.utms.content || 'none';
--- a/app/zip.js
+++ b/app/zip.js
@@ -50,7 +50,7 @@ class File {
    v.setUint32(0, 0x08074b50, true); // sig
    v.setUint32(4, this.crc, true); // crc32
    v.setUint32(8, this.size, true); // compressed size
-    v.setUint16(12, this.size, true); // uncompressed size
+    v.setUint32(12, this.size, true); // uncompressed size
    return new Uint8Array(dd);
  }

@@ -60,7 +60,7 @@ class File {
    v.setUint32(0, 0x02014b50, true); // sig
    v.setUint16(4, 20, true); // version made
    v.setUint16(6, 20, true); // version required
-    v.setUint16(8, 0, true); // bit flags
+    v.setUint16(8, 8, true); // bit flags (8 = use data descriptor)
    v.setUint16(10, 0, true); // compression
    v.setUint16(12, this.dateTime.time, true); // modified time
    v.setUint16(14, this.dateTime.date, true); // modified date
--- a/circle.yml
+++ b/circle.yml
@@ -35,8 +35,7 @@ jobs:
          path: coverage
  integration_tests:
    docker:
-      - image: circleci/node:10
-      - image: selenium/standalone-firefox
+      - image: circleci/node:10-browsers
    steps:
      - checkout
      - restore_cache:
@@ -46,7 +45,9 @@ jobs:
          key: send-int-{{ checksum "package-lock.json" }}
          paths:
            - node_modules
-      - run: npm run circleci-test-integration
+      - run: 
+          name: Run integration test
+          command: ./scripts/bin/run-integration-test-circleci.sh
  deploy_dev:
    machine: true
    steps:
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -1,6 +1,6 @@
 ## How big of a file can I transfer with Firefox Send?

-There is a 2GB file size limit built in to Send, however, in practice you may
+There is a 2.5GB file size limit built in to Send(1GB for non-signed in users), however, in practice you may
 be unable to send files that large.  Send encrypts and decrypts the files in
 the browser which is great for security but will tax your system resources.  In
 particular you can expect to see your memory usage go up by at least the size
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "firefox-send",
-  "version": "3.0.3",
+  "version": "3.0.8",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -965,14 +965,29 @@
      "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==",
      "dev": true
    },
-    "@dannycoates/webcrypto-liner": {
-      "version": "0.1.34",
-      "resolved": "https://registry.npmjs.org/@dannycoates/webcrypto-liner/-/webcrypto-liner-0.1.34.tgz",
-      "integrity": "sha512-QTP7EIlNkcp3jA5XAHk3uU6q3ZOcXOHRZnmzt+yDPf9dhLa5QR99ooHC8JHrD/J4dwVKuMY995aMCGF+M0g5Cg==",
+    "@dannycoates/elliptic": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@dannycoates/elliptic/-/elliptic-6.4.2.tgz",
+      "integrity": "sha512-2G4qWMB2SRBk4H75d+BFBbz2b1cseIYCI8G7duGxtxdnjGxhewpripDsVr1lCagmijyYX4zDyfKTNoId5GGyow==",
      "dev": true,
      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "@dannycoates/webcrypto-liner": {
+      "version": "0.1.37",
+      "resolved": "https://registry.npmjs.org/@dannycoates/webcrypto-liner/-/webcrypto-liner-0.1.37.tgz",
+      "integrity": "sha512-EM29TDkn7GJaa/oOfLeS1vrAxEkyM+WfUsmHTz7OyrxvMZNqz2SiYdZkXBIvg+QCnKTfXc2x//ORAilesugQlg==",
+      "dev": true,
+      "requires": {
+        "@dannycoates/elliptic": "^6.4.2",
        "asmcrypto.js": "^0.22.0",
-        "elliptic": "^6.4.1",
        "webcrypto-core": "github:dannycoates/webcrypto-core#8e0152a66d3ae6329cf080ccb3085eb06637070f"
      }
    },
@@ -2413,8 +2428,7 @@
    "buffer-crc32": {
      "version": "0.2.13",
      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
    },
    "buffer-equal-constant-time": {
      "version": "1.0.1",
@@ -5863,8 +5877,7 @@
    "fs-constants": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
    },
    "fs-extra": {
      "version": "4.0.3",
@@ -8054,8 +8067,7 @@
    "isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
    },
    "isobject": {
      "version": "3.0.1",
@@ -8305,6 +8317,15 @@
      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
      "dev": true
    },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
    "known-css-properties": {
      "version": "0.11.0",
      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.11.0.tgz",
@@ -9616,8 +9637,7 @@
    "nice-try": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
    },
    "nise": {
      "version": "1.4.10",
@@ -11426,8 +11446,7 @@
    "path-key": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
    },
    "path-parse": {
      "version": "1.0.6",
@@ -11475,8 +11494,7 @@
    "pend": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
    },
    "perfectionist": {
      "version": "2.4.0",
@@ -12778,8 +12796,7 @@
    "progress": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
    },
    "promise-inflight": {
      "version": "1.0.1",
@@ -12915,6 +12932,15 @@
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
          "dev": true
+        },
+        "ws": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.0.tgz",
+          "integrity": "sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
        }
      }
    },
@@ -13840,6 +13866,130 @@
      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
      "dev": true
    },
+    "selenium-standalone": {
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-6.16.0.tgz",
+      "integrity": "sha512-tl7HFH2FOxJD1is7Pzzsl0pY4vuePSdSWiJdPn+6ETBkpeJDiuzou8hBjvWYWpD+eIVcOrmy3L0R3GzkdHLzDw==",
+      "requires": {
+        "async": "^2.6.2",
+        "commander": "^2.19.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.1.1",
+        "lodash": "^4.17.11",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "progress": "2.0.3",
+        "request": "2.88.0",
+        "tar-stream": "2.0.0",
+        "urijs": "^1.19.1",
+        "which": "^1.3.1",
+        "yauzl": "^2.10.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+          "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+          "requires": {
+            "lodash": "^4.17.11"
+          }
+        },
+        "bl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz",
+          "integrity": "sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==",
+          "requires": {
+            "readable-stream": "^2.3.5",
+            "safe-buffer": "^5.1.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+              "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            }
+          }
+        },
+        "commander": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "fd-slicer": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+          "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+          "requires": {
+            "pend": "~1.2.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        },
+        "readable-stream": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+          "integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "tar-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.0.0.tgz",
+          "integrity": "sha512-n2vtsWshZOVr/SY4KtslPoUlyNh06I2SGgAOCZmquCEjlbV/LjY2CY80rDtdQRHFOYXNlgBDo6Fr3ww2CWPOtA==",
+          "requires": {
+            "bl": "^2.2.0",
+            "end-of-stream": "^1.4.1",
+            "fs-constants": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.1.1"
+          }
+        },
+        "yauzl": {
+          "version": "2.10.0",
+          "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+          "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+          "requires": {
+            "buffer-crc32": "~0.2.3",
+            "fd-slicer": "~1.1.0"
+          }
+        }
+      }
+    },
    "selfsigned": {
      "version": "1.10.4",
      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
@@ -14000,7 +14150,6 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
      "requires": {
        "shebang-regex": "^1.0.0"
      }
@@ -14008,8 +14157,7 @@
    "shebang-regex": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
    },
    "shell-quote": {
      "version": "1.6.1",
@@ -16199,6 +16347,11 @@
        "punycode": "^2.1.0"
      }
    },
+    "urijs": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz",
+      "integrity": "sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg=="
+    },
    "urix": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
@@ -16576,6 +16729,40 @@
        "sauce-connect-launcher": "~1.2.3"
      }
    },
+    "wdio-selenium-standalone-service": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/wdio-selenium-standalone-service/-/wdio-selenium-standalone-service-0.0.12.tgz",
+      "integrity": "sha512-R8iUL30SkFfZictAG5wRofeCsHQ4bIucDtaArCQWZkUqS+DlGTStIk3TaIOCaX7dS7UW1YN/lJt9Vsn4Ekmoxg==",
+      "dev": true,
+      "requires": {
+        "fs-extra": "^0.30.0",
+        "selenium-standalone": "^6.15.4"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "jsonfile": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        }
+      }
+    },
    "wdio-spec-reporter": {
      "version": "0.1.5",
      "resolved": "https://registry.npmjs.org/wdio-spec-reporter/-/wdio-spec-reporter-0.1.5.tgz",
@@ -17284,7 +17471,6 @@
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
      "requires": {
        "isexe": "^2.0.0"
      }
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "firefox-send",
  "description": "File Sharing Experiment",
-  "version": "3.0.3",
+  "version": "3.0.8",
  "author": "Mozilla (https://mozilla.org)",
  "repository": "mozilla/send",
  "homepage": "https://github.com/mozilla/send/",
@@ -64,7 +64,7 @@
    "@babel/plugin-proposal-class-properties": "^7.3.4",
    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
    "@babel/preset-env": "^7.3.4",
-    "@dannycoates/webcrypto-liner": "^0.1.34",
+    "@dannycoates/webcrypto-liner": "^0.1.37",
    "@dannycoates/webpack-dev-server": "^3.1.4",
    "@fullhuman/postcss-purgecss": "^1.1.0",
    "@mattiasbuelens/web-streams-polyfill": "0.2.1",
@@ -126,6 +126,7 @@
    "wdio-firefox-profile-service": "^0.1.3",
    "wdio-mocha-framework": "^0.6.3",
    "wdio-sauce-service": "^0.4.14",
+    "wdio-selenium-standalone-service": "0.0.12",
    "wdio-spec-reporter": "^0.1.5",
    "webdriverio": "^4.14.3",
    "webpack": "4.28.4",
@@ -152,11 +153,13 @@
    "node-fetch": "^2.3.0",
    "raven": "^2.6.4",
    "redis": "^2.8.0",
+    "selenium-standalone": "^6.15.6",
    "ua-parser-js": "^0.7.19",
    "websocket-stream": "^5.1.2"
  },
  "availableLanguages": [
    "en-US",
+    "ast",
    "bn-BD",
    "ca",
    "cak",
@@ -168,6 +171,7 @@
    "en-CA",
    "en-GB",
    "es-AR",
+    "es-CL",
    "es-ES",
    "es-MX",
    "fr",
@@ -175,6 +179,7 @@
    "hr",
    "hsb",
    "hu",
+    "ia",
    "id",
    "it",
    "ja",
@@ -182,6 +187,7 @@
    "lt",
    "nl",
    "nn-NO",
+    "pl",
    "pt-BR",
    "pt-PT",
    "ro",
--- a/public/locales/ast/send.ftl
+++ b/public/locales/ast/send.ftl
@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = esperimentu web
-siteFeedback = Feedback
-uploadPageHeader = Compartición privada y cifrada de ficheros
-uploadPageExplainer = Unvia ficheros pente un enllaz seguru, priváu y cifráu que caduca automáticamente p'asegurar que les tos coses nun queden siempres na rede.
-uploadPageLearnMore = Deprendi más
-uploadPageDropMessage = Suelta equí'l to ficheru p'aniciar la xuba
-uploadPageSizeMessage = Pal meyor funcionamientu, lo meyor ye que'l to ficheru seya menor de 1GB
-uploadPageBrowseButton = Esbilla un ficheru nel to ordenador
-uploadPageBrowseButton1 = Esbilla un ficheru pa unviar
-uploadPageMultipleFilesAlert = Anguaño nun se sofita la xuba múltiple de ficheros o carpetes.
-uploadPageBrowseButtonTitle = Xubir ficheru
-uploadingPageProgress = Xubiendo { $filename } ({ $size })
+siteFeedback = Comentarios
 importingFile = Importando...
-verifyingFile = Verificando...
 encryptingFile = Cifrando...
 decryptingFile = Descifrando...
-notifyUploadDone = Finó la to xuba.
-uploadingPageMessage = Namái que'l ficheru xuba, sedrás a afitar les opciones de caducidá.
-uploadingPageCancel = Encaboxar xuba
-uploadCancelNotification = Encaboxóse la to xuba.
-uploadingPageLargeFileMessage = Esti ficheru ye grande y pue entardar daqué en xubir. ¡Paciencia!
-uploadingFileNotification = Avísame cuando se complete la xuba.
-uploadSuccessConfirmHeader = Preparáu pa unviar
-uploadSvgAlt = Xubir
-uploadSuccessTimingHeader = L'enllaz del to ficheru caducará dempués d'una descarga o en 24 hores.
-expireInfo = L'enllaz al ficheru va caducar tres { $downloadCount } o { $timespan }.
 downloadCount =
    { $num ->
        [one] 1 descarga
@@ -36,75 +14,26 @@ timespanHours =
        [one] 1 hora
       *[other] { $num } hores
    }
-copyUrlFormLabelWithName = Copia y comparti l'enllaz pa unviar el to ficheru: { $filename }
-copyUrlFormButton = Copiar al cartafueyu
 copiedUrl = ¡Copióse!
-deleteFileButton = Desaniciar ficheru
-sendAnotherFileLink = Unviar otru ficheru
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Baxar
-downloadsFileList = Descargues
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Tiempu
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Baxar { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Introducir contraseña
 unlockInputPlaceholder = Contraseña
 unlockButtonLabel = Desbloquiar
-downloadFileTitle = Baxar ficheru cifráu
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = El to collaciu unvióte un ficheru usando Firefox Send, un serviciu que te permite compartir ficheros con un enllaz seguru, priváu y cifráu que caduca automáticamente p'asegurar que les to coses nun queden siempres na rede.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Baxar
-downloadNotification = Completóse la to descarga.
-downloadFinish = Descarga completada
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
+downloadFinish = Completóse la descarga
 fileSizeProgress = ({ $partialSize } de { $totalSize })
-# Firefox Send is a brand name and should not be localized.
-sendYourFilesLink = Prueba Firefox Send
-downloadingPageProgress = Baxando { $filename } ({ $size })
-downloadingPageMessage = Dexa esta llingüeta abierta entrín vamos en cata del to ficheru y lu desciframos, por favor.
-errorAltText = Fallu de xuba
+sendYourFilesLink = Probar Firefox Send
 errorPageHeader = ¡Daqué foi mal!
-errorPageMessage = Hebo un fallu xubiendo'l ficheru.
-errorPageLink = Unviar otru ficheru
 fileTooBig = Esti ficheru ye mui grande como pa xubilu. Debería tener menos de { $size }.
-linkExpiredAlt = Enllaz caducáu
-expiredPageHeader = ¡Esti enllaz caducó o enxamás nun esistó!
+linkExpiredAlt = Caducó l'enllaz
 notSupportedHeader = El to restolador nun ta sofitáu.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Desafortunadamente esti restolador nun sofita la teunoloxía web qu'usa Firefox Send. Precisarás d'usar otru restolador. ¡Aconseyámoste Firefox!
 notSupportedLink = ¿Por qué'l mio restolador nun ta sofitáu?
-notSupportedOutdatedDetail = Desafortunadamente esta versión de Firefox nun sofita la teunoloxía web qu'usa Firefox Send. Precisarás d'anovar Firefox.
+notSupportedOutdatedDetail = Desafortunadamente esta versión de Firefox nun sofita la teunoloxía web qu'usa Firefox Send. Vas precisar anovar Firefox.
 updateFirefox = Anovar Firefox
-downloadFirefoxButtonSub = Descarga de baldre
-uploadedFile = Ficheru
-copyFileList = Copiar URL
-# expiryFileList is used as a column header
-expiryFileList = Caduca en
-deleteFileList = Desaniciar
-nevermindButton = Nun m'importa
-legalHeader = Términos y privacidá
-legalNoticeTestPilot = Anguaño Firefox Send ye un esperimentu de Test Pilot y ta suxetu a los <a>Términos de serviciu</a> y l'<a>Avisu de privacidá</a> de Test Pilot. <a>Equí</a> pues deprender más tocante a esti esperimentu y la so recoyida de datos.
-legalNoticeMozilla = L'usu de Firefox Send tamién ta suxetu al <a>Avisu de privacidá</a> y a los <a>Términos d'usu de la páxina web</a> de Mozilla.
-deletePopupText = ¿Desaniciar esti ficheru?
-deletePopupYes = Sí
 deletePopupCancel = Encaboxar
 deleteButtonHover = Desaniciar
-copyUrlHover = Copiar URL
 footerLinkLegal = Llegal
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Tocante a Test Pilot
 footerLinkPrivacy = Privacidá
-footerLinkTerms = Términos
 footerLinkCookies = Cookies
-requirePasswordCheckbox = Riquir una contraseña pa baxar esti ficheru
-addPasswordButton = Amestar contraseña
-changePasswordButton = Camudar
-passwordTryAgain = Contraseña incorreuta. Volvi tentalo.
+passwordTryAgain = La contraseña ye incorreuta. Volvi tentalo.
 javascriptRequired = Firefox Send rique JavaScript
 whyJavascript = ¿Por qué Firefox Send rique JavaScript?
 enableJavascript = Activa JavaScript y volvi tentalo, por favor.
@@ -112,9 +41,101 @@ enableJavascript = Activa JavaScript y volvi tentalo, por favor.
 expiresHoursMinutes = { $hours }h { $minutes }m
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
 expiresMinutes = { $minutes }m
-# A short status message shown when a password is successfully set
-passwordIsSet = Afitóse la contraseña
 # A short status message shown when the user enters a long password
 maxPasswordLength = Llargor máximu de la contraseña: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Nun pudo afitase esta contraseña
+
+## 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 = Compartición de ficheros privada y cenciella
+notifyUploadEncryptDone = El ficheru ta cifráu y preparáu pa unviase
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Caduca tres { $downloadCount } ó { $timespan }
+timespanMinutes =
+    { $num ->
+        [one] 1 minutu
+       *[other] { $num } minutos
+    }
+timespanDays =
+    { $num ->
+        [one] 1 día
+       *[other] { $num } díes
+    }
+timespanWeeks =
+    { $num ->
+        [one] 1 selmana
+       *[other] { $num } selmanes
+    }
+fileCount =
+    { $num ->
+        [one] 1 ficheru
+       *[other] { $num } ficheros
+    }
+# 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 = Tamañu total: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Copia l'enllaz pa compartir el ficheru:
+copyLinkButton = Copiar l'enllaz
+downloadTitle = Descarga de ficheros
+downloadDescription = Esti ficheru compartióse per { -send-brand } con cifráu puntu a puntu y un enllaz que caduca automáticamente.
+trySendDescription = Prueba { -send-brand } pa una compartición de ficheros cenciella y segura.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] Namái pue xubise 1 ficheru al empar.
+       *[other] Namái puen xubise { $count } ficheros al empar.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Namái se permite 1 archivu
+       *[other] Namái se permiten { $count } archivos
+    }
+expiredTitle = Esti enllaz caducó.
+notSupportedDescription = { -send-brand } nun va funcionar con esti restolador. { -send-short-brand } funciona meyor cola versión última de { -firefox } y cola versión actual de la mayoría de restoladores.
+legalTitle = Noticia de privacidá de { -send-short-brand }
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days }d { $hours }h { $minutes }m
+addFilesButton = Esbillar los ficheros a unviar
+uploadButton = Xubir
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Arrastra y suelta ficheros
+# 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 = o calca pa unviar hasta { $size }
+addPassword = Protexer con una contraseña
+emailPlaceholder = Introduz el to corréu
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = Anicia sesión pa unviar hasta { $size }
+signInButton = Rexistrase/aniciar sesión
+accountBenefitTitle = Creación d'una cuenta { -firefox } o aniciu de sesión nella
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = Comparti ficheros d'hasta { $size }
+accountBenefitDownloadCount = Comparti ficheros con más xente
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Caltén activos los enllaces demientres 1 día
+       *[other] Caltén activos los enllaces demientres 1 díes
+    }
+accountBenefitSync = Xestiona los ficheros compartíos dende cualesquier preséu
+accountBenefitMoz = Deprendi más tocante a otros servicios de { -mozilla }
+signOut = Zarrar sesión
+okButton = Aceutar
+downloadingTitle = Baxando
+noStreamsWarning = Esti restolador quiciabes nun seya a descifrar un ficheru d'esti tamañu.
--- a/public/locales/cak/send.ftl
+++ b/public/locales/cak/send.ftl
@@ -78,7 +78,17 @@ fileCount =
        [one] 1 yakb'äl
       *[other] { $num } taq yakb'äl
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Ronojel runimilem: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Tawachib'ej ri ximonel richin nakomonij ri ayakb'al:
@@ -110,15 +120,15 @@ uploadButton = Tijotob'äx
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Keqirirëx chuqa' ke'osq'opïx taq yakb'äl
 # the second part of the string 'Drag and drop files or click to send up to 1GB'
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = o tapitz'a' richin natäq k'a { $size }
 addPassword = Tichajïx rik'in ewan tzij
 emailPlaceholder = Tatz'ib'aj ataqoya'l
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $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'
 accountBenefitTitle = Tatz'uku' jun { -firefox } Rub'i' Ataqoy'al o Tatikirisaj molojri'ïl
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $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 }
 accountBenefitDownloadCount = Ke'akomonij taq yakb'äl kik'in ch'aqa' chik winaqi'
 accountBenefitTimeLimit =
--- a/public/locales/cs/send.ftl
+++ b/public/locales/cs/send.ftl
@@ -166,7 +166,7 @@ dragAndDropFiles = Přetažením myší nebo kliknutím sem
 # 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 = můžete poslat až { $size }
-addPassword = Chránit heslem
+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
--- a/public/locales/cy/send.ftl
+++ b/public/locales/cy/send.ftl
@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = arbrawf gwe
 siteFeedback = Adborth
-uploadPageHeader = Rhannu Ffeiliau wedi eu Hamgryptio yn Breifat
-uploadPageExplainer = Anfon ffeiliau drwy ddolen diogel, breifat ac wedi ei amgryptio sy'n dod i ben yn awtomatig er mwyn sicrhau nad yw eich pethau'n bodoli ar lein am byth.
-uploadPageLearnMore = Dysgu rhagor
-uploadPageDropMessage = Gollyngwch eich ffeiliau yma i gychwyn llwytho i fyny
-uploadPageSizeMessage = Mae'n well cadw maint y ffeiliau o dan 1GB er mwyn iddo weithio ar ei orau.
-uploadPageBrowseButton = Dewiswch ffeil ar eich cyfrifiadur
-uploadPageBrowseButton1 = Dewiswch ffeil i'w llwytho i fyny
-uploadPageMultipleFilesAlert = Nid yw llwytho nifer lluosog o ffeiliau neu ffolder yn cael ei gynnal ar hyn o bryd.
-uploadPageBrowseButtonTitle = Llwytho ffeil i fyny
-uploadingPageProgress = Llwytho { $filename } ({ $maint }) i fyny
 importingFile = Mewnforio…
-verifyingFile = Wrthi'n gwirio…
 encryptingFile = Wrthi'n amgryptio…
 decryptingFile = Wrthi'n dadgryptio…
-notifyUploadDone = Mae eich llwytho wedi gorffen.
-uploadingPageMessage = Unwaith y bydd eich ffeil wedi llwytho bydd modd gosod y manylion dod i ben.
-uploadingPageCancel = Diddymu'r llwytho
-uploadCancelNotification = Cafodd eich llwytho ei ddiddymu.
-uploadingPageLargeFileMessage = Mae'r ffeil yn fawr a gall gymryd peth amser i'w llwytho. Amynedd!
-uploadingFileNotification = Dweud pan fydd y llwytho wedi gorffen.
-uploadSuccessConfirmHeader = Yn Barod i Anfon
-uploadSvgAlt = Llwytho i Fyny
-uploadSuccessTimingHeader = Bydd y ddolen i'ch ffeil y dod i ben ar ôl 1 llwytho neu o fewn 24 awr.
-expireInfo = Bydd y ddolen i'ch ffeil yn dod i ben ym mhen { $downloadCount } neu { $timespan }.
 downloadCount =
    { $num ->
        [zero] Llwythi i lawr
@@ -44,76 +22,26 @@ timespanHours =
        [many] awr
       *[other] awr
    }
-copyUrlFormLabelWithName = Copïo a rhannu'r ddolen i anfon eich ffeil: { $filename }
-copyUrlFormButton = Copïo i'r clipfwrdd
 copiedUrl = Wedi eu copïo!
-deleteFileButton = Dileu ffeil
-sendAnotherFileLink = Anfon ffeil arall
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Llwytho i lawr
-downloadsFileList = Llwythi
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Amser
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Llwytho i lawr { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Rhowch Gyfrinair
 unlockInputPlaceholder = Cyfrinair
 unlockButtonLabel = Datgloi
-downloadFileTitle = Llwythwch Ffeil wedi ei Hamgryptio i Lawr
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Mae ffrind i chi yn anfon ffeil atoch drwy Firefox Send, gwasanaeth sy'n caniatáu i chi rannu ffeiliau drwy ddolen ddiogel, breifat ac wedi ei amgryptio sy'n dod i ben yn awtomatig er mwyn sicrhau nad yw eich deunydd yn aros ar-lein am byth.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Llwytho i Lawr
-downloadNotification = Mae eich llwytho wedi gorffen
 downloadFinish = Llwytho wedi Gorffen
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } o { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Rhowch gynnig ar Firefox Send
-downloadingPageProgress = Llwytho i lawr { $filename } ({ $size })
-downloadingPageMessage = Gadewch y tab yma ar agor tra fyddwn yn estyn eich ffeil a'i dad-amgryptio.
-errorAltText = Gwall llwytho
 errorPageHeader = Aeth rhywbeth o'i le!
-errorPageMessage = Bu gwall wrth lwytho'r ffeil.
-errorPageLink = Anfon ffeil arall
 fileTooBig = Mae'r ffeil yn rhy fawr i'w llwytho. Dylai fod yn llai na { $size }.
 linkExpiredAlt = Mae'r ddolen wedi dod i ben
-expiredPageHeader = Mae'r ddolen wedi dod i ben neu nad yw wedi bodoli erioed!
 notSupportedHeader = Nid yw eich porwr yn cael ei gynnal.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Yn anffodus, nid yw'r porwr hwn yn cynnal y technoleg gwe sy'n cynnal Firefox Send. Bydd angen i chi ddefnyddio porwr arall. Rydym ni'n argymell Firefox!
 notSupportedLink = Pam nad yw fy mhorwr yn cael ei gynnal?
 notSupportedOutdatedDetail = Yn anffodus, nid yw'r fersiwn yma o Firefox yn cynnal y technoleg gwe sy'n gyrru Firefox Send. Bydd angen i chi ddiweddaru eich porwr.
 updateFirefox = Diweddaru Firefox
-downloadFirefoxButtonSub = Llwytho i Lawr am Ddim
-uploadedFile = Ffeil
-copyFileList = Copïo URL
-# expiryFileList is used as a column header
-expiryFileList = Daw i ben ymhen
-deleteFileList = Dileu
-nevermindButton = Dim ots
-legalHeader = Amodau a Phreifatrwydd
-legalNoticeTestPilot = Ar hyn o mae Firefox Send yn arbrawf  o fewn rhaglen Test Pilot ac yn destun <a>Amodau Gwasanaeth</a> a <a>Hysbysiad Preifatrwydd</a> Test Pilot . Gallwch ddysgu rhagor am yr arbrawf a'r data mae'n ei gasglu <a>yma</a>.
-legalNoticeMozilla = Mae'r defnydd o wefan Firefox Send hefyd yn destun <a>Hysbysiad Preifatrwydd Gwefannau</a> ac <a>Amodau Defnydd Gwefannau</a> Mozilla.
-deletePopupText = Dileu'r ffeil?
-deletePopupYes = Iawn
 deletePopupCancel = Diddymu
 deleteButtonHover = Dileu
-copyUrlHover = Copïo'r URL
 footerLinkLegal = Cyfreithiol
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Ynghylch Test Pilot
 footerLinkPrivacy = Preifatrwydd
-footerLinkTerms = Amodau
 footerLinkCookies = Cwcis
-requirePasswordCheckbox = Gosod angen cyfrinair i lwytho'r ffeil hon i lawr
-addPasswordButton = Ychwanegu Cyfrinair
-changePasswordButton = Newid
 passwordTryAgain = Cyfrinair anghywir. Ceisiwch eto.
-reportIPInfringement = Adrodd ar Gamddefnydd o'r IP
 javascriptRequired = Mae Firefox Send angen JavaScript
 whyJavascript = Pam fod Firefox Send angen JavaScript?
 enableJavascript = Galluogwch JavaScript a cheisio eto.
@@ -121,14 +49,12 @@ enableJavascript = Galluogwch JavaScript a cheisio eto.
 expiresHoursMinutes = { $hours }a { $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 = Wedi gosod y cyfrinair
 # A short status message shown when the user enters a long password
 maxPasswordLength = Hyd mwyaf cyfrinair: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Nid oedd modd gosod y cyfrinair hwn

-## New strings for the vNext version of Firefox Send
+## Send version 2 strings

 # Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
 -send-brand = Firefox Send
@@ -176,7 +102,17 @@ fileCount =
        [many] { $num } ffeil
       *[other] { $num } ffeil
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Cyfanswm maint: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Copïwch y ddolen i rannu eich ffeil:
@@ -216,15 +152,15 @@ uploadButton = Llwytho i fyny
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Llusgo a gollwng ffeiliau
 # the second part of the string 'Drag and drop files or click to send up to 1GB'
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = neu glicio i anfon hyd at { $size }
 addPassword = Diogelu gyda chyfrinair
 emailPlaceholder = Rhowch eich e-bost
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $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
 accountBenefitTitle = Creu Cyfrif { -firefox } neu fewngofnodi
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Rhannu ffeiliau hyd at { $size }
 accountBenefitDownloadCount = Rhannu ffeiliau gyda mwy o bobl
 accountBenefitTimeLimit =
--- a/public/locales/da/send.ftl
+++ b/public/locales/da/send.ftl
@@ -78,7 +78,17 @@ fileCount =
        [one] 1 fil
       *[other] { $num } filer
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Samlet størrelse: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Kopier linket for at dele din fil:
@@ -110,15 +120,15 @@ uploadButton = Upload
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Træk og slip filer
 # the second part of the string 'Drag and drop files or click to send up to 1GB'
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = eller klik for at sende filer på op til { $size }
 addPassword = Beskyt med adgangskode
 emailPlaceholder = Indtast din mailadresse
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $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
 accountBenefitTitle = Opret en { -firefox }-konto eller log ind
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $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 }
 accountBenefitDownloadCount = Del filer med flere personer
 accountBenefitTimeLimit =
--- a/public/locales/de/send.ftl
+++ b/public/locales/de/send.ftl
@@ -24,19 +24,19 @@ sendYourFilesLink = Firefox Send ausprobieren
 errorPageHeader = Ein Fehler ist aufgetreten!
 fileTooBig = Die Datei ist zu groß zum Hochladen. Sie sollte maximal { $size } groß sein.
 linkExpiredAlt = Link abgelaufen
-notSupportedHeader = Ihr Browser wird nicht unterstützt.
+notSupportedHeader = Dein Browser wird nicht unterstützt.
 notSupportedLink = Warum wird mein Browser nicht unterstützt?
-notSupportedOutdatedDetail = Leider unterstützt diese Firefox-Version die Web-Technologie nicht, auf der Firefox Send basiert. Sie müssen Ihren Browser aktualisieren.
+notSupportedOutdatedDetail = Leider unterstützt diese Firefox-Version die Web-Technologie nicht, auf der Firefox Send basiert. Du musst deinen Browser aktualisieren.
 updateFirefox = Firefox aktualisieren
 deletePopupCancel = Abbrechen
 deleteButtonHover = Löschen
 footerLinkLegal = Rechtliches
 footerLinkPrivacy = Datenschutz
 footerLinkCookies = Cookies
-passwordTryAgain = Falsches Passwort. Versuchen Sie es erneut.
+passwordTryAgain = Falsches Passwort. Versuche es nochmal.
 javascriptRequired = Firefox Send benötigt JavaScript
 whyJavascript = Warum benötigt Firefox Send JavaScript?
-enableJavascript = Bitte aktivieren Sie JavaScript und versuchen Sie es erneut.
+enableJavascript = Bitte aktiviere JavaScript und versuche es erneut.
 # A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
 expiresHoursMinutes = { $hours }h { $minutes }m
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
@@ -53,9 +53,9 @@ passwordSetError = Dieses Passwort konnte nicht eingerichtet werden
 -send-short-brand = Send
 -firefox = Firefox
 -mozilla = Mozilla
-introTitle = Einfache, private Dateifreigabe
-introDescription = Mit { -send-brand } können Sie Dateien mit Ende-zu-Ende-Verschlüsselung und einem automatisch ablaufenden Link freigeben. So können Sie die geteilten Inhalte privat halten und sicherstellen, dass Ihre Daten nicht für immer online bleiben.
-notifyUploadEncryptDone = Ihre Datei ist verschlüsselt und zum Senden bereit
+introTitle = Einfach und privat Dateien versenden
+introDescription = Mit { -send-brand } kannst du Dateien sicher mit anderen teilen – mit End-to-End-Verschlüsselung und einem Freigabe-Link, der automatisch abläuft. So bleiben deine geteilten Inhalte privat und du kannst sicherstellen, dass deine Daten nicht für immer im Web herumschwirren.
+notifyUploadEncryptDone = Deine Datei ist verschlüsselt und zum Senden bereit
 # downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
 archiveExpiryInfo = Läuft ab nach { $downloadCount } oder { $timespan }
 timespanMinutes =
@@ -91,11 +91,11 @@ fileSize = { $num }{ $units }
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 totalSize = Gesamtgröße: { $size }
 # the next line after the colon contains a file name
-copyLinkDescription = Kopieren Sie den Link, um Ihre Datei zu teilen:
+copyLinkDescription = Kopiere den Link, um deine Datei zu teilen:
 copyLinkButton = Link kopieren
 downloadTitle = Dateien herunterladen
-downloadDescription = Diese Datei wurde über { -send-brand } mit Ende-zu-Ende-Verschlüsselung und einem automatisch ablaufenden Link geteilt.
-trySendDescription = Probieren Sie { -send-brand } aus, um einfach und privat Dateien zu teilen.
+downloadDescription = Diese Datei wurde über { -send-brand } mit End-to-End-Verschlüsselung und einem automatisch ablaufenden Link geteilt.
+trySendDescription = Probiere { -send-brand } aus, um einfach und sicher Dateien zu versenden.
 # count will always be > 10
 tooManyFiles =
    { $count ->
@@ -118,30 +118,30 @@ expiresDaysHoursMinutes = { $days }d { $hours }h { $minutes }m
 addFilesButton = Dateien zum Hochladen auswählen
 uploadButton = Hochladen
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
-dragAndDropFiles = Dateien ziehen und ablegen
+dragAndDropFiles = Dateien per Drag & Drop einfügen
 # 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 = oder klicken, um bis zu { $size } zu senden
 addPassword = Mit Passwort schützen
-emailPlaceholder = Geben Sie Ihre E-Mail-Adresse ein
+emailPlaceholder = E-Mail-Adresse eingeben
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
-signInSizeBump = Melden Sie sich an, um Dateien bis { $size } zu senden
+signInSizeBump = Melde dich an, um Dateien bis { $size } zu senden
 signInButton = Anmelden/Registrieren
-accountBenefitTitle = Erstellen Sie ein { -firefox }-Konto oder melden Sie sich an
+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
-accountBenefitDownloadCount = Teilen Sie Dateien mit anderen Menschen
+accountBenefitDownloadCount = Teile Dateien mit weiteren Leuten
 accountBenefitTimeLimit =
    { $count ->
        [one] Link bis zu einen Tag lang aktiv halten
       *[other] Link bis zu { $count } Tage lang aktiv halten
    }
 accountBenefitSync = Geteilte Dateien von anderen Geräten aus verwalten
-accountBenefitMoz = Erfahren Sie mehr über andere { -mozilla }-Dienste
+accountBenefitMoz = Erfahre mehr über andere { -mozilla }-Dienste
 signOut = Abmelden
 okButton = OK
 downloadingTitle = Wird heruntergeladen…
 noStreamsWarning = Dieser Browser kann eine so große Datei möglicherweise nicht entschlüsseln.
-noStreamsOptionCopy = Kopieren Sie den Link, um ihn in einem anderen Browser zu öffnen
-noStreamsOptionFirefox = Probieren Sie unseren Lieblingsbrowser aus
+noStreamsOptionCopy = Kopiere den Link, um ihn in einem anderen Browser zu öffnen
+noStreamsOptionFirefox = Probiere unseren Lieblingsbrowser aus
 noStreamsOptionDownload = Mit diesem Browser weitermachen
--- a/public/locales/es-CL/send.ftl
+++ b/public/locales/es-CL/send.ftl
@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = experimento web
 siteFeedback = Comentarios
-uploadPageHeader = Compartir archivos de forma privada y cifrada
-uploadPageExplainer = Enviar archivos a través de un enlace seguro, privado y cifrado que automáticamente expira para asegurar que tus cosas no permanecerán en línea por la eternidad.
-uploadPageLearnMore = Aprender más
-uploadPageDropMessage = Suelta tu archivo aquí para empezar a subirlo
-uploadPageSizeMessage = Para una operación más confiable, es mejor mantener el tamaño del archivo bajo 1 GB
-uploadPageBrowseButton = Selecciona un archivo en tu computador
-uploadPageBrowseButton1 = Selecciona un archivo a subir
-uploadPageMultipleFilesAlert = Subir múltiples archivos o una carpeta actualmente no es posible.
-uploadPageBrowseButtonTitle = Subir archivo
-uploadingPageProgress = Subiendo { $filename } ({ $size })
 importingFile = Importando…
-verifyingFile = Verificando…
 encryptingFile = Cifrando…
 decryptingFile = Descifrando…
-notifyUploadDone = Tu subida ha terminado.
-uploadingPageMessage = Una vez que tu archivo sea subido podrás ajustar las opciones de expiración.
-uploadingPageCancel = Cancelar subida
-uploadCancelNotification = Tu subida fue cancelada.
-uploadingPageLargeFileMessage = Este archivo es grande y puede tardar un rato en subir. ¡Aprovecha de hacer algo mientras!
-uploadingFileNotification = Notificarme cuando la subida sea completada.
-uploadSuccessConfirmHeader = Listo para enviar
-uploadSvgAlt = Subir
-uploadSuccessTimingHeader = El enlace a tu archivo expirará tras 1 descarga o en 24 horas.
-expireInfo = El enlace a tu archivo expirará después de { $downloadCount } o { $timespan }.
 downloadCount =
    { $num ->
        [one] 1 descarga
@@ -36,76 +14,26 @@ timespanHours =
        [one] 1 hora
       *[other] { $num } horas
    }
-copyUrlFormLabelWithName = Copia y comparte el enlace para enviar tu archivo: { $filename }
-copyUrlFormButton = Copiar al portapapeles
 copiedUrl = ¡Copiado!
-deleteFileButton = Eliminar archivo
-sendAnotherFileLink = Enviar otro archivo
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Descargar
-downloadsFileList = Descargas
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Tiempo
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Descargar { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Ingresar contraseña
 unlockInputPlaceholder = Contraseña
 unlockButtonLabel = Desbloquear
-downloadFileTitle = Bajar archivo cifrado
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Tu amigo te está enviando un archivo con Firefox Send, un servicio que te permite compartir archivos con un enlace seguro, privado y cifrado que expira automáticamente para asegurar que tus cosas no queden en línea de por vida.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Descargar
-downloadNotification = Tu descarga se completó.
 downloadFinish = Descarga completa
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } de { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Probar Firefox Send
-downloadingPageProgress = Descargando { $filename } ({ $size })
-downloadingPageMessage = Por favor, deja esta pestaña abierta mientras recibimos tu archivo y lo desciframos.
-errorAltText = Error de subida
 errorPageHeader = ¡Algo se fue a las pailas!
-errorPageMessage = Hubo un error al subir el archivo.
-errorPageLink = Enviar otro archivo
 fileTooBig = Ese archivo es muy grande para ser subido. Debiera tener un tamaño menor a { $size }.
 linkExpiredAlt = Enlace expirado
-expiredPageHeader = ¡Este enlace ha expirado o quizá jamás existió!
 notSupportedHeader = Tu navegador no está soportado.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Lamentablemente este navegador no soporta la tecnología web que potencia a Firefox Send. Deberás probar en otro navegador. ¡Recomendamos Firefox!
 notSupportedLink = ¿Por qué mi navegador no es soportado?
 notSupportedOutdatedDetail = Lamentablemente esta versión de Firefox no soporta la tecnología web que potencia a Firefox Send. Deberás actualizar tu navegador.
 updateFirefox = Actualizar Firefox
-downloadFirefoxButtonSub = Descarga gratuita
-uploadedFile = Archivo
-copyFileList = Copiar URL
-# expiryFileList is used as a column header
-expiryFileList = Expira en
-deleteFileList = Eliminar
-nevermindButton = Da lo mismo
-legalHeader = Términos y privacidad
-legalNoticeTestPilot = Firefox Send es actualmente un experimento de Test Pilot, y está sujeto a los <a>Términos del servicio</a> y la <a>Política de privacidad</a> de Test Pilot. Puedes aprender más sobre este experimento y su recolección de datos <a>aquí</a>.
-legalNoticeMozilla = El uso del sitio web de Firefox Send también está sujeto a la <a>Política de privacidad de sitios web</a> y los <a>Términos de uso de sitios web</a> de Mozilla.
-deletePopupText = ¿Eliminar este archivo?
-deletePopupYes = Sí
 deletePopupCancel = Cancelar
 deleteButtonHover = Eliminar
-copyUrlHover = Copiar URL
 footerLinkLegal = Legal
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Acerca de Test Pilot
 footerLinkPrivacy = Privacidad
-footerLinkTerms = Términos
 footerLinkCookies = Cookies
-requirePasswordCheckbox = Requerir una contraseña para descargar este archivo
-addPasswordButton = Añadir contraseña
-changePasswordButton = Cambiar
 passwordTryAgain = Contraseña incorrecta. Vuelve a intentarlo.
-reportIPInfringement = Reportar infracción de PI
 javascriptRequired = Firefox Send requiere JavaScript.
 whyJavascript = ¿Por qué Firefox Send requiere JavaScript?
 enableJavascript = Por favor, activa JavaScript y vuelve a intentarlo.
@@ -113,9 +41,107 @@ enableJavascript = Por favor, activa JavaScript y vuelve a intentarlo.
 expiresHoursMinutes = { $hours }h { $minutes }m
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
 expiresMinutes = { $minutes }m
-# A short status message shown when a password is successfully set
-passwordIsSet = Contraseña establecida
 # A short status message shown when the user enters a long password
 maxPasswordLength = Longitud máxima de la contraseña: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Esta contraseña no pudo ser establecida
+
+## 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 = Intercambio de archivos sencillo y privado
+introDescription = { -send-brand } te permite compartir archivos con cifrado de extremo a extremo y un enlace que expira automáticamente. Así puedes mantener lo que compartes en privado y asegurarte de que tus cosas no permanezcan en línea para siempre.
+notifyUploadEncryptDone = Tu archivo está cifrado y listo para enviar
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Expira después de { $downloadCount } o { $timespan }
+timespanMinutes =
+    { $num ->
+        [one] 1 minuto
+       *[other] { $num } minutos
+    }
+timespanDays =
+    { $num ->
+        [one] 1 día
+       *[other] { $num } días
+    }
+timespanWeeks =
+    { $num ->
+        [one] 1 semana
+       *[other] { $num } semanas
+    }
+fileCount =
+    { $num ->
+        [one] 1 archivo
+       *[other] { $num } archivos
+    }
+# 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 = Tamaño total: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Copiar el enlace para compartir el archivo:
+copyLinkButton = Copiar enlace
+downloadTitle = Bajando archivos
+downloadDescription = Este archivo fue compartido a través de { -send-brand } con cifrado de punto a punto y un enlace que expira automáticamente.
+trySendDescription = Prueba { -send-brand } para compartir archivos de forma sencilla y segura.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] Solo 1 archivo puede ser subido a la vez.
+       *[other] Solo { $count } archivos pueden ser subidos a la vez.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Solo 1 archivo está permitido.
+       *[other] Solo { $count } archivos están permitidos.
+    }
+expiredTitle = Este enlace ha expirado.
+notSupportedDescription = { -send-brand } no funcionará con este navegador. { -send-short-brand } funciona mejor con la última versión de { -firefox } y con la versión actual de la mayoría de los navegadores.
+downloadFirefox = Bajar { -firefox }
+legalTitle = Aviso de privacidad de { -send-short-brand }
+legalDateStamp = Versión 1.0 del 12 de marzo de 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 }h { $minutes }m
+addFilesButton = Selecciona los archivos a subir
+uploadButton = Subir
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Arrastra y suelta archivos
+# 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 = o haz clic para enviar hasta { $size }
+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
+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 }
+accountBenefitDownloadCount = Comparte archivos con más personas
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Mantener enlaces activos durante 1 día
+       *[other] Mantener enlaces activos durante { $count } días
+    }
+accountBenefitSync = Administrar los archivos compartidos desde cualquier dispositivo
+accountBenefitMoz = Aprender más acerca de otros servicios de { -mozilla }
+signOut = Salir
+okButton = Aceptar
+downloadingTitle = Bajando
+noStreamsWarning = Es posible que este navegador no pueda descifrar un archivo tan grande.
+noStreamsOptionCopy = Copiar el enlace para abrirlo en otro navegador
+noStreamsOptionFirefox = Prueba nuestro navegador favorito
+noStreamsOptionDownload = Continuar con este navegador
--- a/public/locales/es-ES/send.ftl
+++ b/public/locales/es-ES/send.ftl
@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = experimento web
 siteFeedback = Comentario
-uploadPageHeader = Compartir archivos cifrados y privados
-uploadPageExplainer = Envía archivos a través de un enlace cifrado, privado y seguro que caducará automáticamente para que tus datos no sean accesibles en línea de por vida.
-uploadPageLearnMore = Descubre más
-uploadPageDropMessage = Suelta aquí tu archivo para empezar a subirlo
-uploadPageSizeMessage = Para que la operación sea más segura, el archivo debería ocupar menos de 1GB
-uploadPageBrowseButton = Seleccionar un archivo en el equipo
-uploadPageBrowseButton1 = Seleccionar un archivo para subir
-uploadPageMultipleFilesAlert = Aún no se pueden subir varios archivos o una carpeta.
-uploadPageBrowseButtonTitle = Subir archivo
-uploadingPageProgress = Subiendo { $filename } ({ $size })
 importingFile = Importando...
-verifyingFile = Comprobando...
 encryptingFile = Encriptando...
 decryptingFile = Desencriptando...
-notifyUploadDone = La subida ha finalizado.
-uploadingPageMessage = Cuando se suba tu archivo podrás condigurar las opciones de caducidad.
-uploadingPageCancel = Cancelar subida
-uploadCancelNotification = Se canceló la subida.
-uploadingPageLargeFileMessage = El archivo es grande y puede tardar unos minutos en subirse. ¡Tómatelo con calma!
-uploadingFileNotification = Notificarme cuando se complete la subida.
-uploadSuccessConfirmHeader = Listo para enviar
-uploadSvgAlt = Subir
-uploadSuccessTimingHeader = El enlace al archivo caducará tras descargarlo una vez o en 24 horas.
-expireInfo = El enlace al archivo expirará tras { $downloadCount } o { $timespan }.
 downloadCount =
    { $num ->
        [one] 1 descarga
@@ -36,76 +14,26 @@ timespanHours =
        [one] 1 hora
       *[other] { $num } horas
    }
-copyUrlFormLabelWithName = Copiar y compartir el enlace para enviar tu archivo: { $filename }
-copyUrlFormButton = Copiar en el portapapeles
 copiedUrl = ¡Copiado!
-deleteFileButton = Eliminar archivo
-sendAnotherFileLink = Enviar otro archivo
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Descargar
-downloadsFileList = Descargas
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Fecha
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Descargar { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Introducir contraseña
 unlockInputPlaceholder = Contraseña
 unlockButtonLabel = Desbloquear
-downloadFileTitle = Descargar archivo encriptado
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Tu amigo te está enviando un archivo a través de Firefox Send, un servicio que te permite compartir archivos con un enlace seguro, privado y cifrado que caduca automáticamente para que tus cosas no sean accesibles en línea de por vida.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Descargar
-downloadNotification = Se completó la descarga.
 downloadFinish = Descarga completa
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } de { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Prueba Firefox Send
-downloadingPageProgress = Descargando { $filename } ({ $size })
-downloadingPageMessage = Deja esta pestaña abierta mientras buscamos tu archivo y lo desencriptamos.
-errorAltText = Error en la subida
 errorPageHeader = ¡Se produjo un error!
-errorPageMessage = Se produjo un error al subir el archivo.
-errorPageLink = Enviar otro archivo
 fileTooBig = Ese archivo es muy grande. Debería ocupar menos de { $size }.
 linkExpiredAlt = Enlace caducado
-expiredPageHeader = ¡El enlace ha caducado o nunca existió!
 notSupportedHeader = Tu navegador no está admitido.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Lamentablemente, este navegador no admite la tecnología web que necesita Firefox Send. Tendrás que probar otro navegador. ¡Te recomendamos Firefox!
 notSupportedLink = ¿Por qué no se admite mi navegador?
 notSupportedOutdatedDetail = Lamentablemente, esta versión de Firefox no admite la tecnología web que impulsa Firefox Send. Tendrás que actualizar tu navegador.
 updateFirefox = Actualizar Firefox
-downloadFirefoxButtonSub = Descarga gratuita
-uploadedFile = Archivo
-copyFileList = Copiar URL
-# expiryFileList is used as a column header
-expiryFileList = Caduca en
-deleteFileList = Eliminar
-nevermindButton = Da igual
-legalHeader = Términos y privacidad
-legalNoticeTestPilot = Firefox Send sigue siendo un experimento de Test Pilot y está sujero a las <a>Condiciones del servicio</a> y al <a>Aviso de privacidad</a> de Test Pilot. <a>Aquí</a> podrás descubrir más sobre este experimento y su recopilación de datos.
-legalNoticeMozilla = El uso de la página de Firefox Send también está sujeto al <a>Aviso de privacidad sobre sitios web</a> y a los <a>Términos de uso sobre sitios web</a>.
-deletePopupText = ¿Eliminar el archivo?
-deletePopupYes = Sí
 deletePopupCancel = Cancelar
 deleteButtonHover = Eliminar
-copyUrlHover = Copiar URL
 footerLinkLegal = Legal
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Sobre Test Pilot
 footerLinkPrivacy = Privacidad
-footerLinkTerms = Términos
 footerLinkCookies = Cookies
-requirePasswordCheckbox = Requerir una contraseña para descargar este archivo
-addPasswordButton = Añadir contraseña
-changePasswordButton = Cambiar
 passwordTryAgain = Contraseña incorrecta. Inténtelo de nuevo.
-reportIPInfringement = Denunciar vulneración de propiedad intelectual
 javascriptRequired = Firefox Send requiere JavaScript
 whyJavascript = ¿Por qué Firefox Send requiere JavaScript?
 enableJavascript = Por favor, activa JavaScript y vuelve a intentarlo.
@@ -113,20 +41,20 @@ enableJavascript = Por favor, activa JavaScript y vuelve a intentarlo.
 expiresHoursMinutes = { $hours }h { $minutes }m
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
 expiresMinutes = { $minutes }m
-# A short status message shown when a password is successfully set
-passwordIsSet = Contraseña establecida
 # A short status message shown when the user enters a long password
 maxPasswordLength = Longitud máxima de la contraseña: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = No se ha podido establecer la contraseña

-## New strings for the vNext version of Firefox Send
+## Send version 2 strings

 # Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
 -send-brand = Firefox Send
 -send-short-brand = Enviar
 -firefox = Firefox
 -mozilla = Mozilla
+introTitle = Compartir archivos de forma sencilla y privada
+introDescription = { -send-brand } te permite compartir archivos con cifrado de extremo a extremo y un enlace que caduca automáticamente. Así que puedes mantener lo que compartes en privado y asegurarte de que tus cosas no permanezcan en línea para siempre.
 notifyUploadEncryptDone = El archivo está cifrado y listo para enviar
 # downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
 archiveExpiryInfo = Caduca tras { $downloadCount } o { $timespan }
@@ -150,12 +78,24 @@ fileCount =
        [one] 1 archivo
       *[other] { $num } archivos
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Tamaño total: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Copiar el enlace para compartir el archivo:
 copyLinkButton = Copiar enlace
 downloadTitle = Descargar archivos
+downloadDescription = Este archivo se compartió a través de { -send-brand } con cifrado de extremo a extremo y un enlace que caduca automáticamente.
+trySendDescription = Prueba { -send-brand } para compartir archivos de forma sencilla y segura.
 # count will always be > 10
 tooManyFiles =
    { $count ->
@@ -169,6 +109,7 @@ tooManyArchives =
       *[other] Solo se permiten { $count } archivos.
    }
 expiredTitle = Este enlace ha expirado.
+notSupportedDescription = { -send-brand } no funciona con este navegador. { -send-short-brand } funciona mejor con la última versión de { -firefox }, y funciona con la última versión de la mayoría de los navegadores.
 downloadFirefox = Descargar { -firefox }
 legalTitle = Aviso de privacidad de { -send-short-brand }
 legalDateStamp = Versión 1.0 del 12 de marzo de 2019
@@ -179,15 +120,15 @@ uploadButton = Subir
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Arrastrar y soltar archivos
 # the second part of the string 'Drag and drop files or click to send up to 1GB'
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = o hacer clic para enviar hasta { $size }
 addPassword = Proteger con contraseña
 emailPlaceholder = Introducir dirección de correo
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $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
 accountBenefitTitle = Crear una cuenta { -firefox } o iniciar sesión
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Compartir archivos de hasta { $size }
 accountBenefitDownloadCount = Compartir archivos con más gente
 accountBenefitTimeLimit =
--- a/public/locales/eu/send.ftl
+++ b/public/locales/eu/send.ftl
@@ -22,6 +22,22 @@ downloadFinish = Deskarga burututa
 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
+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.
+updateFirefox = Eguneratu Firefox
+deletePopupCancel = Utzi
+deleteButtonHover = Ezabatu

 ## Send version 2 strings

+# byte abbreviation
+bytes = B
+# kibibyte abbreviation
+kb = KB
+# mebibyte abbreviation
+mb = MB
+# gibibyte abbreviation
+gb = GB
--- a/public/locales/hr/send.ftl
+++ b/public/locales/hr/send.ftl
@@ -84,7 +84,17 @@ fileCount =
        [few] { $num } datoteke
       *[other] { $num } datoteka
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Ukupna veličina: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Kopirajte poveznicu da biste podijelili svoju datoteku:
@@ -118,15 +128,15 @@ uploadButton = Prijenos
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Povucite i ispustite datoteke
 # the second part of the string 'Drag and drop files or click to send up to 1GB'
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = ili kliknite za slanje do { $size }
 addPassword = Zaštitite lozinkom
 emailPlaceholder = Unesite svoju adresu e-pošte
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $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
 accountBenefitTitle = Stvorite { -firefox } račun ili se prijavite
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Dijelite datoteke do { $size }
 accountBenefitDownloadCount = Dijelite datoteke s više osoba
 accountBenefitTimeLimit =
--- a/public/locales/ia/send.ftl
+++ b/public/locales/ia/send.ftl
@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = un experimento web
 siteFeedback = Reaction
-uploadPageHeader = Compartimento de files private e cryptate
-uploadPageExplainer = Invia files per un ligamine secur, private e cryptate que automaticamente expira pro assecurar que tu datos non resta in linea per sempre.
-uploadPageLearnMore = Saper plus
-uploadPageDropMessage = Depone ci tu file pro comenciar a lo cargar
-uploadPageSizeMessage = Pro evitar problemas, mantene tu file sub 1GB
-uploadPageBrowseButton = Elige un file sur tu computator
-uploadPageBrowseButton1 = Elige un file a cargar
-uploadPageMultipleFilesAlert = Le cargamento de plure files o de un dossier non es actualmente admittite.
-uploadPageBrowseButtonTitle = Cargar le file
-uploadingPageProgress = Cargamento de { $filename } ({ $size })
 importingFile = Importation…
-verifyingFile = Verifica…
 encryptingFile = Cryptation...
 decryptingFile = Decryptation…
-notifyUploadDone = Cargamento terminate
-uploadingPageMessage = Post cargate tu file, tu potera definir le optiones de expiration.
-uploadingPageCancel = Cancellar le cargamento
-uploadCancelNotification = Cargamento cancellate.
-uploadingPageLargeFileMessage = Iste file es grande e pote prender multe tempore pro le cargamento. Patientia!
-uploadingFileNotification = Notificar me quando le cargamento es complete.
-uploadSuccessConfirmHeader = Preste a inviar
-uploadSvgAlt = Cargamento
-uploadSuccessTimingHeader = Le ligamine a tu file expirara post un discargamento o in 24 horas.
-expireInfo = Le ligamine a tu file expirara post { $downloadCount } o { $timespan }
 downloadCount =
    { $num ->
        [one] discargamento
@@ -36,76 +14,26 @@ timespanHours =
        [one] hora
       *[other] horas
    }
-copyUrlFormLabelWithName = Copia e comparti le ligamine pro inviar tu file: { $filename }
-copyUrlFormButton = Copiar al area de transferentia
 copiedUrl = Copiate!
-deleteFileButton = Deler le file
-sendAnotherFileLink = Inviar un altere file
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Discargar
-downloadsFileList = Discargamentos
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Tempore
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Discargar { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Insere le contrasigno
 unlockInputPlaceholder = Contrasigno
 unlockButtonLabel = Disblocar
-downloadFileTitle = Discargar le file cryptate
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Tu amico te invia un file per Firefox Send, un servicio que te permitte de compartir files per un ligamine secur, private e cryptate, que expira automaticamente pro te assecurar que tu datos non resta online per sempre.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Discargar
-downloadNotification = Discargamento completate.
 downloadFinish = Discargamento completate
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } de { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Proba Firefox Send
-downloadingPageProgress = Discargamento de { $filename } ({ $size })
-downloadingPageMessage = Per favor lassa iste scheda aperte durante que nos prende tu file e lo decifra.
-errorAltText = Error de cargamento.
 errorPageHeader = Un error occurreva!
-errorPageMessage = Un error occurreva durante le cargamento del file.
-errorPageLink = Inviar un altere file
 fileTooBig = Iste file es troppo grande pro lo cargar. Illo debe ser inferior a { $size }.
 linkExpiredAlt = Ligamine expirate
-expiredPageHeader = Iste ligamine expirava o illo non existeva  jammais!
 notSupportedHeader = Tu navigator non es supportate
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Infelicemente iste navigator non supporta le nove technologias web que move Firefox Send. Tu besonia de probar un altere navigator. Nos recommenda Firefox!
 notSupportedLink = Perque iste navigator non es supportate?
 notSupportedOutdatedDetail = Infelicemente iste version de Firefox non supporta le nove technologias web que move Firefox Send. Tu besonia de actualisar tu navigator.
 updateFirefox = Actualisar Firefox
-downloadFirefoxButtonSub = Discargamento gratuite
-uploadedFile = File
-copyFileList = Copiar le URL
-# expiryFileList is used as a column header
-expiryFileList = Expira in
-deleteFileList = Deler
-nevermindButton = No, gratias
-legalHeader = Terminos & confidentialitate
-legalNoticeTestPilot = Firefox Send es actualmente un experimento pilota, e subjecte a <a>Terminos de servicio</a> e <a>Notification de confidentialitate</a> de Experimento pilota. Tu pote saper plus re iste experimento e su recolta de datos <a>hic</a>.
-legalNoticeMozilla = Le uso del sito web de Firefox Send es anque subjecte a <a>Notitia de confidentialitate de sito web</a> e <a>Terminos de servicio sito web</a>.
-deletePopupText = Deler iste file?
-deletePopupYes = Si
 deletePopupCancel = Cancellar
 deleteButtonHover = Deler
-copyUrlHover = Copiar le URL
 footerLinkLegal = Legal
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Re Test Pilot
 footerLinkPrivacy = Confidentialitate
-footerLinkTerms = Terminos
 footerLinkCookies = Cookies
-requirePasswordCheckbox = Requirer un contrasigno pro discargar iste file
-addPasswordButton = Adder contrasigno
-changePasswordButton = Cambiar
 passwordTryAgain = Contrasigno incorrecte. Retenta.
-reportIPInfringement = Reportar un violation de proprietate intellectual
 javascriptRequired = Firefox Send require JavaScript
 whyJavascript = Proque Firefox Send require JavaScript?
 enableJavascript = Por favor activa JavaScript e tenta novemente.
@@ -113,9 +41,94 @@ enableJavascript = Por favor activa JavaScript e tenta novemente.
 expiresHoursMinutes = { $hours }h { $minutes }m
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
 expiresMinutes = { $minutes }m
-# A short status message shown when a password is successfully set
-passwordIsSet = Configuration del contrasigno
 # A short status message shown when the user enters a long password
 maxPasswordLength = Maxime longor del contrasigno: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Iste contrasigno non pote ser definite
+
+## 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 = Comparti file in maniera confidential
+timespanMinutes =
+    { $num ->
+        [one] 1 minuta
+       *[other] { $num } minutas
+    }
+timespanDays =
+    { $num ->
+        [one] 1 die
+       *[other] { $num } dies
+    }
+timespanWeeks =
+    { $num ->
+        [one] 1 septimana
+       *[other] { $num } septimanas
+    }
+fileCount =
+    { $num ->
+        [one] 1 file
+       *[other] { $num } files
+    }
+# 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 = Dimension total: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Copia le ligamine pro compartir le file:
+copyLinkButton = Copiar ligamine
+downloadTitle = Discargar files
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] Solo 1 file al vice pote ser cargate.
+       *[other] Solo { $count } files al vice pote ser cargate.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Solo 1 archivo es consentite.
+       *[other] Solo { $count } archivos es consentite.
+    }
+expiredTitle = Iste ligamine ha expirate.
+downloadFirefox = Discargar { -firefox }
+legalTitle = Politica de confidentialitate de { -send-short-brand }
+legalDateStamp = Version 1.0 del 12 martio 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 }h { $minutes }m
+addFilesButton = Selige le files a cargar
+uploadButton = Cargar
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Traher e deponer files
+# 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 = o cliccar pro inviar usque { $size }
+addPassword = Proteger per contrasigno
+emailPlaceholder = Insere tu adresse email
+# $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
+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 }
+accountBenefitDownloadCount = Comparti files con plus de personas
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Retene active le ligamine pro 1 die
+       *[other] Retene active le ligamine pro { $count } dies
+    }
+signOut = Disconnecter
+okButton = OK
+downloadingTitle = Discargamento
--- a/public/locales/id/send.ftl
+++ b/public/locales/id/send.ftl
@@ -1,109 +1,37 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = eksperimen web
 siteFeedback = Saran
-uploadPageHeader = Pribadi, Berbagi Berkas Terenskripsi
-uploadPageExplainer = Kirim berkas melalui tautan yang aman, pribadi, dan terenkripsi yang secara otomatis kedaluwarsa untuk memastikan berkas Anda tidak daring selamanya.
-uploadPageLearnMore = Pelajari lebih lanjut
-uploadPageDropMessage = Lepas berkas Anda di sini untuk mulai mengunggah
-uploadPageSizeMessage = Untuk pengoperasian yang paling andal, sebaiknya jaga berkas Anda di bawah 1GB
-uploadPageBrowseButton = Pilih berkas pada komputer Anda
-uploadPageBrowseButton1 = Pilih berkas untuk diunggah
-uploadPageMultipleFilesAlert = Saat ini belum mendukung pengunggahan beberapa berkas atau folder.
-uploadPageBrowseButtonTitle = Unggah berkas
-uploadingPageProgress = Mengunggah { $filename } ({ $size })
 importingFile = Mengimpor…
-verifyingFile = Memverifikasi…
 encryptingFile = Mengenkripsi...
 decryptingFile = Mendekripsi...
-notifyUploadDone = Unggahan Anda telah selesai.
-uploadingPageMessage = Setelah berkas diunggah, Anda dapat mengatur pilihan kedaluwarsa.
-uploadingPageCancel = Batal unggah
-uploadCancelNotification = Unggahan Anda dibatalkan.
-uploadingPageLargeFileMessage = Berkas ini berukuran besar dan mungkin perlu beberapa saat untuk mengunggahnya. Silakan tunggu!
-uploadingFileNotification = Beri tahu saya ketika unggahan telah selesai.
-uploadSuccessConfirmHeader = Siap untuk Dikirim
-uploadSvgAlt = Unggah
-uploadSuccessTimingHeader = Tautan ke berkas Anda akan berakhir setelah 1 unduhan atau dalam 24 jam.
-expireInfo = Tautan ke berkas Anda akan kedaluwarsa setelah { $downloadCount } atau { $timespan }.
 downloadCount =
    { $num ->
-       *[other] { $number } unduhan
+       *[other] { $num } unduhan
    }
 timespanHours =
    { $num ->
-       *[other] { $number } jam
+       *[other] { $num } jam
    }
-copyUrlFormLabelWithName = Salin dan bagikan tautan untuk mengirim berkas Anda: { $filename }
-copyUrlFormButton = Salin ke papan klip
 copiedUrl = Tersalin!
-deleteFileButton = Hapus berkas
-sendAnotherFileLink = Kirim berkas lain
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Unduh
-downloadsFileList = Unduhan
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Waktu
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Unduh { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Masukkan Sandi
 unlockInputPlaceholder = Sandi
 unlockButtonLabel = Buka
-downloadFileTitle = Unduh Berkas Terenkripsi
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Teman Anda mengirimkan berkas dengan Firefox Send, layanan yang memungkinkan Anda berbagi berkas dengan tautan yang aman, pribadi, dan terenkripsi yang secara otomatis berakhir untuk memastikan berkas Anda tidak daring selamanya.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Unduh
-downloadNotification = Unduhan Anda telah selesai.
 downloadFinish = Unduhan Selesai
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } dari { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Coba Firefox Send
-downloadingPageProgress = Mengunduh { $filename } ({ $size })
-downloadingPageMessage = Sila biarkan tab ini terbuka sementara kami memproses berkas Anda dan mendekripsinya.
-errorAltText = Unggahan bermasalah
 errorPageHeader = Terjadi kesalahan!
-errorPageMessage = Terjadi kesalahan saat mengunggah berkas.
-errorPageLink = Kirim berkas lain
 fileTooBig = Berkas terlalu besar untuk diunggah. Harus kurang dari { $size }.
 linkExpiredAlt = Tautan kedaluwarsa
-expiredPageHeader = Tautan ini telah kedaluwarsa atau tidak pernah ada!
 notSupportedHeader = Peramban Anda tidak mendukung.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Sayangnya peramban ini tidak mendukung teknologi web yang menggerakkan Firefox Send. Anda perlu mencoba peramban lain. Kami merekomendasikan Firefox!
 notSupportedLink = Mengapa peramban saya tidak didukung?
 notSupportedOutdatedDetail = Sayangnya Firefox versi ini tidak mendukung teknologi web yang menggerakkan Firefox Send. Anda perlu memperbarui peramban Anda.
 updateFirefox = Perbarui Firefox
-downloadFirefoxButtonSub = Unduh Gratis
-uploadedFile = Berkas
-copyFileList = Salin URL
-# expiryFileList is used as a column header
-expiryFileList = Kedaluwarsa Pada
-deleteFileList = Hapus
-nevermindButton = Abaikan
-legalHeader = Syarat & Privasi
-legalNoticeTestPilot = Saat ini Firefox Send merupakan eksperimen Test Pilot, dan merupakan subyek dari <a>Ketentuan Layanan</a> dan <a>Pemberitahuan Privasi</a> Test Pilot. Anda dapat mempelajari lebih lanjut tentang eksperimen ini dan pengumpulan datanya <a>di sini</a>.
-legalNoticeMozilla = Penggunaan situs Firefox Send juga merupakan subyek dari <a>Pemberitahuan Privasi Situs Web</a> dan <a>Persyaratan Penggunaan Situs Web</a> Mozilla.
-deletePopupText = Hapus berkas ini?
-deletePopupYes = Ya
 deletePopupCancel = Batal
 deleteButtonHover = Hapus
-copyUrlHover = Salin URL
 footerLinkLegal = Legal
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Tentang Test Pilot
 footerLinkPrivacy = Privasi
-footerLinkTerms = Ketentuan
 footerLinkCookies = Kuki
-requirePasswordCheckbox = Membutuhkan sandi untuk mengunduh berkas ini
-addPasswordButton = Tambahkan Sandi
-changePasswordButton = Ubah
 passwordTryAgain = Sandi salah. Silakan coba lagi.
-reportIPInfringement = Laporkan Pelanggaran IP
 javascriptRequired = Firefox Send membutuhkan JavaScript.
 whyJavascript = Mengapa Firefox Send membutuhkan JavaScript?
 enableJavascript = Silakan aktifkan JavaScript dan coba lagi.
@@ -111,14 +39,12 @@ enableJavascript = Silakan aktifkan JavaScript dan coba lagi.
 expiresHoursMinutes = { $hours }j { $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 = Sandi diatur
 # A short status message shown when the user enters a long password
 maxPasswordLength = Panjang sandi maksimal: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Tidak bisa menyetel sandi ini

-## New strings for the vNext version of Firefox Send
+## Send version 2 strings

 # Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
 -send-brand = Firefox Send
@@ -132,21 +58,31 @@ notifyUploadEncryptDone = Berkas Anda terenkripsi dan siap untuk dikirim
 archiveExpiryInfo = Berakhir setelah { $downloadCount } atau { $timespan }
 timespanMinutes =
    { $num ->
-       *[other] menit
+       *[other] { $num } menit
    }
 timespanDays =
    { $num ->
-       *[other] hari
+       *[other] { $num } hari
    }
 timespanWeeks =
    { $num ->
-       *[other] pekan
+       *[other] { $num } pekan
    }
 fileCount =
    { $num ->
-       *[other] berkas
+       *[other] { $num } berkas
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Total ukuran: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Salin tautan untuk membagikan berkas Anda:
@@ -176,15 +112,15 @@ uploadButton = Unggah
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Seret dan jatuhkan berkas
 # the second part of the string 'Drag and drop files or click to send up to 1GB'
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = atau klik untuk mengirim hingga { $size }
 addPassword = Lindungi dengan kata sandi
 emailPlaceholder = Masukkan surel Anda
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Masuk untuk dapat mengirim hingga { $size }
 signInButton = Masuk/Daftar
 accountBenefitTitle = Buat { -firefox } Account atau masuk
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Bagikan berkas hingga { $size }
 accountBenefitDownloadCount = Bagikan berkas kepada lebih banyak orang
 accountBenefitTimeLimit =
--- a/public/locales/ja/send.ftl
+++ b/public/locales/ja/send.ftl
@@ -72,7 +72,17 @@ fileCount =
    { $num ->
       *[other] { $num } ファイル
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = 合計サイズ: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = リンクをコピーしてファイルを共有:
@@ -102,15 +112,15 @@ 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 a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = または、クリックして最大 { $size } のファイルを送信
 addPassword = パスワードで保護
 emailPlaceholder = メールアドレスを入力
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = ログインすると最大 { $size } のファイルを送信できます
 signInButton = ログイン/登録
 accountBenefitTitle = { -firefox } アカウントを作成またはログイン
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = 最大 { $size } までのファイルを共有
 accountBenefitDownloadCount = より多くの人とファイルを共有
 accountBenefitTimeLimit =
--- a/public/locales/ka/send.ftl
+++ b/public/locales/ka/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 = ყველაზე საიმედო მომსახურება, შეგიძლიათ ატვირთოთ არაუმეტეს 1GB ზომის ფაილი
-uploadPageBrowseButton = ფაილის არჩევა კომპიუტერიდან
-uploadPageBrowseButton1 = ფაილის არჩევა ასატვირთად
-uploadPageMultipleFilesAlert = ერთდროულად რამდენიმე ფაილის ან საქაღალდის ატვირთვა, ამჟამად არაა ხელმისაწვდომი.
-uploadPageBrowseButtonTitle = ფაილის ატვირთვა
-uploadingPageProgress = მიმდინარეობს ატვირთვა { $filename } ({ $size })
 importingFile = გადმოტანა...
-verifyingFile = დამოწმება...
 encryptingFile = დაშიფვრა...
 decryptingFile = გაშიფვრა...
-notifyUploadDone = ფაილის ატვირთვა დასრულებულია.
-uploadingPageMessage = ფაილის ატვირთვის შემდეგ, შეგიძლიათ მიუთითოთ შენახვის ვადა.
-uploadingPageCancel = ატვირთვის გაუქმება
-uploadCancelNotification = ფაილის ატვირთვა გაუქმებულია.
-uploadingPageLargeFileMessage = ფაილი დიდია და ატვირთვამ შესაძლოა დიდხანს გასტანოს. ასე რომ, მოკალათდით!
-uploadingFileNotification = შეტყობინება, ატვირთვის დასრულებისას.
-uploadSuccessConfirmHeader = მზადაა გასაგზავნად
-uploadSvgAlt = ატვირთვა
-uploadSuccessTimingHeader = ფაილს ვადა გაუვა 1 ჩამოტვირთვის ან 24 საათის მერე.
-expireInfo = ფაილის ბმულს, ვადა გაუვა { $downloadCount }, ან { $timespan } მერე.
 downloadCount =
    { $num ->
        [one] 1 ჩამოტვირთვა
@@ -36,76 +14,26 @@ timespanHours =
        [one] 1 საათი
       *[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 = შეიყვანეთ პაროლი
+copiedUrl = ასლი აღებულია!
 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-ის მუშაობისთვის. გესაჭიროებათ სხვა ბრაუზერი. ჩვენ შეგვიძლია გირჩიოთ Firefox!
 notSupportedLink = რატომ არაა ჩემი ბრაუზერი მხარდაჭერილი?
 notSupportedOutdatedDetail = სამწუხაროდ, Firefox-ის ამ ვერსიას არ გააჩნია ის ტექნოლოგია, რომელიც აუცილებელია Firefox Send-ის მუშაობისთვის. გესაჭიროებათ, ბრაუზერის განახლება.
 updateFirefox = Firefox-ის განახლება
-downloadFirefoxButtonSub = უფასო ჩამოტვირთვა
-uploadedFile = ფაილი
-copyFileList = URL-ბმულის ასლი
-# expiryFileList is used as a column header
-expiryFileList = ვადის გასვლის დრო
-deleteFileList = წაშლა
-nevermindButton = არ აქვს მნიშვნელობა
-legalHeader = პირობები და პირადულობა
-legalNoticeTestPilot = Firefox Send ამჟამად Test Pilot-ის საცდელი პროექტია და ექვემდებარება Test Pilot-ის <a>მომსახურების პირობებსა</a> და <a>პირადი მონაცემების დაცვის დებულებას</a>. ვრცლად, ამ საცდელი პროექტისა და მონაცემების აღრიცხვის შესახებ, შეგიძლიათ იხილოთ <a>აქ</a>.
-legalNoticeMozilla = Firefox Send ვებსაიტი, ასევე ექვემდებარება Mozilla-ს <a>ვებსაიტების პირადი მონაცემების შესახებ დებულებას</a> და <a>ვებსაიტების გამოყენების პირობებს</a>.
-deletePopupText = წაიშალოს ეს ფაილი?
-deletePopupYes = დიახ
 deletePopupCancel = გაუქმება
 deleteButtonHover = წაშლა
-copyUrlHover = URL-ს ასლი
 footerLinkLegal = სამართლებრივი საკითხები
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Test Pilot-ის შესახებ
 footerLinkPrivacy = პირადულობა
-footerLinkTerms = პირობები
 footerLinkCookies = ფუნთუშები
-requirePasswordCheckbox = პაროლის მოთხოვნა, ფაილის ჩამოტვირთვისას
-addPasswordButton = პაროლის დამატება
-changePasswordButton = შეცვლა
 passwordTryAgain = პაროლი არასწორია. სცადეთ ხელახლა.
-reportIPInfringement = მოხსენება დარღვევაზე
 javascriptRequired = Firefox Send საჭიროებს JavaScript-ს
 whyJavascript = რატომ საჭიროებს Firefox Send JavaScript-ს?
 enableJavascript = გთხოვთ ჩართოთ JavaScript და სცადოთ ხელახლა.
@@ -113,14 +41,12 @@ enableJavascript = გთხოვთ ჩართოთ JavaScript და ს
 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 = ამ პაროლის დაყენება ვერ ხერხდება

-## New strings for the vNext version of Firefox Send
+## Send version 2 strings

 # Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
 -send-brand = Firefox Send
@@ -152,13 +78,23 @@ fileCount =
        [one] 1 ფაილი
       *[other] { $num } ფაილი
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 }-ის საშუალებით, გამჭოლი დაშიფვრითა და ვადიანი ბმულით.
+downloadDescription = ფაილი გაზიარებულია { -send-brand }-ის საშუალებით, გამჭოლი დაშიფვრითა და ვადიანი ბმულით.
 trySendDescription = გამოსცადეთ { -send-brand }, ფაილების გაზიარება მარტივად, დაცულად.
 # count will always be > 10
 tooManyFiles =
@@ -184,15 +120,15 @@ 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 a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = ან დაწკაპეთ გასაგზავნად { $size }-მდე
 addPassword = პაროლით დაცვა
 emailPlaceholder = შეიყვანეთ ელფოსტა
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = შედით ანგარიშზე, რომ გაგზავნოთ { $size }-მდე
 signInButton = ანგარიშზე შესვლა/შექმნა
 accountBenefitTitle = შექმენით { -firefox }-ანგარიში ან შედით
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = გააზიარეთ ფაილები { $size }-მდე
 accountBenefitDownloadCount = გაუზიარეთ ფაილები მეტ ხალხს
 accountBenefitTimeLimit =
--- a/public/locales/ko/send.ftl
+++ b/public/locales/ko/send.ftl
@@ -1,103 +1,31 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = 웹 실험
 siteFeedback = 사용자 의견
-uploadPageHeader = 개인적이고, 암호화된 파일 공유
-uploadPageExplainer = 안전하고, 개인적이며, 암호화된 링크를 통해 파일을 공유하세요. 사용자의 파일이 더 이상 온라인 상에 남지 않도록 링크는 자동적으로 만료됩니다.
-uploadPageLearnMore = 더 알아보기
-uploadPageDropMessage = 파일을 끌어 놓아 업로드 시작
-uploadPageSizeMessage = 확실한 작동을 위해서, 파일의 크기가 1GB보다 작은 것이 좋음
-uploadPageBrowseButton = 컴퓨터의 파일을 선택
-uploadPageBrowseButton1 = 업로드 할 파일 선택
-uploadPageMultipleFilesAlert = 여러 개의 파일 또는 폴더를 업로드하는 것은 현재로선 지원되지 않습니다.
-uploadPageBrowseButtonTitle = 파일 업로드
-uploadingPageProgress = { $filename } ({ $size }) 업로드 중
 importingFile = 가져오는 중…
-verifyingFile = 확인하는 중…
 encryptingFile = 암호화 중…
 decryptingFile = 복호화 중…
-notifyUploadDone = 업로드가 완료되었습니다.
-uploadingPageMessage = 파일이 업로드 되고 나서 만료 옵션을 설정할 수 있습니다.
-uploadingPageCancel = 업로드 취소
-uploadCancelNotification = 업로드가 취소되었습니다.
-uploadingPageLargeFileMessage = 이 파일은 크기가 커서 시간이 다소 걸릴 수 있습니다. 잠시만 기다려주세요!
-uploadingFileNotification = 업로드가 완료되면 알림을 표시해 주세요.
-uploadSuccessConfirmHeader = 보낼 준비 완료
-uploadSvgAlt = 업로드
-uploadSuccessTimingHeader = 이 파일의 링크는 한 번의 다운로드 후 또는 24시간이 지난 뒤에 만료됩니다.
-expireInfo = 이 파일의 링크는 { $downloadCount }나 { $timespan } 후에 만료됩니다.
 downloadCount = 1 다운로드
 timespanHours = 1 시간
-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에 사용되는 웹 기술을 지원하지 않습니다. 다른 브라우저로 다시 시도해주세요. Firefox를 추천합니다!
 notSupportedLink = 왜 이 브라우저는 지원이 되지 않나요?
 notSupportedOutdatedDetail = 안타깝게도 현재 브라우저 버전에서는 Firefox Send에 사용되는 웹 기술을 지원하지 않습니다. 브라우저 업데이트가 필요합니다.
 updateFirefox = Firefox 업데이트
-downloadFirefoxButtonSub = 무료 다운로드
-uploadedFile = 파일
-copyFileList = URL 복사
-# expiryFileList is used as a column header
-expiryFileList = 만료기한
-deleteFileList = 삭제
-nevermindButton = 괜찮습니다
-legalHeader = 이용약관 & 개인정보 보호
-legalNoticeTestPilot = Firefox Send는 현재 Test Pilot 실험 중이고, Test Pilot <a>이용 약관</a>과 <a>개인정보 보호공지</a>가 적용됩니다. 이 실험과 데이터 수집에 관해서는 <a>여기</a>에서 더 알아볼 수 있습니다.
-legalNoticeMozilla = 또한, Firefox Send 웹사이트 사용에는 <a>웹사이트 개인정보 공지</a>와 <a>웹 사이트 이용약관</a>이 적용됩니다.
-deletePopupText = 이 파일을 지우시겠습니까?
-deletePopupYes = 예
 deletePopupCancel = 아니오
 deleteButtonHover = 삭제
-copyUrlHover = URL 복사
 footerLinkLegal = 법적 정보
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Test Pilot 정보
 footerLinkPrivacy = 개인정보 보호
-footerLinkTerms = 이용 약관
 footerLinkCookies = 쿠키
-requirePasswordCheckbox = 이 파일을 다운로드하려면 비밀번호가 필요함
-addPasswordButton = 비밀번호 추가
-changePasswordButton = 바꾸기
 passwordTryAgain = 비밀번호가 맞지 않습니다. 다시 시도해 주세요.
-reportIPInfringement = 지적 재산권 침해 신고
 javascriptRequired = Firefox Send는 자바스크립트를 필요로 합니다
 whyJavascript = 왜 Firefox Send에 자바스크립트가 필요하죠?
 enableJavascript = 자바스크립트를 활성화하고 다시 시도해 주세요.
@@ -105,9 +33,55 @@ 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 = 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 ->
+       *[other] { $num }분
+    }
+timespanDays =
+    { $num ->
+       *[other] { $num }일
+    }
+timespanWeeks =
+    { $num ->
+       *[other] { $num }주
+    }
+fileCount =
+    { $num ->
+       *[other] { $num } 파일
+    }
+# 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 = 전체 크기: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = 링크를 복사해서 파일을 공유하세요:
+copyLinkButton = 링크 복사
+downloadTitle = 파일 다운로드
+downloadFirefox = 다운로드 { -firefox }
+# 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 }분
--- a/public/locales/nn-NO/send.ftl
+++ b/public/locales/nn-NO/send.ftl
@@ -77,7 +77,17 @@ fileCount =
        [one] 1 fil
       *[other] { $num } filer
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Total storleik: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Kopier lenka for å dele fila di:
@@ -107,15 +117,15 @@ uploadButton = Last opp
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Dra og slepp filer
 # the second part of the string 'Drag and drop files or click to send up to 1GB'
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = eller klikk for å senda opp til { $size }
 addPassword = Vern med passord
 emailPlaceholder = Skriv inn e-postadressa di
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = LOgg inn for å senda opp til { $size }
 signInButton = Logg inn/Registrer deg
 accountBenefitTitle = Lag ein { -firefox }-konto eller logg inn
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Del filer opp til { $size }
 accountBenefitDownloadCount = Del filer med fleire personar
 accountBenefitTimeLimit =
--- a/public/locales/pl/send.ftl
+++ b/public/locales/pl/send.ftl
@@ -1,5 +1,52 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
+siteFeedback = Wyślij opinię
+importingFile = Importowanie…
+encryptingFile = Szyfrowanie…
+decryptingFile = Odszyfrowywanie…
+downloadCount =
+    { $num ->
+        [one] 1 pobraniu
+        [few] { $num } pobraniach
+       *[many] { $num } pobraniach
+    }
+timespanHours =
+    { $num ->
+        [one] godzinie
+        [few] { $num } godzinach
+       *[many] { $num } godzinach
+    }
+copiedUrl = Skopiowano
+unlockInputPlaceholder = Hasło
+unlockButtonLabel = Odblokuj
+downloadButtonLabel = Pobierz
+downloadFinish = Ukończono pobieranie
+fileSizeProgress = ({ $partialSize } z { $totalSize })
+sendYourFilesLink = Wypróbuj Firefox Send
+errorPageHeader = Coś się nie udało.
+fileTooBig = Ten plik jest za duży, aby go wysłać. Musi być mniejszy niż { $size }
+linkExpiredAlt = Odnośnik wygasł
+notSupportedHeader = Używana przeglądarka nie jest obsługiwana.
+notSupportedLink = Dlaczego ta przeglądarka nie jest obsługiwana?
+notSupportedOutdatedDetail = Ta wersja Firefoksa nie obsługuje technologii internetowej, która napędza Firefox Send. Należy uaktualnić przeglądarkę.
+updateFirefox = Uaktualnij Firefoksa
+deletePopupCancel = Anuluj
+deleteButtonHover = Usuń
+footerLinkLegal = Kwestie prawne
+footerLinkPrivacy = Prywatność
+footerLinkCookies = Ciasteczka
+passwordTryAgain = Niepoprawne hasło. Spróbuj ponownie.
+javascriptRequired = Firefox Send wymaga języka JavaScript
+whyJavascript = Dlaczego Firefox Send wymaga języka JavaScript?
+enableJavascript = Włącz obsługę języka JavaScript i spróbuj ponownie.
+# A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
+expiresHoursMinutes = { $hours } godz. { $minutes } min
+# A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
+expiresMinutes = { $minutes } min
+# A short status message shown when the user enters a long password
+maxPasswordLength = Maksymalna długość hasła: { $length }
+# A short status message shown when there was an error setting the password
+passwordSetError = Nie można ustawić tego hasła

 ## Send version 2 strings

@@ -8,6 +55,35 @@ title = Firefox Send
 -send-short-brand = Send
 -firefox = Firefox
 -mozilla = Mozilla
+introTitle = Proste, prywatne udostępnianie plików
+introDescription = { -send-brand } umożliwia udostępnianie plików za pomocą szyfrowania typu „end-to-end” i odnośników, które automatycznie wygasają. Dzięki temu możesz mieć pewność, że to co udostępniasz jest bezpieczne i nie pozostanie w Internecie na zawsze.
+notifyUploadEncryptDone = Plik jest zaszyfrowany i gotowy do wysłania
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Wygasa po { $downloadCount } lub { $timespan }
+timespanMinutes =
+    { $num ->
+        [one] minucie
+        [few] { $num } minutach
+       *[many] { $num } minutach
+    }
+timespanDays =
+    { $num ->
+        [one] dniu
+        [few] { $num } dniach
+       *[many] { $num } dniach
+    }
+timespanWeeks =
+    { $num ->
+        [one] tygodniu
+        [few] { $num } tygodniach
+       *[many] { $num } tygodniach
+    }
+fileCount =
+    { $num ->
+        [one] 1 plik
+        [few] { $num } pliki
+       *[many] { $num } plików
+    }
 # byte abbreviation
 bytes = B
 # kibibyte abbreviation
@@ -18,3 +94,63 @@ 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 = Całkowity rozmiar: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Skopiuj odnośnik, aby udostępnić plik:
+copyLinkButton = Kopiuj odnośnik
+downloadTitle = Pobierz pliki
+downloadDescription = Ten plik został udostępniony przez { -send-brand } za pomocą szyfrowania typu „end-to-end” i odnośnika, który automatycznie wygasa.
+trySendDescription = Wypróbuj { -send-brand }, aby prosto i bezpiecznie udostępniać pliki.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] Jednocześnie można wysyłać tylko jeden plik.
+        [few] Jednocześnie można wysyłać tylko { $count } pliki.
+       *[many] Jednocześnie można wysyłać tylko { $count } plików.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Dozwolone jest tylko jedno archiwum.
+        [few] Dozwolone są tylko { $count } archiwa.
+       *[many] Dozwolonych jest tylko { $count } archiwów.
+    }
+expiredTitle = Ten odnośnik wygasł.
+notSupportedDescription = { -send-brand } nie będzie działało w tej przeglądarce. { -send-short-brand } najlepiej działa w najnowszej wersji Firefoksa, ale będzie działać także w aktualnych wersjach większości przeglądarek.
+downloadFirefox = Pobierz Firefoksa
+legalTitle = Zasady ochrony prywatności serwisu { -send-short-brand }
+legalDateStamp = Wersja 1.0 z 12 marca 2019 r.
+# 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 } godz. { $minutes } min
+addFilesButton = Wybierz pliki do wysłania
+uploadButton = Wyślij
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Przeciągnij pliki
+# 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 = lub kliknij, aby wysłać do { $size }
+addPassword = Chroń hasłem
+emailPlaceholder = Wpisz adres e-mail
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = Zaloguj się, aby wysłać do { $size }
+signInButton = Zaloguj/zarejestruj się
+accountBenefitTitle = Utwórz konto Firefoksa lub zaloguj się
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = Udostępniaj pliki do { $size }
+accountBenefitDownloadCount = Udostępniaj pliki większej liczbie osób
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Odnośniki aktywne przez jeden dzień
+        [few] Odnośniki aktywne przez { $count } dni
+       *[many] Odnośniki aktywne przez { $count } dni
+    }
+accountBenefitSync = Zarządzaj udostępnionymi plikami z każdego urządzenia
+accountBenefitMoz = Poznaj inne serwisy Mozilli
+signOut = Wyloguj się
+okButton = OK
+downloadingTitle = Pobieranie
+noStreamsWarning = Ta przeglądarka może nie być w stanie odszyfrować tak dużego pliku.
+noStreamsOptionCopy = Skopiuj odnośnik, aby otworzyć w innej przeglądarce
+noStreamsOptionFirefox = Wypróbuj naszą ulubioną przeglądarkę
+noStreamsOptionDownload = Kontynuuj za pomocą tej przeglądarki
--- a/public/locales/ru/send.ftl
+++ b/public/locales/ru/send.ftl
@@ -84,7 +84,17 @@ fileCount =
        [few] { $num } файла
       *[other] { $num } файлов
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Скопируйте ссылку, чтобы поделиться своим файлом:
@@ -118,15 +128,15 @@ 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 a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = или щёлкните здесь, чтобы отправить их (до { $size })
 addPassword = Защитить паролем
 emailPlaceholder = Введите ваш адрес электронной почты
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Войдите, чтобы отправлять файлы до { $size }
 signInButton = Войти/Зарегистрироваться
 accountBenefitTitle = Создайте Аккаунт { -firefox } или войдите
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Делитесь файлами до { $size }
 accountBenefitDownloadCount = Делитесь файлами с несколькими людьми
 accountBenefitTimeLimit =
--- a/public/locales/sk/send.ftl
+++ b/public/locales/sk/send.ftl
@@ -84,7 +84,17 @@ fileCount =
        [few] { $num } súbory
       *[other] { $num } súborov
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Celková veľkosť: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Súbor môžete zdieľať pomocou tohto odkazu:
@@ -118,15 +128,15 @@ uploadButton = Nahrať
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Pretiahnutím súboru alebo kliknutím sem
 # the second part of the string 'Drag and drop files or click to send up to 1GB'
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = môžete poslať až { $size }
 addPassword = Chrániť heslom
 emailPlaceholder = Zadajte e-mailovú adresu
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Pre odoslanie súborov s veľkosťou až { $size }, sa, prosím, prihláste
 signInButton = Prihlásiť sa/Zaregistrovať sa
 accountBenefitTitle = Vytvorte si účet { -firefox } alebo sa prihláste
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Zdieľanie súborov s veľkosťou až { $size }
 accountBenefitDownloadCount = Zdieľanie súborov s viacerými ľuďmi
 accountBenefitTimeLimit =
--- a/public/locales/sv-SE/send.ftl
+++ b/public/locales/sv-SE/send.ftl
@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = webbexperiment
 siteFeedback = Återkoppling
-uploadPageHeader = Privat, krypterad fildelning
-uploadPageExplainer = Skicka filer via en säker, privat och krypterad länk som automatiskt upphör för att säkerställa att dina saker inte förblir på nätet för alltid.
-uploadPageLearnMore = Läs mer
-uploadPageDropMessage = Släpp filen här för att börja ladda upp
-uploadPageSizeMessage = För den mest tillförlitliga driften är det bäst att hålla din fil under 1 GB
-uploadPageBrowseButton = Välj en fil på din dator
-uploadPageBrowseButton1 = Välj en fil att ladda upp
-uploadPageMultipleFilesAlert = Överföring av flera filer eller en mapp stöds för närvarande inte.
-uploadPageBrowseButtonTitle = Ladda upp fil
-uploadingPageProgress = Laddar upp { $filename } ({ $size })
 importingFile = Importerar…
-verifyingFile = Verifierar…
 encryptingFile = Krypterar…
 decryptingFile = Avkodar…
-notifyUploadDone = Din uppladdning har slutförts.
-uploadingPageMessage = När din filuppladdning är klar kommer du att kunna ange alternativ för upphörande.
-uploadingPageCancel = Avbryt uppladdning
-uploadCancelNotification = Din uppladdning avbröts.
-uploadingPageLargeFileMessage = Den här filen är stor och kan ta ett tag att ladda upp. Ha tålamod!
-uploadingFileNotification = Meddela mig när uppladdningen är klar.
-uploadSuccessConfirmHeader = Klar för att skicka
-uploadSvgAlt = Ladda upp
-uploadSuccessTimingHeader = Länken till din fil upphör att gälla efter 1 nedladdning eller om 24 timmar.
-expireInfo = Länken till din fil upphör att gälla efter { $downloadCount } eller { $timespan }.
 downloadCount =
    { $num ->
        [one] 1 nedladdning
@@ -36,76 +14,26 @@ timespanHours =
        [one] 1 timme
       *[other] { $num } timmar
    }
-copyUrlFormLabelWithName = Kopiera och dela länken för att skicka din fil: { $filename }
-copyUrlFormButton = Kopiera till urklipp
 copiedUrl = Kopierad!
-deleteFileButton = Ta bort fil
-sendAnotherFileLink = Skicka en annan fil
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Ladda ner
-downloadsFileList = Nedladdningar
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Tid
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Ladda ner { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Ange lösenord
 unlockInputPlaceholder = Lösenord
 unlockButtonLabel = Lås upp
-downloadFileTitle = Hämta krypterad fil
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Din vän skickar dig en fil med Firefox Send, en tjänst som låter dig dela filer med en säker, privat och krypterad länk som automatiskt upphör för att säkerställa att dina saker inte förblir på nätet för alltid.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Ladda ner
-downloadNotification = Din nedladdning har slutförts.
 downloadFinish = Nedladdning klar
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } av { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Testa Firefox Send
-downloadingPageProgress = Laddar ner { $filename } ({ $size })
-downloadingPageMessage = Lämna den här fliken öppen medan vi laddar ner din fil och dekrypterar den.
-errorAltText = Uppladdningsfel
 errorPageHeader = Något gick fel!
-errorPageMessage = Det har uppstått ett fel vid uppladdning av filen.
-errorPageLink = Skicka en annan fil
 fileTooBig = Den filen är för stor för att ladda upp. Det ska vara mindre än { $size }.
 linkExpiredAlt = Länk upphörd
-expiredPageHeader = Den här länken har upphört eller har aldrig existerat i första hand!
 notSupportedHeader = Din webbläsare stöds inte.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Tyvärr stöder inte webbläsaren den webbteknologi som används av Firefox Send. Du måste försöka med en annan webbläsare. Vi rekommenderar Firefox!
 notSupportedLink = Varför stöds inte min webbläsare?
 notSupportedOutdatedDetail = Tyvärr stödjer den här versionen av Firefox inte webbtekniken som driver Firefox Send. Du måste uppdatera din webbläsare.
 updateFirefox = Uppdatera Firefox
-downloadFirefoxButtonSub = Gratis nedladdning
-uploadedFile = Fil
-copyFileList = Kopiera URL
-# expiryFileList is used as a column header
-expiryFileList = Upphör
-deleteFileList = Ta bort
-nevermindButton = Glöm det
-legalHeader = Villkor och sekretess
-legalNoticeTestPilot = Firefox Send är för närvarande ett Test Pilot experiment och omfattas av Test Pilots <a>användarvillkor</a> och <a>sekretesspolicy</a>. Du kan läsa dig mer om detta experiment och dess datainsamling <a>här</a>.
-legalNoticeMozilla = Användning av webbplatsen för Firefox Send är också föremål för Mozillas <a>sekretesspolicy för webbplatser</a> och <a>användarvillkor för webbplatser</a>.
-deletePopupText = Ta bort den här filen?
-deletePopupYes = Ja
 deletePopupCancel = Avbryt
 deleteButtonHover = Ta bort
-copyUrlHover = Kopiera URL
 footerLinkLegal = Juridisk information
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Om Test Pilot
 footerLinkPrivacy = Sekretess
-footerLinkTerms = Villkor
 footerLinkCookies = Kakor
-requirePasswordCheckbox = Kräver ett lösenord för att ladda ner den här filen
-addPasswordButton = Lägg till lösenord
-changePasswordButton = Ändra
 passwordTryAgain = Felaktigt lösenord. Försök igen.
-reportIPInfringement = Rapportera IP-överträdelse
 javascriptRequired = Firefox Send kräver JavaScript
 whyJavascript = Varför kräver Firefox Send JavaScript?
 enableJavascript = Aktivera JavaScript och försök igen.
@@ -113,14 +41,12 @@ enableJavascript = Aktivera JavaScript och försök igen.
 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 = Lösenord satt
 # A short status message shown when the user enters a long password
 maxPasswordLength = Maximal lösenordslängd: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Det här lösenordet kunde inte ställas in

-## New strings for the vNext version of Firefox Send
+## Send version 2 strings

 # Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
 -send-brand = Firefox Send
@@ -152,7 +78,17 @@ fileCount =
        [one] 1 fil
       *[other] { $num } filer
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Total storlek: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Kopiera länken för att dela din fil:
@@ -184,15 +120,15 @@ uploadButton = Ladda upp
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Dra och släpp filer
 # the second part of the string 'Drag and drop files or click to send up to 1GB'
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = eller klicka för att skicka upp till { $size }
 addPassword = Skydda med lösenord
 emailPlaceholder = Ange din e-postadress
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Logga in för att skicka upp till { $size }
 signInButton = Logga in/registrera dig
 accountBenefitTitle = Skapa ett { -firefox }-konto eller logga in
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Dela filer upp till { $size }
 accountBenefitDownloadCount = Dela filer med fler personer
 accountBenefitTimeLimit =
--- a/public/locales/uk/send.ftl
+++ b/public/locales/uk/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 = Для більш надійної роботи сервісу, розмір вашого файлу не має перевищувати 1ГБ.
-uploadPageBrowseButton = Виберіть файл на комп'ютері
-uploadPageBrowseButton1 = Виберіть файл для вивантаження
-uploadPageMultipleFilesAlert = Вивантаження кількох файлів чи тек на даний момент не підтримується.
-uploadPageBrowseButtonTitle = Вивантажити файл
-uploadingPageProgress = Вивантажуємо { $filename } ({ $size })
 importingFile = Імпортуємо...
-verifyingFile = Перевіряємо...
 encryptingFile = Шифруємо...
 decryptingFile = Розшифровуємо...
-notifyUploadDone = Ваше вивантаження завершено.
-uploadingPageMessage = Як тільки ваш вайл вивантажиться,ви зможете встановити термін зберігання.
-uploadingPageCancel = Скасувати вивантаження
-uploadCancelNotification = Ваше вивантаження було скасовано.
-uploadingPageLargeFileMessage = Цей файл доволі великий і його вивантаження може зайняти певний час. Тримайтеся!
-uploadingFileNotification = Сповістити мене, коли вивантаження буде готово.
-uploadSuccessConfirmHeader = Готовий до надсилання
-uploadSvgAlt = Вивантажити
-uploadSuccessTimingHeader = Час дії цього посилання закінчиться після 1 завантаження, або через 24 години.
-expireInfo = Посилання на ваш файл стане недійсним після { $downloadCount } файла, або через { $timespan }.
 downloadCount =
    { $num ->
        [one] 1 завантаження
@@ -38,76 +16,26 @@ timespanHours =
        [few] { $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 = Ваш друг надіслав файл за допомогою 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)".
+downloadFinish = Завантаження завершено
 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. Вам треба скористатися іншим браузером. Ми рекомендуємо Firefox!
 notSupportedLink = Чому мій браузер не підтримується?
 notSupportedOutdatedDetail = На жаль, ця версія Firefox не підтримує веб-технологію, завдяки якій працює Firefox Send. Вам потрібно оновити свій браузер.
 updateFirefox = Оновити Firefox
-downloadFirefoxButtonSub = Безкоштовне завантаження
-uploadedFile = Файл
-copyFileList = Копіювати URL
-# expiryFileList is used as a column header
-expiryFileList = Термін дії закінчується
-deleteFileList = Видалити
-nevermindButton = Не важливо
-legalHeader = Умови та конфіденційність
-legalNoticeTestPilot = Firefox Send в даний час є експериментом Test Pilot, і тому підпадає під <a>умови служби</a> і <a>повідомлення про приватність</a> Test Pilot. Ви можете дізнатись більше про цей експеримент і його збір даних <a>тут</a>.
-legalNoticeMozilla = Використання сайту Firefox Send також підпадає під <a>повідомлення про конфіденційність веб-сайтів</a> та <a>правила використання веб-сайтів</a> Mozilla.
-deletePopupText = Видалити цей файл?
-deletePopupYes = Так
 deletePopupCancel = Скасувати
 deleteButtonHover = Видалити
-copyUrlHover = Копіювати URL
 footerLinkLegal = Права
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Про Test Pilot
 footerLinkPrivacy = Приватність
-footerLinkTerms = Умови
 footerLinkCookies = Куки
-requirePasswordCheckbox = Вимагати пароль для завантаження цього файлу
-addPasswordButton = Додати пароль
-changePasswordButton = Змінити
 passwordTryAgain = Невірний пароль. Спробуйте знову.
-reportIPInfringement = Повідомити про порушення прав на інтелектуальну власність
 javascriptRequired = Firefox Send потребує JavaScript
 whyJavascript = Чому для Firefox Send потрібен JavaScript?
 enableJavascript = Будь ласка, увімкніть JavaScript та спробуйте знову.
@@ -115,14 +43,12 @@ enableJavascript = Будь ласка, увімкніть JavaScript та сп
 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 = Неможливо встановити цей пароль

-## New strings for the vNext version of Firefox Send
+## Send version 2 strings

 # Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
 -send-brand = Firefox Send
@@ -130,7 +56,7 @@ passwordSetError = Неможливо встановити цей пароль
 -firefox = Firefox
 -mozilla = Mozilla
 introTitle = Простий, приватний обмін файлами
-introDescription = { -send-brand } дозволяє обмінюватися файлами з використанням наскрізного шифрування та посиланнями з обмеженим терміном дії. Отже, ви можете можете бути певними, що ваші дані зберігаються приватно і не залишаються в мережі назавжди.
+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 }
@@ -158,10 +84,20 @@ fileCount =
        [few] { $num } файли
       *[other] { $num } файлів
    }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# 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 = Скопіюйте посилання, щоб надати спільний доступ до файлу:
+copyLinkDescription = Скопіюйте посилання для спільного доступу:
 copyLinkButton = Копіювати посилання
 downloadTitle = Завантажити файли
 downloadDescription = Цей файл було надіслано через { -send-brand } з використанням наскрізного шифрування і посиланням, що має обмежений термін дії.
@@ -192,22 +128,22 @@ 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 a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = або натисніть, щоб надіслати до { $size }
 addPassword = Захист паролем
 emailPlaceholder = Введіть свою електронну пошту
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Увійдіть, щоб надсилати файли розміром до { $size }
 signInButton = Вхід чи Реєстрація
 accountBenefitTitle = Створіть обліковий запис { -firefox } або увійдіть
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Обмінюйтесь файлами розміром до { $size }
 accountBenefitDownloadCount = Обмінюйтесь файлами з більшою кількістю людей
 accountBenefitTimeLimit =
    { $count ->
-        [one] Зберігати посилання активними протягом 1 дня
-        [few] Зберігати посилання активними протягом { $count } днів
-       *[other] Зберігати посилання активними протягом { $count } днів
+        [one] Зберігайте посилання активними протягом 1 дня
+        [few] Зберігайте посилання активними протягом { $count } днів
+       *[other] Зберігайте посилання активними протягом { $count } днів
    }
 accountBenefitSync = Керуйте спільними файлами з буль-якого пристрою
 accountBenefitMoz = Дізнайтеся про інші сервіси { -mozilla }
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /download/
--- a/scripts/bin/run-integration-test-circleci.sh
+++ b/scripts/bin/run-integration-test-circleci.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -ex
+
+GECKODRIVER_URL=$(
+  curl -s 'https://api.github.com/repos/mozilla/geckodriver/releases/latest' |
+  python -c "import sys, json; r = json.load(sys.stdin); print([a for a in r['assets'] if 'linux64' in a['name']][0]['browser_download_url']);"
+);
+
+
+curl -L -o geckodriver.tar.gz $GECKODRIVER_URL
+gunzip -c geckodriver.tar.gz | tar xopf -
+chmod +x geckodriver
+sudo mv geckodriver /bin
+geckodriver --version
+# Install pip
+sudo apt-get install python-pip
+sudo pip install --upgrade pip
+
+sudo pip install mozdownload mozinstall==1.15
+
+mkdir -p ~/project/firefox-downloads/
+find  ~/project/firefox-downloads/ -type f -mtime +90 -delete
+mozdownload --version latest --type daily --destination ~/project/firefox-downloads/firefox_nightly/
+
+export PATH=~/project/firefox:$PATH
+mozinstall $(ls -t firefox-downloads/firefox_nightly/*.tar.bz2 | head -1)
+firefox --version
+ npm run circleci-test-integration
--- a/server/layout.js
+++ b/server/layout.js
@@ -9,6 +9,8 @@ module.exports = function(state, body = '') {
      <head>
        <title>${state.title}</title>
        <base href="/" />
+        <meta name="robots" content="${state.robots},noarchive" />
+        <meta name="google" content="nositelinkssearchbox" />
        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
        <meta charset="utf-8" />
        <meta name="viewport" content="width=device-width, initial-scale=1" />
--- a/server/middleware/auth.js
+++ b/server/middleware/auth.js
@@ -1,3 +1,4 @@
+const assert = require('assert');
 const crypto = require('crypto');
 const storage = require('../storage');
 const fxa = require('../fxa');
@@ -19,7 +20,7 @@ module.exports = {
        );
        hmac.update(Buffer.from(meta.nonce, 'base64'));
        const verifyHash = hmac.digest();
-        if (verifyHash.equals(Buffer.from(auth, 'base64'))) {
+        if (crypto.timingSafeEqual(verifyHash, Buffer.from(auth, 'base64'))) {
          req.nonce = crypto.randomBytes(16).toString('base64');
          storage.setField(id, 'nonce', req.nonce);
          res.set('WWW-Authenticate', `send-v1 ${req.nonce}`);
@@ -48,7 +49,11 @@ module.exports = {
        if (!req.meta) {
          return res.sendStatus(404);
        }
-        req.authorized = req.meta.owner === ownerToken;
+        const metaOwner = Buffer.from(req.meta.owner, 'utf8');
+        const owner = Buffer.from(ownerToken, 'utf8');
+        assert(metaOwner.length > 0);
+        assert(metaOwner.length === owner.length);
+        req.authorized = crypto.timingSafeEqual(metaOwner, owner);
      } catch (e) {
        req.authorized = false;
      }
--- a/server/state.js
+++ b/server/state.js
@@ -7,6 +7,10 @@ const { getFxaConfig } = require('./fxa');
 module.exports = async function(req) {
  const locale = req.language || 'en-US';
  let authConfig = null;
+  let robots = 'none';
+  if (req.route && req.route.path === '/') {
+    robots = 'all';
+  }
  if (config.fxa_client_id) {
    try {
      authConfig = await getFxaConfig();
@@ -33,6 +37,7 @@ module.exports = async function(req) {
    fileInfo: {},
    cspNonce: req.cspNonce,
    user: { avatar: assets.get('user.svg'), loggedIn: false },
+    robots,
    authConfig,
    layout
  };
--- a/test/backend/owner-tests.js
+++ b/test/backend/owner-tests.js
@@ -32,7 +32,7 @@ describe('Owner Middleware', function() {
    const next = sinon.stub();
    storage.metadata.returns(Promise.resolve(null));
    const res = response();
-    await ownerMiddleware(request('x', 'y'), res);
+    await ownerMiddleware(request('a', 'y'), res, next);
    sinon.assert.notCalled(next);
    sinon.assert.calledWith(res.sendStatus, 404);
  });
@@ -42,7 +42,7 @@ describe('Owner Middleware', function() {
    const meta = { owner: 'y' };
    storage.metadata.returns(Promise.resolve(meta));
    const res = response();
-    await ownerMiddleware(request('x', null), res);
+    await ownerMiddleware(request('b', null), res, next);
    sinon.assert.notCalled(next);
    sinon.assert.calledWith(res.sendStatus, 401);
  });
@@ -52,7 +52,7 @@ describe('Owner Middleware', function() {
    const meta = { owner: 'y' };
    storage.metadata.returns(Promise.resolve(meta));
    const res = response();
-    await ownerMiddleware(request('x', 'z'), res);
+    await ownerMiddleware(request('c', 'z'), res, next);
    sinon.assert.notCalled(next);
    sinon.assert.calledWith(res.sendStatus, 401);
  });
@@ -61,7 +61,7 @@ describe('Owner Middleware', function() {
    const next = sinon.stub();
    storage.metadata.returns(Promise.reject(new Error()));
    const res = response();
-    await ownerMiddleware(request('x', 'y'), res);
+    await ownerMiddleware(request('d', 'y'), res, next);
    sinon.assert.notCalled(next);
    sinon.assert.calledWith(res.sendStatus, 401);
  });
@@ -70,7 +70,7 @@ describe('Owner Middleware', function() {
    const next = sinon.stub();
    const meta = { owner: 'y' };
    storage.metadata.returns(Promise.resolve(meta));
-    const req = request('x', 'y');
+    const req = request('e', 'y');
    const res = response();
    await ownerMiddleware(req, res, next);
    assert.equal(req.meta, meta);
--- a/test/integration/download-tests.js
+++ b/test/integration/download-tests.js
@@ -51,9 +51,35 @@ describe('Firefox Send', function() {
    browser.waitForExist(downloadPage.downloadComplete);
    browser.back();
    browser.waitForExist('send-archive');
-    assert.equal(
-      browser.getText('send-archive > div:first-of-type').substring(0, 24),
-      'Expires after 1 download'
+    assert(
+      browser
+        .getText('send-archive > div:first-of-type')
+        .includes('Expires after 1 download')
    );
  });
+
+  it('should ensure that the downloaded file size matches the uploaded file size', function() {
+    browser.chooseFile(
+      homePage.uploadInput,
+      `${testFilesPath}/${testFiles[0]}`
+    );
+    // get the file size for upload
+    const uploadSize = fs.statSync(`${testFilesPath}/${testFiles[0]}`).size;
+
+    browser.waitForExist(homePage.uploadButton);
+    browser.click(homePage.uploadButton);
+
+    browser.waitForExist(homePage.shareUrl);
+    const downloadPage = new DownloadPage(browser.getValue(homePage.shareUrl));
+    downloadPage.open();
+    downloadPage.download();
+    browser.waitForExist(downloadPage.downloadComplete);
+
+    // get the file size for download
+    const downloadFile = path.join(downloadDir, `${testFiles[0]}`);
+    const downloadSize = fs.statSync(downloadFile).size;
+
+    // check if upload and download file sizes are equal
+    assert.equal(uploadSize, downloadSize);
+  });
 });
--- a/test/integration/homepage-tests.js
+++ b/test/integration/homepage-tests.js
@@ -3,12 +3,16 @@ const assert = require('assert');
 const HomePage = require('./pages/desktop/home_page');

 describe('Firefox Send homepage', function() {
+  this.retries(2);
  const homePage = new HomePage();
  const baseUrl = browser.options['baseUrl'];
  const footerLinks = ['mozilla', 'legal', 'legal', 'cookies', 'github'];

  beforeEach(function() {
    homePage.open();
+    if (process.env.ANDROID) {
+      this.skip();
+    }
  });

  it('should have the right title', function() {
--- a/test/wdio.circleci.conf.js
+++ b/test/wdio.circleci.conf.js
@@ -1,6 +1,5 @@
 // eslint-disable-next-line node/no-extraneous-require
 const ip = require('ip');
-const path = require('path');
 const common = require('./wdio.common.conf');

 /*/
@@ -11,8 +10,7 @@ Config for running selenium from a circleci docker container against localhost

 exports.config = Object.assign({}, common.config, {
  baseUrl: `http://${ip.address()}:8000`,
-  exclude: [path.join(__dirname, './integration/download-tests.js')],
  maxInstances: 1,
  bail: 1,
-  services: [require('./testServer')]
+  services: [require('./testServer'), 'selenium-standalone']
 });
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -40,7 +40,7 @@ const serviceWorker = {
        test: /\.(png|jpg)$/,
        loader: 'file-loader',
        options: {
-          name: '[name].[hash:8].[ext]'
+          name: '[name].[contenthash:8].[ext]'
        }
      },
      {
@@ -49,7 +49,7 @@ const serviceWorker = {
          {
            loader: 'file-loader',
            options: {
-              name: '[name].[hash:8].[ext]'
+              name: '[name].[contenthash:8].[ext]'
            }
          },
          {
@@ -82,7 +82,8 @@ const web = {
    ios: ['./ios/ios.js']
  },
  output: {
-    filename: '[name].[hash:8].js',
+    chunkFilename: '[name].[contenthash:8].js',
+    filename: '[name].[contenthash:8].js',
    path: path.resolve(__dirname, 'dist')
  },
  module: {
@@ -124,7 +125,7 @@ const web = {
        test: /\.(png|jpg)$/,
        loader: 'file-loader',
        options: {
-          name: '[name].[hash:8].[ext]'
+          name: '[name].[contenthash:8].[ext]'
        }
      },
      {
@@ -133,7 +134,7 @@ const web = {
          {
            loader: 'file-loader',
            options: {
-              name: '[name].[hash:8].[ext]'
+              name: '[name].[contenthash:8].[ext]'
            }
          },
          {
@@ -189,7 +190,7 @@ const web = {
    new webpack.EnvironmentPlugin(['NODE_ENV']),
    new webpack.IgnorePlugin(/\.\.\/dist/), // used in common/*.js
    new ExtractTextPlugin({
-      filename: '[name].[hash:8].css'
+      filename: '[name].[md5:contenthash:8].css'
    }),
    new VersionPlugin(), // used for the /__version__ route
    new AndroidIndexPlugin(),
Author	SHA1	Message	Date
Danny Coates	cbd7a99e38	v3.0.8	2019-03-18 16:26:12 -07:00
Danny Coates	6a5960c254	updated CONTRIBUTORS	2019-03-18 15:38:28 -07:00
Danny Coates	b70cbd8359	Merge pull request #1259 from co16353sidak/patch-1 Updated file size limit (as of March 2019)	2019-03-18 15:33:35 -07:00
Danny Coates	ad72fa11a4	added locales to production	2019-03-18 15:26:06 -07:00
Danny Coates	cc9a5d112a	added entrypoint param to fxa auth request	2019-03-18 15:01:01 -07:00
Danny Coates	122867b926	updated webcrypto-liner	2019-03-18 12:43:20 -07:00
Michal Stanke	3f7d755070	Pontoon: Update Czech (cs) localization of Firefox Send Localization authors: - Michal Stanke <mstanke@mozilla.cz>	2019-03-18 18:11:34 +00:00
Danny Coates	ad9070b7c6	changed webpack output filenames to use contenthash	2019-03-17 19:21:28 -07:00
Sidak Singh Aulakh	30678b824b	Updated file size limit (as of March 2019) The file size limit was previously marked as 2 hours, but now it supports 2.5GB (1GB for non signed in users)	2019-03-17 21:44:01 +05:30
josotrix	5dedad8ae7	Pontoon: Update Spanish (Chile) (es-CL) localization of Firefox Send Localization authors: - josotrix <josotrix@ravmn.cl> - ravmn <ravmn@ravmn.cl>	2019-03-17 15:53:11 +00:00
victor.gonzalezro	748f8cc7f8	Pontoon: Update Spanish (Chile) (es-CL) localization of Firefox Send Localization authors: - victor.gonzalezro <victor.gonzalezro@gmail.com> - josotrix <josotrix@ravmn.cl>	2019-03-16 19:51:52 +00:00
Victor Bychek	be9b51adbb	Pontoon: Update Russian (ru) localization of Firefox Send Localization authors: - MytnikAA <MytnikAA@gmail.com> - Victor Bychek <a@bychek.ru>	2019-03-16 16:32:15 +00:00
Danny Coates	7f13d4d9b6	fixed incorrect uncompressed size in zip	2019-03-16 09:19:28 -07:00
Edi Santoso	0e81ef2514	Pontoon: Update Indonesian (id) localization of Firefox Send Localization authors: - Edi Santoso <repopamor@gmail.com>	2019-03-16 14:12:13 +00:00
Björn I	b0907095e4	Pontoon: Update Norwegian Nynorsk (nn-NO) localization of Firefox Send Localization authors: - Björn I. <bjorni.svindseth@yahoo.com>	2019-03-16 12:12:58 +00:00
Piotr Drąg	c4cc736cff	Pontoon: Update Polish (pl) localization of Firefox Send Localization authors: - tomowoj <tomowoj@gmail.com> - Piotr Drąg <piotrdrag@gmail.com> - Paweł <bauerp@bauerp.info>	2019-03-16 11:18:13 +00:00
Piotr Drąg	c4118c5684	Pontoon: Update Polish (pl) localization of Firefox Send Localization authors: - tomowoj <tomowoj@gmail.com> - Piotr Drąg <piotrdrag@gmail.com> - Paweł <bauerp@bauerp.info>	2019-03-16 10:52:16 +00:00
Jakob Kappel	fad35cf8fc	Pontoon: Update Danish (da) localization of Firefox Send Localization authors: - Jakob Kappel <jakobkpetersen@gmail.com>	2019-03-16 09:32:00 +00:00
Edi Santoso	062cbbd1f8	Pontoon: Update Indonesian (id) localization of Firefox Send Localization authors: - Francesco Lodolo <francesco.lodolo@mozillaitalia.org> - Edi Santoso <repopamor@gmail.com>	2019-03-16 06:32:00 +00:00
dskmori	f200bd51d2	Pontoon: Update Japanese (ja) localization of Firefox Send Localization authors: - dskmori <ghoti.fish.dsk@gmail.com>	2019-03-16 02:52:18 +00:00
Enol	152616574f	Pontoon: Update Asturian (ast) localization of Firefox Send Localization authors: - Enol <enolp@softastur.org>	2019-03-15 18:52:57 +00:00
Enol	822fcb363d	Pontoon: Update Asturian (ast) localization of Firefox Send Localization authors: - Enol <enolp@softastur.org>	2019-03-15 18:32:08 +00:00
Enol	e1c6e59495	Pontoon: Update Asturian (ast) localization of Firefox Send Localization authors: - Enol <enolp@softastur.org>	2019-03-15 18:12:41 +00:00
Danny Coates	d42d8f8b75	v3.0.7	2019-03-15 09:40:03 -07:00
Danny Coates	ebbb1d05d2	use crypto.timingSafeEqual in hmac and ownerToken authentication	2019-03-14 22:09:34 -07:00
Melo46	67b55d1477	Pontoon: Update Interlingua (ia) localization of Firefox Send Localization authors: - Melo46 <melo@carmu.com>	2019-03-14 23:52:14 +00:00
Danny Coates	e3391ca823	Merge pull request #1242 from mgalicer/fix-1130 [Integration-Test] Add test to ensure that file size stays consistent	2019-03-14 14:54:37 -07:00
ravmn	0cac3bd0dc	Pontoon: Update Spanish (Chile) (es-CL) localization of Firefox Send Localization authors: - victor.gonzalezro <victor.gonzalezro@gmail.com> - josotrix <josotrix@ravmn.cl> - ravmn <ravmn@ravmn.cl>	2019-03-14 21:52:00 +00:00
Juan Sián	78de0b7a22	Pontoon: Update Kaqchikel (cak) localization of Firefox Send Localization authors: - Juan Sián <ajtzibsyan@yahoo.com>	2019-03-14 21:51:56 +00:00
Juraj Cigáň	14308dc491	Pontoon: Update Slovak (sk) localization of Firefox Send Localization authors: - Juraj Cigáň <kusavica@gmail.com>	2019-03-14 21:31:50 +00:00
Danny Coates	f690e4a705	v3.0.6	2019-03-14 13:19:25 -07:00
Danny Coates	3e14d3049d	only index / route	2019-03-14 13:17:47 -07:00
Danny Coates	6a6f8b86e4	v3.0.5	2019-03-14 12:04:01 -07:00
Danny Coates	c4891c3866	fixed req.route bug when no routes match	2019-03-14 12:02:36 -07:00
Danny Coates	5d0d5ef858	v3.0.4	2019-03-14 11:44:42 -07:00
Danny Coates	4e26c6ab75	added robots meta tag	2019-03-14 11:40:01 -07:00
julenx	7413a3336a	Pontoon: Update Basque (eu) localization of Firefox Send Localization authors: - p.sanroman.bengoetxea <p.sanroman.bengoetxea@gmail.com> - julenx <julenx@gmail.com> - Ander Elortondo <ander.elor@gmail.com>	2019-03-14 17:52:22 +00:00
Artem Polivanchuk	ef825206a4	Pontoon: Update Ukrainian (uk) localization of Firefox Send Localization authors: - Artem Polivanchuk <artem@mozilla.org.ua>	2019-03-14 15:11:51 +00:00
stripTM	f6a2e3ef53	Pontoon: Update Spanish (Spain) (es-ES) localization of Firefox Send Localization authors: - avelper <avelper@mozilla-hispano.org> - stripTM <striptm@yahoo.com>	2019-03-14 12:32:53 +00:00
Rhoslyn Prys	98bf370ccb	Pontoon: Update Welsh (cy) localization of Firefox Send Localization authors: - Rhoslyn Prys <rprys@posteo.net>	2019-03-14 08:51:39 +00:00
Mikeyy	1e9e9d6494	Pontoon: Update Croatian (hr) localization of Firefox Send Localization authors: - Mikeyy <mihovil@miho.im>	2019-03-14 08:32:08 +00:00
Artem Polivanchuk	c698b39d5c	Pontoon: Update Ukrainian (uk) localization of Firefox Send Localization authors: - Artem Polivanchuk <artem@mozilla.org.ua>	2019-03-14 07:13:37 +00:00
Melo46	109ee6aa29	Pontoon: Update Interlingua (ia) localization of Firefox Send Localization authors: - Melo46 <melo@carmu.com>	2019-03-14 05:32:26 +00:00
Melo46	fe9ed5f001	Pontoon: Update Interlingua (ia) localization of Firefox Send Localization authors: - Melo46 <melo@carmu.com>	2019-03-14 05:16:00 +00:00
Hyeonseok Shin	84d74a096c	Pontoon: Update Korean (ko) localization of Firefox Send Localization authors: - Hyeonseok Shin <hyeonseok@gmail.com> - dskmori <ghoti.fish.dsk@gmail.com>	2019-03-14 02:12:19 +00:00
victor.gonzalezro	770d276f6d	Pontoon: Update Spanish (Chile) (es-CL) localization of Firefox Send Localization authors: - victor.gonzalezro <victor.gonzalezro@gmail.com> - ravmn <ravmn@ravmn.cl>	2019-03-14 00:32:17 +00:00
G12r	ddf69120e8	Pontoon: Update Georgian (ka) localization of Firefox Send Localization authors: - G12r <georgianization@outlook.com>	2019-03-14 00:32:15 +00:00
G12r	6c583e09a7	Pontoon: Update Georgian (ka) localization of Firefox Send Localization authors: - G12r <georgianization@outlook.com>	2019-03-14 00:11:37 +00:00
Danny Coates	677ff65e8d	Merge pull request #1227 from jrbenny35/run-download-tests-on-ci Update config for running download tests on CI	2019-03-13 16:11:34 -07:00
Anika Dorn	8445657b72	Pontoon: Update German (de) localization of Firefox Send Localization authors: - Anika Dorn <adorn@mozilla.com>	2019-03-13 20:53:06 +00:00
Andreas Pettersson	33ef1f33a5	Pontoon: Update Swedish (sv-SE) localization of Firefox Send Localization authors: - Andreas Pettersson <az@kth.se>	2019-03-13 20:32:15 +00:00
Anika Dorn	ff79662b72	Pontoon: Update German (de) localization of Firefox Send Localization authors: - Anika Dorn <adorn@mozilla.com>	2019-03-13 20:32:13 +00:00
marigalicer	0012dec277	[Integration-Test] Add test to ensure that file size stays consistent fixes #1130	2019-03-13 16:03:44 -04:00
Benjamin Forehand Jr	3f8ebdaf4b	Remove extra changes from package.json.	2019-03-13 10:02:36 -04:00
Benjamin Forehand Jr	6559afba37	Fix port.	2019-03-12 20:56:31 -04:00
Benjamin Forehand Jr	f07988426b	Fix permissions.	2019-03-12 20:52:41 -04:00
Benjamin Forehand Jr	bada0707c5	Update config for running download tests on CI	2019-03-12 20:47:54 -04:00