Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into release/5.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcin Mazurek committed Jul 13, 2023
2 parents 85c5df5 + 2772978 commit 44942bd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

- Apply Catalyst API improvements ([PR 3136](https://github.com/input-output-hk/daedalus/pull/3136))
- Switched to the new Catalyst API ([PR 3129](https://github.com/input-output-hk/daedalus/pull/3129))
- Updated Catalyst links ([PR 3137](https://github.com/input-output-hk/daedalus/pull/3137))

### Fixes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const VotingFooterLinks = injectIntl(
observer(({ onClickExternalLink, intl }: Props) => {
const links: FooterLink[] = [
{
url: 'https://bit.ly/3dSZJvx',
url: 'https://bit.ly/ProjCatNews',
label: intl.formatMessage(messages.newsletter),
},
{
Expand Down
4 changes: 2 additions & 2 deletions source/renderer/app/i18n/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@
"voting.info.androidAppButtonUrl": "https://play.google.com/store/apps/details?id=io.iohk.vitvoting",
"voting.info.appleAppButtonUrl": "https://apps.apple.com/in/app/catalyst-voting/id1517473397",
"voting.info.learnMoreLinkLabel": "Learn more",
"voting.info.learnMoreLinkUrl": "https://cardano.ideascale.com/a/index",
"voting.info.learnMoreLinkUrl": "https://projectcatalyst.io/",
"voting.info.noWallets.createWalletButtonLabel": "Create wallet",
"voting.info.noWallets.headLine": "Voting registration is not available as you currently do not have any Shelley-compatible wallets.",
"voting.info.noWallets.instructions": "Create a new wallet and transfer a minimum of {minVotingFunds} ADA (or restore an existing wallet with funds), then return here to register for voting.",
Expand All @@ -733,7 +733,7 @@
"voting.registerToVote.votingInstructions": "If you are not registered yet, make sure to register to vote in the current fund before the snapshot date.",
"voting.resultsPhase.endDateLabel": "End of voting:",
"voting.resultsPhase.viewResultsLinkLabel": "View results",
"voting.resultsPhase.viewResultsLinkURL": "https://cardano.ideascale.com/a/pages/results",
"voting.resultsPhase.viewResultsLinkURL": "https://projectcatalyst.io/funds",
"voting.snapshotPhase.snapshotDateLabel": "Snapshot date:",
"voting.snapshotPhase.votingDateLabel": "Next voting period:",
"voting.tallyingPhase.endDateLabel": "Voting ended:",
Expand Down
4 changes: 2 additions & 2 deletions source/renderer/app/i18n/locales/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@
"voting.info.androidAppButtonUrl": "https://play.google.com/store/apps/details?id=io.iohk.vitvoting",
"voting.info.appleAppButtonUrl": "https://apps.apple.com/in/app/catalyst-voting/id1517473397",
"voting.info.learnMoreLinkLabel": "もっと知る",
"voting.info.learnMoreLinkUrl": "https://cardano.ideascale.com/a/index",
"voting.info.learnMoreLinkUrl": "https://projectcatalyst.io/",
"voting.info.noWallets.createWalletButtonLabel": "ウォレットを作成する",
"voting.info.noWallets.headLine": "現在Shelley対応のウォレットがないため、有権者登録はできません。",
"voting.info.noWallets.instructions": "ウォレットを作成し、そこに{minVotingFunds} ADA以上を移してから(または既存の資金入りウォレットを復元してから)、改めてここで有権者登録を行ってください。",
Expand All @@ -733,7 +733,7 @@
"voting.registerToVote.votingInstructions": "登録を済ませていない場合は、スナップショットの実施日前に現行のファンドの有権者登録を行ってください。",
"voting.resultsPhase.endDateLabel": "投票締め切り:",
"voting.resultsPhase.viewResultsLinkLabel": "結果を見る",
"voting.resultsPhase.viewResultsLinkURL": "https://cardano.ideascale.com/a/pages/results",
"voting.resultsPhase.viewResultsLinkURL": "https://projectcatalyst.io/funds",
"voting.snapshotPhase.snapshotDateLabel": "スナップショット日:",
"voting.snapshotPhase.votingDateLabel": "次回投票期間:",
"voting.tallyingPhase.endDateLabel": "投票締め切り:",
Expand Down

0 comments on commit 44942bd

Please sign in to comment.