diff --git a/CHANGELOG.md b/CHANGELOG.md index 2096cd5a8c..d387b02ff6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### Chores +- Updated `cardano-wallet` to v2022-10-06 ([PR 3045](https://github.com/input-output-hk/daedalus/pull/3045)) +- Changed Japanese translations in delegate screen ([PR 3044](https://github.com/input-output-hk/daedalus/pull/3044)) - Updated trezor-connect to v9 ([PR 3038](https://github.com/input-output-hk/daedalus/pull/3038)) - Added analytics data collection ([PR 2927](https://github.com/input-output-hk/daedalus/pull/2927), [PR 2989](https://github.com/input-output-hk/daedalus/pull/2989), [PR 3003](https://github.com/input-output-hk/daedalus/pull/3003), [PR 3028](https://github.com/input-output-hk/daedalus/pull/3028)) - Updated LedgerJS to 5.1.0 ([PR 3036](https://github.com/input-output-hk/daedalus/pull/3036)) diff --git a/default.nix b/default.nix index 42d9746d6a..76e328ea40 100644 --- a/default.nix +++ b/default.nix @@ -32,12 +32,15 @@ let }; pkgs = import sources.nixpkgs { inherit system config; }; sources = localLib.sources // { - cardano-wallet = pkgs.runCommand "cardano-wallet" {} '' - cp -r ${localLib.sources.cardano-wallet} $out - chmod -R +w $out - cd $out - patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch} - ''; + cardano-wallet = + if target != "aarch64-darwin" + then localLib.sources.cardano-wallet + else pkgs.runCommand "cardano-wallet" {} '' + cp -r ${localLib.sources.cardano-wallet} $out + chmod -R +w $out + cd $out + patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch} + ''; }; haskellNix = import sources."haskell.nix" {}; inherit (import haskellNix.sources.nixpkgs-unstable haskellNix.nixpkgsArgs) haskell-nix; diff --git a/nix/sources.json b/nix/sources.json index 30dc8afee2..7ec42b1e2b 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -24,15 +24,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "cardano-wallet": { - "branch": "v2022-08-16", + "branch": "v2022-10-06", "description": "Official Wallet Backend & API for Cardano decentralized", "homepage": null, "owner": "input-output-hk", "repo": "cardano-wallet", - "rev": "afe575663a866c612b4a4dc3a90a8a700e387a86", - "sha256": "03shbj5kxvcb22k1bvfcv9q529lg47g9y9pvvwkyb2jy285rwyhv", + "rev": "2130fe0acf19fa218cef8de4ef325ae9078e356e", + "sha256": "0d0wk6n7vij4qkp2qml5qdghk41dvm1078ps48673waf4cxjxaz0", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-wallet/archive/afe575663a866c612b4a4dc3a90a8a700e387a86.tar.gz", + "url": "https://github.com/input-output-hk/cardano-wallet/archive/2130fe0acf19fa218cef8de4ef325ae9078e356e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "cardano-world": { diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json index 56659c05b2..728b3e0265 100755 --- a/source/renderer/app/i18n/locales/ja-JP.json +++ b/source/renderer/app/i18n/locales/ja-JP.json @@ -465,7 +465,7 @@ "staking.delegationSetup.chooseStakePool.step.dialog.stepIndicatorLabel": "ステップ{currentStep}/{totalSteps}", "staking.delegationSetup.chooseStakePool.step.dialog.title": "ステークプールを選択する", "staking.delegationSetup.chooseWallet.step.dialog.continueButtonLabel": "続ける", - "staking.delegationSetup.chooseWallet.step.dialog.description": "このウォレットには委任を有効にするために必要な最低額{minDelegationFunds} ADAが入っていません。{minDelegationFunds} ADA以上入っているウォレットを選択して、[続ける]をクリックしてください。", + "staking.delegationSetup.chooseWallet.step.dialog.description": "委任する資金が入ったウォレットを選択してください。委任をオプションにするためには、選択したウォレットに{minDelegationFunds}ADA以上入っている必要があります。", "staking.delegationSetup.chooseWallet.step.dialog.errorMinDelegationFunds": "選択されたウォレットには委任を有効にするために必要な最低額{minDelegationFunds} ADAが入っていません。{minDelegationFunds} ADA以上入っているウォレットを選択して、[続ける]をクリックしてください。", "staking.delegationSetup.chooseWallet.step.dialog.errorMinDelegationFundsRewardsOnly": "このウォレットに含まれているのは報酬残高のみであるため、委任はできません。", "staking.delegationSetup.chooseWallet.step.dialog.errorRestoringWallet": "このウォレットは現在同期中のため委任に使用することができません。",