From 173ca461a964da0a1393cbffae3723d71447a322 Mon Sep 17 00:00:00 2001
From: Danny Coates <dannycoates@gmail.com>
Date: Tue, 6 Nov 2018 11:49:27 -0800
Subject: [PATCH] bump version to v2.6.0

---
 package-lock.json | 44 ++++++++++++++++++++++----------------------
 package.json      |  9 +++++----
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 423c0e98..ea784d55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "firefox-send",
-  "version": "2.5.5",
+  "version": "2.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -253,9 +253,9 @@
       "integrity": "sha512-QzB0/IMvB0eFxFK7Eqh+bfC8NLv3E9ScjWQrPOk6GgfNroxcVITdTlT8NRsRrcp5+QQJVPLkRqKG0PUdaWXmHw=="
     },
     "@google-cloud/storage": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-2.2.0.tgz",
-      "integrity": "sha512-aBzcOJELU8N3a78D+Q3InIJ1x3GnhdWgMCjr8mxO6o1mJhDcQp4k2gjE4WijIp7OB2Vtol/NPudvdvgYyHE+tg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-2.3.0.tgz",
+      "integrity": "sha512-5IT6lkTJPNpWZDtHSL7AzDOIDMhkdl1ruxrLryVXsuaP61F8IukMgtoxG0KxH199FoRxCw2fFUvkB5guPTf8fQ==",
       "requires": {
         "@google-cloud/common": "^0.26.0",
         "@google-cloud/paginator": "^0.1.0",
@@ -328,9 +328,9 @@
       "integrity": "sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A=="
     },
     "@types/duplexify": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.5.0.tgz",
-      "integrity": "sha512-+aZCCdxuR/Q6n58CBkXyqGqimIqpYUcFLfBXagXv7e9TdJUevqkKhzopBuRz3RB064sQxnJnhttHOkK/O93Ouw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.0.tgz",
+      "integrity": "sha512-5zOA53RUlzN74bvrSGwjudssD9F3a797sDZQkiYpUOxW+WHaXTCPz4/d5Dgi6FKnOqZ2CpaTo0DhgIfsXAOE/A==",
       "requires": {
         "@types/node": "*"
       }
@@ -344,14 +344,14 @@
       }
     },
     "@types/node": {
-      "version": "10.12.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.1.tgz",
-      "integrity": "sha512-i1sl+WCX2OCHeUi9oi7PiCNUtYFrpWhpcx878vpeq/tlZTKzcFdHePlyFHVbWqeuKN0SRPl/9ZFDSTsfv9h7VQ=="
+      "version": "10.12.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.2.tgz",
+      "integrity": "sha512-53ElVDSnZeFUUFIYzI8WLQ25IhWzb6vbddNp8UHlXQyU0ET2RhV5zg0NfubzU7iNMh5bBXb0htCzfvrSVNgzaQ=="
     },
     "@types/request": {
-      "version": "2.48.0",
-      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.0.tgz",
-      "integrity": "sha512-KnfoOtqXKllSqfXSEvGTd8KDkNlpHs+PWr6I6XiEIWk/jckH3pNmWDXNFZyPkB9wApb8vzDq2wMByM/0GFSmXg==",
+      "version": "2.48.1",
+      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz",
+      "integrity": "sha512-ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==",
       "requires": {
         "@types/caseless": "*",
         "@types/form-data": "*",
@@ -360,9 +360,9 @@
       }
     },
     "@types/tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha512-MDQLxNFRLasqS4UlkWMSACMKeSm1x4Q3TxzUC7KQUsh6RK1ZrQ0VEyE3yzXcBu+K8ejVj4wuX32eUG02yNp+YQ=="
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.4.tgz",
+      "integrity": "sha512-Set5ZdrAaKI/qHdFlVMgm/GsAv/wkXhSTuZFkJ+JI7HK+wIkIlOaUXSXieIvJ0+OvGIqtREFoE+NHJtEq0gtEw=="
     },
     "JSONStream": {
       "version": "0.8.4",
@@ -734,9 +734,9 @@
       "dev": true
     },
     "aws-sdk": {
-      "version": "2.346.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.346.0.tgz",
-      "integrity": "sha512-4nJfbsK5Chu1ujIHHuvzRz7Ypu9Rbb8KQ/9T5QkVKUaQkl7AUnaUyENykIjhUybQlyg6uqPXg4JTK0801P+OfA==",
+      "version": "2.349.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.349.0.tgz",
+      "integrity": "sha512-yGYCvXOKpvLfbhh1Vo+/2q+Z5bRdPlFpXX3kHBGz4haI6ZoLfFGuztap4en83zim/wpG1ZrhVJjd9u+i9l1ZEA==",
       "requires": {
         "buffer": "4.9.1",
         "events": "1.1.1",
@@ -9196,9 +9196,9 @@
       "integrity": "sha1-ICtIAhoMTL3i34DeFaF0Q8i0OYA="
     },
     "node-fetch": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.0.tgz",
-      "integrity": "sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA=="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.1.tgz",
+      "integrity": "sha512-ObXBpNCD3A/vYQiQtEWl7DuqjAXjfptYFuGHLdPl5U19/6kJuZV+8uMHLrkj3wJrJoyfg4nhgyFixZdaZoAiEQ=="
     },
     "node-forge": {
       "version": "0.7.6",
diff --git a/package.json b/package.json
index fd4001fb..88452fbf 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "firefox-send",
   "description": "File Sharing Experiment",
-  "version": "2.5.5",
+  "version": "2.6.0",
   "author": "Mozilla (https://mozilla.org)",
   "repository": "mozilla/send",
   "homepage": "https://github.com/mozilla/send/",
@@ -114,16 +114,16 @@
     "webpack-unassert-loader": "^1.2.0"
   },
   "dependencies": {
-    "@google-cloud/storage": "^2.0.3",
-    "aws-sdk": "^2.328.0",
+    "@google-cloud/storage": "^2.3.0",
+    "aws-sdk": "^2.349.0",
     "babel-polyfill": "^6.26.0",
     "choo": "^6.13.0",
     "cldr-core": "^32.0.0",
     "connect-busboy": "0.0.2",
     "convict": "^4.4.0",
     "express": "^4.16.3",
-    "fluent": "^0.6.4",
     "fast-crc32c": "^1.0.4",
+    "fluent": "^0.6.4",
     "fluent-langneg": "^0.1.0",
     "helmet": "^3.13.0",
     "mkdirp": "^0.5.1",
@@ -145,6 +145,7 @@
     "de",
     "dsb",
     "el",
+    "en-CA",
     "es-AR",
     "es-CL",
     "es-ES",