Merge remote-tracking branch 'origin/develop' into sync-master-with-d…

…evelop

* origin/develop: (31 commits)
  Performance: Delivery optimized images (#7176)
  Add `appName` message to each locale
  Remove the disk store (#7170)
  Update @hapi/subtext as per security advisory (#7172)
  Add fixes for German translations (#7168)
  Fix recipient field of approve screen (#7171)
  3box integration 2.0 (#6972)
  ci - metamaskbot - include links to dep-viz and all artifacts (#7155)
  Replace `undefined` selectedAddress with `null` (#7161)
  Add polyfill for AbortController (#7157)
  Remove redundant error logging (#7158)
  Set minimum Firefox version to v56.2 to support Waterfox (#7156)
  ci - install deps with "--har" flag to capture network activity (#7143)
  ci - create source-map-explorer build-artifacts (#7141)
  ci - build-artifacts - generate sesify-viz for inspecting deps (#7151)
  Publish GitHub release from master branch (#7136)
  fix rinkeby spelling (#7148)
  deps - move gulp-terser-js to devDeps
  test:integration - fix renamed test data file
  lint fix
  ...

.circleci/config.yml

@@ -92,11 +92,16 @@ jobs:
       - run:
           name: Install deps
           command: |
-           yarn --frozen-lockfile
+           yarn --frozen-lockfile --har
+      - run:
+          name: Collect yarn install HAR logs
+          command: |
+            .circleci/scripts/collect-har-artifact.sh
       - persist_to_workspace:
           root: .
           paths:
           - node_modules
+          - build-artifacts
 
   prep-build:
     docker:
@@ -213,6 +218,9 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - run:
+          name: build:source-map-explorer
+          command: ./development/source-map-explorer.sh
       - store_artifacts:
           path: dist/sourcemaps
           destination: builds/sourcemaps
@@ -222,6 +230,13 @@ jobs:
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
+      # important: generate sesify viz AFTER uploading builds as artifacts
+      - run:
+          name: build:sesify-viz
+          command: ./.circleci/scripts/create-sesify-viz
+      - store_artifacts:
+          path: build-artifacts
+          destination: build-artifacts
       - run:
           name: build:announce
           command: ./development/metamaskbot-build-announce.js

.circleci/scripts/collect-har-artifact.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -x
+
+mkdir -p build-artifacts/yarn-install-har
+mv ./*.har build-artifacts/yarn-install-har/

.circleci/scripts/create-sesify-viz

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+set -u
+set -o pipefail
+
+# prepare artifacts dir
+mkdir -p ./build-artifacts/deps-viz/
+
+# generate viz
+SESIFY_AUTOGEN=1 npx gulp build:extension:js:background
+npx sesify-viz --deps sesify/deps-background.json --config sesify/background.json --dest ./build-artifacts/deps-viz/background

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Current Develop Branch
+- [#7168](https://github.com/MetaMask/metamask-extension/pull/7168): Add fixes for German translations
 
 ## 7.2.1 Tue Sep 17 2019
 - [#7180](https://github.com/MetaMask/metamask-extension/pull/7180): Add `appName` message to each locale

app/_locales/de/messages.json

@@ -33,7 +33,7 @@
     "message": "$1 möchte sich mit deinem Account verbinden"
   },
   "providerRequestInfo": {
-    "message": "Die unten aufgeführte Domäne versucht, Zugriff auf die Ethereum-API anzufordern, damit sie mit der Ethereum-Blockchain interagieren kann. Überprüfen Sie immer, dass Sie sich auf der richtigen Website befinden, bevor Sie den Web3-Zugriff genehmigen."
+    "message": "Diese Website fordert Zugriff auf Ihre aktuelle Kontoadresse. Stellen Sie immer sicher, dass Sie den Websites vertrauen, mit denen Sie interagieren."
   },
   "about": {
     "message": "Über"
@@ -434,7 +434,7 @@
     "description": "Exchange type (cryptocurrencies)"
   },
   "currencyConversion": {
-    "message": "Währungsumrechung"
+    "message": "Währungsumrechnung"
   },
   "currentLanguage": {
     "message": "Aktuelle Sprache"
@@ -788,7 +788,7 @@
     "message": "Account importieren"
   },
   "importAccountMsg": {
-    "message": " Importierte Accounts werden nicht mit der Seed-Wörterfolge  deines ursprünglichen MetaMask Accounts verknüpft. Erfahre mehr über importierte Accounts."
+    "message": " Importierte Accounts werden nicht mit der Seed-Wörterfolge deines ursprünglichen MetaMask Accounts verknüpft. Erfahre mehr über importierte Accounts."
   },
   "importAccountSeedPhrase": {
     "message": "Ein Konto mit einem Seed-Schlüssel importieren"
@@ -994,7 +994,7 @@
     "message": "Neue Adresse erkannt! Klicken Sie hier, um sie zu Ihrem Adressbuch hinzuzufügen."
   },
   "newAccountNumberName": {
-    "message": "Account  $1",
+    "message": "Account $1",
     "description": "Default name of next account to be created on create account screen"
   },
   "newContact": {
@@ -1651,7 +1651,7 @@
     "message": "Transaktionsstornierung versucht mit Gasgebühr von $1 bei $2"
   },
   "transactionCancelSuccess": {
-    "message": "Transaktion bei  $2 erfolgreich storniert"
+    "message": "Transaktion bei $2 erfolgreich storniert"
   },
   "transactions": {
     "message": "Transaktionen"
@@ -1703,7 +1703,7 @@
     "message": "Willkommen zur neuen Oberfläche (Beta)"
   },
   "uiWelcomeMessage": {
-    "message": "Du verwendest  nun die neue MetaMask Oberfläche. Schau dich um, teste die neuen Features wie z.B. das Senden von Token und lass es uns wissen falls du irgendwelche Probleme hast."
+    "message": "Du verwendest nun die neue MetaMask Oberfläche. Schau dich um, teste die neuen Features wie z.B. das Senden von Token und lass es uns wissen falls du irgendwelche Probleme hast."
   },
   "unapproved": {
     "message": "Nicht genehmigt"

app/_locales/en/messages.json

@@ -505,6 +505,9 @@
   "customRPC": {
     "message": "Custom RPC"
   },
+  "dataBackupFoundInfo": {
+    "message": "Some of your account data was backed up during a previous installation of MetaMask. This could include your settings, contacts and tokens. Would you like to restore this data now?"
+  },
   "decimalsMustZerotoTen": {
     "message": "Decimals must be at least 0, and not over 36."
   },
@@ -1148,6 +1151,9 @@
   "noTransactions": {
     "message": "You have no transactions"
   },
+  "noThanks": {
+    "message": "No Thanks"
+  },
   "notEnoughGas": {
     "message": "Not Enough Gas"
   },
@@ -1337,6 +1343,10 @@
   "restoreAccountWithSeed": {
     "message": "Restore your Account with Seed Phrase"
   },
+  "restoreWalletPreferences": {
+    "message": "A backup of your data from $1 has been found. Would you like to restore your wallet preferences?",
+    "description": "$1 is the date at which the data was backed up"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "requests waiting to be acknowledged"
   },
@@ -1642,6 +1652,15 @@
   "symbolBetweenZeroTwelve": {
     "message": "Symbol must be between 0 and 12 characters."
   },
+  "syncWithThreeBox": {
+    "message": "Sync data with 3Box"
+  },
+  "syncWithThreeBoxDescription": {
+    "message": "Turn on to have your settings backed up with 3Box"
+  },
+  "syncWithThreeBoxDisabled": {
+    "message": "3Box has been disabled due to an error during the initial sync"
+  },
   "syncWithMobile": {
     "message": "Sync with mobile"
   },

app/_locales/index.json

@@ -6,7 +6,7 @@
   { "code": "ca", "name": "Català" },
   { "code": "cs", "name": "Čeština" },
   { "code": "da", "name": "Dansk" },
-  { "code": "de", "name": "Deutsche" },
+  { "code": "de", "name": "Deutsch" },
   { "code": "el", "name": "ελληνικά" },
   { "code": "en", "name": "English" },
   { "code": "es", "name": "Español" },

app/home.html

@@ -9,7 +9,7 @@
   </head>
   <body>
     <div id="app-content"></div>
-    <script src="./libs.js" type="text/javascript" charset="utf-8"></script>
+    <script src="./ui-libs.js" type="text/javascript" charset="utf-8"></script>
     <script src="./ui.js" type="text/javascript" charset="utf-8"></script>
   </body>
 </html>