Merge branch 'v2-integration' into feature/ddw-924-create-link-component

input-output-hk · Jan 14, 2020 · 9aa7a6b · 9aa7a6b
2 parents d2eb124 + 7b6f330
commit 9aa7a6b
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Changelog
 - Improved network screen with responsive main copy box ([PR 1797](https://github.com/input-output-hk/daedalus/pull/1797))
 
 ### Fixes
+- Fixed a typo in the Staking Pools section ([PR 1785](https://github.com/input-output-hk/daedalus/pull/1785))
 - Fixed Daedalus ITN Terms of Service typo ([PR 1809](https://github.com/input-output-hk/daedalus/pull/1809))
 - Fixed handling of duplicated wallet IDs when restoring both legacy and new wallets from the same wallet recovery phrase ([PR 1805](https://github.com/input-output-hk/daedalus/pull/1805))
 

diff --git a/source/renderer/app/components/staking/stake-pools/StakePools.js b/source/renderer/app/components/staking/stake-pools/StakePools.js
@@ -14,7 +14,7 @@ import StakePool from '../../../domains/StakePool';
 const messages = defineMessages({
   delegatingListTitle: {
     id: 'staking.stakePools.delegatingListTitle',
-    defaultMessage: '!!!Stake pools you are currently delegating to',
+    defaultMessage: '!!!Staking pools you are delegating to',
     description: '"delegatingListTitlee" for the Stake Pools page.',
   },
   listTitle: {

diff --git a/source/renderer/app/components/staking/stake-pools/StakePoolsSearch.js b/source/renderer/app/components/staking/stake-pools/StakePoolsSearch.js
@@ -18,7 +18,7 @@ const messages = defineMessages({
   },
   delegatingListTitle: {
     id: 'staking.stakePools.search.delegatingListTitle',
-    defaultMessage: '!!!Stake pools you are currently delegating to',
+    defaultMessage: '!!!Staking pools you are delegating to',
     description: '"delegatingListTitlee" for the Stake Pools search.',
   },
   listTitle: {

diff --git a/source/renderer/app/i18n/locales/de-DE.json b/source/renderer/app/i18n/locales/de-DE.json
@@ -382,11 +382,11 @@
   "staking.rewards.tableHeader.reward": "!!!Reward",
   "staking.rewards.tableHeader.wallet": "!!!Wallet",
   "staking.rewards.title": "!!!Earned Rewards",
-  "staking.stakePools.delegatingListTitle": "!!!Stake pools you are currently delegating to",
+  "staking.stakePools.delegatingListTitle": "!!!Staking pools you are delegating to",
   "staking.stakePools.listTitle": "!!!Stake pools ({pools})",
   "staking.stakePools.listTitleWithSearch": "!!!Stake pools. Search results: ({pools})",
   "staking.stakePools.loadingStakePoolsMessage": "!!!Loading stake pools",
-  "staking.stakePools.search.delegatingListTitle": "!!!Stake pools you are currently delegating to",
+  "staking.stakePools.search.delegatingListTitle": "!!!Staking pools you are delegating to",
   "staking.stakePools.search.listTitle": "!!!Stake pools ({pools})",
   "staking.stakePools.search.searchInputPlaceholder": "!!!Search stake pools",
   "staking.stakePools.tooltip.controlledStake": "!!!Controlled stake",

diff --git a/source/renderer/app/i18n/locales/defaultMessages.json b/source/renderer/app/i18n/locales/defaultMessages.json
@@ -3876,7 +3876,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Stake pools you are currently delegating to",
+        "defaultMessage": "!!!Staking pools you are delegating to",
         "description": "\"delegatingListTitlee\" for the Stake Pools page.",
         "end": {
           "column": 3,
@@ -3951,7 +3951,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Stake pools you are currently delegating to",
+        "defaultMessage": "!!!Staking pools you are delegating to",
         "description": "\"delegatingListTitlee\" for the Stake Pools search.",
         "end": {
           "column": 3,

diff --git a/source/renderer/app/i18n/locales/en-US.json b/source/renderer/app/i18n/locales/en-US.json
@@ -382,11 +382,11 @@
   "staking.rewards.tableHeader.reward": "Reward",
   "staking.rewards.tableHeader.wallet": "Wallet",
   "staking.rewards.title": "Earned delegation rewards",
-  "staking.stakePools.delegatingListTitle": "Staking pools your are delegating to",
+  "staking.stakePools.delegatingListTitle": "Staking pools you are delegating to",
   "staking.stakePools.listTitle": "Stake pools ({pools})",
   "staking.stakePools.listTitleWithSearch": "Stake pools. Search results: ({pools})",
   "staking.stakePools.loadingStakePoolsMessage": "Loading stake pools",
-  "staking.stakePools.search.delegatingListTitle": "Staking pools your are delegating to",
+  "staking.stakePools.search.delegatingListTitle": "Staking pools you are delegating to",
   "staking.stakePools.search.listTitle": "Stake pools ({pools})",
   "staking.stakePools.search.searchInputPlaceholder": "Search stake pools",
   "staking.stakePools.tooltip.controlledStake": "Controlled stake:",

diff --git a/source/renderer/app/i18n/locales/hr-HR.json b/source/renderer/app/i18n/locales/hr-HR.json
@@ -382,11 +382,11 @@
   "staking.rewards.tableHeader.reward": "!!!Reward",
   "staking.rewards.tableHeader.wallet": "!!!Wallet",
   "staking.rewards.title": "!!!Earned Rewards",
-  "staking.stakePools.delegatingListTitle": "!!!Stake pools you are currently delegating to",
+  "staking.stakePools.delegatingListTitle": "!!!Staking pools you are delegating to",
   "staking.stakePools.listTitle": "!!!Stake pools ({pools})",
   "staking.stakePools.listTitleWithSearch": "!!!Stake pools. Search results: ({pools})",
   "staking.stakePools.loadingStakePoolsMessage": "!!!Loading stake pools",
-  "staking.stakePools.search.delegatingListTitle": "!!!Stake pools you are currently delegating to",
+  "staking.stakePools.search.delegatingListTitle": "!!!Staking pools you are delegating to",
   "staking.stakePools.search.listTitle": "!!!Stake pools ({pools})",
   "staking.stakePools.search.searchInputPlaceholder": "!!!Search stake pools",
   "staking.stakePools.tooltip.controlledStake": "!!!Controlled stake",

diff --git a/source/renderer/app/i18n/locales/ko-KR.json b/source/renderer/app/i18n/locales/ko-KR.json
@@ -382,11 +382,11 @@
   "staking.rewards.tableHeader.reward": "!!!Reward",
   "staking.rewards.tableHeader.wallet": "!!!Wallet",
   "staking.rewards.title": "!!!Earned Rewards",
-  "staking.stakePools.delegatingListTitle": "!!!Stake pools you are currently delegating to",
+  "staking.stakePools.delegatingListTitle": "!!!Staking pools you are delegating to",
   "staking.stakePools.listTitle": "!!!Stake pools ({pools})",
   "staking.stakePools.listTitleWithSearch": "!!!Stake pools. Search results: ({pools})",
   "staking.stakePools.loadingStakePoolsMessage": "!!!Loading stake pools",
-  "staking.stakePools.search.delegatingListTitle": "!!!Stake pools you are currently delegating to",
+  "staking.stakePools.search.delegatingListTitle": "!!!Staking pools you are delegating to",
   "staking.stakePools.search.listTitle": "!!!Stake pools ({pools})",
   "staking.stakePools.search.searchInputPlaceholder": "!!!Search stake pools",
   "staking.stakePools.tooltip.controlledStake": "!!!Controlled stake",

diff --git a/source/renderer/app/i18n/locales/zh-CN.json b/source/renderer/app/i18n/locales/zh-CN.json
@@ -382,11 +382,11 @@
   "staking.rewards.tableHeader.reward": "!!!Reward",
   "staking.rewards.tableHeader.wallet": "!!!Wallet",
   "staking.rewards.title": "!!!Earned Rewards",
-  "staking.stakePools.delegatingListTitle": "!!!Stake pools you are currently delegating to",
+  "staking.stakePools.delegatingListTitle": "!!!Staking pools you are delegating to",
   "staking.stakePools.listTitle": "!!!Stake pools ({pools})",
   "staking.stakePools.listTitleWithSearch": "!!!Stake pools. Search results: ({pools})",
   "staking.stakePools.loadingStakePoolsMessage": "!!!Loading stake pools",
-  "staking.stakePools.search.delegatingListTitle": "!!!Stake pools you are currently delegating to",
+  "staking.stakePools.search.delegatingListTitle": "!!!Staking pools you are delegating to",
   "staking.stakePools.search.listTitle": "!!!Stake pools ({pools})",
   "staking.stakePools.search.searchInputPlaceholder": "!!!Search stake pools",
   "staking.stakePools.tooltip.controlledStake": "!!!Controlled stake",