merge v2.0.11 and merge conflict

packages/apps/public/locales/ar/translation.json

@@ -400,7 +400,7 @@
   "Raw storage": "تخزين أولي",
   "Reasonable": "معقول",
   "Reassign": "إعادة التعيين",
-  "Redeem": "إسترداد",
+  "Unfreeze": "إسترداد",
   "Referenda": "الاستفتاءات",
   "Register": "تسجيل",
   "Register Asset": "تسجيل الأصل",

packages/apps/public/locales/en/app-accounts-chainx.json

@@ -64,7 +64,7 @@
   "Create": "Create",
   "Create a backup file for this account": "Create a backup file for this account",
   "Cross-chain assets": "Cross-chain assets",
-  "Current Account": "Current Account",
+  "Current Accounts": "Current Accounts",
   "Currently, only cross-chain top-up initiated by BTC addresses starting with 1 and 3 is supported": "Currently, only cross-chain top-up initiated by BTC addresses starting with 1 and 3 is supported",
   "DEX Reserved": "DEX Reserved",
   "Darwinia Address": "Darwinia Address",
@@ -88,7 +88,11 @@
   "Forget this account": "Forget this account",
   "Forget this address": "Forget this address",
   "Free Balance": "Free Balance",
-  "Frozen Voting": "Frozen Voting",
+  "Voting Frozen": "Voting Frozen",
+  "The number of Voting Frozen is the largest number of votes which are locked in Staking、Referendum or Voting for Council": "The number of Voting Frozen is the largest number of votes which are locked in Staking、Referendum or Voting for Council",
+  "UnBound Frozen": "UnBound Frozen",
+  "Other Frozen": "Other Frozen",
+  "The Other Frozen mainly include pledge freeze, DEX freeze, council election freeze, submit proposal freeze, seconding freeze and so on": "The Other Frozen mainly include pledge freeze, DEX freeze, council election freeze, submit proposal freeze, seconding freeze and so on",
   "Full Legal Name": "Full Legal Name",
   "Future versions of the web-only interface will drop support for non-external accounts, much like the IPFS version.": "Future versions of the web-only interface will drop support for non-external accounts, much like the IPFS version.",
   "Get the information for the 16-OP_RETURN address": "Get the information for the 16-OP_RETURN address",
@@ -390,6 +394,9 @@
   "total deposit": "total deposit",
   "transactions": "transactions",
   "transferrable": "transferrable",
+  "The amount of ticket revocable": "The amount of ticket revocable",
+  "Switchable Amount": "Switchable Amount",
+  "Vote Amounts": "Vote Amounts",
   "transferrable minus fees": "transferrable minus fees",
   "trusted social recovery helpers": "trusted social recovery helpers",
   "trust、senator、the node of validate": "trust、senator、the node of validate",

packages/apps/public/locales/en/app-staking-chainx.json

@@ -10,7 +10,7 @@
   "Drop this node": "Drop this node",
   "Freeze": "Freeze",
   "My Account": "My Account",
-  "My Accounts": "My Accounts",
+  "Current Accounts": "Current Accounts",
   "My Stake": "My Stake",
   "My Staking": "My Staking",
   "Node Drop": "Node Drop",
@@ -28,11 +28,10 @@
   "ReBound": "ReBound",
   "Rebond": "Rebond",
   "Rebond Amount": "Rebond Amount",
-  "Redeem": "Redeem",
-  "To Redeem": "To Redeem",
-  "Redeem ID": "Redeem ID",
+  "To Unfreeze": "To Unfreeze",
+  "Unfreeze ID": "Unfreeze ID",
   "Redeem the current node": "Redeem the current node",
-  "Redemption": "Redemption",
+  "Unfreeze": "Unfreeze",
   "Register": "Register",
   "Register Account": "Register Account",
   "Register Node": "Register Node",
@@ -54,5 +53,8 @@
   "Vote Amount": "Vote Amount",
   "Vote for the node": "Vote for the node",
   "Vote for validator": "Vote for validator",
-  "transferrable": "transferrable"
+  "transferrable": "transferrable",
+  "Switchable Amount": "Switchable Amount",
+  "Vote Amounts": "Vote Amounts",
+  "The amount of ticket revocable": "The amount of ticket revocable"
 }

packages/apps/public/locales/en/app-staking.json

@@ -58,7 +58,7 @@
   "Max, {{eras}} eras": "Max, {{eras}} eras",
   "Most profitable": "Most profitable",
   "My Account": "My Account",
-  "My Accounts": "My Accounts",
+  "Current Accounts": "Current Accounts",
   "My Stake": "My Stake",
   "My Staking": "My Staking",
   "My stashes": "My stashes",
@@ -108,11 +108,10 @@
   "ReBound": "ReBound",
   "Rebond": "Rebond",
   "Rebond Amount": "Rebond Amount",
-  "Redeem": "Redeem",
-  "To Redeem": "To Redeem",
-  "Redeem ID": "Redeem ID",
+  "To Unfreeze": "To Unfreeze",
+  "Unfreeze ID": "Unfreeze ID",
   "Redeem the current node": "Redeem the current node",
-  "Redemption": "Redemption",
+  "Unfreeze": "Unfreeze",
   "Register": "Register",
   "Register Account": "Register Account",
   "Register new node": "Register new node",
@@ -270,6 +269,9 @@
   "total stake": "total stake",
   "total staked": "total staked",
   "transferrable": "transferrable",
+  "Switchable Amount": "Switchable Amount",
+  "Vote Amounts": "Vote Amounts",
+  "The amount of ticket revocable": "The amount of ticket revocable",
   "unapplied": "unapplied",
   "unbond amount": "unbond amount",
   "validator to query": "validator to query",

packages/apps/public/locales/en/react-signer.json

@@ -37,5 +37,6 @@
   "multisig call data": "multisig call data",
   "multisig signatory": "multisig signatory",
   "proxy account": "proxy account",
+  "Transaction fee": "Transaction fee",
   "unlock for {{expiry}} min": "unlock for {{expiry}} min"
 }

packages/apps/public/locales/en/translation.json

@@ -68,7 +68,7 @@
   "Create a backup file for this account": "",
   "Cross-chain assets": "",
   "Currency trade": "",
-  "Current Account": "",
+  "Current Accounts": "",
   "Current Status": "",
   "Currently, only cross-chain top-up initiated by BTC addresses starting with 1 and 3 is supported": "",
   "Custom Endpoint": "",
@@ -97,7 +97,11 @@
   "Forget this account": "",
   "Free Balance": "",
   "Freeze Amount": "",
-  "Frozen Voting": "",
+  "Voting Frozen": "",
+  "The number of Voting Frozen is the largest number of votes which are locked in Staking、Referendum or Voting for Council": "",
+  "UnBound Frozen": "",
+  "Other Frozen": "",
+  "The Other Frozen mainly include pledge freeze, DEX freeze, council election freeze, submit proposal freeze, seconding freeze and so on": "",
   "Full Legal Name": "",
   "Get the information for the 16-OP_RETURN address": "",
   "Governance": "",
@@ -275,6 +279,7 @@
   "Total interest on all accounts": "",
   "Total prize pool": "",
   "Trading ID": "",
+  "Transaction fee": "",
   "Transfer": "",
   "Transfers": "",
   "Trust hot multi-signature address": "",

packages/apps/public/locales/es/translation.json

@@ -355,7 +355,7 @@
   "Reassign": "Reasignar",
   "Recent Blocks": "bloques recientes",
   "Recent Events": "eventos recientes",
-  "Redeem": "Canjear",
+  "Unfreeze": "Canjear",
   "Referenda": "referéndum",
   "Register": "Registrarse",
   "Register Asset": "Registro de activos",

packages/apps/public/locales/fr/translation.json

@@ -491,7 +491,7 @@
   "Reassign": "Réaffecter",
   "Recent Blocks": "blocs récents",
   "Recent Events": "événements récents",
-  "Redeem": "Récupérer les tokens",
+  "Unfreeze": "Récupérer les tokens",
   "Referenda": "referenda",
   "Register": "Enregistrer",
   "Register Asset": "Enregistrer un actif",

packages/apps/public/locales/id/translation.json

@@ -481,7 +481,7 @@
   "Reassign": "Assign ulang",
   "Recent Blocks": "blok terbaru",
   "Recent Events": "event terbaru",
-  "Redeem": "Tebus",
+  "Unfreeze": "Tebus",
   "Referenda": "referendum",
   "Register": "Daftar",
   "Register Asset": "Daftar Aset",

packages/apps/public/locales/it/translation.json

@@ -481,7 +481,7 @@
   "Reassign": "Riassegna",
   "Recent Blocks": "blocchi recenti",
   "Recent Events": "eventi recenti",
-  "Redeem": "Riscatta",
+  "Unfreeze": "Riscatta",
   "Referenda": "referendum in corso",
   "Register": "Registra",
   "Register Asset": "Registra Asset",

packages/apps/public/locales/ja/translation.json

@@ -202,7 +202,7 @@
   "Raw seed": "生のシード",
   "Reasonable": "適切な",
   "Reassign": "再度アサインする",
-  "Redeem": "再取得",
+  "Unfreeze": "再取得",
   "Register": "登録",
   "Register Asset": "アセットを登録する",
   "Register a parachain": "パラチェーンを登録する",

packages/apps/public/locales/ko/translation.json

@@ -477,7 +477,7 @@
   "Reassign": "재할당",
   "Recent Blocks": "최근 블록",
   "Recent Events": "최근 이벤트",
-  "Redeem": "가져오기",
+  "Unfreeze": "가져오기",
   "Register": "등록하다",
   "Register Asset": "자산을 등록합니다",
   "Register a parachain": "파라체인을 등록하다",

packages/apps/public/locales/pt/translation.json

@@ -355,7 +355,7 @@
   "Reassign": "Reatribuir",
   "Recent Blocks": "blocos recentes",
   "Recent Events": "eventos recentes",
-  "Redeem": "Resgatar",
+  "Unfreeze": "Resgatar",
   "Referenda": "referendo",
   "Register": "Registro",
   "Register Asset": "Registrar ativo",

packages/apps/public/locales/ru/translation.json

@@ -361,7 +361,7 @@
   "Reassign": "Переназначить",
   "Recent Blocks": "последние блоки",
   "Recent Events": "последние события",
-  "Redeem": "Получить",
+  "Unfreeze": "Получить",
   "Referenda": "референдумы",
   "Register": "Зарегистрировать",
   "Register Asset": "Зарегистрировать Актив",

packages/apps/public/locales/zh/translation.json

@@ -92,7 +92,7 @@
   "Aura": "Aura",
   "Authorize Transaction": "批准交易",
   "Available": "可用的",
-  "Available Interest": "该账户可提利息",
+  "Available Interest": "可提利息",
   "Avg Price": "成交均价",
   "Aye": "投票赞同",
   "Aye {{count}}": "同意 {{count}}",
@@ -157,7 +157,7 @@
   "Choose Account": "选择账号",
   "Claim": "提息",
   "Claim Interest": "提息",
-  "Claim Interests": "使用当前账户进行提息",
+  "Claim Interests": "提息",
   "Claim tokens": "映射代币",
   "Claim tokens...": "认领代币...",
   "Clear Identity": "清除身份",
@@ -202,7 +202,7 @@
   "Current Status": "当前节点状态",
   "Current Validator": "当前提息节点",
   "Current account nonce: {{accountNonce}}": "当前账户的 nonce 值: {{accountNonce}}",
-  "Current interest validator": "当前提息节点",
+  "Current interest validator": "对该节点提息",
   "Current prime member, default voting": "现任主要成员，默认投票",
   "Current society head, exempt": "现任社团负责人，豁免",
   "Current vote validator": "当前投票节点",
@@ -294,9 +294,13 @@
   "Free Balance": "可用余额",
   "Freeze": "冻结",
   "Freeze Amount": "冻结金额",
-  "From Validator": "当前验证人",
+  "From Validator": "当前节点",
   "From the following data": "根据以下数据",
-  "Frozen Voting": "投票冻结",
+  "Voting Frozen": "投票冻结",
+  "The number of Voting Frozen is the largest number of votes which are locked in Staking、Referendum or Voting for Council": "投票冻结包含质押冻结，公投冻结和理事会投票冻结。投票冻结数量以质押冻结总数、公投冻结数和理事会投票冻结数中最大冻结数显示。",
+  "UnBound Frozen": "撤票冻结",
+  "Other Frozen": "其他冻结",
+  "The Other Frozen mainly include pledge freeze, DEX freeze, council election freeze, submit proposal freeze, seconding freeze and so on": "其他冻结主要包含DEX冻结、理事会参选冻结、国库提案冻结、公民提案冻结、附议冻结等金额。",
   "Full Legal Name": "法定全称",
   "Future versions of the web-only interface will drop support for non-external accounts, much like the IPFS version.": "未来版本的纯 web 界面将不再支持非外部帐户，这与 IPFS 版本非常相似。",
   "General": "通用",
@@ -391,7 +395,7 @@
   "Multisig message with call (not approval with hash)": "有调用的多重签名消息（没有带哈希的批准）",
   "Mutates contract state": "改变合约状态",
   "My Account": "我的账户",
-  "My Accounts": "我的账户",
+  "Current Accounts": "当前账户",
   "My On-Chain Name": "我的链上名字",
   "My Stake": "我的质押",
   "My Staking": "我的质押",
@@ -581,19 +585,18 @@
   "Reason": "原因",
   "Reasonable": "合理的",
   "Reassign": "重新分配",
-  "Rebond": "切换投票节点",
+  "Rebond": "切换",
   "Rebond Amount": "切换投票数量",
   "Recent Blocks": "最新区块",
   "Recent Events": "最新事件",
   "Recent blocks": "最新区块",
   "Recharge": "跨链充值",
   "Recharge OP_RETURN trust's hot multi-sign address with a wallet that supports OP_RETURN information": "使用支持 OP_RETURN 的钱包向信托热多签地址充值，并输入 OP_RETURN 信息。",
   "Records": "跨链记录",
-  "Redeem": "赎回",
-  "To Redeem": "待赎回",
-  "Redeem ID": "赎回ID",
-  "Redeem the current node": "对当前节点进行赎回",
-  "Redemption": "赎回",
+  "To Unfreeze": "待解冻",
+  "Unfreeze ID": "解冻 ID",
+  "Redeem the current node": "对该节点赎回",
+  "Unfreeze": "解冻",
   "Referenda": "参考文献",
   "Refresh In": "刷新",
   "Register": "注册",
@@ -1046,7 +1049,7 @@
   "Tippers ({{count}})": "付小费的人({{count}})",
   "Tips": "小费",
   "To Council": "对理事会",
-  "To Validator": "切换验证人",
+  "To Validator": "切换至节点",
   "To ensure optimal fund security using the same stash/controller is strongly discouraged, but not forbidden.": "为了确保最佳的资金安全使用相同的stash/controller 账户是强烈不建议的，但不是禁止。",
   "Token": "币种",
   "Top Up": "跨链充值",
@@ -1063,6 +1066,7 @@
   "Total prize pool": "奖池总额",
   "Trade": "币币交易",
   "Trading ID": "交易ID",
+  "Transaction fee": "交易手续费",
   "Transfer": "转账",
   "Transfer X-BTC Amount": "X-BTC转账数量",
   "Transfer an amount from a specific account into a parachain.": "将一笔款项从一个特定的账户转到一个平行链账户",
@@ -1136,7 +1140,8 @@
   "Vote for current candidates": "给当前候选人投票",
   "Vote for defender": "投票给提出者",
   "Vote for the node": "对该节点进行投票",
-  "Vote for validator": "投票节点",
+  "Vote for validator": "对该节点进行投票",
+  "UnBound for validator": "对该节点撤票",
   "Vote on proposal": "投票议案",
   "Vote with account": "用账户投票",
   "Votes": "投票",
@@ -1457,6 +1462,7 @@
   "propose": "提案",
   "proposed by": "被提案",
   "proposer": "提案人",
+  "main account": "主账户",
   "proxied account": "代理账户",
   "proxied name": "代理名字",
   "proxy account": "代理帐户",
@@ -1546,6 +1552,9 @@
   "transfer received": "转账接收成功",
   "transfer remark/comment": "转账备注/评论",
   "transferrable": "可转账的",
+  "The amount of ticket revocable": "可撤票金额",
+  "Switchable Amount": "可切换金额",
+  "Vote Amounts": "可投票金额",
   "trusted social recovery helpers": "信任的社交恢复帮手",
   "twitter": "Twitter",
   "type": "类型",
@@ -1585,7 +1594,7 @@
   "vote for defender": "为提出者投票",
   "vote from account": "从账户投票",
   "vote using my account": "使用我的账户投票",
-  "voteable": "可投票的",
+  "voteable": "可投票数",
   "voting balance": "投票余额",
   "voting period": "投票起",
   "voting round": "投票轮次",
@@ -1604,6 +1613,7 @@
   "your new password": "你的新密码",
   "Chinese Node": "中国节点",
   "Overseas Node": "海外节点",
+  "Patract Node": "Patract 节点",
   "Test Node": "测试节点",
   "Prompt": "温馨提示",
   "The version you are visiting is not the latest version. If you can, please use our latest version and click the button below to enter the download page:": "您访问的版本不是最新版本哦，如果可以，请使用我们的最新版本，点击下方按钮进入下载页面：",