Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into testnet #1755

Merged
merged 6 commits into from
Aug 15, 2024
Merged

Merge develop into testnet #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af99e0f
Merge pull request #1744 from nervosnetwork/testnet
Keith-CY Aug 7, 2024
35bf96b
Merge pull request #1746 from nervosnetwork/testnet
Keith-CY Aug 7, 2024
4eaf192
Merge pull request #1748 from nervosnetwork/testnet
Keith-CY Aug 9, 2024
461a75b
Merge pull request #1751 from nervosnetwork/testnet
Keith-CY Aug 9, 2024
f531791
Merge pull request #1754 from nervosnetwork/testnet
Keith-CY Aug 14, 2024
a6624d0
fix: fix i18n
Keith-CY Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@
"live_cell": "Live Cell",
"dead_cell": "Consumed Cell",
"cell_info": "Cell Info",
"pending_cell": "Pending Cell",
"bind_description": {
"binding": "\"Binding\": The UTXO corresponding to the current Cell has been consumed. If the \"Binding\" status persists for too long, please check the CKB transaction status under the BTC address that consumed this UTXO.",
"bound": "\"Bound\": \"Bound\" means that the Owner of the Cell is a live BTC UTXO, and the Cell has been bound to a specific BTC address.",
Expand Down
1 change: 1 addition & 0 deletions src/locales/zh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
"cell": {
"live_cell": "未消耗 Cell",
"dead_cell": "已消耗 Cell",
"pending_cell": "待确认 Cell",
"cell_info": "Cell 信息",
"bind_description": {
"binding": "“待绑定”：当前Cell 对应的UTXO 已被消耗。如果“待绑定”持续时间过长，请检查消耗 此UTXO 对应BTC地址下的CKB交易状态。",
Expand Down