bump version

Promote the beefy UI to default

.nsprc

@@ -0,0 +1,3 @@
+{
+  "exceptions": ["https://nodesecurity.io/advisories/534"]
+}

README.md

@@ -7,6 +7,20 @@
 
 ---
 
+## Table of Contents
+
+* [What it does](#what-it-does)
+* [Requirements](#requirements)
+* [Development](#development)
+* [Commands](#commands)
+* [Configuration](#configuration)
+* [Localization](#localization)
+* [Contributing](#contributing)
+* [Testing](#testing)
+* [License](#license)
+
+---
+
 ## What it does
 
 A file sharing experiment which allows you to send encrypted files to other users.

app/experiments.js

@@ -1,38 +1,9 @@
 import hash from 'string-hash';
 
-const experiments = {
-  '5YHCzn2CQTmBwWwTmZupBA': {
-    id: '5YHCzn2CQTmBwWwTmZupBA',
-    run: function(variant, state, emitter) {
-      state.experiment = {
-        xid: this.id,
-        xvar: variant
-      };
-      // Beefy UI
-      if (variant === 1) {
-        state.config.uploadWindowStyle = 'upload-window upload-window-b';
-        state.config.uploadButtonStyle = 'btn browse browse-b';
-      } else {
-        state.config.uploadWindowStyle = 'upload-window';
-        state.config.uploadButtonStyle = 'btn browse';
-      }
-      emitter.emit('render');
-    },
-    eligible: function(state) {
-      return this.luckyNumber(state) >= 0.5;
-    },
-    variant: function(state) {
-      return this.luckyNumber(state) < 0.75 ? 0 : 1;
-    },
-    luckyNumber: function(state) {
-      return luckyNumber(
-        `${this.id}:${state.storage.get('testpilot_ga__cid')}`
-      );
-    }
-  }
-};
+const experiments = {};
 
 //Returns a number between 0 and 1
+// eslint-disable-next-line no-unused-vars
 function luckyNumber(str) {
   return hash(str) / 0xffffffff;
 }

app/fileManager.js

@@ -135,6 +135,7 @@ export default function(state, emitter) {
       const time = Date.now() - start;
       const speed = size / (time / 1000);
       metrics.completedUpload({ size, time, speed, type });
+      document.getElementById('cancel-upload').hidden = 'hidden';
       await delay(1000);
       await fadeOut('upload-progress');
       info.name = file.name;

app/main.js

@@ -20,10 +20,6 @@ app.use((state, emitter) => {
   state.translate = locale.getTranslator();
   state.storage = storage;
   state.raven = Raven;
-  state.config = {
-    uploadWindowStyle: 'upload-window',
-    uploadButtonStyle: 'browse btn'
-  };
   emitter.on('DOMContentLoaded', async () => {
     if (
       /firefox/i.test(navigator.userAgent) &&

app/templates/welcome.js

@@ -13,8 +13,7 @@ module.exports = function(state, emit) {
         'uploadPageLearnMore'
       )}</a>
     </div>
-    <div class="${state.config
-      .uploadWindowStyle}" ondragover=${dragover} ondragleave=${dragleave}>
+    <div class="upload-window" ondragover=${dragover} ondragleave=${dragleave}>
       <div id="upload-img"><img src="${assets.get(
         'upload.svg'
       )}" title="${state.translate('uploadSvgAlt')}"/></div>
@@ -23,11 +22,10 @@ module.exports = function(state, emit) {
         'uploadPageSizeMessage'
       )}</em></span>
       <form method="post" action="upload" enctype="multipart/form-data">
-        <label for="file-upload" id="browse" class="${state.config
-          .uploadButtonStyle}" title="${state.translate(
-    'uploadPageBrowseButton1'
-  )}">${state.translate('uploadPageBrowseButton1')}</label>
-        <input id="file-upload" type="file" name="fileUploaded" onchange=${upload} />
+        <input id="file-upload" type="file" name="fileUploaded" onchange=${upload} onfocus=${onfocus} onblur=${onblur} />
+        <label for="file-upload" id="browse" class="btn browse" title="${state.translate(
+          'uploadPageBrowseButton1'
+        )}">${state.translate('uploadPageBrowseButton1')}</label>
       </form>
     </div>
     ${fileList(state, emit)}
@@ -44,6 +42,14 @@ module.exports = function(state, emit) {
     div.classList.remove('ondrag');
   }
 
+  function onfocus(event) {
+    event.target.classList.add('has-focus');
+  }
+
+  function onblur(event) {
+    event.target.classList.remove('has-focus');
+  }
+
   async function upload(event) {
     event.preventDefault();
     const target = event.target;

assets/main.css

@@ -205,7 +205,7 @@ a {
 }
 
 .upload-window {
-  border: 1px dashed rgba(0, 148, 251, 0.5);
+  border: 3px dashed rgba(0, 148, 251, 0.5);
   margin: 0 auto;
   height: 255px;
   border-radius: 4px;
@@ -219,7 +219,7 @@ a {
 }
 
 .upload-window.ondrag {
-  border: 3px dashed rgba(0, 148, 251, 0.5);
+  border: 5px dashed rgba(0, 148, 251, 0.5);
   margin: 0 auto;
   height: 251px;
   transform: scale(1.04);
@@ -231,14 +231,6 @@ a {
   text-align: center;
 }
 
-.upload-window-b {
-  border: 3px dashed rgba(0, 148, 251, 0.5);
-}
-
-.upload-window-b.ondrag {
-  border: 5px dashed rgba(0, 148, 251, 0.5);
-}
-
 .link {
   color: #0094fb;
   text-decoration: none;
@@ -258,10 +250,10 @@ a {
 .browse {
   background: #0297f8;
   border-radius: 5px;
-  font-size: 15px;
+  font-size: 20px;
   color: #fff;
   min-width: 240px;
-  height: 44px;
+  height: 60px;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -273,13 +265,18 @@ a {
   background-color: #0287e8;
 }
 
-.browse-b {
-  height: 60px;
-  font-size: 20px;
+input[type='file'] {
+  opacity: 0;
+  overflow: hidden;
+  position: absolute;
+  z-index: -1;
 }
 
-input[type='file'] {
-  display: none;
+input[type='file'].has-focus + #browse,
+input[type='file']:focus + #browse {
+  background-color: #0287e8;
+  outline: 1px dotted #000;
+  outline: -webkit-focus-ring-color auto 5px;
 }
 
 #file-size-msg {

assets/send_logo.svg

@@ -1 +1 @@
-<svg width="30" height="27" viewBox="0 0 30 27" xmlns="http://www.w3.org/2000/svg"><title>send logo</title><g stroke="#3E3D40" fill="none" fill-rule="evenodd"><path d="M22.364 19.989l-2.153-2.103a2.046 2.046 0 0 0-2.665-.151l3.402 3.323a.531.531 0 0 1 0 .766l-2.466 2.408a.563.563 0 0 1-.784 0l-3.398-3.32a1.932 1.932 0 0 0 .188 2.564l2.153 2.103c.788.77 2.066.77 2.855 0l2.868-2.802a1.94 1.94 0 0 0 0-2.788M8.77 14.745a.534.534 0 0 0 0 .766l3.399 3.32a2.05 2.05 0 0 1-2.625-.184l-2.153-2.102a1.94 1.94 0 0 1 0-2.79l2.869-2.801a2.052 2.052 0 0 1 2.854 0l2.153 2.103c.73.713.775 1.83.154 2.603l-3.401-3.323a.565.565 0 0 0-.784 0L8.77 14.745zm9.464 5.682a.777.777 0 0 1 0 1.118.822.822 0 0 1-1.144 0l-5.6-5.47a.777.777 0 0 1 0-1.118.822.822 0 0 1 1.144 0l5.6 5.47z" stroke-width=".618" fill="#3E3D40"/><path d="M6.065 20.606c-2.913-1.586-3.988-3.656-3.988-6.468 0-2.81 2.265-6.425 5.786-6.289.1.004.55-.006.649 0 .895-3.27 2.508-6.353 6.898-6.353 4.557 0 7.336 3.716 6.75 7.785.08-.005 1.232.17 1.31.186 3.096.644 4.915 3.275 4.915 5.18 0 1.905-.107 3.029-2.023 4.947" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round"/></g></svg>
+<svg width="30" height="27" viewBox="0 0 30 27" xmlns="http://www.w3.org/2000/svg"><title>send logo</title><g stroke="#3E3D40" fill="none" fill-rule="evenodd" transform="translate(-0.231,0.11948695)"><path d="M22.364 19.989l-2.153-2.103a2.046 2.046 0 0 0-2.665-.151l3.402 3.323a.531.531 0 0 1 0 .766l-2.466 2.408a.563.563 0 0 1-.784 0l-3.398-3.32a1.932 1.932 0 0 0 .188 2.564l2.153 2.103c.788.77 2.066.77 2.855 0l2.868-2.802a1.94 1.94 0 0 0 0-2.788M8.77 14.745a.534.534 0 0 0 0 .766l3.399 3.32a2.05 2.05 0 0 1-2.625-.184l-2.153-2.102a1.94 1.94 0 0 1 0-2.79l2.869-2.801a2.052 2.052 0 0 1 2.854 0l2.153 2.103c.73.713.775 1.83.154 2.603l-3.401-3.323a.565.565 0 0 0-.784 0L8.77 14.745zm9.464 5.682a.777.777 0 0 1 0 1.118.822.822 0 0 1-1.144 0l-5.6-5.47a.777.777 0 0 1 0-1.118.822.822 0 0 1 1.144 0l5.6 5.47z" stroke-width=".618" fill="#3E3D40"/><path d="M6.065 20.606c-2.913-1.586-3.988-3.656-3.988-6.468 0-2.81 2.265-6.425 5.786-6.289.1.004.55-.006.649 0 .895-3.27 2.508-6.353 6.898-6.353 4.557 0 7.336 3.716 6.75 7.785.08-.005 1.232.17 1.31.186 3.096.644 4.915 3.275 4.915 5.18 0 1.905-.107 3.029-2.023 4.947" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round"/></g></svg>

browserconfig.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square70x70logo src=“favicon-76.png”/>
+      <square150x150logo src="favicon-228.png"/>
+      <TileColor>#0297F8</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig> 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "firefox-send",
   "description": "File Sharing Experiment",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "author": "Mozilla (https://mozilla.org)",
   "repository": "mozilla/send",
   "homepage": "https://github.com/mozilla/send/",
@@ -43,26 +43,26 @@
     "node": ">=8.2.0"
   },
   "devDependencies": {
-    "autoprefixer": "^7.1.4",
+    "autoprefixer": "^7.1.5",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
-    "babel-plugin-yo-yoify": "^0.7.0",
+    "babel-plugin-yo-yoify": "^1.0.1",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
-    "copy-webpack-plugin": "^4.0.1",
+    "copy-webpack-plugin": "^4.1.1",
     "cross-env": "^5.0.5",
     "css-loader": "^0.28.7",
     "css-mqpacker": "^6.0.1",
     "cssnano": "^3.10.0",
-    "eslint": "^4.7.2",
+    "eslint": "^4.8.0",
     "eslint-plugin-mocha": "^4.11.0",
-    "eslint-plugin-node": "^5.1.1",
+    "eslint-plugin-node": "^5.2.0",
     "eslint-plugin-security": "^1.4.0",
     "expose-loader": "^0.7.3",
     "extract-loader": "^1.0.1",
-    "file-loader": "^0.11.2",
+    "file-loader": "^1.1.5",
     "git-rev-sync": "^1.9.1",
     "github-changes": "^1.1.0",
     "html-loader": "^0.5.1",
@@ -72,39 +72,39 @@
     "nanobus": "^4.2.0",
     "npm-run-all": "^4.1.1",
     "postcss-loader": "^2.0.6",
-    "prettier": "^1.7.0",
+    "prettier": "^1.7.4",
     "proxyquire": "^1.8.0",
-    "raven-js": "^3.17.0",
+    "raven-js": "^3.18.1",
     "redis-mock": "^0.20.0",
-    "require-from-string": "^1.2.1",
+    "require-from-string": "^2.0.1",
     "rimraf": "^2.6.2",
-    "selenium-webdriver": "^3.5.0",
-    "sinon": "^3.3.0",
+    "selenium-webdriver": "^3.6.0",
+    "sinon": "^4.0.1",
     "string-hash": "^1.1.3",
     "stylelint-config-standard": "^17.0.0",
-    "stylelint-no-unsupported-browser-features": "^1.0.0",
+    "stylelint-no-unsupported-browser-features": "^1.0.1",
     "supertest": "^3.0.0",
     "testpilot-ga": "^0.3.0",
     "val-loader": "^1.0.2",
     "webpack": "^3.6.0",
-    "webpack-dev-server": "^2.8.2",
+    "webpack-dev-server": "^2.9.1",
     "webpack-manifest-plugin": "^1.3.2",
     "webpack-unassert-loader": "^1.2.0"
   },
   "dependencies": {
-    "aws-sdk": "^2.122.0",
+    "aws-sdk": "^2.130.0",
     "body-parser": "^1.18.2",
-    "choo": "^6.1.0",
+    "choo": "^6.4.2",
     "connect-busboy": "0.0.2",
-    "convict": "^4.0.0",
-    "express": "^4.15.5",
+    "convict": "^4.0.1",
+    "express": "^4.16.2",
     "express-request-language": "^1.1.12",
     "fluent": "^0.4.1",
     "fluent-langneg": "^0.1.0",
-    "helmet": "^3.8.1",
+    "helmet": "^3.8.2",
     "mkdirp": "^0.5.1",
     "mozlog": "^2.1.1",
-    "raven": "^2.1.2",
+    "raven": "^2.2.1",
     "redis": "^2.8.0"
   },
   "availableLanguages": [

public/locales/cy/send.ftl

@@ -2,14 +2,14 @@
 title = Firefox Send
 siteSubtitle = arbrawf gwe
 siteFeedback = Adborth
-uploadPageHeader = Rhannu Ffeiliau wedi eu Hamgryptio Preifat
+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 ffeilia neu ffolder yn cael ei gynnal ar hyn o bryd.
+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}  i fyny ({ $size })
 importingFile = Mewnforio…
@@ -17,13 +17,13 @@ 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 manylion dod i ben.
+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. Arhoswch!
-uploadingFileNotification = Dweud wrtha i pan fydd y llwytho wedi gorffen.
+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
+uploadSvgAlt = Llwytho i Fyny
 uploadSuccessTimingHeader = Bydd y ddolen i'ch ffeil y dod i ben ar ôl 1 llwytho neu o fewn 24 awr.
 copyUrlFormLabelWithName = Copïo a rhannu'r ddolen i anfon eich ffeil: { $filename }
 copyUrlFormButton = Copïo i'r clipfwrdd
@@ -43,7 +43,7 @@ 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 = Profwch Firefox Send
+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
@@ -55,9 +55,9 @@ 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!
+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.
+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
@@ -67,7 +67,7 @@ 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'i gasglu data <a>yma</a>.
+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

public/locales/he/send.ftl

@@ -0,0 +1,73 @@
+// Firefox Send is a brand name and should not be localized.
+title = Firefox Send
+siteSubtitle = ניסוי אינטרנט
+siteFeedback = משוב
+uploadPageHeader = שיתוף קבצים פרטי, מוצפן
+uploadPageExplainer = לשלוח קבצים דרך קישור בטוח, פרטי ומוצפן שפג אוטומטית, כדי לוודא שהתכנים הפרטיים שלך לא יהיו ברשת לנצח.
+uploadPageLearnMore = מידע נוסף
+uploadPageDropMessage = יש לגרור קבצים לכאן כדי להתחיל בהעלאה
+uploadPageSizeMessage = להשגת ביצועים מיטביים, מוטב לשמור על הקובץ מתחת לגודל של 1 ג״ב
+uploadPageBrowseButton1 = נא לבחור קובץ להעלאה
+uploadPageMultipleFilesAlert = העלאה של מספר קבצים או ספריה אינה נתמכת כרגע.
+uploadPageBrowseButtonTitle = העלאת קובץ
+uploadingPageProgress = { $filename } ({ $size }) בהעלאה
+importingFile = מתבצע ייבוא...
+verifyingFile = מתבצע אימות…
+encryptingFile = מתבצעת הצפנה...
+decryptingFile = מתבצע פענוח...
+notifyUploadDone = ההעלאה שלך הסתיימה
+uploadingPageMessage = אחרי שהקובץ שלך יעלה, ניתן יהיה להגדיר אפשרויות תפוגה.
+uploadCancelNotification = ההעלאה שלך בוטלה.
+uploadingPageLargeFileMessage = קובץ זה גדול ועלול לקחת זמן להעלות אותו. סבלנות!
+uploadingFileNotification = נא להודיע לי כשתסתיים ההעלאה.
+uploadSuccessConfirmHeader = מוכן לשליחה
+uploadSvgAlt
+    .alt = להעלות
+uploadSuccessTimingHeader = הקישור לקובץ שלך יפוג אחרי הורדה אחת או בעוד 24 שעות.
+copyUrlFormLabelWithName = ניתן להעתיק ולשתף את הקישור כדי לשלוח את הקובץ שלך: { $filename }
+copiedUrl = הועתק!
+deleteFileButton = מחיקת קובץ
+    .title = מחיקת קובץ
+sendAnotherFileLink = שליחת קובץ נוסף
+    .title = שליחת קובץ נוסף
+// Alternative text used on the download link/button (indicates an action).
+downloadAltText
+    .alt = הורדה
+downloadFileName = ההורדה נכשלה
+downloadFileSize = ({ $size })
+// Text and title used on the download link/button (indicates an action).
+downloadButtonLabel = הורדה
+    .title = הורדה
+downloadNotification = ההורדה הושלמה.
+downloadFinish = ההורדה הושלמה
+// This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
+fileSizeProgress = ({ $partialSize } מתוך { $totalSize })
+downloadingPageProgress = בהורדה: { $filename } ({ $size })
+errorAltText
+    .alt = תקלה בהעלאה
+errorPageHeader = משהו השתבש!
+errorPageLink = שליחת קובץ נוסף
+fileTooBig = הקובץ הזה גדול מידי להעלאה. עליו להיות קטן מ־{ $size }.
+linkExpiredAlt
+    .alt = קישור פג
+notSupportedHeader = הדפדפן שלך לא נתמך.
+notSupportedLink = למה אין תמיכה בדפדפן שלי?
+downloadFirefoxButtonSub = הורדה בחינם
+uploadedFile = קובץ
+copyFileList = העתקת כתובת
+// expiryFileList is used as a column header
+expiryFileList = יפוג בעוד
+deleteFileList = מחיקה
+nevermindButton = לא משנה
+legalHeader = תנאי שירות ופרטיות
+deletePopupText = למחוק דף זה?
+deletePopupYes = כן
+deletePopupCancel = ביטול
+deleteButtonHover
+    .title = מחיקה
+copyUrlHover
+    .title = העתקת קישור
+footerLinkLegal = מידע משפטי
+footerLinkPrivacy = פרטיות
+footerLinkTerms = תנאי שימוש
+footerLinkCookies = קובצי עוגיות

public/locales/id/send.ftl

@@ -8,9 +8,11 @@ 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
+    .title = Pilih berkas untuk diunggah
 uploadPageMultipleFilesAlert = Saat ini belum mendukung pengunggahan beberapa berkas atau folder.
 uploadPageBrowseButtonTitle = Unggah berkas
-uploadingPageHeader = Mengunggah Berkas Anda
+uploadingPageProgress = Mengunggah { $filename } ({ $size })
 importingFile = Mengimpor…
 verifyingFile = Memverifikasi…
 encryptingFile = Mengenkripsi...
@@ -39,6 +41,8 @@ downloadMessage = Teman Anda mengirimkan berkas dengan Firefox Send, layanan yan
 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 })

public/locales/sk/send.ftl

@@ -35,7 +35,7 @@ downloadAltText = Prevziať
 downloadFileName = Prevziať { $filename }
 downloadFileSize = ({ $size })
 // Firefox Send is a brand name and should not be localized.
-downloadMessage = Váš priateľ vám odoslal súbor pomocou služby Firefox Sync - táto vám umožňuje zdieľať súbory pomocou bezpečného, súkromného a zašifrovaného odkazu, ktorého platnosť automaticky vyprší. Vďaka tomu máte istotu, že vaše súbory neostanú na internete naveky.
+downloadMessage = Váš priateľ vám odoslal súbor pomocou služby Firefox Send - táto vám umožňuje zdieľať súbory pomocou bezpečného, súkromného a zašifrovaného odkazu, ktorého platnosť automaticky vyprší. Vďaka tomu máte istotu, že vaše súbory neostanú na internete naveky.
 // Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Prevziať
 downloadNotification = Vaše preberanie bolo dokončené.

server/layout.js

@@ -31,9 +31,39 @@ module.exports = function(state, body = '') {
     <title>${state.title}</title>
 
     <link rel="stylesheet" type="text/css" href="${assets.get('main.css')}" />
-    <link rel="icon" type="image/png" href="${assets.get(
-      'favicon-32x32.png'
-    )}" sizes="32x32" />
+    
+    <!-- generic favicons -->
+    <link rel="icon" href="${assets.get('favicon-32.png')}" sizes="32x32">
+    <link rel="icon" href="${assets.get('favicon-96.png')}" sizes="96x96">
+    <link rel="icon" href="${assets.get('favicon-128.png')}" sizes="128x128">
+    <link rel="icon" href="${assets.get('favicon-228.png')}" sizes="228x228">
+
+    <!-- Android -->
+    <link rel="shortcut icon" href="${assets.get(
+      'favicon-196.png'
+    )}" sizes="196x196">
+
+    <!-- iOS -->
+    <link rel="apple-touch-icon" href="${assets.get(
+      'favicon-120.png'
+    )}" sizes="120x120">
+    <link rel="apple-touch-icon" href="${assets.get(
+      'favicon-152.png'
+    )}" sizes="152x152">
+    <link rel="apple-touch-icon" href="${assets.get(
+      'favicon-180.png'
+    )}" sizes="180x180">
+
+    <!-- Windows 8 IE 10-->
+    <meta name="msapplication-TileColor" content="#FFFFFF">
+    <meta name="msapplication-TileImage" content="${assets.get(
+      'favicon-144.png'
+    )}">
+
+    <!— Windows 8.1 + IE11 and above —>
+    <meta name="msapplication-config" content="/browserconfig.xml"/>
+    
+    
     ${firaTag}
     <script defer src="/jsconfig.js"></script>
     <script defer src="${assets.get('runtime.js')}"></script>

server/state.js

@@ -15,10 +15,6 @@ module.exports = function(req) {
     storage: {
       files: []
     },
-    config: {
-      uploadWindowStyle: 'upload-window',
-      uploadButtonStyle: 'browse btn'
-    },
     fira: false,
     fileInfo: {},
     layout