Merge branch 'master' into rename-references-to-erc875

AlphaWallet/Localization/es.lproj/Localizable.strings

@@ -74,7 +74,7 @@
 "wallet.create.button.title" = "Create Wallet";
 "wallet.create.inProgress" = "Creating wallet...";
 "wallet.import.button.title" = "Import Wallet";
-"wallets.backup.alertSheet.title" = "Hacer copia de seguridad del almacén de claves";
+"wallets.backup.alertSheet.title" = "Backup Encrypted Wallet";
 "transactions.tabbar.item.title" = "Actas";
 "import.navigation.title" = "Importando cartera";
 "browser.home.button.title" = "Home";
@@ -91,9 +91,9 @@
 "importWallet.import.button.title" = "Importar";
 "importWallet.import.invalidAddress" = "Invalid Ethereum Address";
 "importWallet.import.invalidPrivateKey" = "Private Key has to be 64 characters long";
-"Keystore JSON" = "Keystore JSON";
+"Keystore JSON" = "Encrypted Wallet";
 "More Details" = "Más Detalles";
-"Keystore" = "Keystore";
+"Keystore" = "From Backup";
 "Private Key" = "Private Key";
 "settings.currency.button.title" = "Moneda";
 "settings.network.test.label.title" = "Prueba";

AlphaWallet/Localization/zh-Hans.lproj/Localizable.strings

@@ -56,7 +56,7 @@
 "transactions.deposit.button.title" = "购买";
 "transactions.noTransactions.label.title" = "暂无记录";
 "wallet.navigation.title" = "钱包";
-"wallets.backup.alertSheet.title" = "备份 Keystore";
+"wallets.backup.alertSheet.title" = "备份 Encrypted Wallet";
 "transactions.tabbar.item.title" = "我的账单";
 "transaction.navigation.title" = "交易";
 "import.navigation.title" = "导入钱包";
@@ -72,9 +72,9 @@
 "importWallet.import.button.title" = "导入";
 "importWallet.import.invalidAddress" = "无效的以太坊地址";
 "importWallet.import.invalidPrivateKey" = "私钥长度必须为64个字符";
-"Keystore JSON" = "Keystore JSON";
+"Keystore JSON" = "Encrypted Wallet";
 "More Details" = "更多详情";
-"Keystore" = "Keystore";
+"Keystore" = "From Backup";
 "Private Key" = "私有密钥";
 "settings.currency.button.title" = "货币";
 "settings.network.test.label.title" = "测试网络";