Merge branch 'master' into testing

2 files changed, 54 insertions, 3 deletions

diff --git a/docs/QA_Guide.md b/docs/QA_Guide.md
new file mode 100644
index 000000000..0b7c0e023
--- /dev/null
+++ b/docs/QA_Guide.md
@@ -0,0 +1,48 @@
+# QA Guide
+
+Steps to mark a full pass of QA complete.
+* Browsers: Opera, Chrome, Firefox, Edge.
+* OS: Ubuntu, Mac OSX, Windows
+* Load older version of MetaMask and attempt to simulate updating the extension.
+* Open Developer Console in background and popup, inspect errors.
+* Watch the state logs 
+  * Transactions (unapproved txs -> rejected/submitted -> confirmed)
+  * Nonces/LocalNonces
+* Vault integrity
+    * create vault
+    * Log out
+    * Log in again
+    * Log out
+    * Restore from seed
+    * Create a second account
+    * Import a loose account (not related to HD Wallet)
+    * Import old existing vault seed phrase (pref with test Ether)
+    * Download State Logs, Priv key file, seed phrase file.
+* Send Ether
+    * by address
+    * by ens name
+* Web3 API Stability
+    * Create a contract from a Ðapp (remix)
+    * Load a Ðapp that reads using events/logs (ENS)
+    * Connect to MEW/MyCypto
+    * Send a transaction from any Ðapp
+        - MEW
+        - EtherDelta
+        - Leeroy
+        - Aragon
+        - (https://tmashuang.github.io/demo-dapp)
+    * Check account balances
+* Token Management
+    * create a token with tokenfactory (http://tokenfactory.surge.sh/#/factory)
+    * Add that token to the token view
+    * Send that token to another metamask address.
+    * confirm the token arrived.
+* Send a transaction and sign a message (https://danfinlay.github.io/js-eth-personal-sign-examples/) for each keyring type
+    * hd keyring
+    * imported keyring
+* Change network from mainnet → ropsten → rinkeby → localhost (ganache)
+* Ganache set blocktime to simulate retryTx in MetaMask
+* Copy public key to clipboard
+* Export private key
+
+* Explore changes in master, target features that have been changed and break.
diff --git a/docs/translating-guide.md b/docs/translating-guide.md
index ae2dfecd3..8b2bc1785 100644
--- a/docs/translating-guide.md
+++ b/docs/translating-guide.md
@@ -6,9 +6,12 @@ The MetaMask browser extension supports new translations added in the form of ne
 
 ## Adding a new Language
 
-Each supported language is represented by a folder in `app/_locales` whose name is that language's subtag ([look up a language subtag using this tool](https://r12a.github.io/app-subtags/)).
+- Each supported language is represented by a folder in `app/_locales` whose name is that language's subtag (example: `app/_locales/es/`). (look up a language subtag using the [r12a "Find" tool](https://r12a.github.io/app-subtags/) or this [wikipedia list](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)).
+- Inside that folder there should be a `messages.json`. 
+- An easy way to start your translation is to first **make a copy** of `app/_locales/en/messages.json` (the english translation), and then **translate the `message` key** for each in-app message.
+- **The `description` key** is just to add context for what the translation is about, it **does not need to be translated**.
+- Add the language to the [locales index](https://github.com/MetaMask/metamask-extension/blob/master/app/_locales/index.json) `app/_locales/index.json` 
 
-Inside that folder there should be a `messages.json` file that follows the specified format. An easy way to start your translation is to first duplicate `app/_locales/en/messages.json` (the english translation), and then update the `message` key for each in-app message.
 
 That's it! When MetaMask is loaded on a computer with that language set as the system language, they will see your translation instead of the default one.
 
@@ -20,7 +23,7 @@ To automatically see if you are missing any phrases to translate, we have a scri
 node development/verify-locale-strings.js $YOUR_LOCALE
 ```
 
-Where `$YOUR_LOCALE` is your [locale string](https://r12a.github.io/app-subtags/), i.e. the name of your language folder.
+Where `$YOUR_LOCALE` is your locale string (example: `es`), i.e. the name of your language folder.
 
 To verify that your translation works in the app, you will need to [build a local copy](https://github.com/MetaMask/metamask-extension#building-locally) of MetaMask. You will need to change your browser language, your operating system language, and restart your browser (sorry it's so much work!).