From f6e4907128c4d4d6eca04026249acc5d48a48332 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Sat, 26 Jun 2021 16:48:57 -0700 Subject: [PATCH 01/42] skip downloading the Cypress binary on Docker --- docker/frontend/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 2293f59a9..9243e7cb9 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -2,6 +2,7 @@ FROM node:12-buster-slim AS builder ARG commitHash ENV DOCKER_COMMIT_HASH=${commitHash} +ENV CYPRESS_INSTALL_BINARY=0 WORKDIR /build COPY . . From da13349b142a1360206e9f6dfd3dc6cab1a4d83f Mon Sep 17 00:00:00 2001 From: softsimon Date: Sun, 27 Jun 2021 12:16:59 -0400 Subject: [PATCH 02/42] Reduce titles in Russian language to prevent overflows. --- frontend/src/styles.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 9a985bbba..b33dd78da 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -251,6 +251,9 @@ body { font-size: 14px; } +html:lang(ru) .card-title { + font-size: 0.9rem; +} /* Chartist */ $ct-series-names: (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z); From df588695ec4c18770ff6d4b73cad1c35dafedcae Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Tue, 29 Jun 2021 14:08:11 -0300 Subject: [PATCH 03/42] Fix iinverse mempool graph also affect the TV view (#580) --- .../app/components/statistics/chartist.component.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/components/statistics/chartist.component.scss b/frontend/src/app/components/statistics/chartist.component.scss index e3c813602..1f72f6bb4 100644 --- a/frontend/src/app/components/statistics/chartist.component.scss +++ b/frontend/src/app/components/statistics/chartist.component.scss @@ -1,11 +1,11 @@ -.ct-legend{ +.ct-legend { top: 130px; display: flex; flex-direction: column-reverse; @media (min-width: 653px) { top: 90px; } -} -.ct-legend.inverted{ - flex-direction: column; -} \ No newline at end of file + } + .ct-legend.inverted { + flex-direction: column !important; + } \ No newline at end of file From 807d4b032782e8727c3a1cd9518663fb02e29b34 Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Tue, 29 Jun 2021 14:10:15 -0300 Subject: [PATCH 04/42] Fix tv only (#598) * Remove TV Only container. --- .../integration/mainnet/mainnet.spec.ts | 5 ++- .../television/television.component.html | 2 - .../television/television.component.scss | 39 ++++++++----------- 3 files changed, 19 insertions(+), 27 deletions(-) diff --git a/frontend/cypress/integration/mainnet/mainnet.spec.ts b/frontend/cypress/integration/mainnet/mainnet.spec.ts index e9a5c1c8e..a9b112514 100644 --- a/frontend/cypress/integration/mainnet/mainnet.spec.ts +++ b/frontend/cypress/integration/mainnet/mainnet.spec.ts @@ -35,8 +35,9 @@ describe('Mainnet', () => { cy.viewport('macbook-16'); cy.visit('/'); cy.get('li:nth-of-type(4) > a').click().then(() => { + cy.viewport('macbook-16'); cy.wait(1000); - cy.get('.tv-only').should('not.be.visible'); + cy.get('.blockchain-wrapper').should('be.visible'); }); }); @@ -45,7 +46,7 @@ describe('Mainnet', () => { cy.get('li:nth-of-type(4) > a').click().then(() => { cy.viewport('iphone-6'); cy.wait(1000); - cy.get('.tv-only').should('be.visible'); + cy.get('.blockchain-wrapper').should('not.be.visible'); }); }); }); diff --git a/frontend/src/app/components/television/television.component.html b/frontend/src/app/components/television/television.component.html index dda09e23e..a541630a4 100644 --- a/frontend/src/app/components/television/television.component.html +++ b/frontend/src/app/components/television/television.component.html @@ -4,8 +4,6 @@ -
TV only
-
diff --git a/frontend/src/app/components/television/television.component.scss b/frontend/src/app/components/television/television.component.scss index d7b105bfb..48a83e1a1 100644 --- a/frontend/src/app/components/television/television.component.scss +++ b/frontend/src/app/components/television/television.component.scss @@ -31,6 +31,15 @@ .blockchain-wrapper { + display: flex; + height: 100%; + min-height: 240px; + position: relative; + top: -20px; + @media(min-height: 800px) { + top: 10px; + } + .position-container { position: absolute; left: 50%; @@ -76,29 +85,13 @@ } } -.tv-only { - display: block; - height: 100vh; - width: 100%; - position: relative; - display: flex; - text-align: center; - flex-direction: row; - align-items: center; - justify-content: center; - @media(min-width: 768px) { - display: none; - } - @media(max-height: 720px) { - display: flex; - } -} .tv-container { - display: none; - @media(min-width: 768px) { - display: flex; - } - @media(max-height: 720px) { - display: none; + display: flex; + margin-top: 0px; + flex-direction: column; + @media(max-height: 700px) { + .blockchain-wrapper{ + display: none !important; + } } } \ No newline at end of file From 8e1aae1bbfc9e751f2ccb84a24f906985d06a07b Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 29 Jun 2021 13:11:39 -0400 Subject: [PATCH 05/42] Updating i18n messages. --- frontend/src/locale/messages.xlf | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 26f1345ae..54118f552 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -2965,14 +2965,6 @@ statistics.transaction-vbytes-per-second - - TV only - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now From b48a48a6becb6b6cc079babba69e57b029a7c70e Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 29 Jun 2021 13:12:47 -0400 Subject: [PATCH 06/42] Updating from transifex. --- frontend/src/locale/messages.ar.xlf | 35 +++++++++------------- frontend/src/locale/messages.ca.xlf | 8 ------ frontend/src/locale/messages.cs.xlf | 9 ------ frontend/src/locale/messages.de.xlf | 9 ------ frontend/src/locale/messages.en_US.xlf | 8 ------ frontend/src/locale/messages.es.xlf | 9 ------ frontend/src/locale/messages.fa.xlf | 9 ------ frontend/src/locale/messages.fi.xlf | 13 +++------ frontend/src/locale/messages.fr.xlf | 8 ------ frontend/src/locale/messages.he.xlf | 9 ------ frontend/src/locale/messages.hr.xlf | 8 ------ frontend/src/locale/messages.hu.xlf | 9 ------ frontend/src/locale/messages.it.xlf | 9 ------ frontend/src/locale/messages.ja.xlf | 9 ------ frontend/src/locale/messages.ka.xlf | 8 ------ frontend/src/locale/messages.ko.xlf | 40 ++++++++++++++++++-------- frontend/src/locale/messages.nb.xlf | 8 ------ frontend/src/locale/messages.nl.xlf | 9 ------ frontend/src/locale/messages.pl.xlf | 9 ------ frontend/src/locale/messages.pt.xlf | 9 ------ frontend/src/locale/messages.ru.xlf | 9 ------ frontend/src/locale/messages.sl.xlf | 9 ------ frontend/src/locale/messages.sv.xlf | 9 ------ frontend/src/locale/messages.tr.xlf | 9 ------ frontend/src/locale/messages.uk.xlf | 9 ------ frontend/src/locale/messages.vi.xlf | 9 ------ frontend/src/locale/messages.zh.xlf | 8 ------ 27 files changed, 45 insertions(+), 252 deletions(-) diff --git a/frontend/src/locale/messages.ar.xlf b/frontend/src/locale/messages.ar.xlf index 6d6614513..a3dff0000 100644 --- a/frontend/src/locale/messages.ar.xlf +++ b/frontend/src/locale/messages.ar.xlf @@ -494,7 +494,7 @@ Block - كتلة + الكتلة src/app/bisq/bisq-block/bisq-block.component.html 4 @@ -524,7 +524,7 @@ Timestamp - الوقت و التاريخ + الوقت والتاريخ src/app/bisq/bisq-block/bisq-block.component.html 21 @@ -1482,7 +1482,7 @@ multisig of - متعدد التوقيع من + متعدد التواقيع من src/app/components/address-labels/address-labels.component.html 5 @@ -2547,7 +2547,7 @@ Size - حجم + الحجم src/app/components/block/block.component.html 31,33 @@ -2568,7 +2568,7 @@ Weight - وزن + الوزن src/app/components/block/block.component.html 35,37 @@ -2882,7 +2882,7 @@ Unconfirmed - غير مؤكده + غير مؤكدة src/app/components/footer/footer.component.html 16,17 @@ -2993,7 +2993,7 @@ Fee span - امتداد الرسوم + نطاق الرسوم src/app/components/mempool-block/mempool-block.component.html 20,21 @@ -3188,15 +3188,6 @@ statistics.transaction-vbytes-per-second - - TV only - فقط للتفاز - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now الآن @@ -3698,7 +3689,7 @@ SegWit - سيقويت + SegWit src/app/components/tx-features/tx-features.component.html 1 @@ -3716,7 +3707,7 @@ This transaction saved % on fees by using SegWit and could save % more by fully upgrading to native SegWit-Bech32 - هذه التحويله وفرة ٪ من رسوم التحويل عن طريق استخدام السيقويت و ممكن ان توفر ٪ اكثر عن طريق التطور الى النيتف سيقويت Bech32 + هذه المعاملة وفرت ٪ من رسوم التحويل باستخدام سيقويت وممكن ان توفر ٪ اكثر عن طريق التطور الى نيتف سيقويت Bech32 src/app/components/tx-features/tx-features.component.html 3 @@ -3725,7 +3716,7 @@ This transaction could save % on fees by upgrading to native SegWit-Bech32 or % by upgrading to SegWit-P2SH - كان من الممكن أن توفر هذه التحويله٪ من الرسوم عن طريق الترقية إلى SegWit-Bech32 أو ٪ عن طريق الترقية إلى SegWit-P2SH + كان من الممكن أن توفر هذه المعاملة ٪ من الرسوم عن طريق الترقية إلى سيقويت Bech32 أو ٪ عن طريق الترقية إلى سيقويت-P2SH src/app/components/tx-features/tx-features.component.html 5 @@ -3776,7 +3767,7 @@ Only ~ sat/vB was needed to get into this block - المتبقي فقط ~ سات/ في بي للدخول في هذه الكتله + كان مطلوب ~ sat/vB فقط لاضافة هذه المعاملة لهذة الكتلة src/app/components/tx-fee-rating/tx-fee-rating.component.html 2 @@ -3789,7 +3780,7 @@ Overpaid x - دفع اكثر مما يستحق + دفع x اكثر مما يجب src/app/components/tx-fee-rating/tx-fee-rating.component.html 2 @@ -3870,7 +3861,7 @@ Minimum fee - الحد الادنى للعموله + الحد الادنى للعمولة src/app/dashboard/dashboard.component.html 161,162 diff --git a/frontend/src/locale/messages.ca.xlf b/frontend/src/locale/messages.ca.xlf index 376271a21..e8be35e1b 100644 --- a/frontend/src/locale/messages.ca.xlf +++ b/frontend/src/locale/messages.ca.xlf @@ -3125,14 +3125,6 @@ statistics.transaction-vbytes-per-second - - TV only - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Ara diff --git a/frontend/src/locale/messages.cs.xlf b/frontend/src/locale/messages.cs.xlf index f32448584..a300f8aa1 100644 --- a/frontend/src/locale/messages.cs.xlf +++ b/frontend/src/locale/messages.cs.xlf @@ -3226,15 +3226,6 @@ statistics.transaction-vbytes-per-second - - TV only - Pouze TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Právě teď diff --git a/frontend/src/locale/messages.de.xlf b/frontend/src/locale/messages.de.xlf index 92caf8a68..075943c08 100644 --- a/frontend/src/locale/messages.de.xlf +++ b/frontend/src/locale/messages.de.xlf @@ -3229,15 +3229,6 @@ statistics.transaction-vbytes-per-second - - TV only - Nur Fernseher - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Gerade eben diff --git a/frontend/src/locale/messages.en_US.xlf b/frontend/src/locale/messages.en_US.xlf index 6e1a521fa..c24df8f47 100644 --- a/frontend/src/locale/messages.en_US.xlf +++ b/frontend/src/locale/messages.en_US.xlf @@ -2964,14 +2964,6 @@ statistics.transaction-vbytes-per-second - - TV only - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now diff --git a/frontend/src/locale/messages.es.xlf b/frontend/src/locale/messages.es.xlf index 0ac1a5589..fd824f1c6 100644 --- a/frontend/src/locale/messages.es.xlf +++ b/frontend/src/locale/messages.es.xlf @@ -3229,15 +3229,6 @@ statistics.transaction-vbytes-per-second - - TV only - Solo TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Justo ahora diff --git a/frontend/src/locale/messages.fa.xlf b/frontend/src/locale/messages.fa.xlf index f3cf5e8f4..3007e30b8 100644 --- a/frontend/src/locale/messages.fa.xlf +++ b/frontend/src/locale/messages.fa.xlf @@ -3233,15 +3233,6 @@ statistics.transaction-vbytes-per-second - - TV only - تلویزیونی - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now همین الان diff --git a/frontend/src/locale/messages.fi.xlf b/frontend/src/locale/messages.fi.xlf index 60d469740..61e01b91e 100644 --- a/frontend/src/locale/messages.fi.xlf +++ b/frontend/src/locale/messages.fi.xlf @@ -1377,6 +1377,7 @@ The Mempool Open Source Project + Mempool avoimen lähdekoodin projekti src/app/components/about/about.component.html 12,13 @@ -1385,6 +1386,7 @@ Building a mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, without any advertising, altcoins, or third-party trackers. + Rakennetaan mempool- ja lohkoketjuselain Bitcoin-yhteisölle, jossa keskitytään transaktiokulumarkkinoihin ja monikerroksiseen ekosysteemiin ilman mainontaa, altcoineja tai kolmannen osapuolen seurantalaitteita. src/app/components/about/about.component.html 13,17 @@ -2180,6 +2182,7 @@ Returns the ancestors and the best descendant fees for a transaction. + Palauttaa esisiirtokulun ja jälkisiirtokulun siirtotapahtumalle. src/app/components/api-docs/api-docs.component.html 563,565 @@ -2475,6 +2478,7 @@ of   + /  src/app/components/asset/asset.component.html 76 @@ -3225,15 +3229,6 @@ statistics.transaction-vbytes-per-second - - TV only - Vain TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Juuri nyt diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index 1d96a8042..871c1dc9f 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -3170,14 +3170,6 @@ statistics.transaction-vbytes-per-second - - TV only - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now À l'instant même diff --git a/frontend/src/locale/messages.he.xlf b/frontend/src/locale/messages.he.xlf index 16d071b5b..f957f43a5 100644 --- a/frontend/src/locale/messages.he.xlf +++ b/frontend/src/locale/messages.he.xlf @@ -3203,15 +3203,6 @@ statistics.transaction-vbytes-per-second - - TV only - מצב טלוויזיה בלבד - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now זה עתה diff --git a/frontend/src/locale/messages.hr.xlf b/frontend/src/locale/messages.hr.xlf index 4dccca6f1..0f36fe2a9 100644 --- a/frontend/src/locale/messages.hr.xlf +++ b/frontend/src/locale/messages.hr.xlf @@ -2972,14 +2972,6 @@ statistics.transaction-vbytes-per-second - - TV only - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now diff --git a/frontend/src/locale/messages.hu.xlf b/frontend/src/locale/messages.hu.xlf index 9417a9856..c06cde2f9 100644 --- a/frontend/src/locale/messages.hu.xlf +++ b/frontend/src/locale/messages.hu.xlf @@ -3229,15 +3229,6 @@ statistics.transaction-vbytes-per-second - - TV only - Csak TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Épp most diff --git a/frontend/src/locale/messages.it.xlf b/frontend/src/locale/messages.it.xlf index 658bc339b..3d94f0b97 100644 --- a/frontend/src/locale/messages.it.xlf +++ b/frontend/src/locale/messages.it.xlf @@ -3222,15 +3222,6 @@ statistics.transaction-vbytes-per-second - - TV only - TV only - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Proprio ora diff --git a/frontend/src/locale/messages.ja.xlf b/frontend/src/locale/messages.ja.xlf index fc4d70d50..f424d0b78 100644 --- a/frontend/src/locale/messages.ja.xlf +++ b/frontend/src/locale/messages.ja.xlf @@ -3229,15 +3229,6 @@ statistics.transaction-vbytes-per-second - - TV only - TVのみ - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now ちょうど今 diff --git a/frontend/src/locale/messages.ka.xlf b/frontend/src/locale/messages.ka.xlf index a729df206..5194f4c1c 100644 --- a/frontend/src/locale/messages.ka.xlf +++ b/frontend/src/locale/messages.ka.xlf @@ -3100,14 +3100,6 @@ statistics.transaction-vbytes-per-second - - TV only - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now ზუსტად ახლა diff --git a/frontend/src/locale/messages.ko.xlf b/frontend/src/locale/messages.ko.xlf index 890af0de9..1a2367ea1 100644 --- a/frontend/src/locale/messages.ko.xlf +++ b/frontend/src/locale/messages.ko.xlf @@ -243,6 +243,7 @@ + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts 296 @@ -250,6 +251,7 @@ + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts 296 @@ -1951,7 +1953,7 @@ Get the list of unspent transaction outputs associated with the address/scripthash. Available fields: txid, vout, value, and status (with the status of the funding tx).There is also a valuecommitment field that may appear in place of value, plus the following additional fields: asset/assetcommitment, nonce/noncecommitment, surjection_proof, and range_proof. - 주소 / 스크립트 해시와 관련된 미사용 트랜잭션 출력 목록을 가져옵니다. 사용 가능한 필드 : txid , vout , 값 ,및 상태 (tx 기금 현황과 함께). 또한valuecommitment필드가 값 대신으로 나타날 수 있습니다. 추가로 따라오는 필드들: 자산/asstcommitment,임시값/noncecommitment,전사함수_증명,그리고range_proof. + 주소 / 스크립트 해시와 관련된 미사용 트랜잭션 출력 목록을 가져옵니다. 사용 가능한 필드 : txid , vout , 값 ,및 상태 (tx 기금 현황과 함께). 또한valuecommitment필드가 값 대신으로 나타날 수 있습니다. 추가로 따라오는 필드들: 자산/asstcommitment,임시값/noncecommitment,전사함수_증명,그리고range_proof. src/app/components/api-docs/api-docs.component.html 100,101 @@ -1985,7 +1987,13 @@ Get the current total supply of the specified asset. For the native asset (L-BTC), this is calculated as [chain,mempool]_stats.peg_in_amount - [chain,mempool]_stats.peg_out_amount - [chain,mempool]_stats.burned_amount. For issued assets, this is calculated as [chain,mempool]_stats.issued_amount - [chain,mempool]_stats.burned_amount. Not available for assets with blinded issuances. If /decimal is specified, returns the supply as a decimal according to the asset's divisibility. Otherwise, returned in base units. - 지정된 자산의 현재 총 공급량을 가져옵니다. 네이티브 자산 (L-BTC)의 경우 [chain, mempool] _stats.peg_in_amount-[chain, mempool] _stats.peg_out_amount-[chain, mempool] _stats.burned_amount로 계산됩니다. 발행 된 자산의 경우 [chain, mempool] _stats.issued_amount-[chain, mempool] _stats.burned_amount로 계산됩니다. 블라인드 발행이있는 자산에는 사용할 수 없습니다. / decimal이 지정된 경우 자산의 분할 가능성에 따라 소수로 공급을 반환합니다. 그렇지 않으면 기본 단위로 반환됩니다. + 지정된 자산의 현재 총 공급량을 가져옵니다. 네이티브 자산 (L-BTC)의 경우 [chain, mempool] _stats.peg_in_amount- +[chain, mempool] _stats.peg_out_amount- +[chain, mempool] _stats.burned_amount로 계산됩니다. +발행 된 자산의 경우 +[chain, mempool] _stats.issued_amount- +[chain, mempool] _stats.burned_amount로 계산됩니다. +블라인드 발행이있는 자산에는 사용할 수 없습니다. 만약 decimal이 지정된 경우 자산의 분할 가능성에 따라 소수로 공급을 반환합니다. 그렇지 않으면 기본 단위로 반환됩니다. src/app/components/api-docs/api-docs.component.html 162,165 @@ -2276,7 +2284,7 @@ Returns the spending status of a transaction output. Available fields: spent (boolean), txid (optional), vin (optional), and status (optional, the status of the spending tx). - 트랜잭션 아웃풋의 지출(소모?) 상황을 반환합니다. 사용 가능한 필드 : 지출 (불린), txid (선택 사항), vin (선택 사항), 및 상황( 선택 사항, tx 지출 상황) + 트랜잭션 아웃풋의 지출 상황을 반환합니다. 사용 가능한 필드 : 지출 (불린), txid (선택 사항), vin (선택 사항), 및 상황( 선택 사항, tx 지출 상황) src/app/components/api-docs/api-docs.component.html 723,724 @@ -2308,6 +2316,7 @@ Broadcast a raw transaction to the network. The transaction should be provided as hex in the request body. The txid will be returned on success. + raw 트랜젝션을 네트워크에 브로드 캐스트합니다. 트랜잭션은 요청 본문에 16 진수로 제공되어야합니다. 성공하면 txid 이 반환됩니다. src/app/components/api-docs/api-docs.component.html 800,801 @@ -2325,6 +2334,7 @@ Default push: action: 'want', data: ['blocks', ...] to express what you want pushed. Available: blocks, mempool-blocks, live-2h-chart, and stats.Push transactions related to address: 'track-address': '3PbJ...bF9B' to receive all new transactions containing that address as input or output. Returns an array of transactions. address-transactions for new mempool transactions, and block-transactions for new block confirmed transactions. + 기본 푸시 : 작업: 'want', 데이터 : [ 'blocks', ...] 은 푸시하려는 것을 표현합니다. 사용 가능 : 블록 , mempool-blocks , live-2h-chart , 및상태. 주소와 관련된 트랜잭션을 푸시합니다:’트렉-주소’: ‘3PbJ…bF9B’인풋 또는 아웃풋 주소를 포함한 새로운 트랜잭션을 받기위해. 트랜잭션 모음을 반환합니다. 주소 트랜잭션들 새로운 mempool 트랜잭션 경우, 그리고블록 트랜잭션 새로운 블록 컨펌된 트랜잭션인 경우. src/app/components/api-docs/api-docs.component.html 819,820 @@ -2478,6 +2488,7 @@ of   + of  src/app/components/asset/asset.component.html 76 @@ -2699,6 +2710,7 @@ Based on average native segwit transaction of 140 vBytes + 평균 native segwit 트랜잭션의 140 vBytes 기준 src/app/components/block/block.component.html 46,48 @@ -2778,6 +2790,7 @@ Difficulty + 난이도 src/app/components/block/block.component.html 110,113 @@ -2786,6 +2799,7 @@ Nonce + 임시값 src/app/components/block/block.component.html 114,116 @@ -3200,6 +3214,7 @@ Mempool by vBytes (sat/vByte) + Mempool by vBytes (sat.vByte) src/app/components/statistics/statistics.component.html 13 @@ -3217,21 +3232,13 @@ Transaction vBytes per second (vB/s) + 초당 트랜잭션 vByte (vB / s) src/app/components/statistics/statistics.component.html 53 statistics.transaction-vbytes-per-second - - TV only - TV만 이용 가능 - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now 방금 @@ -3488,6 +3495,7 @@ Descendant + 자손 src/app/components/transaction/transaction.component.html 163 @@ -3497,6 +3505,7 @@ Ancestor + 조상 src/app/components/transaction/transaction.component.html 177 @@ -3564,6 +3573,7 @@ Effective fee rate + 유효 수수료율 src/app/components/transaction/transaction.component.html 345 @@ -3726,6 +3736,7 @@ This transaction saved % on fees by using native SegWit-Bech32 + 이 트랜잭션은 native SegWit-Bech32를 사용하여 수수료 %를 절약했습니다. src/app/components/tx-features/tx-features.component.html 1 @@ -3752,6 +3763,7 @@ This transaction saved % on fees by using SegWit and could save % more by fully upgrading to native SegWit-Bech32 + 이 트랜잭션은 SegWit을 사용하여 수수료에서 %를 절약했으며 native SegWit-Bech32로 완전히 업그레이드하여 %를 더 절약 할 수 있습니다. src/app/components/tx-features/tx-features.component.html 3 @@ -3760,6 +3772,7 @@ This transaction could save % on fees by upgrading to native SegWit-Bech32 or % by upgrading to SegWit-P2SH + 이 트랜잭션은 native SegWit-Bech32로 업그레이드 해서 수수료 % 또는 SegWit-P2SH 로 업그레이드하여 수수료 %를 절약 할 수 있습니다. src/app/components/tx-features/tx-features.component.html 5 @@ -3768,6 +3781,7 @@ This transaction support Replace-By-Fee (RBF) allowing fee bumping + 이 트랜잭션은 수수료 범핑(fee bumping)을 허용하는 RBF (Replace-By-Fee)를 지원합니다. src/app/components/tx-features/tx-features.component.html 8 @@ -3790,6 +3804,7 @@ This transaction does NOT support Replace-By-Fee (RBF) and cannot be fee bumped using this method + 이 트랜잭션은 RBF (Replace-By-Fee)를 지원하지 않으며이 방법을 사용하여 수수료 범핑을(fee bumping) 할 수 없습니다. src/app/components/tx-features/tx-features.component.html 9 @@ -3808,6 +3823,7 @@ Only ~ sat/vB was needed to get into this block + 이 블록에 들어가려면 ~ sat / vB 만 필요했습니다./ 필요합니다. src/app/components/tx-fee-rating/tx-fee-rating.component.html 2 diff --git a/frontend/src/locale/messages.nb.xlf b/frontend/src/locale/messages.nb.xlf index 83dfe7ec7..519c4db3d 100644 --- a/frontend/src/locale/messages.nb.xlf +++ b/frontend/src/locale/messages.nb.xlf @@ -3214,14 +3214,6 @@ statistics.transaction-vbytes-per-second - - TV only - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Akkurat nå diff --git a/frontend/src/locale/messages.nl.xlf b/frontend/src/locale/messages.nl.xlf index 6162cc201..451cd51fe 100644 --- a/frontend/src/locale/messages.nl.xlf +++ b/frontend/src/locale/messages.nl.xlf @@ -3226,15 +3226,6 @@ statistics.transaction-vbytes-per-second - - TV only - Alleen TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Zojuist diff --git a/frontend/src/locale/messages.pl.xlf b/frontend/src/locale/messages.pl.xlf index ca4657663..feb7e669a 100644 --- a/frontend/src/locale/messages.pl.xlf +++ b/frontend/src/locale/messages.pl.xlf @@ -3217,15 +3217,6 @@ statistics.transaction-vbytes-per-second - - TV only - Tylko TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Przed chwilą diff --git a/frontend/src/locale/messages.pt.xlf b/frontend/src/locale/messages.pt.xlf index e557f713a..535560579 100644 --- a/frontend/src/locale/messages.pt.xlf +++ b/frontend/src/locale/messages.pt.xlf @@ -3229,15 +3229,6 @@ statistics.transaction-vbytes-per-second - - TV only - Apenas TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Agora diff --git a/frontend/src/locale/messages.ru.xlf b/frontend/src/locale/messages.ru.xlf index 8e2a91675..056569f6c 100644 --- a/frontend/src/locale/messages.ru.xlf +++ b/frontend/src/locale/messages.ru.xlf @@ -3233,15 +3233,6 @@ statistics.transaction-vbytes-per-second - - TV only - Только полноэкранный режим - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Только что diff --git a/frontend/src/locale/messages.sl.xlf b/frontend/src/locale/messages.sl.xlf index 183232d3a..d41bc5340 100644 --- a/frontend/src/locale/messages.sl.xlf +++ b/frontend/src/locale/messages.sl.xlf @@ -3228,15 +3228,6 @@ statistics.transaction-vbytes-per-second - - TV only - Samo za TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Pravkar diff --git a/frontend/src/locale/messages.sv.xlf b/frontend/src/locale/messages.sv.xlf index 4d2b36c3a..3edbce076 100644 --- a/frontend/src/locale/messages.sv.xlf +++ b/frontend/src/locale/messages.sv.xlf @@ -3229,15 +3229,6 @@ statistics.transaction-vbytes-per-second - - TV only - Endast TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Just nu diff --git a/frontend/src/locale/messages.tr.xlf b/frontend/src/locale/messages.tr.xlf index d4f378cf5..de53b8d06 100644 --- a/frontend/src/locale/messages.tr.xlf +++ b/frontend/src/locale/messages.tr.xlf @@ -3230,15 +3230,6 @@ statistics.transaction-vbytes-per-second - - TV only - Sadece TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Şimdi diff --git a/frontend/src/locale/messages.uk.xlf b/frontend/src/locale/messages.uk.xlf index 6c409a67a..b7d1d0aa3 100644 --- a/frontend/src/locale/messages.uk.xlf +++ b/frontend/src/locale/messages.uk.xlf @@ -3221,15 +3221,6 @@ statistics.transaction-vbytes-per-second - - TV only - Тільки TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Щойно diff --git a/frontend/src/locale/messages.vi.xlf b/frontend/src/locale/messages.vi.xlf index e0b23c3f9..2b5100eb0 100644 --- a/frontend/src/locale/messages.vi.xlf +++ b/frontend/src/locale/messages.vi.xlf @@ -3226,15 +3226,6 @@ statistics.transaction-vbytes-per-second - - TV only - Chỉ TV - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now Vừa mới đây diff --git a/frontend/src/locale/messages.zh.xlf b/frontend/src/locale/messages.zh.xlf index e824c4f1d..115e47c9f 100644 --- a/frontend/src/locale/messages.zh.xlf +++ b/frontend/src/locale/messages.zh.xlf @@ -3156,14 +3156,6 @@ statistics.transaction-vbytes-per-second - - TV only - - src/app/components/television/television.component.html - 7 - - television.tv-only - Just now 刚刚 From 78c44eedbc0e078bb5b78c6464b5bc21159c4a68 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 3 Jul 2021 14:34:47 -0700 Subject: [PATCH 07/42] Update from transifex --- frontend/src/locale/messages.ar.xlf | 4 ++-- frontend/src/locale/messages.cs.xlf | 3 +++ frontend/src/locale/messages.it.xlf | 8 ++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/frontend/src/locale/messages.ar.xlf b/frontend/src/locale/messages.ar.xlf index a3dff0000..ecf6fa9e7 100644 --- a/frontend/src/locale/messages.ar.xlf +++ b/frontend/src/locale/messages.ar.xlf @@ -39,7 +39,7 @@ Next month - الشهر القادم + الشهر التالي node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-month.ts 72 @@ -123,7 +123,7 @@ Next - القادم + التالي node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/pagination/pagination.ts 404 diff --git a/frontend/src/locale/messages.cs.xlf b/frontend/src/locale/messages.cs.xlf index a300f8aa1..4084ec877 100644 --- a/frontend/src/locale/messages.cs.xlf +++ b/frontend/src/locale/messages.cs.xlf @@ -1377,6 +1377,7 @@ The Mempool Open Source Project + Open source projekt Mempool src/app/components/about/about.component.html 12,13 @@ -1385,6 +1386,7 @@ Building a mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, without any advertising, altcoins, or third-party trackers. + Vytváříme mempool a blockchain explorer pro bitcoinovou komunitu se zaměřením na trh transakčních poplatků a vícevrstvý ekosystém, bez reklamy, altcoinů a sledovačů třetích stran. src/app/components/about/about.component.html 13,17 @@ -2476,6 +2478,7 @@ of   + z   src/app/components/asset/asset.component.html 76 diff --git a/frontend/src/locale/messages.it.xlf b/frontend/src/locale/messages.it.xlf index 3d94f0b97..9b6ffb1ec 100644 --- a/frontend/src/locale/messages.it.xlf +++ b/frontend/src/locale/messages.it.xlf @@ -1377,6 +1377,7 @@ The Mempool Open Source Project + Il Progetto Open Source Mempool src/app/components/about/about.component.html 12,13 @@ -1385,6 +1386,7 @@ Building a mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, without any advertising, altcoins, or third-party trackers. + Costruire un esploratore di mempool e blockchain per la comunità Bitcoin, concentrandosi sul mercato delle commissioni di transazione e sull'ecosistema multi-layer, senza pubblicità, altcoin o tracker di terze parti. src/app/components/about/about.component.html 13,17 @@ -1591,6 +1593,7 @@ Endpoint + Endpoint src/app/components/api-docs/api-docs.component.html 20,21 @@ -1747,6 +1750,7 @@ Description + Descrizione src/app/components/api-docs/api-docs.component.html 25,26 @@ -2346,6 +2350,7 @@ Code Example + Esempio di Codice src/app/components/api-docs/code-template.component.html 6 @@ -2362,6 +2367,7 @@ Install Package + Installa Pacchetto src/app/components/api-docs/code-template.component.html 23,24 @@ -2370,6 +2376,7 @@ Response + Risposta src/app/components/api-docs/code-template.component.html 36,37 @@ -2472,6 +2479,7 @@ of   + di   src/app/components/asset/asset.component.html 76 From eb6db6caf3bad5086fbfd0cbcc0003a0d92c0e42 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 3 Jul 2021 14:36:10 -0700 Subject: [PATCH 08/42] Bump version for v2.2.0 release --- backend/package-lock.json | 4 ++-- backend/package.json | 2 +- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 35b61ad45..dbaec2b22 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "mempool-backend", - "version": "2.2.0-dev", + "version": "2.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mempool-backend", - "version": "2.2.0-dev", + "version": "2.2.0", "license": "GNU Affero General Public License v3.0", "dependencies": { "@mempool/bitcoin": "^3.0.2", diff --git a/backend/package.json b/backend/package.json index 357bf2149..d2a424765 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "mempool-backend", - "version": "2.2.0-dev", + "version": "2.2.0", "description": "Bitcoin mempool visualizer and blockchain explorer backend", "license": "GNU Affero General Public License v3.0", "homepage": "https://mempool.space", diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d478697f5..a39576b54 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "mempool-frontend", - "version": "2.2.0-dev", + "version": "2.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mempool-frontend", - "version": "2.2.0-dev", + "version": "2.2.0", "license": "GNU Affero General Public License v3.0", "dependencies": { "@angular/animations": "~11.2.8", diff --git a/frontend/package.json b/frontend/package.json index 902417956..2f27a2dfa 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "mempool-frontend", - "version": "2.2.0-dev", + "version": "2.2.0", "description": "Bitcoin mempool visualizer and blockchain explorer backend", "license": "GNU Affero General Public License v3.0", "homepage": "https://mempool.space", From 1d29fad98641947d31783aeeabc63c1815b7a389 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 3 Jul 2021 14:49:59 -0700 Subject: [PATCH 09/42] Bump version to v2.2.1-dev --- backend/package-lock.json | 4 ++-- backend/package.json | 2 +- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index dbaec2b22..36a729b5d 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "mempool-backend", - "version": "2.2.0", + "version": "2.2.1-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mempool-backend", - "version": "2.2.0", + "version": "2.2.1-dev", "license": "GNU Affero General Public License v3.0", "dependencies": { "@mempool/bitcoin": "^3.0.2", diff --git a/backend/package.json b/backend/package.json index d2a424765..8c1169f46 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "mempool-backend", - "version": "2.2.0", + "version": "2.2.1-dev", "description": "Bitcoin mempool visualizer and blockchain explorer backend", "license": "GNU Affero General Public License v3.0", "homepage": "https://mempool.space", diff --git a/frontend/package-lock.json b/frontend/package-lock.json index a39576b54..9bf10bfb9 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "mempool-frontend", - "version": "2.2.0", + "version": "2.2.1-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mempool-frontend", - "version": "2.2.0", + "version": "2.2.1-dev", "license": "GNU Affero General Public License v3.0", "dependencies": { "@angular/animations": "~11.2.8", diff --git a/frontend/package.json b/frontend/package.json index 2f27a2dfa..5fe725e5b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "mempool-frontend", - "version": "2.2.0", + "version": "2.2.1-dev", "description": "Bitcoin mempool visualizer and blockchain explorer backend", "license": "GNU Affero General Public License v3.0", "homepage": "https://mempool.space", From 1e9f131a2a30302b791612b924fbb7c0d13d8d6c Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Mon, 5 Jul 2021 16:28:56 -0300 Subject: [PATCH 10/42] Fix pagination responsive layout. (#590) * Fix pagination responsive css. * Fix css title block transaction alignment. * Add pagination responsive layout to bisq tx page. * Add pagination responsive to bisq blocks page. * Fix pagination css - bisq txs page. * Add e2e tests for bisq and mainnet pagination. --- .../cypress/integration/bisq/bisq.spec.ts | 14 +++++++++++ .../integration/mainnet/mainnet.spec.ts | 22 +++++++++++++--- .../bisq-blocks/bisq-blocks.component.html | 6 ++--- .../bisq-blocks/bisq-blocks.component.scss | 12 +++++++-- .../bisq/bisq-blocks/bisq-blocks.component.ts | 8 ++++-- .../bisq-transactions.component.html | 6 ++--- .../bisq-transactions.component.scss | 13 ++++++++-- .../bisq-transactions.component.ts | 8 ++++-- .../app/components/block/block.component.html | 24 ++++++++---------- .../app/components/block/block.component.scss | 25 +++++++++++++++++++ .../app/components/block/block.component.ts | 6 ++++- .../transactions-list.component.html | 2 +- .../transactions-list.component.scss | 6 +++++ frontend/src/styles.scss | 21 ++++++++++++++++ 14 files changed, 138 insertions(+), 35 deletions(-) diff --git a/frontend/cypress/integration/bisq/bisq.spec.ts b/frontend/cypress/integration/bisq/bisq.spec.ts index 6cc9ad910..1fe579e49 100644 --- a/frontend/cypress/integration/bisq/bisq.spec.ts +++ b/frontend/cypress/integration/bisq/bisq.spec.ts @@ -48,4 +48,18 @@ describe('Bisq', () => { }); }); + it('shows blocks pagination with 5 pages (desktop)', () => { + cy.viewport(760, 800); + cy.visit('/bisq/transactions'); + // 5 pages + 4 buttons = 9 buttons + cy.get('.pagination-container ul.pagination').first().children().should('have.length', 9); + }); + + it('shows blocks pagination with 3 pages (mobile)', () => { + cy.viewport(669, 800); + cy.visit('/bisq/blocks'); + // 3 pages + 4 buttons = 7 buttons + cy.get('.pagination-container ul.pagination').first().children().should('have.length', 7); + }); + }); diff --git a/frontend/cypress/integration/mainnet/mainnet.spec.ts b/frontend/cypress/integration/mainnet/mainnet.spec.ts index a9b112514..060a3f293 100644 --- a/frontend/cypress/integration/mainnet/mainnet.spec.ts +++ b/frontend/cypress/integration/mainnet/mainnet.spec.ts @@ -76,17 +76,17 @@ describe('Mainnet', () => { cy.get('#details').should('not.be.visible'); }); }); - it('shows blocks with no pagination', () => { + cy.viewport('iphone-6'); cy.visit('/block/00000000000000000001ba40caf1ad4cec0ceb77692662315c151953bfd7c4c4'); - cy.get('h2').invoke('text').should('equal', '19 transactions'); - cy.get('ul.pagination').first().children().should('have.length', 5); + cy.get('.block-tx-title h2').invoke('text').should('equal', '19 transactions'); + cy.get('.pagination-container ul.pagination').first().children().should('have.length', 6); }); it('supports pagination on the block screen', () => { // 41 txs cy.visit('/block/00000000000000000009f9b7b0f63ad50053ad12ec3b7f5ca951332f134f83d8'); - cy.get('.header-bg.box > a').invoke('text').then((text1) => { + cy.get('.pagination-container a').invoke('text').then((text1) => { cy.get('.active + li').first().click().then(() => { cy.get('.header-bg.box > a').invoke('text').then((text2) => { expect(text1).not.to.eq(text2); @@ -94,5 +94,19 @@ describe('Mainnet', () => { }); }); }); + + it('shows blocks pagination with 5 pages (desktop)', () => { + cy.viewport(760, 800); + cy.visit('/block/000000000000000000049281946d26fcba7d99fdabc1feac524bc3a7003d69b3'); + // 5 pages + 4 buttons = 9 buttons + cy.get('.pagination-container ul.pagination').first().children().should('have.length', 9); + }); + + it('shows blocks pagination with 3 pages (mobile)', () => { + cy.viewport(669, 800); + cy.visit('/block/000000000000000000049281946d26fcba7d99fdabc1feac524bc3a7003d69b3'); + // 3 pages + 4 buttons = 7 buttons + cy.get('.pagination-container ul.pagination').first().children().should('have.length', 7); + }); }); }); diff --git a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html index e7dc382c1..9fbd6ad1b 100644 --- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html +++ b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html @@ -1,4 +1,4 @@ -
+

BSQ Blocks


@@ -26,9 +26,7 @@

- +
diff --git a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss index 478fa4c6d..3bae38e56 100644 --- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss +++ b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss @@ -1,3 +1,11 @@ -.pagination { - overflow: hidden; +.pagination-container { + float: none; + margin-bottom: 200px; + @media(min-width: 400px){ + float: right; + } +} + +.container-xl { + padding-bottom: 110px; } \ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts index c52326fdf..1e805188b 100644 --- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts +++ b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts @@ -23,7 +23,7 @@ export class BisqBlocksComponent implements OnInit { isLoading = true; // @ts-ignore paginationSize: 'sm' | 'lg' = 'md'; - paginationMaxSize = 4; + paginationMaxSize = 5; constructor( private websocketService: WebsocketService, @@ -38,7 +38,7 @@ export class BisqBlocksComponent implements OnInit { this.seoService.setTitle($localize`:@@8a7b4bd44c0ac71b2e72de0398b303257f7d2f54:Blocks`); this.itemsPerPage = Math.max(Math.round(this.contentSpace / this.fiveItemsPxSize) * 5, 10); this.loadingItems = Array(this.itemsPerPage); - if (document.body.clientWidth < 768) { + if (document.body.clientWidth < 670) { this.paginationSize = 'sm'; this.paginationMaxSize = 3; } @@ -83,4 +83,8 @@ export class BisqBlocksComponent implements OnInit { queryParamsHandling: 'merge', }); } + + onResize(event: any) { + this.paginationMaxSize = event.target.innerWidth < 670 ? 3 : 5; + } } diff --git a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html index 43053bc30..f85c29a9b 100644 --- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html +++ b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html @@ -1,4 +1,4 @@ -
+

BSQ Transactions

@@ -44,9 +44,7 @@
- +
diff --git a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.scss b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.scss index e631cfce4..72d305d08 100644 --- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.scss +++ b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.scss @@ -8,8 +8,11 @@ label { left: inherit; } -.pagination { - overflow: hidden; +.pagination-container { + float: none; + @media(min-width: 400px){ + float: right; + } } h1{ @@ -17,4 +20,10 @@ h1{ @media(min-width: 375px){ font-size: 2rem; } +} +.container-xl { + padding-bottom: 60px; + @media(min-width: 400px){ + padding-bottom: 100px; + } } \ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts index ab4637e9c..5962ac856 100644 --- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts +++ b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts @@ -60,7 +60,7 @@ export class BisqTransactionsComponent implements OnInit { // @ts-ignore paginationSize: 'sm' | 'lg' = 'md'; - paginationMaxSize = 4; + paginationMaxSize = 5; txTypes = ['ASSET_LISTING_FEE', 'BLIND_VOTE', 'COMPENSATION_REQUEST', 'GENESIS', 'LOCKUP', 'PAY_TRADE_FEE', 'PROOF_OF_BURN', 'PROPOSAL', 'REIMBURSEMENT_REQUEST', 'TRANSFER_BSQ', 'UNLOCK', 'VOTE_REVEAL', 'IRREGULAR']; @@ -85,7 +85,7 @@ export class BisqTransactionsComponent implements OnInit { this.loadingItems = Array(this.itemsPerPage); - if (document.body.clientWidth < 768) { + if (document.body.clientWidth < 670) { this.paginationSize = 'sm'; this.paginationMaxSize = 3; } @@ -168,4 +168,8 @@ export class BisqTransactionsComponent implements OnInit { trackByFn(index: number) { return index; } + + onResize(event: any) { + this.paginationMaxSize = event.target.innerWidth < 670 ? 3 : 5; + } } diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index b808019da..a07ad3e04 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -1,4 +1,4 @@ -
+

Genesis Block {{ blockHeight }}

@@ -125,22 +125,21 @@
-
- -

- - {{ i }} transaction - {{ i }} transactions -

- - +
+

+ + {{ i }} transaction + {{ i }} transactions +

+ +
-
+
@@ -167,8 +166,7 @@
- - + diff --git a/frontend/src/app/components/block/block.component.scss b/frontend/src/app/components/block/block.component.scss index 6b92de4c4..b5bae22f1 100644 --- a/frontend/src/app/components/block/block.component.scss +++ b/frontend/src/app/components/block/block.component.scss @@ -71,4 +71,29 @@ h1 { .details-table td:first-child { white-space: pre-wrap; } +} + +.block-tx-title { + margin-top: -1.5rem; + display: block; + text-align: right; + @media (min-width: 550px) { + margin-top: 1rem; + } + h2 { + width: auto; + display: inline-block; + float: left; + margin: 0; + line-height: 1.6; + padding-right: 10px; + top: -10px; + position: relative; + @media (min-width: 550px) { + top: 0px; + } + @media (min-width: 768px) { + line-height: 1; + } + } } \ No newline at end of file diff --git a/frontend/src/app/components/block/block.component.ts b/frontend/src/app/components/block/block.component.ts index 26a69b7eb..fedf17c46 100644 --- a/frontend/src/app/components/block/block.component.ts +++ b/frontend/src/app/components/block/block.component.ts @@ -46,7 +46,7 @@ export class BlockComponent implements OnInit, OnDestroy { ngOnInit() { this.websocketService.want(['blocks', 'mempool-blocks']); - this.paginationMaxSize = window.matchMedia('(max-width: 700px)').matches ? 3 : 5; + this.paginationMaxSize = window.matchMedia('(max-width: 670px)').matches ? 3 : 5; this.network = this.stateService.network; this.itemsPerPage = this.stateService.env.ITEMS_PER_PAGE; @@ -216,4 +216,8 @@ export class BlockComponent implements OnInit, OnDestroy { } return this.block && this.block.height > 681393 && (new Date().getTime() / 1000) < 1628640000; } + + onResize(event: any) { + this.paginationMaxSize = event.target.innerWidth < 670 ? 3 : 5; + } } diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index 533c389c3..03ab90afd 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -1,5 +1,5 @@ -
+
{{ tx.txid | shortenString : 16 }} {{ tx.txid }} diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.scss b/frontend/src/app/components/transactions-list/transactions-list.component.scss index f2ac4c47f..fd95e3759 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.scss +++ b/frontend/src/app/components/transactions-list/transactions-list.component.scss @@ -132,3 +132,9 @@ .fiat { margin-left: 10px; } + +.tx-page-container { + padding: 10px; + margin-bottom: 10px; + margin-top: 10px; +} \ No newline at end of file diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index b33dd78da..4d1d5072c 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -672,3 +672,24 @@ th { } } } + + +.pagination-container { + + display: inline-block; + width: 100%; + justify-content: space-between; + background: #1d1f31; + margin: 0; + @media (min-width: 550px) { + width: auto; + } + ul { + justify-content: space-evenly !important; + margin: 0; + @media (min-width: 400px) { + width: auto; + padding-left: 5px; + } + } +} \ No newline at end of file From 2e2e6aa01f691ca28d2763faf827fda01e428cda Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 6 Jul 2021 19:43:18 +0300 Subject: [PATCH 11/42] Parse TXID, hash or address strings from search bar and allow searching for TXID:OUTPUT. (#578) fixes #450 fixes #415 --- .../search-form/search-form.component.ts | 27 +++++++++++-------- .../transaction/transaction.component.html | 2 +- .../transaction/transaction.component.ts | 8 ++++-- .../transactions-list.component.html | 2 +- .../transactions-list.component.ts | 1 + 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/frontend/src/app/components/search-form/search-form.component.ts b/frontend/src/app/components/search-form/search-form.component.ts index dd0acb874..d5edc8f7e 100644 --- a/frontend/src/app/components/search-form/search-form.component.ts +++ b/frontend/src/app/components/search-form/search-form.component.ts @@ -23,9 +23,9 @@ export class SearchFormComponent implements OnInit { searchForm: FormGroup; @Output() searchTriggered = new EventEmitter(); - regexAddress = /^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[bB]?[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})$/; - regexBlockhash = /^[0]{8}[a-fA-F0-9]{56}$/; - regexTransaction = /^[a-fA-F0-9]{64}$/; + regexAddress = /([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[bB]?[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})/; + regexBlockhash = /[0]{8}[a-fA-F0-9]{56}/; + regexTransaction = /([a-fA-F0-9]{64}):?(\d+)?/; regexBlockheight = /^[0-9]+$/; @ViewChild('instance', {static: true}) instance: NgbTypeahead; @@ -96,21 +96,26 @@ export class SearchFormComponent implements OnInit { if (searchText) { this.isSearching = true; if (this.regexAddress.test(searchText)) { - this.navigate('/address/', searchText); - } else if (this.regexBlockhash.test(searchText) || this.regexBlockheight.test(searchText)) { + const matches = this.regexAddress.exec(searchText); + this.navigate('/address/', matches[0]); + } else if (this.regexBlockhash.test(searchText)) { + const matches = this.regexBlockhash.exec(searchText); + this.navigate('/block/', matches[0]); + } else if (this.regexBlockheight.test(searchText)) { this.navigate('/block/', searchText); } else if (this.regexTransaction.test(searchText)) { + const matches = this.regexTransaction.exec(searchText); if (this.network === 'liquid') { - if (this.assets[searchText]) { - this.navigate('/asset/', searchText); + if (this.assets[matches[0]]) { + this.navigate('/asset/', matches[0]); } - this.electrsApiService.getAsset$(searchText) + this.electrsApiService.getAsset$(matches[0]) .subscribe( - () => { this.navigate('/asset/', searchText); }, - () => { this.navigate('/tx/', searchText); } + () => { this.navigate('/asset/', matches[0]); }, + () => { this.navigate('/tx/', matches[0]); } ); } else { - this.navigate('/tx/', searchText); + this.navigate('/tx/', matches[0]); } } else { this.isSearching = false; diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index ed35889e8..a3b2b9db2 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -198,7 +198,7 @@
- +

Details

diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index 74d181a50..520fc2069 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -20,6 +20,7 @@ export class TransactionComponent implements OnInit, OnDestroy { network = ''; tx: Transaction; txId: string; + outputIndex: number; txInBlockIndex: number; isLoadingTx = true; error: any = undefined; @@ -75,9 +76,11 @@ export class TransactionComponent implements OnInit, OnDestroy { this.subscription = this.route.paramMap.pipe( switchMap((params: ParamMap) => { - this.txId = params.get('id') || ''; - this.seoService.setTitle($localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:`); this.resetTransaction(); + const urlMatch = (params.get('id') || '').split(':'); + this.txId = urlMatch[0]; + this.outputIndex = urlMatch[1] === undefined ? null : parseInt(urlMatch[1], 10); + this.seoService.setTitle($localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:`); return merge( of(true), this.stateService.connectionState$.pipe( @@ -202,6 +205,7 @@ export class TransactionComponent implements OnInit, OnDestroy { resetTransaction() { this.error = undefined; this.tx = null; + this.outputIndex = null; this.waitingForTransaction = false; this.isLoadingTx = true; this.rbfTransaction = undefined; diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index 03ab90afd..25ab12b62 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -117,7 +117,7 @@ - +
{{ vout.scriptpubkey_address | shortenString : 16 }} diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts index dd7350954..2e5eb96a0 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.ts +++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts @@ -19,6 +19,7 @@ export class TransactionsListComponent implements OnInit, OnChanges { displayDetails = false; @Input() transactions: Transaction[]; + @Input() outputIndex: number; @Input() showConfirmations = false; @Input() transactionPage = false; From 3ae3df6722508385be6da68d6886ecbffb734448 Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 6 Jul 2021 19:55:01 +0300 Subject: [PATCH 12/42] Revert "Parse TXID, hash or address strings from search bar and allow searching for TXID:OUTPUT. (#578)" (#610) This reverts commit 2e2e6aa01f691ca28d2763faf827fda01e428cda. --- .../search-form/search-form.component.ts | 27 ++++++++----------- .../transaction/transaction.component.html | 2 +- .../transaction/transaction.component.ts | 8 ++---- .../transactions-list.component.html | 2 +- .../transactions-list.component.ts | 1 - 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/frontend/src/app/components/search-form/search-form.component.ts b/frontend/src/app/components/search-form/search-form.component.ts index d5edc8f7e..dd0acb874 100644 --- a/frontend/src/app/components/search-form/search-form.component.ts +++ b/frontend/src/app/components/search-form/search-form.component.ts @@ -23,9 +23,9 @@ export class SearchFormComponent implements OnInit { searchForm: FormGroup; @Output() searchTriggered = new EventEmitter(); - regexAddress = /([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[bB]?[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})/; - regexBlockhash = /[0]{8}[a-fA-F0-9]{56}/; - regexTransaction = /([a-fA-F0-9]{64}):?(\d+)?/; + regexAddress = /^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[bB]?[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})$/; + regexBlockhash = /^[0]{8}[a-fA-F0-9]{56}$/; + regexTransaction = /^[a-fA-F0-9]{64}$/; regexBlockheight = /^[0-9]+$/; @ViewChild('instance', {static: true}) instance: NgbTypeahead; @@ -96,26 +96,21 @@ export class SearchFormComponent implements OnInit { if (searchText) { this.isSearching = true; if (this.regexAddress.test(searchText)) { - const matches = this.regexAddress.exec(searchText); - this.navigate('/address/', matches[0]); - } else if (this.regexBlockhash.test(searchText)) { - const matches = this.regexBlockhash.exec(searchText); - this.navigate('/block/', matches[0]); - } else if (this.regexBlockheight.test(searchText)) { + this.navigate('/address/', searchText); + } else if (this.regexBlockhash.test(searchText) || this.regexBlockheight.test(searchText)) { this.navigate('/block/', searchText); } else if (this.regexTransaction.test(searchText)) { - const matches = this.regexTransaction.exec(searchText); if (this.network === 'liquid') { - if (this.assets[matches[0]]) { - this.navigate('/asset/', matches[0]); + if (this.assets[searchText]) { + this.navigate('/asset/', searchText); } - this.electrsApiService.getAsset$(matches[0]) + this.electrsApiService.getAsset$(searchText) .subscribe( - () => { this.navigate('/asset/', matches[0]); }, - () => { this.navigate('/tx/', matches[0]); } + () => { this.navigate('/asset/', searchText); }, + () => { this.navigate('/tx/', searchText); } ); } else { - this.navigate('/tx/', matches[0]); + this.navigate('/tx/', searchText); } } else { this.isSearching = false; diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index a3b2b9db2..ed35889e8 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -198,7 +198,7 @@
- +

Details

diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index 520fc2069..74d181a50 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -20,7 +20,6 @@ export class TransactionComponent implements OnInit, OnDestroy { network = ''; tx: Transaction; txId: string; - outputIndex: number; txInBlockIndex: number; isLoadingTx = true; error: any = undefined; @@ -76,11 +75,9 @@ export class TransactionComponent implements OnInit, OnDestroy { this.subscription = this.route.paramMap.pipe( switchMap((params: ParamMap) => { - this.resetTransaction(); - const urlMatch = (params.get('id') || '').split(':'); - this.txId = urlMatch[0]; - this.outputIndex = urlMatch[1] === undefined ? null : parseInt(urlMatch[1], 10); + this.txId = params.get('id') || ''; this.seoService.setTitle($localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:`); + this.resetTransaction(); return merge( of(true), this.stateService.connectionState$.pipe( @@ -205,7 +202,6 @@ export class TransactionComponent implements OnInit, OnDestroy { resetTransaction() { this.error = undefined; this.tx = null; - this.outputIndex = null; this.waitingForTransaction = false; this.isLoadingTx = true; this.rbfTransaction = undefined; diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index 25ab12b62..03ab90afd 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -117,7 +117,7 @@ - +
{{ vout.scriptpubkey_address | shortenString : 16 }} diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts index 2e5eb96a0..dd7350954 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.ts +++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts @@ -19,7 +19,6 @@ export class TransactionsListComponent implements OnInit, OnChanges { displayDetails = false; @Input() transactions: Transaction[]; - @Input() outputIndex: number; @Input() showConfirmations = false; @Input() transactionPage = false; From 9dae7020c8b8a4b3cf9676a073cbb0de5cbd21bc Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Tue, 6 Jul 2021 13:56:32 -0300 Subject: [PATCH 13/42] Liquid support for unblinding transactions. (#588) * Add docker file to generate wallycore wasm js lib. * Add unblinded liquid transactions. * Add background to unblided transactions. * Check liquid network to try to unblind tx. Ww don't want to try to unblind transactions in other networks. Co-authored-by: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> * Delete libwally-core dockerfile. * Delete wallycore.html. * Fix validation unblind tx. Fix lint. Add errorUnblinded. Add vin.prevout unblinded tx. * Add e2e testing to liquids unblinded tx. * Load libwally.js dynamically. * Fix table size. * Add Blockstream License to libwally and wallycore. Co-authored-by: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> --- .../cypress/integration/liquid/liquid.spec.ts | 89 +- .../app/components/transaction/libwally.js | 184 ++++ .../transaction/transaction.component.html | 48 +- .../transaction/transaction.component.ts | 393 ++++++--- .../transactions-list.component.html | 18 +- .../transactions-list.component.scss | 55 +- .../transactions-list.component.ts | 1 + .../src/app/interfaces/electrs.interface.ts | 2 + frontend/src/resources/wallycore/wallycore.js | 802 ++++++++++++++++++ .../src/resources/wallycore/wallycore.wasm | Bin 0 -> 135961 bytes 10 files changed, 1408 insertions(+), 184 deletions(-) create mode 100644 frontend/src/app/components/transaction/libwally.js create mode 100644 frontend/src/resources/wallycore/wallycore.js create mode 100755 frontend/src/resources/wallycore/wallycore.wasm diff --git a/frontend/cypress/integration/liquid/liquid.spec.ts b/frontend/cypress/integration/liquid/liquid.spec.ts index c1d1c1a02..38abe6bb4 100644 --- a/frontend/cypress/integration/liquid/liquid.spec.ts +++ b/frontend/cypress/integration/liquid/liquid.spec.ts @@ -44,38 +44,77 @@ describe('Liquid', () => { }); describe('assets', () => { - it('shows the assets screen', () => { - cy.visit('/liquid'); - cy.get('li:nth-of-type(5) > a').click().then(() => { - cy.get('table tr').should('have.length', 5); - }); - }); - - it('allows searching assets', () => { - cy.visit('/liquid'); - cy.get('li:nth-of-type(5) > a').click().then(() => { - cy.get('.container-xl input').click().type('Liquid Bitcoin').then(() => { - cy.get('table tr').should('have.length', 1); + it('shows the assets screen', () => { + cy.visit('/liquid'); + cy.get('li:nth-of-type(5) > a').click().then(() => { + cy.get('table tr').should('have.length', 5); }); }); - }); - it('shows a specific asset ID', () => { - cy.visit('/liquid'); - cy.get('li:nth-of-type(5) > a').click().then(() => { - cy.get('.container-xl input').click().type('Liquid CAD').then(() => { - cy.get('table tr td:nth-of-type(4) a').click(); + it('allows searching assets', () => { + cy.visit('/liquid'); + cy.get('li:nth-of-type(5) > a').click().then(() => { + cy.get('.container-xl input').click().type('Liquid Bitcoin').then(() => { + cy.get('table tr').should('have.length', 1); + }); }); }); - }); - it('shows a specific asset issuance TX', () => { - cy.visit('/liquid'); - cy.get('li:nth-of-type(5) > a').click().then(() => { - cy.get('.container-xl input').click().type('Liquid CAD').then(() => { - cy.get('table tr td:nth-of-type(5) a').click(); + it('shows a specific asset ID', () => { + cy.visit('/liquid'); + cy.get('li:nth-of-type(5) > a').click().then(() => { + cy.get('.container-xl input').click().type('Liquid CAD').then(() => { + cy.get('table tr td:nth-of-type(4) a').click(); + }); + }); + }); + + it('shows a specific asset issuance TX', () => { + cy.visit('/liquid'); + cy.get('li:nth-of-type(5) > a').click().then(() => { + cy.get('.container-xl input').click().type('Liquid CAD').then(() => { + cy.get('table tr td:nth-of-type(5) a').click(); + }); }); }); - }); }); + + + describe('unblinded TX', () => { + it('show unblinded TX', () => { + cy.visit('/liquid/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=100000,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,0ab9f70650f16b1db8dfada05237f7d0d65191c3a13183da8a2ddddfbde9a2ad,fd98b2edc5530d76acd553f206a431f4c1fab27e10e290ad719582af878e98fc,2364760,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,90c7a43b15b905bca045ca42a01271cfe71d2efe3133f4197792c24505cb32ed,12eb5959d9293b8842e7dd8bc9aa9639fd3fd031c5de3ba911adeca94eb57a3a'); + cy.get('#table-tx-vin tr').should('have.class', 'assetBox'); + cy.get('#table-tx-vout tr').should('have.class', 'assetBox'); + }); + + it('show empty unblinded TX', () => { + cy.visit('/liquid/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded='); + cy.get('#table-tx-vin tr').should('have.class', ''); + cy.get('#table-tx-vout tr').should('have.class', ''); + }); + + it('show invalid unblinded TX hex', () => { + cy.visit('/liquid/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=123'); + cy.get('#table-tx-vin tr').should('have.class', ''); + cy.get('#table-tx-vout tr').should('have.class', ''); + cy.get('.error-unblinded' ).contains('Error: Invalid blinding data (invalid hex)'); + }); + + it('show first unblinded vout', () => { + cy.visit('/liquid/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=100000,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,0ab9f70650f16b1db8dfada05237f7d0d65191c3a13183da8a2ddddfbde9a2ad,fd98b2edc5530d76acd553f206a431f4c1fab27e10e290ad719582af878e98fc'); + cy.get('#table-tx-vout tr:first-child()').should('have.class', 'assetBox'); + }); + + it('show second unblinded vout', () => { + cy.visit('/liquid/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=2364760,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,90c7a43b15b905bca045ca42a01271cfe71d2efe3133f4197792c24505cb32ed,12eb5959d9293b8842e7dd8bc9aa9639fd3fd031c5de3ba911adeca94eb57a3a'); + cy.get('#table-tx-vout tr').should('have.class', 'assetBox'); + }); + + it('show invalid error unblinded TX', () => { + cy.visit('/liquid/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=100000,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,0ab9f70650f16b1db8dfada05237f7d0d65191c3a13183da8a2ddddfbde9a2ad,fd98b2edc5530d76acd553f206a431f4c1fab27e10e290ad719582af878e98fc,2364760,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,90c7a43b15b905bca045ca42a01271cfe71d2efe3133f4197792c24505cb32ed,12eb5959d9293b8842e7dd8bc9aa9639fd3fd031c5de3ba911adeca94eb57a3c'); + cy.get('#table-tx-vout tr').should('have.class', 'assetBox'); + cy.get('.error-unblinded' ).contains('Error: Invalid blinding data.'); + }); + }); + }); diff --git a/frontend/src/app/components/transaction/libwally.js b/frontend/src/app/components/transaction/libwally.js new file mode 100644 index 000000000..f72cbfc00 --- /dev/null +++ b/frontend/src/app/components/transaction/libwally.js @@ -0,0 +1,184 @@ +/* +The MIT License (MIT) + +Copyright 2021 Blockstream Corp + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +const WALLY_OK = 0, + ASSET_COMMITMENT_LEN = 33, + ASSET_GENERATOR_LEN = 33, + ASSET_TAG_LEN = 32, + BLINDING_FACTOR_LEN = 32; + +const WASM_URL = `./resources/wallycore/wallycore.js`; + +let load_promise, Module; +export function load() { + return ( + load_promise || + (load_promise = new Promise((resolve, reject) => { + const script = document.createElement("script"); + script.src = WASM_URL; + script.addEventListener("error", reject); + script.addEventListener("load", () => + InitWally().then((module) => { + Module = module; + resolve(); + }, reject) + ); + document.body.appendChild(script); + })) + ); +} + +// Simple wrapper to execute both asset_generator_from_bytes and asset_value_commitment, +// with hex conversions +export function generate_commitments( + value, + asset_hex, + value_blinder_hex, + asset_blinder_hex +) { + const asset = parseHex(asset_hex, ASSET_TAG_LEN), + value_blinder = parseHex(value_blinder_hex, BLINDING_FACTOR_LEN), + asset_blinder = parseHex(asset_blinder_hex, BLINDING_FACTOR_LEN); + + const asset_commitment = asset_generator_from_bytes(asset, asset_blinder), + value_commitment = asset_value_commitment( + value, + value_blinder, + asset_commitment + ); + + return { + asset_commitment: encodeHex(asset_commitment), + value_commitment: encodeHex(value_commitment), + }; +} + +export function asset_generator_from_bytes(asset, asset_blinder) { + const asset_commitment_ptr = Module._malloc(ASSET_GENERATOR_LEN); + checkCode( + Module.ccall( + "wally_asset_generator_from_bytes", + "number", + ["array", "number", "array", "number", "number", "number"], + [ + asset, + asset.length, + asset_blinder, + asset_blinder.length, + asset_commitment_ptr, + ASSET_GENERATOR_LEN, + ] + ) + ); + + const asset_commitment = readBytes(asset_commitment_ptr, ASSET_GENERATOR_LEN); + Module._free(asset_commitment_ptr); + return asset_commitment; +} + +export function asset_value_commitment(value, value_blinder, asset_commitment) { + // Emscripten transforms int64 function arguments into two int32 arguments, see: + // https://emscripten.org/docs/getting_started/FAQ.html#how-do-i-pass-int64-t-and-uint64-t-values-from-js-into-wasm-functions + const [value_lo, value_hi] = split_int52_lo_hi(value); + + const value_commitment_ptr = Module._malloc(ASSET_COMMITMENT_LEN); + checkCode( + Module.ccall( + "wally_asset_value_commitment", + "number", + [ + "number", + "number", + "array", + "number", + "array", + "number", + "number", + "number", + ], + [ + value_lo, + value_hi, + value_blinder, + value_blinder.length, + asset_commitment, + asset_commitment.length, + value_commitment_ptr, + ASSET_COMMITMENT_LEN, + ] + ) + ); + + const value_commitment = readBytes( + value_commitment_ptr, + ASSET_COMMITMENT_LEN + ); + Module._free(value_commitment_ptr); + return value_commitment; +} + +function checkCode(code) { + if (code != WALLY_OK) throw new Error(`libwally failed with code ${code}`); +} + +function readBytes(ptr, size) { + const bytes = new Uint8Array(size); + for (let i = 0; i < size; i++) bytes[i] = Module.getValue(ptr + i, "i8"); + return bytes; +} + +// Split a 52-bit JavaScript number into two 32-bits numbers for the low and high bits +// https://stackoverflow.com/a/19274574 +function split_int52_lo_hi(i) { + let lo = i | 0; + if (lo < 0) lo += 4294967296; + + let hi = i - lo; + hi /= 4294967296; + + if (hi < 0 || hi >= 1048576) throw new Error("not an int52: " + i); + + return [lo, hi]; +} + +function encodeHex(bytes) { + // return Buffer.from(bytes).toString("hex"); + return Array.from(bytes) + .map((b) => b.toString(16).padStart(2, "0")) + .join(""); +} + +// Parse hex string encoded in *reverse* +function parseHex(str, expected_size) { + if (!/^([0-9a-f]{2})+$/.test(str)) + throw new Error("Invalid blinders (invalid hex)"); + if (str.length != expected_size * 2) + throw new Error("Invalid blinders (invalid length)"); + return new Uint8Array( + str + .match(/.{2}/g) + .map((hex_byte) => parseInt(hex_byte, 16)) + .reverse() + ); +} diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index ed35889e8..d2080498b 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -9,33 +9,33 @@ -
-
-

Transaction

-
+
+
+

Transaction

+
-
- - {{ txId | shortenString : 24 }} - {{ txId }} - - -
+
+ + {{ txId | shortenString : 24 }} + {{ txId }} + + +
-
- - - - - - +
+ + + + + + +
-
@@ -198,7 +198,7 @@
- +

Details

diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index 74d181a50..f3f2191a4 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -1,7 +1,13 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { ElectrsApiService } from '../../services/electrs-api.service'; import { ActivatedRoute, ParamMap } from '@angular/router'; -import { switchMap, filter, catchError, retryWhen, delay } from 'rxjs/operators'; +import { + switchMap, + filter, + catchError, + retryWhen, + delay, +} from 'rxjs/operators'; import { Transaction, Block } from '../../interfaces/electrs.interface'; import { of, merge, Subscription, Observable, Subject } from 'rxjs'; import { StateService } from '../../services/state.service'; @@ -14,7 +20,7 @@ import { CpfpInfo } from 'src/app/interfaces/node-api.interface'; @Component({ selector: 'app-transaction', templateUrl: './transaction.component.html', - styleUrls: ['./transaction.component.scss'] + styleUrls: ['./transaction.component.scss'], }) export class TransactionComponent implements OnInit, OnDestroy { network = ''; @@ -23,6 +29,7 @@ export class TransactionComponent implements OnInit, OnDestroy { txInBlockIndex: number; isLoadingTx = true; error: any = undefined; + errorUnblinded: any = undefined; waitingForTransaction = false; latestBlock: Block; transactionTime = -1; @@ -32,6 +39,7 @@ export class TransactionComponent implements OnInit, OnDestroy { cpfpInfo: CpfpInfo | null; showCpfpDetails = false; fetchCpfp$ = new Subject(); + commitments: Map; constructor( private route: ActivatedRoute, @@ -40,28 +48,36 @@ export class TransactionComponent implements OnInit, OnDestroy { private websocketService: WebsocketService, private audioService: AudioService, private apiService: ApiService, - private seoService: SeoService, - ) { } + private seoService: SeoService + ) {} ngOnInit() { this.websocketService.want(['blocks', 'mempool-blocks']); - this.stateService.networkChanged$.subscribe((network) => this.network = network); + this.stateService.networkChanged$.subscribe( + (network) => (this.network = network) + ); this.fetchCpfpSubscription = this.fetchCpfp$ .pipe( - switchMap((txId) => this.apiService.getCpfpinfo$(txId) - .pipe( - retryWhen((errors) => errors.pipe(delay(2000))) - ) - ), + switchMap((txId) => + this.apiService + .getCpfpinfo$(txId) + .pipe(retryWhen((errors) => errors.pipe(delay(2000)))) + ) ) .subscribe((cpfpInfo) => { if (!this.tx) { return; } - const lowerFeeParents = cpfpInfo.ancestors.filter((parent) => (parent.fee / (parent.weight / 4)) < this.tx.feePerVsize); - let totalWeight = this.tx.weight + lowerFeeParents.reduce((prev, val) => prev + val.weight, 0); - let totalFees = this.tx.fee + lowerFeeParents.reduce((prev, val) => prev + val.fee, 0); + const lowerFeeParents = cpfpInfo.ancestors.filter( + (parent) => parent.fee / (parent.weight / 4) < this.tx.feePerVsize + ); + let totalWeight = + this.tx.weight + + lowerFeeParents.reduce((prev, val) => prev + val.weight, 0); + let totalFees = + this.tx.fee + + lowerFeeParents.reduce((prev, val) => prev + val.fee, 0); if (cpfpInfo.bestDescendant) { totalWeight += cpfpInfo.bestDescendant.weight; @@ -69,98 +85,116 @@ export class TransactionComponent implements OnInit, OnDestroy { } this.tx.effectiveFeePerVsize = totalFees / (totalWeight / 4); - this.stateService.markBlock$.next({ txFeePerVSize: this.tx.effectiveFeePerVsize }); + this.stateService.markBlock$.next({ + txFeePerVSize: this.tx.effectiveFeePerVsize, + }); this.cpfpInfo = cpfpInfo; }); - this.subscription = this.route.paramMap.pipe( - switchMap((params: ParamMap) => { - this.txId = params.get('id') || ''; - this.seoService.setTitle($localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:`); - this.resetTransaction(); - return merge( - of(true), - this.stateService.connectionState$.pipe( - filter((state) => state === 2 && this.tx && !this.tx.status.confirmed) - ), - ); - }), - switchMap(() => { - let transactionObservable$: Observable; - if (history.state.data) { - transactionObservable$ = of(history.state.data); - } else { - transactionObservable$ = this.electrsApiService.getTransaction$(this.txId).pipe( - catchError(this.handleLoadElectrsTransactionError.bind(this)) + this.subscription = this.route.paramMap + .pipe( + switchMap(async (params: ParamMap) => { + this.txId = params.get('id') || ''; + + await this.checkUnblindedTx(); + this.seoService.setTitle( + $localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:` ); - } - return merge( - transactionObservable$, - this.stateService.mempoolTransactions$ - ); - }) - ) - .subscribe((tx: Transaction) => { - if (!tx) { - return; - } - this.tx = tx; - if (tx.fee === undefined) { - this.tx.fee = 0; - } - this.tx.feePerVsize = tx.fee / (tx.weight / 4); - this.isLoadingTx = false; - this.error = undefined; - this.waitingForTransaction = false; - this.setMempoolBlocksSubscription(); + this.resetTransaction(); + return merge( + of(true), + this.stateService.connectionState$.pipe( + filter( + (state) => state === 2 && this.tx && !this.tx.status.confirmed + ) + ) + ); + }), + switchMap(() => { + let transactionObservable$: Observable; + if (history.state.data) { + transactionObservable$ = of(history.state.data); + } else { + transactionObservable$ = this.electrsApiService + .getTransaction$(this.txId) + .pipe( + catchError(this.handleLoadElectrsTransactionError.bind(this)) + ); + } + return merge( + transactionObservable$, + this.stateService.mempoolTransactions$ + ); + }) + ) + .subscribe( + async (tx: Transaction) => { + if (!tx) { + return; + } + this.tx = tx; + if (tx.fee === undefined) { + this.tx.fee = 0; + } + this.tx.feePerVsize = tx.fee / (tx.weight / 4); + this.isLoadingTx = false; + this.error = undefined; + this.waitingForTransaction = false; + this.setMempoolBlocksSubscription(); - if (!tx.status.confirmed) { - this.websocketService.startTrackTransaction(tx.txid); + if (!tx.status.confirmed) { + this.websocketService.startTrackTransaction(tx.txid); - if (tx.firstSeen) { - this.transactionTime = tx.firstSeen; - } else { - this.getTransactionTime(); - } - } + if (tx.firstSeen) { + this.transactionTime = tx.firstSeen; + } else { + this.getTransactionTime(); + } + } - if (this.tx.status.confirmed) { - this.stateService.markBlock$.next({ blockHeight: tx.status.block_height }); - } else { - if (tx.cpfpChecked) { - this.stateService.markBlock$.next({ txFeePerVSize: tx.effectiveFeePerVsize }); - this.cpfpInfo = { - ancestors: tx.ancestors, - bestDescendant: tx.bestDescendant, - }; - } else { - this.fetchCpfp$.next(this.tx.txid); + if (this.tx.status.confirmed) { + this.stateService.markBlock$.next({ + blockHeight: tx.status.block_height, + }); + } else { + if (tx.cpfpChecked) { + this.stateService.markBlock$.next({ + txFeePerVSize: tx.effectiveFeePerVsize, + }); + this.cpfpInfo = { + ancestors: tx.ancestors, + bestDescendant: tx.bestDescendant, + }; + } else { + this.fetchCpfp$.next(this.tx.txid); + } + } + await this.checkUnblindedTx(); + }, + (error) => { + this.error = error; + this.isLoadingTx = false; } + ); + + this.stateService.blocks$.subscribe(([block, txConfirmed]) => { + this.latestBlock = block; + + if (txConfirmed && this.tx) { + this.tx.status = { + confirmed: true, + block_height: block.height, + block_hash: block.id, + block_time: block.timestamp, + }; + this.stateService.markBlock$.next({ blockHeight: block.height }); + this.audioService.playSound('magic'); } - }, - (error) => { - this.error = error; - this.isLoadingTx = false; }); - this.stateService.blocks$ - .subscribe(([block, txConfirmed]) => { - this.latestBlock = block; - - if (txConfirmed && this.tx) { - this.tx.status = { - confirmed: true, - block_height: block.height, - block_hash: block.id, - block_time: block.timestamp, - }; - this.stateService.markBlock$.next({ blockHeight: block.height }); - this.audioService.playSound('magic'); - } - }); - - this.stateService.txReplaced$ - .subscribe((rbfTransaction) => this.rbfTransaction = rbfTransaction); + this.stateService.txReplaced$.subscribe( + (rbfTransaction) => (this.rbfTransaction = rbfTransaction) + ); } handleLoadElectrsTransactionError(error: any): Observable { @@ -174,26 +208,30 @@ export class TransactionComponent implements OnInit, OnDestroy { } setMempoolBlocksSubscription() { - this.stateService.mempoolBlocks$ - .subscribe((mempoolBlocks) => { - if (!this.tx) { - return; - } + this.stateService.mempoolBlocks$.subscribe((mempoolBlocks) => { + if (!this.tx) { + return; + } - const txFeePerVSize = this.tx.effectiveFeePerVsize || this.tx.fee / (this.tx.weight / 4); + const txFeePerVSize = + this.tx.effectiveFeePerVsize || this.tx.fee / (this.tx.weight / 4); - for (const block of mempoolBlocks) { - for (let i = 0; i < block.feeRange.length - 1; i++) { - if (txFeePerVSize <= block.feeRange[i + 1] && txFeePerVSize >= block.feeRange[i]) { - this.txInBlockIndex = mempoolBlocks.indexOf(block); - } + for (const block of mempoolBlocks) { + for (let i = 0; i < block.feeRange.length - 1; i++) { + if ( + txFeePerVSize <= block.feeRange[i + 1] && + txFeePerVSize >= block.feeRange[i] + ) { + this.txInBlockIndex = mempoolBlocks.indexOf(block); } } - }); + } + }); } getTransactionTime() { - this.apiService.getTransactionTimes$([this.tx.txid]) + this.apiService + .getTransactionTimes$([this.tx.txid]) .subscribe((transactionTimes) => { this.transactionTime = transactionTimes[0]; }); @@ -226,4 +264,145 @@ export class TransactionComponent implements OnInit, OnDestroy { this.fetchCpfpSubscription.unsubscribe(); this.leaveTransaction(); } + + // Parse the blinders data from a string encoded as a comma separated list, in the following format: + // ,,, + // This can be repeated with a comma separator to specify blinders for multiple outputs. + + parseBlinders(str: string) { + const parts = str.split(','); + const blinders = []; + while (parts.length) { + blinders.push({ + value: this.verifyNum(parts.shift()), + asset: this.verifyHex32(parts.shift()), + value_blinder: this.verifyHex32(parts.shift()), + asset_blinder: this.verifyHex32(parts.shift()), + }); + } + return blinders; + } + + verifyNum(num: string) { + if (!+num) { + throw new Error('Invalid blinding data (invalid number)'); + } + return +num; + } + verifyHex32(str: string) { + if (!str || !/^[0-9a-f]{64}$/i.test(str)) { + throw new Error('Invalid blinding data (invalid hex)'); + } + return str; + } + + async makeCommitmentMap(blinders: any) { + const libwally = await import('./libwally.js'); + await libwally.load(); + const commitments = new Map(); + blinders.forEach(b => { + const { asset_commitment, value_commitment } = + libwally.generate_commitments(b.value, b.asset, b.value_blinder, b.asset_blinder); + + commitments.set(`${asset_commitment}:${value_commitment}`, { + asset: b.asset, + value: b.value, + }); + }); + return commitments; + } + + // Look for the given output, returning an { value, asset } object + find(vout: any) { + return vout.assetcommitment && vout.valuecommitment && + this.commitments.get(`${vout.assetcommitment}:${vout.valuecommitment}`); + } + + // Lookup all transaction inputs/outputs and attach the unblinded data + tryUnblindTx(tx: any) { + if (tx) { + if (tx._unblinded) { return tx._unblinded; } + let matched = 0; + if (tx.vout !== undefined) { + tx.vout.forEach(vout => matched += +this.tryUnblindOut(vout)); + tx.vin.filter(vin => vin.prevout).forEach(vin => matched += +this.tryUnblindOut(vin.prevout)); + } + if (this.commitments !== undefined) { + tx._unblinded = { matched, total: this.commitments.size }; + this.deduceBlinded(tx); + if (matched < this.commitments.size) { + this.errorUnblinded = `Error: Invalid blinding data.`; + } + tx._deduced = false; // invalidate cache so deduction is attempted again + return tx._unblinded; + } + } + } + + // Look the given output and attach the unblinded data + tryUnblindOut(vout: any) { + const unblinded = this.find(vout); + if (unblinded) { Object.assign(vout, unblinded); } + return !!unblinded; + } + + // Attempt to deduce the blinded input/output based on the available information + deduceBlinded(tx: any) { + if (tx._deduced) { return; } + tx._deduced = true; + + // Find ins/outs with unknown amounts (blinded ant not revealed via the `#blinded` hash fragment) + const unknownIns = tx.vin.filter(vin => vin.prevout && vin.prevout.value == null); + const unknownOuts = tx.vout.filter(vout => vout.value == null); + + // If the transaction has a single unknown input/output, we can deduce its asset/amount + // based on the other known inputs/outputs. + if (unknownIns.length + unknownOuts.length === 1) { + + // Keep a per-asset tally of all known input amounts, minus all known output amounts + const totals = new Map(); + tx.vin.filter(vin => vin.prevout && vin.prevout.value != null) + .forEach(({ prevout }) => + totals.set(prevout.asset, (totals.get(prevout.asset) || 0) + prevout.value)); + tx.vout.filter(vout => vout.value != null) + .forEach(vout => + totals.set(vout.asset, (totals.get(vout.asset) || 0) - vout.value)); + + // There should only be a single asset where the inputs and outputs amounts mismatch, + // which is the asset of the blinded input/output + const remainder = Array.from(totals.entries()).filter(([ asset, value ]) => value !== 0); + if (remainder.length !== 1) { throw new Error('unexpected remainder while deducing blinded tx'); } + const [ blindedAsset, blindedValue ] = remainder[0]; + + // A positive remainder (when known in > known out) is the asset/amount of the unknown blinded output, + // a negative one is the input. + if (blindedValue > 0) { + if (!unknownOuts.length) { throw new Error('expected unknown output'); } + unknownOuts[0].asset = blindedAsset; + unknownOuts[0].value = blindedValue; + } else { + if (!unknownIns.length) { throw new Error('expected unknown input'); } + unknownIns[0].prevout.asset = blindedAsset; + unknownIns[0].prevout.value = blindedValue * -1; + } + } + } + + async checkUnblindedTx() { + try { + if (this.network === 'liquid') { + const windowLocationHash = window.location.hash.substring('#blinded='.length); + if (windowLocationHash.length > 0) { + + const blinders = this.parseBlinders(windowLocationHash); + if (blinders) { + this.commitments = await this.makeCommitmentMap(blinders); + this.tryUnblindTx(this.tx); + } + } + } + } catch (error) { + this.errorUnblinded = error; + } + } } diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index 03ab90afd..20dee92e5 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -12,13 +12,16 @@
+
+ +
{{ errorUnblinded }}
- +
- + -
@@ -66,7 +69,7 @@
+ @@ -114,10 +117,10 @@
-
+
- + -
{{ vout.scriptpubkey_address | shortenString : 16 }} @@ -145,7 +148,7 @@
-
+ @@ -162,7 +165,7 @@
+ @@ -235,5 +238,4 @@ {{ assetsMinimal[item.asset][0] }}
{{ item.asset | shortenString : 13 }} -

diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.scss b/frontend/src/app/components/transactions-list/transactions-list.component.scss index fd95e3759..b85069650 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.scss +++ b/frontend/src/app/components/transactions-list/transactions-list.component.scss @@ -4,9 +4,10 @@ .arrow { display: inline-block!important; - position: relative; + position: absolute; width: 14px; - height: 22px; + margin-top: 10px; + margin-left: -5px; box-sizing: content-box } @@ -66,24 +67,6 @@ } } -.details-table { - margin-top: 5px; -} - -.details-table td { - padding: 0.75rem; - &:first-child { - white-space: pre-wrap; - } -} - -.details-table td:nth-child(2) { - word-break: break-all; - white-space: normal; - font-family: "Courier New", Courier, monospace; - font-size: 12px; -} - .smaller-text { font-size: 12px; @media (min-width: 576px) { @@ -137,4 +120,36 @@ padding: 10px; margin-bottom: 10px; margin-top: 10px; +} +.assetBox { + background-color: #653b9c90; +} + +.details-container { + padding: 0px; + tr td { + padding: 0.75rem; + font-size: 12px; + &:first-child { + color: #ffffff66; + white-space: pre-wrap; + @media (min-width: 476px) { + white-space: nowrap; + } + } + &:nth-child(2) { + word-break: break-all; + white-space: normal; + font-family: "Courier New", Courier, monospace; + } + } +} + +.error-unblinded { + display: block; + width: 100%; + color: #d43131; + text-align: right; + margin-top: 0px; + margin-bottom: 10px; } \ No newline at end of file diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts index dd7350954..4425317c0 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.ts +++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts @@ -21,6 +21,7 @@ export class TransactionsListComponent implements OnInit, OnChanges { @Input() transactions: Transaction[]; @Input() showConfirmations = false; @Input() transactionPage = false; + @Input() errorUnblinded = false; @Output() loadMore = new EventEmitter(); diff --git a/frontend/src/app/interfaces/electrs.interface.ts b/frontend/src/app/interfaces/electrs.interface.ts index dcf7508ae..ff948551f 100644 --- a/frontend/src/app/interfaces/electrs.interface.ts +++ b/frontend/src/app/interfaces/electrs.interface.ts @@ -17,6 +17,8 @@ export interface Transaction { bestDescendant?: BestDescendant | null; cpfpChecked?: boolean; deleteAfter?: number; + _unblinded?: any; + _deduced?: boolean; } interface Ancestor { diff --git a/frontend/src/resources/wallycore/wallycore.js b/frontend/src/resources/wallycore/wallycore.js new file mode 100644 index 000000000..8a61046f2 --- /dev/null +++ b/frontend/src/resources/wallycore/wallycore.js @@ -0,0 +1,802 @@ +/* +The MIT License (MIT) + +Copyright 2021 Blockstream Corp + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE +*/ + +var InitWally = (function () { + var _scriptDir = + typeof document !== "undefined" && document.currentScript + ? document.currentScript.src + : undefined; + if (typeof __filename !== "undefined") _scriptDir = _scriptDir || __filename; + return function (InitWally) { + InitWally = InitWally || {}; + + var Module = typeof InitWally !== "undefined" ? InitWally : {}; + var readyPromiseResolve, readyPromiseReject; + Module["ready"] = new Promise(function (resolve, reject) { + readyPromiseResolve = resolve; + readyPromiseReject = reject; + }); + var moduleOverrides = {}; + var key; + for (key in Module) { + if (Module.hasOwnProperty(key)) { + moduleOverrides[key] = Module[key]; + } + } + var arguments_ = []; + var thisProgram = "./this.program"; + var quit_ = function (status, toThrow) { + throw toThrow; + }; + var ENVIRONMENT_IS_WEB = false; + var ENVIRONMENT_IS_WORKER = false; + var ENVIRONMENT_IS_NODE = false; + var ENVIRONMENT_IS_SHELL = false; + ENVIRONMENT_IS_WEB = typeof window === "object"; + ENVIRONMENT_IS_WORKER = typeof importScripts === "function"; + ENVIRONMENT_IS_NODE = + typeof process === "object" && + typeof process.versions === "object" && + typeof process.versions.node === "string"; + ENVIRONMENT_IS_SHELL = + !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER; + var scriptDirectory = ""; + function locateFile(path) { + if (Module["locateFile"]) { + return Module["locateFile"](path, scriptDirectory); + } + return scriptDirectory + path; + } + var read_, readAsync, readBinary, setWindowTitle; + var nodeFS; + var nodePath; + if (ENVIRONMENT_IS_NODE) { + if (ENVIRONMENT_IS_WORKER) { + scriptDirectory = require("path").dirname(scriptDirectory) + "/"; + } else { + scriptDirectory = __dirname + "/"; + } + read_ = function shell_read(filename, binary) { + if (!nodeFS) nodeFS = require("fs"); + if (!nodePath) nodePath = require("path"); + filename = nodePath["normalize"](filename); + return nodeFS["readFileSync"](filename, binary ? null : "utf8"); + }; + readBinary = function readBinary(filename) { + var ret = read_(filename, true); + if (!ret.buffer) { + ret = new Uint8Array(ret); + } + assert(ret.buffer); + return ret; + }; + if (process["argv"].length > 1) { + thisProgram = process["argv"][1].replace(/\\/g, "/"); + } + arguments_ = process["argv"].slice(2); + process["on"]("uncaughtException", function (ex) { + if (!(ex instanceof ExitStatus)) { + throw ex; + } + }); + process["on"]("unhandledRejection", abort); + quit_ = function (status) { + process["exit"](status); + }; + Module["inspect"] = function () { + return "[Emscripten Module object]"; + }; + } else if (ENVIRONMENT_IS_SHELL) { + if (typeof read != "undefined") { + read_ = function shell_read(f) { + return read(f); + }; + } + readBinary = function readBinary(f) { + var data; + if (typeof readbuffer === "function") { + return new Uint8Array(readbuffer(f)); + } + data = read(f, "binary"); + assert(typeof data === "object"); + return data; + }; + if (typeof scriptArgs != "undefined") { + arguments_ = scriptArgs; + } else if (typeof arguments != "undefined") { + arguments_ = arguments; + } + if (typeof quit === "function") { + quit_ = function (status) { + quit(status); + }; + } + if (typeof print !== "undefined") { + if (typeof console === "undefined") console = {}; + console.log = print; + console.warn = console.error = + typeof printErr !== "undefined" ? printErr : print; + } + } else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) { + if (ENVIRONMENT_IS_WORKER) { + scriptDirectory = self.location.href; + } else if (typeof document !== "undefined" && document.currentScript) { + scriptDirectory = document.currentScript.src; + } + if (_scriptDir) { + scriptDirectory = _scriptDir; + } + if (scriptDirectory.indexOf("blob:") !== 0) { + scriptDirectory = scriptDirectory.substr( + 0, + scriptDirectory.lastIndexOf("/") + 1 + ); + } else { + scriptDirectory = ""; + } + { + read_ = function shell_read(url) { + var xhr = new XMLHttpRequest(); + xhr.open("GET", url, false); + xhr.send(null); + return xhr.responseText; + }; + if (ENVIRONMENT_IS_WORKER) { + readBinary = function readBinary(url) { + var xhr = new XMLHttpRequest(); + xhr.open("GET", url, false); + xhr.responseType = "arraybuffer"; + xhr.send(null); + return new Uint8Array(xhr.response); + }; + } + readAsync = function readAsync(url, onload, onerror) { + var xhr = new XMLHttpRequest(); + xhr.open("GET", url, true); + xhr.responseType = "arraybuffer"; + xhr.onload = function xhr_onload() { + if (xhr.status == 200 || (xhr.status == 0 && xhr.response)) { + onload(xhr.response); + return; + } + onerror(); + }; + xhr.onerror = onerror; + xhr.send(null); + }; + } + setWindowTitle = function (title) { + document.title = title; + }; + } else { + } + var out = Module["print"] || console.log.bind(console); + var err = Module["printErr"] || console.warn.bind(console); + for (key in moduleOverrides) { + if (moduleOverrides.hasOwnProperty(key)) { + Module[key] = moduleOverrides[key]; + } + } + moduleOverrides = null; + if (Module["arguments"]) arguments_ = Module["arguments"]; + if (Module["thisProgram"]) thisProgram = Module["thisProgram"]; + if (Module["quit"]) quit_ = Module["quit"]; + var wasmBinary; + if (Module["wasmBinary"]) wasmBinary = Module["wasmBinary"]; + var noExitRuntime; + if (Module["noExitRuntime"]) noExitRuntime = Module["noExitRuntime"]; + if (typeof WebAssembly !== "object") { + abort("no native wasm support detected"); + } + function getValue(ptr, type, noSafe) { + type = type || "i8"; + if (type.charAt(type.length - 1) === "*") type = "i32"; + switch (type) { + case "i1": + return HEAP8[ptr >> 0]; + case "i8": + return HEAP8[ptr >> 0]; + case "i16": + return HEAP16[ptr >> 1]; + case "i32": + return HEAP32[ptr >> 2]; + case "i64": + return HEAP32[ptr >> 2]; + case "float": + return HEAPF32[ptr >> 2]; + case "double": + return HEAPF64[ptr >> 3]; + default: + abort("invalid type for getValue: " + type); + } + return null; + } + var wasmMemory; + var ABORT = false; + var EXITSTATUS = 0; + function assert(condition, text) { + if (!condition) { + abort("Assertion failed: " + text); + } + } + function getCFunc(ident) { + var func = Module["_" + ident]; + assert( + func, + "Cannot call unknown function " + ident + ", make sure it is exported" + ); + return func; + } + function ccall(ident, returnType, argTypes, args, opts) { + var toC = { + string: function (str) { + var ret = 0; + if (str !== null && str !== undefined && str !== 0) { + var len = (str.length << 2) + 1; + ret = stackAlloc(len); + stringToUTF8(str, ret, len); + } + return ret; + }, + array: function (arr) { + var ret = stackAlloc(arr.length); + writeArrayToMemory(arr, ret); + return ret; + }, + }; + function convertReturnValue(ret) { + if (returnType === "string") return UTF8ToString(ret); + if (returnType === "boolean") return Boolean(ret); + return ret; + } + var func = getCFunc(ident); + var cArgs = []; + var stack = 0; + if (args) { + for (var i = 0; i < args.length; i++) { + var converter = toC[argTypes[i]]; + if (converter) { + if (stack === 0) stack = stackSave(); + cArgs[i] = converter(args[i]); + } else { + cArgs[i] = args[i]; + } + } + } + var ret = func.apply(null, cArgs); + ret = convertReturnValue(ret); + if (stack !== 0) stackRestore(stack); + return ret; + } + var UTF8Decoder = + typeof TextDecoder !== "undefined" ? new TextDecoder("utf8") : undefined; + function UTF8ArrayToString(heap, idx, maxBytesToRead) { + var endIdx = idx + maxBytesToRead; + var endPtr = idx; + while (heap[endPtr] && !(endPtr >= endIdx)) ++endPtr; + if (endPtr - idx > 16 && heap.subarray && UTF8Decoder) { + return UTF8Decoder.decode(heap.subarray(idx, endPtr)); + } else { + var str = ""; + while (idx < endPtr) { + var u0 = heap[idx++]; + if (!(u0 & 128)) { + str += String.fromCharCode(u0); + continue; + } + var u1 = heap[idx++] & 63; + if ((u0 & 224) == 192) { + str += String.fromCharCode(((u0 & 31) << 6) | u1); + continue; + } + var u2 = heap[idx++] & 63; + if ((u0 & 240) == 224) { + u0 = ((u0 & 15) << 12) | (u1 << 6) | u2; + } else { + u0 = ((u0 & 7) << 18) | (u1 << 12) | (u2 << 6) | (heap[idx++] & 63); + } + if (u0 < 65536) { + str += String.fromCharCode(u0); + } else { + var ch = u0 - 65536; + str += String.fromCharCode(55296 | (ch >> 10), 56320 | (ch & 1023)); + } + } + } + return str; + } + function UTF8ToString(ptr, maxBytesToRead) { + return ptr ? UTF8ArrayToString(HEAPU8, ptr, maxBytesToRead) : ""; + } + function stringToUTF8Array(str, heap, outIdx, maxBytesToWrite) { + if (!(maxBytesToWrite > 0)) return 0; + var startIdx = outIdx; + var endIdx = outIdx + maxBytesToWrite - 1; + for (var i = 0; i < str.length; ++i) { + var u = str.charCodeAt(i); + if (u >= 55296 && u <= 57343) { + var u1 = str.charCodeAt(++i); + u = (65536 + ((u & 1023) << 10)) | (u1 & 1023); + } + if (u <= 127) { + if (outIdx >= endIdx) break; + heap[outIdx++] = u; + } else if (u <= 2047) { + if (outIdx + 1 >= endIdx) break; + heap[outIdx++] = 192 | (u >> 6); + heap[outIdx++] = 128 | (u & 63); + } else if (u <= 65535) { + if (outIdx + 2 >= endIdx) break; + heap[outIdx++] = 224 | (u >> 12); + heap[outIdx++] = 128 | ((u >> 6) & 63); + heap[outIdx++] = 128 | (u & 63); + } else { + if (outIdx + 3 >= endIdx) break; + heap[outIdx++] = 240 | (u >> 18); + heap[outIdx++] = 128 | ((u >> 12) & 63); + heap[outIdx++] = 128 | ((u >> 6) & 63); + heap[outIdx++] = 128 | (u & 63); + } + } + heap[outIdx] = 0; + return outIdx - startIdx; + } + function stringToUTF8(str, outPtr, maxBytesToWrite) { + return stringToUTF8Array(str, HEAPU8, outPtr, maxBytesToWrite); + } + function writeArrayToMemory(array, buffer) { + HEAP8.set(array, buffer); + } + var buffer, + HEAP8, + HEAPU8, + HEAP16, + HEAPU16, + HEAP32, + HEAPU32, + HEAPF32, + HEAPF64; + function updateGlobalBufferAndViews(buf) { + buffer = buf; + Module["HEAP8"] = HEAP8 = new Int8Array(buf); + Module["HEAP16"] = HEAP16 = new Int16Array(buf); + Module["HEAP32"] = HEAP32 = new Int32Array(buf); + Module["HEAPU8"] = HEAPU8 = new Uint8Array(buf); + Module["HEAPU16"] = HEAPU16 = new Uint16Array(buf); + Module["HEAPU32"] = HEAPU32 = new Uint32Array(buf); + Module["HEAPF32"] = HEAPF32 = new Float32Array(buf); + Module["HEAPF64"] = HEAPF64 = new Float64Array(buf); + } + var INITIAL_MEMORY = Module["INITIAL_MEMORY"] || 16777216; + if (Module["wasmMemory"]) { + wasmMemory = Module["wasmMemory"]; + } else { + wasmMemory = new WebAssembly.Memory({ + initial: INITIAL_MEMORY / 65536, + maximum: INITIAL_MEMORY / 65536, + }); + } + if (wasmMemory) { + buffer = wasmMemory.buffer; + } + INITIAL_MEMORY = buffer.byteLength; + updateGlobalBufferAndViews(buffer); + var wasmTable; + var __ATPRERUN__ = []; + var __ATINIT__ = []; + var __ATMAIN__ = []; + var __ATPOSTRUN__ = []; + var runtimeInitialized = false; + function preRun() { + if (Module["preRun"]) { + if (typeof Module["preRun"] == "function") + Module["preRun"] = [Module["preRun"]]; + while (Module["preRun"].length) { + addOnPreRun(Module["preRun"].shift()); + } + } + callRuntimeCallbacks(__ATPRERUN__); + } + function initRuntime() { + runtimeInitialized = true; + callRuntimeCallbacks(__ATINIT__); + } + function preMain() { + callRuntimeCallbacks(__ATMAIN__); + } + function postRun() { + if (Module["postRun"]) { + if (typeof Module["postRun"] == "function") + Module["postRun"] = [Module["postRun"]]; + while (Module["postRun"].length) { + addOnPostRun(Module["postRun"].shift()); + } + } + callRuntimeCallbacks(__ATPOSTRUN__); + } + function addOnPreRun(cb) { + __ATPRERUN__.unshift(cb); + } + function addOnPostRun(cb) { + __ATPOSTRUN__.unshift(cb); + } + var runDependencies = 0; + var runDependencyWatcher = null; + var dependenciesFulfilled = null; + function addRunDependency(id) { + runDependencies++; + if (Module["monitorRunDependencies"]) { + Module["monitorRunDependencies"](runDependencies); + } + } + function removeRunDependency(id) { + runDependencies--; + if (Module["monitorRunDependencies"]) { + Module["monitorRunDependencies"](runDependencies); + } + if (runDependencies == 0) { + if (runDependencyWatcher !== null) { + clearInterval(runDependencyWatcher); + runDependencyWatcher = null; + } + if (dependenciesFulfilled) { + var callback = dependenciesFulfilled; + dependenciesFulfilled = null; + callback(); + } + } + } + Module["preloadedImages"] = {}; + Module["preloadedAudios"] = {}; + function abort(what) { + if (Module["onAbort"]) { + Module["onAbort"](what); + } + what += ""; + err(what); + ABORT = true; + EXITSTATUS = 1; + what = "abort(" + what + "). Build with -s ASSERTIONS=1 for more info."; + var e = new WebAssembly.RuntimeError(what); + readyPromiseReject(e); + throw e; + } + function hasPrefix(str, prefix) { + return String.prototype.startsWith + ? str.startsWith(prefix) + : str.indexOf(prefix) === 0; + } + var dataURIPrefix = "data:application/octet-stream;base64,"; + function isDataURI(filename) { + return hasPrefix(filename, dataURIPrefix); + } + var fileURIPrefix = "file://"; + function isFileURI(filename) { + return hasPrefix(filename, fileURIPrefix); + } + var wasmBinaryFile = "wallycore.wasm"; + if (!isDataURI(wasmBinaryFile)) { + wasmBinaryFile = locateFile(wasmBinaryFile); + } + function getBinary() { + try { + if (wasmBinary) { + return new Uint8Array(wasmBinary); + } + if (readBinary) { + return readBinary(wasmBinaryFile); + } else { + throw "both async and sync fetching of the wasm failed"; + } + } catch (err) { + abort(err); + } + } + function getBinaryPromise() { + if ( + !wasmBinary && + (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) && + typeof fetch === "function" && + !isFileURI(wasmBinaryFile) + ) { + return fetch(wasmBinaryFile, { credentials: "same-origin" }) + .then(function (response) { + if (!response["ok"]) { + throw ( + "failed to load wasm binary file at '" + wasmBinaryFile + "'" + ); + } + return response["arrayBuffer"](); + }) + .catch(function () { + return getBinary(); + }); + } + return Promise.resolve().then(getBinary); + } + function createWasm() { + var info = { a: asmLibraryArg }; + function receiveInstance(instance, module) { + var exports = instance.exports; + Module["asm"] = exports; + wasmTable = Module["asm"]["h"]; + removeRunDependency("wasm-instantiate"); + } + addRunDependency("wasm-instantiate"); + function receiveInstantiatedSource(output) { + receiveInstance(output["instance"]); + } + function instantiateArrayBuffer(receiver) { + return getBinaryPromise() + .then(function (binary) { + return WebAssembly.instantiate(binary, info); + }) + .then(receiver, function (reason) { + err("failed to asynchronously prepare wasm: " + reason); + abort(reason); + }); + } + function instantiateAsync() { + if ( + !wasmBinary && + typeof WebAssembly.instantiateStreaming === "function" && + !isDataURI(wasmBinaryFile) && + !isFileURI(wasmBinaryFile) && + typeof fetch === "function" + ) { + return fetch(wasmBinaryFile, { credentials: "same-origin" }).then( + function (response) { + var result = WebAssembly.instantiateStreaming(response, info); + return result.then(receiveInstantiatedSource, function (reason) { + err("wasm streaming compile failed: " + reason); + err("falling back to ArrayBuffer instantiation"); + return instantiateArrayBuffer(receiveInstantiatedSource); + }); + } + ); + } else { + return instantiateArrayBuffer(receiveInstantiatedSource); + } + } + if (Module["instantiateWasm"]) { + try { + var exports = Module["instantiateWasm"](info, receiveInstance); + return exports; + } catch (e) { + err("Module.instantiateWasm callback failed with error: " + e); + return false; + } + } + instantiateAsync().catch(readyPromiseReject); + return {}; + } + function callRuntimeCallbacks(callbacks) { + while (callbacks.length > 0) { + var callback = callbacks.shift(); + if (typeof callback == "function") { + callback(Module); + continue; + } + var func = callback.func; + if (typeof func === "number") { + if (callback.arg === undefined) { + wasmTable.get(func)(); + } else { + wasmTable.get(func)(callback.arg); + } + } else { + func(callback.arg === undefined ? null : callback.arg); + } + } + } + function _abort() { + abort(); + } + function _emscripten_memcpy_big(dest, src, num) { + HEAPU8.copyWithin(dest, src, src + num); + } + function abortOnCannotGrowMemory(requestedSize) { + abort("OOM"); + } + function _emscripten_resize_heap(requestedSize) { + requestedSize = requestedSize >>> 0; + abortOnCannotGrowMemory(requestedSize); + } + var SYSCALLS = { + mappings: {}, + buffers: [null, [], []], + printChar: function (stream, curr) { + var buffer = SYSCALLS.buffers[stream]; + if (curr === 0 || curr === 10) { + (stream === 1 ? out : err)(UTF8ArrayToString(buffer, 0)); + buffer.length = 0; + } else { + buffer.push(curr); + } + }, + varargs: undefined, + get: function () { + SYSCALLS.varargs += 4; + var ret = HEAP32[(SYSCALLS.varargs - 4) >> 2]; + return ret; + }, + getStr: function (ptr) { + var ret = UTF8ToString(ptr); + return ret; + }, + get64: function (low, high) { + return low; + }, + }; + function _fd_close(fd) { + return 0; + } + function _fd_seek(fd, offset_low, offset_high, whence, newOffset) {} + function _fd_write(fd, iov, iovcnt, pnum) { + var num = 0; + for (var i = 0; i < iovcnt; i++) { + var ptr = HEAP32[(iov + i * 8) >> 2]; + var len = HEAP32[(iov + (i * 8 + 4)) >> 2]; + for (var j = 0; j < len; j++) { + SYSCALLS.printChar(fd, HEAPU8[ptr + j]); + } + num += len; + } + HEAP32[pnum >> 2] = num; + return 0; + } + __ATINIT__.push({ + func: function () { + ___wasm_call_ctors(); + }, + }); + var asmLibraryArg = { + b: _abort, + e: _emscripten_memcpy_big, + f: _emscripten_resize_heap, + g: _fd_close, + d: _fd_seek, + c: _fd_write, + a: wasmMemory, + }; + var asm = createWasm(); + var ___wasm_call_ctors = (Module["___wasm_call_ctors"] = function () { + return (___wasm_call_ctors = Module["___wasm_call_ctors"] = + Module["asm"]["i"]).apply(null, arguments); + }); + var _wally_asset_generator_from_bytes = (Module[ + "_wally_asset_generator_from_bytes" + ] = function () { + return (_wally_asset_generator_from_bytes = Module[ + "_wally_asset_generator_from_bytes" + ] = + Module["asm"]["j"]).apply(null, arguments); + }); + var _wally_asset_value_commitment = (Module[ + "_wally_asset_value_commitment" + ] = function () { + return (_wally_asset_value_commitment = Module[ + "_wally_asset_value_commitment" + ] = + Module["asm"]["k"]).apply(null, arguments); + }); + var _wally_init = (Module["_wally_init"] = function () { + return (_wally_init = Module["_wally_init"] = Module["asm"]["l"]).apply( + null, + arguments + ); + }); + var _malloc = (Module["_malloc"] = function () { + return (_malloc = Module["_malloc"] = Module["asm"]["m"]).apply( + null, + arguments + ); + }); + var _free = (Module["_free"] = function () { + return (_free = Module["_free"] = Module["asm"]["n"]).apply( + null, + arguments + ); + }); + var stackSave = (Module["stackSave"] = function () { + return (stackSave = Module["stackSave"] = Module["asm"]["o"]).apply( + null, + arguments + ); + }); + var stackRestore = (Module["stackRestore"] = function () { + return (stackRestore = Module["stackRestore"] = Module["asm"]["p"]).apply( + null, + arguments + ); + }); + var stackAlloc = (Module["stackAlloc"] = function () { + return (stackAlloc = Module["stackAlloc"] = Module["asm"]["q"]).apply( + null, + arguments + ); + }); + Module["ccall"] = ccall; + Module["getValue"] = getValue; + var calledRun; + function ExitStatus(status) { + this.name = "ExitStatus"; + this.message = "Program terminated with exit(" + status + ")"; + this.status = status; + } + dependenciesFulfilled = function runCaller() { + if (!calledRun) run(); + if (!calledRun) dependenciesFulfilled = runCaller; + }; + function run(args) { + args = args || arguments_; + if (runDependencies > 0) { + return; + } + preRun(); + if (runDependencies > 0) return; + function doRun() { + if (calledRun) return; + calledRun = true; + Module["calledRun"] = true; + if (ABORT) return; + initRuntime(); + preMain(); + readyPromiseResolve(Module); + if (Module["onRuntimeInitialized"]) Module["onRuntimeInitialized"](); + postRun(); + } + if (Module["setStatus"]) { + Module["setStatus"]("Running..."); + setTimeout(function () { + setTimeout(function () { + Module["setStatus"](""); + }, 1); + doRun(); + }, 1); + } else { + doRun(); + } + } + Module["run"] = run; + if (Module["preInit"]) { + if (typeof Module["preInit"] == "function") + Module["preInit"] = [Module["preInit"]]; + while (Module["preInit"].length > 0) { + Module["preInit"].pop()(); + } + } + noExitRuntime = true; + run(); + + return InitWally.ready; + }; +})(); +if (typeof exports === "object" && typeof module === "object") + module.exports = InitWally; +else if (typeof define === "function" && define["amd"]) + define([], function () { + return InitWally; + }); +else if (typeof exports === "object") exports["InitWally"] = InitWally; diff --git a/frontend/src/resources/wallycore/wallycore.wasm b/frontend/src/resources/wallycore/wallycore.wasm new file mode 100755 index 0000000000000000000000000000000000000000..d941b95045f18f4b6ef546d9badfe0ed1fe6e460 GIT binary patch literal 135961 zcmeFadywPVb>9d405s45`rR|r^VppqFf+S7Q zbJJtTJIl?IRhiv^IL&pl{16mNPRo`nkfSJV#gw6kXlgDh6tht#S6Gg! z)x{{A&(CLarKpt6m9zQmR3=j_EKTJL*_X4G%G5LhNm_rk6IF_r%h{L6=ReInkzLPx zEPE?+Is2zF&t?B~=4|#q%bdynnaoq!mox9o-p;&ZdOn*;vX%0+cR#cG{LK%)_sV<9 zpZlTG&Hp@`eIw4q**O139L2de?!>vZc(WeGS^eZKe4qd3?$vY9{A2cwdV%+Gj%0W0 zN^yrQqBltFV%(`K{he#M5}6k~QF*?(aV?jrY*nM|-P3Pe$Rz#Tt$OZaCe9@{ZpG2% z+)6#a20NE?8A`~^Pw}FgUDuoW`jmT9s#pA*PGoON^{RU_U!U=BnmK!usTbXwmHM22 z({pd)`n-D+*B3%Lyvbe8^>X!+F-%R0_tr9N&95{XjVMIQtj9_jm}|nEI1Vf|VM%-j zM*4)sT`0ayA>t_%+Hr;M=jyX-)i>kP+WR&);#vNV7Tcp(B@4y&C{}EQVq2b#P;ASy z5sGb4jM(tSs-CT=e%gMscj~ixXyoqHmrMdsmi5q#>Syg2!n7Xx(VhAUJ+z5?QV%cO zsh`qs2g0Hry4m_U{oc4!FWC!{l=aXg#)`$@;S4p5SK>3@{drOLa&b9canD=1xD=P& z^KQiRxsSUzS;f40$NyI^Bd!g~P)4PAkw}a2DHnA&7oUtzxhy^rpNLPo$DLd}9iMQ| z2NBO_UGy#V{&H?B8?wH0CoYrg9V+C?m|n}jxz?9r^Izs3jdW#mZSLL%y76m&w$Y#+ z&{I@cN^4bp5h)E-2!%(B`?R21Ahckg7E_Cc7VOeuYSGYwZQr7y1>3$wgW_Bb4XwyV~w&=M^V{9TUNhi697IPW-A5A^?Y7wEH*| zm;f44eO|>hC@#U8Q9?2g%ESd) zFdr9v+vQZuE{r1z)7HE)D2QzkX%s+=*?B~AW|*-AQ;lcHvl3UGZmh;ram79EM?BBF zqBc!Nn?X$$Tyaw>Zbrq8NabAj*?C$KAAjsyUu9wf$zxQh%-sNUi+|OovY33XQg&cKg+fE z>Sw+N6RT0R_HFtp)xKFj`P%#Rlc}A|-C*SU@H#`*2j;71D9y6?L_L?Ryb33!SCdBL zkBYZn(erCb-pIleM zZ?6}Wu#if~vrot?C4`;TD1L~D*A?;NLqx2Im5Q-aF;?gy$=s*-GXrc%)B*b z-ZkcwC{sq6a+IPdMWYlQr6fwpC?!XkHrai=UX~7&Q#!!2*8yHh2fj&ce3P;9O~%GE z>v73afAk?zzgwx_ZK>aFsTs+u(j>;CSvISS!vM6PvlpSSGlsTi!Im&`43r1ORltob% zjk4${OQI|pWyw)aiE_#)ryS+9m^y7toi?U&BIJyaGXk71tjEuY{EU&GF*2Obt;bhH zzGCDnMn1D1m)GNIl{0PSOuKTBnv`I3<@85u>r zjQB;qXyl7VMp0K0zsMJie8I>l>XYm7(_-&wWAACl-g`uOk5S&^D9?%VoKc>0lpCVl zFv<-_NkmDEk~qqmC~HPpbChov<=c(&?T+%ncrCsWzbAewen(u3&&Q{jc+JIy_!(we zGx17t=2QGRfn~9h6#0wg`rh~&q1*gjkFT#MTfepa1Nn6f=WkoDgWA=2WgQFsz3bSa z*VdIq{N7LA<{!_>Y{oL1QD*DO_kZq7pDV7{ugBlKj-5?hVy+OgqL>wnS#dFca`TUV zEq|;2q4<64SmMMb<_s~bidnUoRTuL&cDH{jd#ipkKDo|B7-N{26=KdR=B&k>^)WYo z;~(VK>(9sE%mm_nuiVyOti+Sa&ysyr zag_bMWk2t-|JVP`Fa2s^z5agcb@CN*)-T!5DEk@9e#T{goyxCciOt6IWHw7?%gSuo zGFx_;{pMG`_xGl5)vv1Rut=5S88WLVvx;R_ahZJx`KaRa@iLjsA6fDL{)>O{zbo8A z>_`WOlv$O`s>-ZtnN?k8H(kY5Z!%jxvYPup{@Y)O)H2LIUb_-95eWxNLBoVDt^K$e!^A!d;f>O@B`U(>}aca^}!W?|DfV09$4{T{BytjBhh;O znPV${bx?6-cH+p2|Ghu_$!*&A%CQxHnD+gHpZm8zNKbh8vDI|#ixl(H#hg0itW2d7 zsTMyh#n1fkXa8;S7M=9C7C*CIr%TMxGOD;*{BW=RC;!j){Rq0qnv&Fq7UviB$w_^3 zrasI<)Nh_yuY(LUoMk2{9`4wG{;xH^%ruZ?s5p-bDziM9<&|09GQ$d1W>=Wi9M|{1 z@HhX<-=OcG(JU2)ZtIuK3d*ctnPD#~vv*rHu_lXgmGK|LoB1*5H5o9z(tqaKVR%T_(tn4!T{kam&v|J_H)X9&a$6#+5hHE ziBvwe;vg)FEh#Fqxg(|ce|-Nx`#W^PxnnC1!cv1$N{S^_vt-pQxoZBzm)`tEddcFk z)tt3zVz;t5Dk&~WideVPJeRx_rDY=dSjB0Vc$&;gM@n(0 z{pI_Nu4D`ba7MY~!zdmdwh>R(#GXK3R%?VgLRv@Gy65H5aX#CPi$; zqOAQX&0{7@@n^sE+rQ4>rAC@u@g?7*CrRfUDB*%8>fBet>#`e_1;1*3n zp(aIUNX3}B!jxuelco6cKe+wVfY0$rMk7)2$sPLF|J5J-YsUNIk&Gsx;*)jp4}a|M z{O&^`8BIdPC+p&G{Y2wmz6IPeDKd8|YF0R<>C$8={_UUs%U>Y-hefiH~*JkdJ9N4S&IMsZ~e@d-vVx#6q&CU|7Ws)SSXt; z#XtOk|LM0fYLerOG6!XorP%NM_&sp(VWDiY6#w#P{?b1rvxfyPlOk&b#rQc%k!69& zy12RbrGHKK4+~|JrT8nq_ai?C$UZETO_t){{5Sw;>5SQ#fdptlf^iZxLLEAEbf2skN>ZK1D3IW zeGJ$;%$qFkU;TkE|0Y;=y!GZVZ?d?*{98Z!cNsYz)>fM=?%(_DFa9Xw1e^WGRFk$t z9EkfViTf!N_fsZr@bm`DY$CtY$nP{V;EG}&UN}FzxW3@p<=fRRSpJjS<@bO22md|{ zv!Qy7d2q_xMMLx8@I>c#zwiJ2Ck$+-js+8E50=oLU>+Pc(GULcpZ*Y;J*@RNxteb_ zHon3rc|2yGwrbKk^H-yD>{cEJi)haH40E*YwT8_O<>-WYRNC4SU~h4B8a!IEmb_`C zZ(FZ_+tr9&GBS8t8uGMh$kV1F3>@^u!y73J+VLr;rWl7Ol|T4nzxX8vW`Lr|x?ug< z)kqu5g?P#)()==!o)UvoHcw}xOY?N1=d?KZ%~vBGJ<7*Vv)Bt$?=q&|C8p5W_4tE= zjt?4ie9)l7DJb*O2ToHyxAQ}rOjFG4d+&Pvy;mdlLa8(ine8ry#^uhc3zF6v z6a)G_a{q~g`}cpJRNsC3^BcaQI;uu3BA**)8JJ%q?mVOv z|2k}Oryki~9lyB4p)>u}F(J-l44E#(5m}^}9vqW^>3k|?{z#_t9N8e}0YeDF%6&7P z7N%o0+gf$gWqAG`0aBG!!Bw5VQ^$zX@5OsuP+sH{eCF{ecXvtW1bZbrCm7v` zv#ZgkO*13T4xyCQEUFr4*&!{HWUfY^rbq5z5=2RtrL+7zD{)DaaMr>F3-1F(9LG_- zc@7OF9m1S=Q9KK8>3zZwIE*4vF45n-Md`Eu7r7`Ql}H?F;cr1vbXccjN0Ro7udn^W zZ{NTFh5Pr<->ENL%k65Q(^(#S-RJcmIi2D4;rDde2@rO6kwcL(>)dcwluVA%&E!SZ=bJ*?Tg*zPS z9QLi5wXTlheYRFbMP^?3V3OgqU3mRnXJes;YM&c)v9AxI_tt;k|O?LQoqHlRE`{v+4?oOUD3}Qt@ z&Oy%8(8)m#BLE`*EWA$`Wjn~Fn|AcvVJ>0nKmu}6%H@!f>{VvSdD|C9k(TqG%ej%K zY>utz#M}mvM^DMoqhXya2ifj;2E$>*O?IUEh$^~{CVI*6Ql1!ndMS4~PwK_)FLyHOaHZO0m=85`PZK^ZyGnd)HUJnWHY zDXzGhG%yBT4J;RTm|K+5!`wThnMQ~U(&E7Eeiq9N;-ZLw<86qu5cy}~+#(E5+gX%< z(7nf5I>;yyxv0N|W3gMl%#ib*FODKzL%E#WS<0q^$PU}E%8atUOEzRV$abHyRLr8! zW`}H4wc@aY>=6Z?Uvj;GleSt#;JkI@dxHid5kBqDiF3|W8)l43{&4L+1kl2cXrm4& zJo{wslxi!>vp=QUu~VvjJEa=5TCyj`49!!vqpsxA%9=(*SB|d?0wiq*K!B+-eeQ;Au4qtllra~UucDG-%5zk-d{J--E`2h zO_nokI4;2NT)f~U@UqI}l=B@oCTSd_`TXJKg&_lDN}^QPT?1^A?JOekVti4rI7RM| z!70L6RT{$XU9Ui)DhGsBwV(;uOHzzb6V7N=(Da!nN$X(QGqTvjow9#TY!*G_*o;0T`7R@A9s6HJ2?_J9^;fbE;a<)0hv}^i#*aUd)AZO*E^zQihwcM8K(Pc2Boy-nBC^%cz zh4fd3YerTu6B>&}IG1offxohd8J#T+hC5?dL6)e^E6}z=9s5ppJ8yOhGGT4zNoyAB zn0K09@MgPE$Nsd(exYVve7{gD>s7B%vmU-zz}|F`b8gh!ViuCJaTK{*pjz2C@4UWt z@I{31)%(w(eJVkFuvoo zY#i^}I3CJ1?Kz^798?%D7b{zBw>+Xzu9Tj>ia|%yD&;Z-b~G@l5uCKJRG55tjo2>4 zbFZ)c%#Sju`Re`O%5b3HrjSyIc>eXZKX6Ixh0O$|Hu1vfi|c6Pjazl=868%4M&D{4 zPHXQLVx}NIzXIjlB-QFVpQ~xY)|zrk?iAnsWsWAr9!#l}%YNZ?F~5)EkI;M2HDwy7 z??Fee_e2jfH>a7e*O4X)N~Y-eB1~pj`(Sm!Nr1o=4D@UKwKvz}X#&@oZL%K1AW1+K zBihY)F*V(xUf3SYdG$raFP(~_yYu#~9Lr%5-^yWsGvC$Z)^%W;%-R&So>Q+@hA+@s z*K#koz$Yy52^Vm8y%dtG zy^;3l`yv%gP)6z%M97;&jj#`Lh*UMI7-XkCG;N4=uAO(RY0+#@ScACmR)0qI{n-Ti)Wioujw&i^0nv!9yp9$-r;JutpDn zAZr>xAC$61$zwfvh4#HL+ElOt-j?95XyYa?`GSwXTf$pgD3o178=0Lw0`B9Q&?9p-@<7Kt zbD_0bFr(HB%ruE_gDc11yi5+PY^G|1vI{EP;E|C5zFM%HTErXYp+TPcc*;q5n>Bnl zVpuL(*4r@3sFt-f9EX0$fT|Hooo?IrLk3)%P}AvvTI*vw1;wG$0kKA4xVGss$Of(& zsip2qEc#&!Qlf7WU7v{F9CSH-m?xQ))*!n1U6gQUOhOz8vgvf1Z%JnYl#YKWN8cb) zS-B`>=)w9P(sdBm{`%fg#RdInxSY2mXBpXtX4cZ966z35Ef=!Yhq5Xrv~2i1utND> z(_&M!7hR9SbY_63^L^R5%| zDQVTdMddA@`0>|$H5a}lwb={nMJR!rk0?gOv+t06jaV_$6Z)r>++XM@>f}eKn{q7@)3&h$WjK;vQi&LC|^`gOu6II#DncLIMsTN&#A4QjA^AH`F4) zi#Rfq7>s$~JQ+NsEH$s^#rO(s)b)G?KKK$GGu~t*Gn@jqO_odq2gO>qv5xOLUl(R4 zbUuy_5BlC-7EX-!WBVQoZzG`wRY|6x;Y|aucq*tT%Gf19N5rC#8B7417;`~J7J-gg z%drdeBaBptO%OiCEn+U9pRcd|Z$Ewi{%?Kt{;$e}^2P8a>x`1<%TjGUXf{Fcz&bMK zvY+u8f{bRmfRL5xzj5Z5W$M}G8+TLXE}0s3>ErBaaxaj3A;9gnK^~UxV2WmqeMC{5 z-#k>57e+&0;x46)+fWOR1o~dX{3i68eJgX%O^v*Y*^0ywrA`|*jaE=nPc78C8X>Pu zHox`hZ2IfdkR|Gyl2abp#||gA3yj_}R0j+4Y3S8E%-+@j+HJyc$cNP z&H$J7j)m`FW%91YmzmmGa7I}qg$y>{suUr14cMV2^I&=q^xVDI*Z#_{-@pG~-@pG1 zxvU}rcr^Vs;Ay(c6nHTWad3krt1&VCB*gmn$IOdNH;aO7G%YLCZEmSCDh2<=gYRC zn&VsFIW4D0>$O~TgNN)VliY3g6bM8~_NKPEYLPa$GLAk7)*`-PW~cS(Oy&a_(j{5j z%H@Z-Q0_Zss5dFJjZ0R!!%hcHgdmLliMjXK)01+_$G)SbazLA;`#ikR|o1n!l z^hj&Lp=J$VvrrQZ@`ANOHQ2rmw{edV)`o4KXTB|*cE|=#8Bn8hEvo_6x@k#^Dwv5A z+e)7EZxLD*sKH#LLZL-DHZibfM^<40KJSFX>BDB0>e+x|tl28w^M>)#yeVkp9-iaI~V$(Tcpl2*(Mv0^i1AWd`=BU*LttYN@yJ zRtDB??A8Q%yXuS%o~}4!fv4+Q{K^RP1bpdSZ`xAc8pV7f&a7o^ujOR-mE^uL4^mRkVGSG=$Zce9l#y3y#2>HV9hEYw?J893rtoQ&qGbm--3M zzzjPeN<5#EC+ilXCHw4SL^6&C)ijcOp<_4sI8XmBYSDOLQmdYwDfg;VjAsXyILB>} z&#r&9%UXZ>6$0t{SKYBAEr^^`I9AqPF*PLsqgXTT`B(dN@-!Q?A=@;Tsy`JkrOVQ~ zjDK}7H8TIu`t-Jc)hNcx=~QS-+rQc@#wP}^U;`oUj2@ri7))w+ka5$WL0O{z&)XT4 z;n^2EgEDVhb2@{PYKaZoQPa_~RAw74CTD8G9s_zQr)I80fK)oQfQu}528DAA_u>VJ z_wW(*pfe~l8dBYX!FX;|yUKy}BCMB<^v38C^tb;db;DX9759QI~6g6q|tXOlC@cD#PK}AUJ4zw zv_+!WfX43J&;Y(YZo_K|w>^rNjy_)m4zna9b7GEsQASxy`9#afvX-hME_tHXoH-n# ze-=s0zyJbk%qevpwH=rySt4>#O6O%PpJ=~9Wrm!!U_3Os^R{V0&YWD*fdRLRZ9DR5 zb0BZK24p$NR=Wl&#;smbHD8Q2JU!1X$1}SIC&jxq3HU5PI{-SobK~ogs zvgqgb`cpQcQAV|_O&U$W>?l!SR&zxRa-a~^4jgN0Hr&NRKM7L~bFlztyQWkPW%nBokbu*5U8KfADcl67wA2jmW;|77W34>@d}SpKq9kv!C#I;@n4wp+d8Z4ALKl=ipQyKTcx+v4!sUbcN!vZWfgAw{}Pi?t_&_1gu0!`t^wEk6%rg;z@~ zepk&c>rWi;k+A$0w}fSKf{%eb_OwAqw@3+O<4%ow+A#@qRi~-6%*%ws*=(@YVQ)w# z8;?C6WsUK;$D=GH9=klskm7NdN3(VWWv2ahkR@-MPuL#%%)sZ*tkbrXFal#{w*=U1 zVnU;B4+3mMG2_szoB$hC%rUg%L!edAB)}dyg=P51DJ-)jIE7^fM7L1W2TduhRYHz@ z%mB6{$FG`gdL|z!c zsv;{XXk|JFEE;BJUKXu_K0_Ekhh(DA+-v+C5--@X;p>F-3%5YQIV9e)XEQu*WXG3O zZC-Q=+NC-A98x~n^3A7HG(kz4b`B{&*ey~nI&TE?J(_%kuJcBkQ;yTS?tD^L^e~-u zO=RbjXelzKb+zun-o>gNJz8~vD|Yl~uxX>CM}u=nWdf?0?RN~nWXY8LkwD>o$oaW?1C6 zrQt^p&Dib4c4{(DAoO`-M|>Jk?9fjG7v*}>gX3Vxfa{Ze| zLB8_b?8a~uz)LO2zwO&6h^+5K*7XugTbm^c$L?bKW&nqpl5hn*_;_L&MK|;cnLTfM`#;K_j);q3*5$#iFh(SD(NJE3}B@cL*2vrdx;)1nTtdEg`hPN=3G32WD!ZuO|9 zE#~*M=!H?E4@jJm79|Ivh6ldM)TO9aujMW~|X&qLo{Qd-|JY{HHJSG-Y<1 zE3QenpfE$Wv|^JmFrCrbjlvDW93N#B*_D72wm?eOoGo944@3^)WvJj z069Y+YC;s|1+;7sCdcOElhCq<*P}yd+3;l!(2|_eXxS$bwSD|}v}}{paN0q?x8jC4 z(6XFI(NdX%c#nCseB7gDp2!@uu$2?m0c`&qWo%d)-6hq4f4_mayzK| zp3#p%%Y(woFh%ytYLF2WWQs zu1RxF0JJ`S&wvM$`IgJ`_=S;Fmlx8X8=qO($*eX#MXJ|BYYZV9aAGXA9&^~)4~o@! z%z2?b@4WTJQ+=H<;@q5dfc@bGv^+$D+OZRpmSmFCmb{gB#(e{2j@(IZA~eKa?EI|^zVTYUem(xFvOfN72;5ADx~j5 zvT`|*(?JJ;f{m(}|H3!$kFjS6exUsj`2b=Mdj@z!Ke#AZaeo0-gVa7WgGis{K4F7U zpKFh>L9EYskFY`T5K<2=3R1g6NbO34#v!!<@erhT@T`}H)HY!hq;qx>q&6)PXq`4d z+rG>IseK})A+@EPlijn&Lu!wl(vaG);)amgwVX#FwU6Ue*lwJ4klH=#A+>$Z0Y)E! zX?~LjGeBEBxKron9HchRc}Q*ZW&~1qjOPKQ?l~O;5AER?NZodc1Eg++po7$%kk^6H zmDk&a)D}`pLuwC^sC@#Yc6|E;{OUT9_0IS~hw6_*>ZW5B&+ zI59}=p7EL%6sv#6L23`e2&5i_TJHN=PJqJH&Fq_zo< zL2B0^b^BtH^;T*_8Z-{6ZQN=eg48}=gQg+1M;Ha^uS|l}jwKp{)E?QZ%mAq^!f8nD zD(B>2<#UOB*mZ=u{aR7V-mc}%$5q}Ls-WNyRe``Es)Bz*R0aG-P<30Vx(y!s%{z21618{YR25j=*OVyrb`@9_27hc>A^~A$ZKzq*V{$a22x9- zYR5}0plZvvPk^wt6IthkA9nzQaa7%R%tpzM=k6_{YR9WUK-E6sG^(~di-Dyk;ZaoG z4IFHnppcE@RL)G>PhpG)E zYl_u9;TK*ZjG*dXsO7G&jjEda zSNz-`2pmEx_&0=9z;6htAm0e2HUy~+;4u6JUJX(YE{sBIpKuyd_X(#VwMTdiQX2-T zdlv@FsXgw&I0UIph=(AxyEF=^9l~H!cWDx&wk*+@q1y3f21soXPD5&2IVXEd$3tqL zlxaw9dLDzJ+9N!+`P5M6Ou&{Lr1q9Pq;{4aU^MVZW}4sPjTx$K9t=`@%MMbTL@~|p z@MZ*3ca7%(r0y>pDzXY>563|2j!PUMbvp!|p}HIL+8pHdb|JNm)Y6dJ=XR^~+`sGF zC*W6)_lT^&=m#CDKMtu|j#&l|dl&-RLmH}mYp8J6ja7bFNJDDZvlv+F5FUlpgGDdv zJujaJL28%dz7rs|P0j&Q_gtQD6;j)aM?z|!o+3H6ke@+n2Tlx9dy8Jvf?_q69HjOk zj6mvUkn@4BPZi&K;RHk!M`D- z0)9hC1^GrGb?<@z1vm_UfmegnF0{0jx=T0>sU5;;NZlbk2B~`&w4B-=LTXbQG;XDK zxZdRuq&6U?t<*kew@{GA!X!xT66uhY+9xNK86dSyI1Q;i<(zCT91p22xKBfB$BG+T zsZGmy#7b>Dwmb6cPDA z>#(1{6_k3{>T(RE?z_YRQujj8LF$2Jfn0V5dA(go?ID#kq_(`&f|c6vIuY=z=|t9= z_k#{dFb=7^j#&l|&s_kthlJFYSAk%qb_u5;wc%L|EcNjOJqoGYfrCvG`ViE|t<;8& z0}gjV#!sO1?2;q5L$&Ghe5;V!n>!LxTl5rZS{L;(NbT!`2vM5zUekhNwdb8uwh;9Q zr0#@TZu?qJfYhxJcYmx+9t^1mbEdx~52@Qh=k^9VHwjYrUFxp~q(0>#6$l(cD)={q zRKRZtsUY77q_zdAZQwBc1zrtOx1psWwM94$sau58klG|X2B~d>)XgEJcBDb$klN=4 zvO|#ChM0!b7Gcz(Jv#|f8-k#cIF(U_8}Ogws;tU)NSK=V5ROl z9b@8T^kX1(%Owtwx*38FQny21`-8mRE~GY*S{hQjUTOhS+rE7Qes!G4x-)*z0SU$- z^s8pzKewFM^zsht_GX}mGT>diPv?LruV)csJ)JzvWSkh&YsI>c!5QKYGUn>U839Ucr*`&EajEuxs}cX=~{se8ur08V#toyOFLms-Hoo^PK3V14eV5f)VZs6+L~F?HK9%jjVbLqvN> zGqvGWAYf{na2iv4ups3NEOiNwV(Mn#VBgCpp!&F(+T+{Y31(`?F5_`#>VDbU@2z5L zr+g%)HmY8+ke^{{7fuXQ`(>|bL9v<@r<4s)cLY z!s8S9JA~ydhPIjT(wq|@wa@2T!A#w9dA?Oh?H7-P)HXdu zn$|;W3{o3#VvyP@c})w7)hRipY$NIsNZk#!-0`)XV5V+|xCdix@?c2C+lYi1X8t>t z5Si`|bZ!Eq^64U9>bY+Z2gmQfmIqV8zagFienUJ3`G$B3?2X{*j_`B`EDV3cDXKQK zG@fn~PUC5da2ijy2#?|Ej^Sx@h^Jkt&p4hoARfX~eRr6~)3&^!a4>ah5}r0K(HNe# zeVGAIb!$-?PjRfRoOh=te-@<=71Lnau(F0=+O=#)z?82h4LheCn0C3irYu6c=%Atx z!F0aKgMn#_2Lsb?(Sd0LMVn7;v-W+aZ8d*GZ?xC!S)yLruqUlNyX8xIS-WkSK2F5MZSFt#I$+`{H*MFM(l+>}6Z+fwL?zs;*NXNPll-e*mwwRL2Z;R=q{I(df;kU&;_>|ukLml~T8AY~zIrs6-kvB~R zz26pn_{b+8{)THGZAl}W{I;Z#O@3R{4gpN$ zw?(?){SeD<%OPaLZwpb(Z;L-E^pLio{I;l(1G33)OWGEc-xe_!n33O>F=WGU3uT+% zmIs_tn&`KM$V=VAjjzSi!m(juo611*O5U zf+?IFD~uxBwpDK6I~sL4eB{#{E5L_2R`4R2fNVHc7$6&t6-ekED?E5nlDu`@h{yp#gsrGHu~|p+}%Lls*ilU-l`8iUYENaBDCuxAFs;Hu8P^0m>gjoe1?&C4xVZgS45<_VB;#ag48bzhag zEUAoqi-~S!Rp?8YPTsY@Tmc1#IH`~A#)dg1y5hty=d8#h2+`ocTOVjSys|WxeY8I5>vM53f6Qm+ z=0_vkesEwlms=q!@7>Kj@MCi`r&6fyzrfU;$PfI+98=6bnyjzu)(2Pf}1OVqgE|udU z#j960UdZ1~vbu$4+Iw`o#|_WimrUFv+(Le5rSj#7n~}0_L^tB-gLpPaa7^!$EFQJx z6CK~L`oRyn+@9x>C{4$+bCOFFA|e)D#C)30P?=1No=Nz33#aP3030`q$^Go@{g5JwolEstnVffbf@dn(F{rUPfAR2 z_G8?*`&=fOe>KiLpT7}j=JOxq7F^QB=4?JYS4n>7WP$_uOmesKXR_J5I7M&Z6uofK z@`-aFg=ZX^b@Di|kGWY~;zq(b@zPLZHKOP1*|S_a8)tEtPhE%xaUM4wmQzFu&ok+v z<2jfYa((>QsU19C&c$o1o6lw}@c!uHvl%Mn$SaVe5SS;B3xN^=f3(HKaa1K-rUf`W4bn659iia+{0P)+9+pqeYswphO4zJZ*J5hDKeQnojIN4 zU;Dh?t%y@S*bTaRIJvg$C?|ATxhTtP7v00s+Ee6`bB?Tdv8cBTftC5d%3NS&Hn1`i zSg8h9xRJ>k=IKl|u%cUhtUS#e-; zun0S=BX)GpQTrDrE(j3mkR7dUF&S#Xj@BnxX*;^BoRfnK$8Q~VNtrgKIk!M@LsPm> zNu#E;TSGw{7o0iWuZJ~(y0hq-7sHysg|H^TgBeQQx-(B(L~&~Zyh&Ts$-eO%jOv87 zZj1)%!j}|0$YPoF!Kh2@&Ff@01l`sV8;mY5KIrgyVgJ0Xg@O)JOB>QHFSTGuHwdeJ zg7v8_NGZq#KjkpNjF{5Nj$@WqGdAJO&sWV3KHja#!IK)$DWp?(=6WYI1G7Gx_jDmB zPdwo|Cr~WpJAv$ZfjrO&6ia2MUtukxO*n0BH+}s>ecRM`WGy1$T#YM>Loz1(Aoy{s zyNPTbY;`9M?#axnntTsq=3tvzneE+1567KAu_5A0-Sst$AI1rkHavn8C{Fz-hleo3 zlTBE&MJy)J$2fu7aeM_QP<%(^*xVUt=CO9UIz^Kbk8}dX7LGD}pn*;#^yHs;M z!!C#k>ePaGX!$g_qXUi1v7H>P(eC)3o3MN;?`wz9vg^wnpe5lnTFQkPn|tQ&Yx2TF z1IusYY@=l{=!%HoorCiFT(bBuj zYj~G=a`QH}teQAad2n|Se9C#We8|PshF5{0f%0;f1~hrGOE0dvmjnw+LR&ZXw#s1jcOj#_1H;9OFg)<%AY zkX>_=2L(TYPSb*7;lI(8Qhox{tE@xEiJOKflXj7Y9`|;~B=W!&*Wj!!Y_xA$LR!^% z#k2K^2QR$_Cx%~-)z{zz3J4tTwS#|*Jwxyt?zMw_BYW+;g412#F#H8n?Ko&BK%|G% zodBUe*EZqwUi&uTvAy!>HqKi>H&d6 zNCp3fkP7$>Ar<5sfz*~DwFMl8zX4LWprwy5H3_GWFKrS|Lu!NY7^JogQV*U;f)l7m ze)T-0wjcS`3y}KAub#J3ANkeuv-NMNU%fFWP@v!tRe``Es)Bz*R0aG-Q1##m@busb zp{o1Ks;3#MeQ0S^-6xzz)gIwAs_qdUL)C*P%v4^pR`5fU1vN>v>dt zNnK29w0h!0tEyPAr<@^LMq@lgjA4k1X8<#)Glxs{sOE9sk_k9klG=fhSVLx zX-I7o9)r}bLF)DpQXl!%^N`wnLb5;9#S9q)$@@04fm@ToInAALr4YxhL8&Q z4Ivfe8-dhqLFzVe82$pU2B|G*X-M57oQBjU;WVUf5*~xpZG+Ut5KLb5;9#S9q)$@@04fm@zZ~_Ge z4lxw~9AYZyH^fw+Zv<2KE`g?d;9>X+z8a=>p{31KzRw!L)DGb^rtT0P!&Gh*m9Nqv zrap44=P|YQ$gy6))JKl>Jf=Q!tmiTH8}3*yn5jVE5K_UvA*2F+Lr4YrMj*8J1K3J@TvPA@z}8JrAkh zaKC!tY$^~qgjDcv2&sVI5K=+D5lGz>q;3L-;cqxd)qs|U)B`^9NJDC$a2itg36DYQ zra@|Nc<<9Azj_{08;|_z1uONDUp)`0kNoO+Nd3n8)l2!1YJiP8;D2zDU%qPU>zA*Y z_VvsByT@=jNby(fg2knxOL^oS z4?TM19S>W3($`IoyyNkmX7S$JxyrsU^da>Yk&O>P-!iH_@{A``>pk*}2dX{tjCTyG zJ@SnAwo%Q`f93P@Euxw^_0W#Y!`W(s&w=DOO&=(ae6-%n9`Vt7@I)6rT5l4G(pnQ; z<;m^Zp^w((n@?qikJjaMj~UcpVM-3p$ayZy zjgVKovck>CeXuSkc=lZ}{^0B@V);q4@73Fp`(C{V!Gzr8A^p9&Ib9q0%iF;Ll6?J5 zcIshX(EK;*mvf&E->1vdo|5lb^0)hCI-Zn9zD&nqqJ$G>sx99J!L5b!hj+utp@q}8 zvCq=+geRVM;3<3!{*d3JcYN!H@6r2&)8C`}FXjUyIEfqi8vSzarV5rzw@~o-XXv;N zc<@)~;R|$g6ZaOsKF=Ka@p%W07fXFqz&<|bqB-;MdBrOY(lZ@-!D*Kq7N);Eznn9F zh~^1UGTcB5VGPGGWt{63?WTLOH|KhrscJv)TXQ+A8#wpG2P26OOm`-_Eyj)8*Vwn` z=yy9031aw4a#K#*PVTJA|JUcQN5#9fH*h)Dow-%dU6gk??pMOe7#+A?!rxvl;l>db z0_7E}J|ibmxrFPdSPhh8t@^y9aH|q60cE9bemimrmtWPVMTzTkic_G|5z5d~b8A;N z*SuRjd>P5*UCJ9reOb|`;(6!2WaQP7UKMfEXATEPUY*pdY4RR8({phi7d;o3!Feh} z&m1@`sjoO%!VNpj%&p>xCY#*21)sGi#P0Rlllr+*JEfnSOwIXOt(_pYZmNkA{5yq& zj^zH9$Ot)AwVujyXs=p7Ys;SKr}2|;nGZtc)qb^p##TVVKliG|t0}$W+M#oC5nhmw zd&PA^h?!Rh)%y8(+FnsJRS@D{wI1tNm&ecwn^joQ^&>N&k$Fa0v=6&!8!n}ogE+6- zL{596?j&KH@MA?T(VZk@#+@W7$C;xpICDv_q(tPRlwb|tjpq{GL83B4&bnDd#qrPH z>rRqfxRd0x98{PiOX81C;mDqxh6qM&thnIL7*YF@=3pTduFUODlA3C;mTtRmg2@mda z5*vdqIGmBkN0L28yoLBNOMKuiguqLw1^t~QvvJ+>+I3myl5iV^Ij*>%-T`|q(^~QTqh>x4hJ7BWn-cNkVP8lf)#{qSg!e ztvn51r{kKdspB2){OuL-V?)kd^C9P9-x}AGK1E6e0!v!H6^m}DqNjKk153J-WFbC{ zpccG*{GBAodW-|}geuk9z+n>AXwsYk1(@<4;-m;C@x0Z_ubq1DrIwLAz-$=2q+O+u z?QXSZ3e~CBoE}wcPHCz&Q<|M>Z8gpXub|oZ{Ok0<%8+tCJ_n^SLOBEFpq!3#7D``~ zU-<3&_rGxe{`okDvJb`I8&W&Vqr17Jc1G3hP1j6|J0(1tqM>$|N$s4J(%P(cUa=Zw z{GRgLD&Yo|zUN|r7Kyviq;|VRPu5eT(%5KHS0$GVhv^hpknPEMA6-F zKm{WP43>3J$&jc~MK=dPT#hfUebt4E_cVf^2Hd%amH(e+RIn>7=VESZl^Zo0NB!eW zd=|aG==9zkj^RiZx-;U=#pf|n)HR9ZM{Bhrucft%ra6~Y3Q6MlQrZcO_l9hCLM5Ij z!aJ~oD&PJ2;C|T3giX}*!eG3>IqMVglkute1fz=@#4qm zfWF@r@6}JxqrEAzIw%2Mt)HdJXlFz3K`U8=3YE6R6Np0?(OzjD^p?j(K^Cq2t~LtMaI|bnjk#4oW;D+Ma0W-M#qCfYueQD%#lr zZP%qmlqUwXj-#EvCkX%qkK-lz-bQ`Vp#mj6X>S08lkN?MfzW|BPuLrPVadH=EEh`f z=Ayj;AeP-5#(tp%ZyvKZ0L6-X!@Sl|L)Yclv~W3vwz}lTM(qWNgHd~GUGO}BXx*U$ z>)fHUG;E%6G}RqCi_{sd$B(ifPjqLFat`3GyI#_xxbDy)XYSBZUyL=m+b{(lf!w5L ztPiu*9Xcw;O=iI!!ZK@8CG`uIb7QK0N+tBT2FKL3KUK$(F!0CKCWdgjLubh-Je<@+ zqlm{te%nMbK-C>OkHZ=x(Bpsvued{JAwHpzgBCS2Y{%{_sh@B#W$?8SpCraoeA1=a zo&t@Q+%tFREXFG?{ef9{x-7-8>4ZAOosiMe*f_s%V3g_?8LXh~sz5b9<*RP2@9UbK6x*&DHB}$< z^f6^ohMfW?tult+Q}N08te1u}g^@=6tW-h{7MZN2YlK2~R3qKZqZ)-8=%OGQH=%~Q zpF}kb%BKb8C6oF}e8!c=MK!Qs_XPP0tPJ$fX@xF|2#|BwhEVFJSC0?5cWpK}Wpgl5Z8_6_;#D$z)S*n4CvCic0U~ z(c;I`qwEsEwM?@y#dq4r-6-Xty<4Wex~&M#PPrm9j3QYRe0s0~eY(OW;K)}hFZKR7 zl;Fm6Ea_0xU_uhCO@ZmveyBgH|x^Z|R3U`y@)S0gGdRw0I;S zB`x3g!a$&_Z`3yjeGxgQ2Ldhd!v1nE*F^Vvo0s*0+93wFPM%m1(|U54Q1Q4JHBkY;XsFv>`8PION(^DO(zJ*>8nz>=bbP^K*A`e+Lm&1%#Q z3axcs$h&3c;gE%o1iNJ!u}jK4nchUu;C(V) zaYviTV%A(QscQ3>|5FWVgA*;Te1zxd;}69GYG(p*gkKp9V12 zlqr)tR?HY+P5q?r21TfDmBhHTxjV&cs>>1(l7c`+mM z0^w2zbdZYI&%4^57!Gi5k!mGPu=T01MjbR+tL5sIq2>)=^8g{NVJ{n?4Qz)ktC_A~ z@uIfgWdm8gERM9bFrkmyGPtIJMBU6jL>FbP6!BA8KjY1=MxW-44qoCf=U%3y?3>qe zFT3DNsK0_Qx!{XfGzz}xf}cQs3Vy-`QDY0f5a+`(g3aBxDzBryIz)MAxGVs(P3X+v z;kr7wjl^Wp=0%NuVf5e$*+&PuD4;Ys*AF~d5wGCmiVu2rPFFt`dmVyy;T`_mG zJbvEkvKb??oKR?)0CWu580EO?q`1nXw-pbJp>697rfn!k)hUOq#Fy<98~Lxq%qV43 z*d+IkMbU!5U<$3iqbY8vmZryJyXbRDH>UN2xXx3}41REsyx?#VfusV56t>gMiwBJsAfSqdoCWv5hr z3MOCui}59AuWnkbZDPfjr9yY=mt15skE*stG|*jcZ!5=-yMzY@e>)^3=_Qx+Naf}B zwo1G@roCDsU^(jE#+}z0h6j2apR*N(p`sD#F-2NC_#y)Q>iy@W}@Y)I$anYqV`5%!QWxEnmpCa|*XzC{>r)DB~ox5#r++ric7+69+ET6d2 z=!7uvBWcie=x?E9imvze1+VJ1GWrI{J6%&@tZ(JG8o zlV|qbNEyc>32h;_`_xiXCayk!TzzT4G%hNozfjBrizU zU93fsuE%+Hdu(S&RLKCUXYHm)ER%_(`p`FCAjCpeR-_jk=@XC!VE>{8UUY9>vcOBo zIUAR5ahXt-tAkeJvyAZrz0n?-@K0-L-9OuC%zySCridAo_3}LiMZXexk3<7O8<;XA z9kn2K7LI4Qw`wD}6x@Wx%C7qwT^A?s}qmzf~AVx{Jy773Ucx zxOR*GSO$M~pHv<#*X;cU+p3nm(ba#ur?w`N6p_ipi1rHD* z5%v5>MN72G^H+1CUfPJaN#fuA&fBlB95A)k z`OH80-hcRO|JA?v!rkw_O%|Vr+b{gTKlat1`icF&+{wIAXX(iNk#l*~+An?KOP~G0 zf4aN<_o0_#aJ)bbr&)5>WjyN4`IvQ-BAdizpqH1tB9fCuNpG<%3ULvLWz1WNBQD~J zbRk%#Qu#_XTf7_Hh%t_3Vf8 zHC`Gc&jcUd$RZ)i#sst^}eBk`ZRo#>QSvcqj#%2rpO zy@6DbxRCM{Jt2g3dpk#tap603Lz+vSrIj<(ESp4jZ&M-J758eUT~-^&F!_a3{2yA( zQ3oqwm~UwR8D`?AOjIa@{ZdfDDTlK9C7%_Mb{>#bnnmd&rPUl`POsp%O4INo^`hFZ zsqUs;^&+a_wA1t#jsN9iy2i^1zHBIZC)aQ^=4PXHE_gbjtpQMLeT<7tE z3jv2MNsHfg*gzjc164)|rTQ7Ppn^7_G`b{_Qz>dkSaUx@0`3buPmJ7J z<{I6J(m2>He99yx%7eGYSD#x?=3h%nx9gN+7X)$>i70ulCwvtp<2J#@oKYg~aC|kH zd(F6r^RHlhBw21MB%2fKuYs7aB4Ra1`z38m zV-qJXsG96UP%aK0@p9I&XGm^RiYIR2NW>8iyeN5n-r%DM5i6$kPIJ)%;d1PK? zR3((Tb=%}cb*ir=^AJ^sf~g)!6g8q^No1;*eMNeuaP~Doxjquk4#K|D>>Bt=`zExy z=0@vUFVYOObEvIvY3nblt;q{65U{UrK_{}D4B~>uem9Ot5E2o`Hfey8+JiI(!nLe} z`x-Z_B4aY6MMCGrCUJ@`WmBtEYQTf~N(q^J5Vr9jgjWk_#6aN~FW9N)atLaJwiCH;CvhAz`9L7cNZMSY54DlDjlWCi%i$EGTZktH ziX#-%8}E!6rD~a+hkB>J;xtYQDq}n-C^z1MgJ}g#+uvf*+uzmcA>7&sVY7}}CZfj( zp18>y!%VgZP?8aLpcQ>w-YGTA)?p7j zh3L2wTD|D@daWqKvG^S%C?+}#SNzD#l;>Acas1MWy^`wEQ`N zRX3y4Cs|M1LIHDAFV;?w17Q9oI|vp10h&Hv#l$!myY zjuPrkPd4#Mh?(z@ks(P^1^)wAfL4LC)pXVhqH)rZY&1N#X%k92jKk;%C0@U$HH>8fs_Uk9BR!_)`E?My5igZzvbOuytGpK=PV zcYoxxGKc(Ru0^t3sI6=>>#0%lI}q#<6`>MItZypSxrzx_2Qwm3<)nBUE@ZOsbk-Io zlsS`Cd1TClaWSWZ#Mc>0!wgcm0*wn zb~%YRpLtiv?CvO9BkBwiJc>s$GjmE=8gEC0mLrk!_sSl7NeC zW^6GoY05`!-I9RSLrYP_Vb%!UFA3NSEk*ekae2L#jWNlYc1eqgnfGf@M>HL+@7m{& zG4)qz=t_yg_^Gl?ig5IUQkPIGj8!_qsC5coY3nrDqC@MHsX4YzdeYC-CQSNs5191l zu}(ErImc43Ej8r5ou;|JH=m<~E5z30$F(i#0kD{|Ofs4G=bb6bAVtgi zc|V3~nD^7C-MpXJugaLEcAEE_sb!OX7N0fgXXv%&n+lSW+=S`J;VSVC;VM@4z%)99 zt6Dlpo{V!IA$Zo)+4bZZz>x;aqtZ;{qlBFk%`OklT#ig+f;@XHLE}XU06sjX`0<1H zE9e>BCX=9lYG$VUC`6Knj6&p|x9$Q6VUDvrGE_#Jnhj^O*1@q5!^-vBUx|`Bq61P# zTP}eqsUvMCS?8sWL~!~+aegT(r==(alh(?&J7>y~O=>BMZfHEPeSNe#QqEu*ihk_X zQB!WmwW(vy)Df^o9hv`W843X(R>z!dsf<%cVk=fqN5e0_21V}kt zPS_hxNtszmnl?RMaT@IVIA+(h+B+i?$|tdm7;cp$FO*zyrKkZ2v6|pabp|L#dg(n+ zZ_8K*SbpbZaz)yifrUuMj15pA=8G& z(?a8sjR7r_#M7#Yn>uN{QC+m@g-(Ty0VaXccwQ`r7jTqM=4>a1>N5)hWqp^;5wPLj zkG>S5#WD995c7RIuQ3*3q6xld?Fcz?4udk}IoBXd+nSG?6&LE-+2B7t%y~G1Np*aa0p!-H&M^^JlM#60{p-IL+fV zaj@K&3(Jj~<_n2fZlvLuPhj|jJV%^TW+kVSF?m5 z%}4wu)e4hr?bgSc%J(lsb9b}$2{5*P0U9fqSEG-@_O*4LAxf^V*A{?lC*+ALGv)##)3vQtEomYI6jr}CB$!6~}o z?fR4!QnIxvrJG7FG0{~B#mhdO$-1z%T$lp^E+5r;nAze_XCf9EOEusmxy0O-Sp&zX zZV^^fVzV)gJwbh$af=J+g-H9v3Oq%|S8gR`Eeugglw4#&7H1u~HlJkq4vxi=by%WC z7?hM*(d_7>$YG95h?=QalK57=l$>X}6ZnVmBpa7r8s zg%9;qR7f9d3OvO!b1I>#Lot=)9fDfN_*9x}6YLo4(W{!7b(l()X$n`J+^brHXymjV zUaO`n7B8{@k*O{6uWBMQiz36sJ})apy@EHc2?y0jZSMXFdRZo}-Xhst(&%KUkD9KK z{7PnhKCV}#9&`(nxx`nLylD93T_$8Ts%qt=7!BGX)F?M-jEE6_yhd8OPt{0A2E?$n zji$egGpq!%Ab3P&SWd05m|@0 zl5hIRj28H%7j^pAN9_$W#0qN0$%fI4K)7>AF@I+{Q4c+=_y5owKSTX|6|R*UB7 zm;VLBFvp^-ac-a0;&yE&Y0sg@3sPSDA3fpFlTpyQ>@8_`Hu?8B^FbBo*oSAqn0|H^ z;$G&~Y%Ra+|C?Q&o0^@SU7k`nD&&@zr2 zwB>T{Mr|3cFn8cDJ7C8#F)d`6EoHJ%E`O#l#a00g0`wrE>gjX4>;R^S2Ag~pkWJ#-^H*zSy`)oP zTtI(;Uv%#^DzOe`M70@NdoIQN`v;LRLdl_QJF6U!h>JHVMUAJJ_2sp@|Bib2S|(n8 zU9Jyq&_~r;4hJLyG7Gjc(c3 zmJwPJXj^^(C_>J#QY&ktr3lH`(lSS2N~^z!nO6QeAnGhfb&B&J;645_;QTDORkBr( z@-0Y&i&_ycihWX1B{d|5K@3V@@6In;EoHZA15(xfRt#C57=o@wHv|p#T%mW7Qo~D( z#mL$#qce;b=-6>-zE)>f>}I`0HDHL9GA(CKYf?0=AiUMHA7OQrbtCJfC02PI7rcZE z&Z8hh3XlLZHCM;lbh@x%Q6)y^I->?47thVT%%Eo@e*2sNSR0lFtH&n3q~Sn#x}R4H4F4)z|=(! z){rhs&dk7s8Io3p29PF#8L$jMNM8s8P1&TZb>k@{<7kX{`H|FAa~P8)QKobNofKK^ zI0KBJxsr1+p1yguUXpOCG5`JqV8E~B%LhL3%=`&bTtNm>Mb`2q6cKQK!fLr9mE&oP z6o*JAIT}T+V*AdVtH=D9`TyE`7x2ukv%YtKH|di;T|Uit#$(Ue-umKDnK(U@tA{j@ z*@7e{2{6eCdEAyhvExiKo|!nFOPooM?fJqeMhzSg@B~yY2SK1#X`QMNdQ_4U^)vxJ zhj6OXC#5P0ty)}Af(a@OMFb~4zyJHLwZFY}87ZMXJUm49e0$yY+UxSJcfISqt=5P8 zs*S6IB1yX9sFPNqt_k+BN_z--UQHU7O^_T)nmEUR_apmlz?FCtwKHYoDyCV~X=CS= zZW+x%iOk){P-IX=kI1XdV{cTD?Ms!AGE93%c)?yn8Ep`4IkenNH4e9)g{q@!+<>db z$;zjs8pn7In|k~(Uw-23lPGc)^yJX?l?q&qmJJv6AM zy_DfP_!pHf!+-`r!$4v>h>l!338eFHkbgK;7{{t+e2AGBQ7tm`;Y=Fa{TIx6s&RH+ ze&NaKCqVW99+V}hf>{C5Ca;2;SVym7@&ST+HVBwivcAhOhZ!$)W@Cw0AMFfWo5Ih4 z1~6@2qftY|Z9v-|M?)4QqFM5In>c(pX3^tg#K#mr;qex6PQ%j9wfY8$+bmCb9E<86 zsJF#br-R^|D-20%vOO(B3@o^N+R9SKt)a-Qth)(CReltir3tLJZV!s7UzT$7;N-Ds zGZQP{WJE5F=$&urT$?lp6V!b0Bb#m?@XQ*7;sMn_DI$Ex+?X{gCr(Lei zjLoEy4Bn)3+^jA3J!`w3EhVAH7|Eb``@Ly(@M=}7W)7iPl~uz$o&-5?B)B6vfkAl1 zgU7LUXF=VOOo;NkBS{&D;>Hv?CTDp#C=gEBXOc_o-1M2w)?#OweHA0xZUUfUg44h= zR9k3YEhS!Po-{^_%|peu)QnnlhtGd*r_Wcle0nV)NE}Sr1{V>`z7G;xVR3NI(CWs+ z%oC!`6X-3<*BHGy^ss0f<`7Nh3&dNODez3cf=4f3yvX_PCp7F-wlR|3mDbK>uRsoP zHhh7c+3MM>sVL_^4FEiUu}L+)me>YEl6V6P*%Ilj*!=LeIX#b4L?s!KiE7FY%ELSh zE0JMKTUj$UsFfYLd{GGxds~S=toA)!p&ZPrSZ=_|kr2uew{iw=&0e{tl_MdPBW~rM zQhktLvA%vQM?xq^+{yv8@XvbX`m7uYp&W55_ZgLg$cXhdtQ-lU9C0gW&HZUX_;Uzq>%KK~DC{wJ!J zed4cZ;wP$)_>6Zen(_&jER&rmG_8~8k;{dd-eHoHms5D}IZiMRfx(my%`Q`%yqIEp z&v0^_VtY?;awo<1p5J7GVtY?-ay!NLp4~)?BiR9uTIz)1I0r(pAII8)%V_kyZ^4QKAMbM7B!f=h)n4Ru~|)cJ^` zPH?8}mf%bor#Q~kE?2;a7Zna0K-lmS*;MX5cZuxM_JIt=Z{7zol;mU|$Ph|zKgdx1 z9qi%rLEGv`2t6gPEipj^u^*fXJ-##21XJ!!eEvBRC` z{L1Rd?f;QAaBgJK80?L{{^kIjTqslV6QckKwhvJ_?$|tS&w6nc;&$h(mz1-z{*Bh5)S9?ku! z;7JGvYz*P#hkq8wt6zSWFW@Fi<>xf8EA7Gr;fhu@thbTg&@db=wedKMhoqY(<+g|` z@er4gyxPWJ1<5yiskJu#{k#BRo4KJ9kgj8Gr+iL^(MfCo|PMl1NE|VAqbKXm> zdUG_sNsH7LzGMx+scXu&^v~jW?WI|GQ)WVG4xWGH`(nyG=9H_)`><-wYo4{wMVC>` zJYPCQrzpY){bP9GqcgJucpp-)fmd|h7~v+4gLrP@PxycW^8{{HV3ELK3p6`0qVQmY z$7SOSFOy@AnMTbq69eyVkw?w-60qTZh^rY6gz1YsbKpd0NUoL4N$hCw4I~d9l=he1 zUmBOc#;CmWQFW}Vo7aV(kKi6DI6gbD#qpWBE{BWFtn@rCGbxN3lMn0Hhh#d8S{#3T zJ=^@mA;UGVb$h@^Xq_Ru6^AAAKZWC4YaLFSwfdMfYbGr#x<9k&W1M$~ll1@s5hii@ ztLEiR+@uKtq1YsRA@gmG+c9%5#}LOBY;0+P++7;zOt~ColjiU0LW@|NX3q<~R*W;f631-G+X z*U_fEMAce12jjd^y}lXeag#V-$-lI$nlrBW)jAr}Fvuy#6kp!jdYtB~*1YCrYSNe7 zj}?PLO~JDnAGB^PJJwik`D($d6Mk>BI9k4HHd{e%wMhu|}s=KvH>4whsnAgw0&qkG;&pX6EtysaGcG@LIYd?K*}tQHSy&v7;TtV%eN*T zHf<5$MPE?QHWJ#7S1a=-WloHD=mIxStf>pP;>xG3PT=;hVlkdq|? z#BS~Ej5@pK-GXF=5b>q?ifcI(aan+7!d!&n?b_N|1S5!LwX6m5&EGY7Ic;Jil8D@# zh|9}dXat}$s}IjZKm*$L8);!rHX8uqYF5`_(OgiU*d(Bntvz2=oZTE*a- zaNCxDnF?L!HLA?3o#r)tCK5C2#J5tRxOb(^(>N8kC5`(bCKO!P=UXGLw!_*c$7s!Y z0*1Y&`*9gaQM`GhU!edwwtKdG_r&2Us(t3uklYzNS>gDZKZsS^-?TvTB{mB5Q*NOT zXw#hqgy$5tt(P;Iy^o)9`(vHjIt#n+zOMLiB;N2=uhZ(dNKB1kP1t#r5fuHAk67@2 z8z*8lOcax4#K)=+-@5#X(_WloGd882l#X+@;m{(--+>l2)Mxq**V{v_!iG=7s!apb zy^m4Xt7I%}Bw6i-5=#A9SAS*$AVol5CQje-{w;_8#r`Z3kK3>j)HEEixcP)H<2Hjq z2byI(Q|-P1>+RWoA0J$2JE4VlK;X>hIiKM*{}R0_&Ti~nNgZWFotszVonGNE$xTTP z5_avEZ|fSD(h^Z)<{JQV3HO5K!uBFx-4t1BK=OtD&l%j|d7ZyFfkwlI35?j%fM}C; zu`mnxQ$FCSaRIlKDG>gME#5~Ahnjm|?Y^w5Y;8n%#eYGGLWX*8ZDg{aA_km`HODWb z;1@eUFN~UJRN&a5anlPdjLp~}44Szgm;;<)RfpM;m|0V%E5oF-W$!7v&wuzkUAl46T=vBo7(v}%(a!&}n;<1rcqCOYP`HPaw` zTYv>PRbU_Y5Pn+;ZwW$fOpp3I-3FVw+#+k%YJ_!(5#bGce<^wh56)o2)kIql%I5KM z+d{BQ{D(MV^I-(z#IFpv_v$f z)AILztVlDWAsMDD?45IH$i@Dz8UDa8zVKGKcFL&IFoC7bVr3iN3On!&+IZS^iUgzY zHk>rnnMK1}{tJl~@z$c_EeB5gKGXiWQ6Vbp$tWNUf;tw^$UF*c6qp%>gV)1bv!i0x z`5E6=`}`m*bw;V(>(+N`&@F0n5OT=62#KqN#-<$WEal&i# zmf&ZHGa}0FXH{ih?K0KqGY7(FHmzF2TM>{atf$MB&U4gbZb5WVoUL@mm9S2NovEe? z7?#2bw8P*Tt{J1mJQ+@Hks#tqu4~aK_K<$?=+0lKQ$ku=9^8-RuPju# zW9c>z&r}HO-ZI{tgB=d)iWhu#_zo3~dquZw;qL8@v?jdGSG3&o8M>=BBfvRw7GUm; z)oK{KI0dL{*%ZZrTXi5>t#ocz)9^FTupF^F;*O-cSB^v}3xTS&5XZg6x>nABA1t#w zkm#*@d;(BmWUkY zn%?eBU$ds;Q2dcJTwa%|=>~ZYE7SD&`cziahlVRqoj-cFfXk;hpV)iVqm-`{rZo2J zmf{@Esb43AsKVgRRMXT4RhuCF(VEbRY(rEhfZXSn@l>2BV#w}V9W=Mm_6BK(3{=t6L+Ci2eI3eJh5FP>v+?aE zdz+MXcscQP!fae4xXt6#D{fWRC1U>4O+vOd>>B8+!^Y*>q)mgWbw1X*VzmzPcCS(t zbyQ}-%BauQ`@F$+99XnWjTD(T#O6qFi;VRY!a*Iw@2aJQbi#M{)jF}e7hIj^bH~@K zCTL6KmK$dXmP19U8fE^vZOC#z*6V0sOBYf-4i2{o;hUOGfhm>_c$6{99da91slLl#B$<5gcTY{v%q?{*cU2Wd zYdtNeqJ~v0)GkMnGbLqp^iVElG!`F%m=T&SLd0$GQ_Uwiy z%AvK4D=@GwA(x5Q0}U2?f=O#-B~MRBZQ1hKB+xuRiy*jWI`nSdAsu?`A+Z*CKEmsu z16np1V77`n^m1-tI`pMJ0f?n8p)p?S5<2vy)|n2y)m!*{(4jAX-b_$>E#T|yI<7;n zVD^63p|@l)+q~xJaSWYmOJs1QPS4$%Qm5ytO})+t zVl18OMvs^-9SK2Wgt)1fqfUO`lriCcgP^^i1_3fgQ zT@`%oLl3cvIz33HSKn@G_kzoPXd+for`N>g{ks1L#|F= z00GrsnE&%W{|~WAGLM&i;;(4prA}|q(5-07O`U!i)I|t&dd+NMrY|a7o@7&}-+PWt zoqiu$_fn_ddxjHX?tLhl-bt~&=Qpt}q&IE5SXCrar{8;a6D^LGG@A_HDaaLg29gA^ zY6F@GU~P}#6>I5;KLiHseSn6gw*8TyDH^cYCjqXn95t6rlF; z?!7RoMs~uviq@Gh91U=r&QcYgymIHPM0-Asz$pqf$BW#g%WwQF9*1Tp}dFV?~tUPZuoBWqfx+Ghb%i5!3 z21c^&KstqRf6x`9WXWM_b~0`-*_g}(OeJrAFle+;WYFFrAOnDOFzDI_(}TgF!|fWk z^kvQTR81Bv)icCu;TB=()FN7u{5RSdjGDqQfauzyNTwv942B~FR`R+KA_iqw-E2&y zqg&*{gF9-gtL50Zm~xIZspGwyrav_+RVbO^01NprE{0*vK_N_F9MfPHve*pT{8ZZ0 zEtA49Bamw$hvp-mGm-WU`TQ~wJz3)xKvJ7g%{ChW+2t@uQBOWroU3M=a$nH0F7<6r zeUnL%fGxth>`efdysxq+5eUV;xfO`(J_j3w_{FGnjOJ)h<=B+cdfM2{>vm~zz#(g$ zE`d>iLSPL;Fav=&^SJ_dH!5(4SvNhq?ds%r)#hyy(KN*8mW_T;n-2PUri9X@%~OoR zmL;V|pk_aenyPO5;IIE0-ntO|>5^=B*99>85DWzM_@$_Z?fTe)b6c{A?M;0nC`=FZ z#sZlzZDig0H&Bws!I`fDuNtpnk|j%3&2{w#)LvxCi|X5k$&zPH1$hZEXid^&8Hc0@ zUNX`xj(tr>UhF1>PI!gHiXTwij)mU>#>EPRVs0bihI_K2VKJD=f~Q~-p{fcgvX5aW zD5PMxL5iE6_**i?U=JyjK@*;owO)!Y*_r__Yxvjky0Xq*qVN*oCG9KNV95UTA+J&P zB*e~m45JFg?)8`qJBZz5F@;W{@1ac$l)tFw%n%og^2A7GydS19pV_cIOdkaVhnTc& z*Z0Pm0vr%1P^?Q;fJ%!wWQth2`YotOaH=n=VOqB81y>f9xvl^n>fOrx`rbRQzW{JL zbns1T{tyn#{t$3{(}gFePGOqLDm7C!^uc=N*sbM{PHicsHu>uIR2=*5km_k^>yaEb z$8ns9<0$k*>9cM|=kjv%jbpO}&tJo*JJJ~qkvj4*hZJD4{WzHBcKK900bCAD9($a@ zI-FnC z)Lg00nyVQ-Sw$NRSjt>!_%v6HMtP28s9u~SnX4D)NJi`V9BG=(m)*0kFkf~c9cGNv znjs#AEyXM^WCXxcS!m(d5rPnssm1nRAh(viz?>#C5M7j-Z*}5+E2VK#7F(u6$L?g5 zjM+@EmG@td0Gp@oZ3LL?B-EBjfK5|>kpP?b@2&J-pZby|MUnbiw{I1;QmeL1eYvLd zdY@BYv!+$AuJ!reJ}sjF^;Jd=Mt#Zt!KkljA+byjbLeIdMd}M|iNn{Zjy_|WEh{Mf zvkUD?bTKXcVY{Wqg+3_)X~(24dw(WcJABoIR>KLcS@oxfr=ZBSkD0bV6A|fEnW2dI zh!elg2x_7tF|z5y7i~jiLa~L=0+(CE=cL5{6_Z$-jh=NtPGXsAKO-{7SlURM6%yoT zsXsQ$A|`m#j=S)cjq@Dw$$jpRB^bz(7XUAVyZLqhP*; ztYQbVfm&+x$mr`6RI4;L5L9Rl_xskNeTDFnlLNm*T;4J&a()cgw_!_)d!Y^cYpRz^m^6Il z_zsPJn+6%66!6`e(cW`lhCT4zasZ@wnA{{@!gry6IsOJ5w&1%B8+Tb`?27N`_4V=H za@|2j7B+_OHc?gHhVN$VOEde%cQR?|;XAnt)>&*%e79cR6W?_a^hJEPV$;{9Rg8f6 zJbdCSJv4$rq3y1V@BFOjzv%0>`?F_Xf$oj)$*8nxLA;|}8lq)3$|V{+=SF3T4Yf8p zezQ(VM%q{84qx=W>5Udq-!an27#x6Vy>#Jn1crbW2m&=`^@c4@&z$Un{i@6>`#IMKMU*7;6{MLUl+tu50! znl{UAX?a_^WEt@rf7wNB8<38@hILo6R|W1ya{5*V_hU0I+Qv zkOf0=8<15%aT}2J2sLk@7?(4pc3?U#^ICBmn742Bwt;m%vt=7_p5uJQyMzV#Q(DA zDdK<3A7~S{Ic7JA6-y8M%T%Ad1vA@thz186GjosO22xC8&Oq3KpLoKDf6<1&9S6}S zV1-d|!`_|vh@0xlCQTRcMASb|*NUirI&>|fewa`Z^GCZ@YkC*U3#@^AsI|aAoMyTU zIA(`FY*rjl=IMlC{)r;uw}}nL8JcVvw}g4!mDKI(T!Lv(j`?RQ`^Ef6_C);0dw9QV zd+dUN+n#uTnntnawlWLvsHMB3{TX${eA7gBVVTS|VmFeuwgapU6})-{1ng8=FXJ{? zkcNJ3k60;Z7z%evrJP~7-<(S=krAy0sESR48^*k$U`=*taWNsOVK2OP9K8?ehw6F& z(nn=ZP)jPUXC@G3jY^cY_G`mzNV;c22z#ZGR*E{LwP__3{mFNgQ1EwO+pLpN&?2pE zkdSR~9n;4KvR9zJToKE3rGXw%(Ix!Glya(3n<)5%ulBTwxKh%6!hd0kYuxCBS8A&4 z)t*j~r7CX<{dxI@x6gf_K8MJ&Ck?!)@D{z8XC4p5r}tHSGZvrPSMe{z;@y1}--yMZ z(FM4Bw*Bc?d~;vL*JJT7?5p@wvG~S5itB>rwa1%PC>;6s$EpKEl;H%5r;?E_qYMl( zfJdYc1kM4Jf%TQ@?rYsx4|}vGhHN4rM2w5tS5@-Ym4haRT&xgY_Auz$a^!-L>B|=Q zLbfy*#Fdq7Uh&0Vd`|I&UVK*Z`CfcU@s(bDS@G3gd`0oKUVK&Y^ez?dXHdF7wTgKwu@-}K6xR$mI*VqmF*A|U!gfqU5i zdCZXkN7o1#oXjAT#aIo25-HqY;eMP5pHafR89SOEv?(1ntZ*B8!pR~^VDIFvF%+&4 zmQOCiv)0UYd!M~jE;t|*0(Ws=E>Nrje6Xpuhv-X>LSe%(z)PLFj3XtxC{0kD>Ln&X z6BLFmMmxG4@JMcRz-C2u)Ol6(nb zGC$l83hZ_RDz4^r6ql}5(l=cn)&{f4bGDM#p z7kwnZRJ^q)%EaKnn&zB9rIc2LN*?bFa>g%-Rk>=2TKY}6N{PD(s{aHLM^LvxnoSgg zJ*2L?9JJG4Y?SY91#ue}hkGsDN2Kec9%0DUL{-qQv4iyJeve@-c3wwb`~rX`Bo!WC ziuh=%X%0}>qS+%VnLL>IhTR?o_p6n26lHDL?_z`5*d{$Jv=#{+h2e7YJKwO@XozVY zOv0R8$2c$&zQ~4M#He~X>=dR0lDGd_QF@ravqgH?zg>FRAEk%IuQCzgW5v`Vs8(-6 zF%|jd4ym4&HVe|jrX)>Z|3!@`xLtjhG?CsTQNmHHp6mwJw_PNqZ>l;%x13Zfp~`UEc@t)ujm)W>p zX5aNP`>&VTyk6$O^)d&qm)W{r=Fs&rhp(48a=pw^GC8Xj2flhz{|Wxr>sqavt1u}* z_g9)~S2|Zr2eGc(GfUOA!gp%W*IuR;%0zf+Lw?t@Z_<6ch2^d_R?|wu*-{B17f`V< z0%dwwgW`x0v_Y^{_K>k~$<}i7JC`H5TpwbEo$4bwF9(hb-vZTJVLrG>fw+3|HPlAM zvSgF3n>M)jv7RrhTGp=%{?PK#fy8$-7R_pM9-SA4vYuVFi;1;n(Tl;*Ng=dqQV*Sx z#ipg9O(TyIf110UL@s*C0t+RCY&A+sY| zXoS~=zX~Rs7c>Thv*}+8s!*v#yD@siqMP)>kX+lM8!@W;=SqXDdJVtzCZfX@aVl;2 zd@NFLT5k_iYDPiOwWrWjSUet8yIpB(LM2pCNs>Qap{^}stu2iU*XxX`MzYF9k08qW zL{)^bPgs?M*?HrtkeYH%gV4;g>X)(2=YC8Lu^2C*h)zeLOe3pq%hrJ=&#rCDwqufi zoV!@JWs8W<-)?Nn?ixA~HHINx-?r?fVs`(w>@J&0UU_p{_EIr>U|V+A=)3Uk!EM=q zRj=~aw(Kqf|NPrS+p?F6*~8niyQl}`Z;x!tUMgmf=Gmxkv*hDNi}m(vQ(buA@D^AF zI)+C!LRafJuo$Kl4(taVz#}VRPT{~t5MdQr2qN7g`(TlKxs9CAUa$1POR%GRU?qqq z7KdOhJXgbWB|Mk)6pqEYYmk5I~)%6yY?EAUTcMYw>gN$VMDW$Ac z&$f@WlcaScWkmGAti<_FwyGjyeM#$P(mA<2Ihj5_6?0*2_P1ZxYA4Sj^IZ1Og-)VR zwEFmgnOP^jHDBS@3Ux;7yWOdC33?s8+y3itmy`nU6E7B>#yMSAFDaZQ-#%7LZXVU{ zSiLiOt*&k-!#09?2cA@ga$sbzshC!}O;|isC8{>PoYub8OPw88m9=x@Rxfsoy3?2> z(SWA&a0BS{rPUi+t-pyY7jly4C$B*YC_3!o%aYd^wCR=*ZoJleS;}obNp@8iXE67S zHm^)n@6@&JvJU1UvtC*_Q9Vw@T&CV?Q6$qh+c&p1tCjw%@OD#o2vbwJV?v^sTgaUU z4B-@>-7y|ig=LVY0WPqrr3>tHTwr1~vP=p-%l(!|YJm)z=O4A-(}!0~71DSfg-ZGbgV)2718g(Q{}A>-KB9 zqTUZ>brMxTiD~nklJU%Rj{P@p2BXDFmp>+5(%pBCgZXYvvc0Rpb~+4cw8u!MRV@HU z(neYfPbMmKoYAyNk+op;Rdkw}Re#R4#sw#-0lv+G=8#Efy^*9uHx7yj3Xar=B-kgB;$Y;vv9jyPgT<7XluY4^YV71b&U(+ar{%|Ym*r0 zcH3{%hsPVVpBWHvF*1~%9PD-)lY@^v`b2gdU{i|D$Ujwi6XZjK##eoOp6FC$^g+2q@F-F)_ahv+~5`;OPW zdLiq6toEwma87u3^xM4K@*l);^JPgzP0#us&XyEQvZ`VH?n3Q5G~ikHB;}TBuRf~! zln~!D+?x$OoUPe=v6h(4Mebfv7e_VEKKqKTp9PUo*@1`Q{W_?4BjW3M?J0xpzpg^e@&7Saty~?kE3ZL*joTA_96wGBdG=8xC==BW)4Yl5LS-xgSjPQasNA0! z*d@2B+<&@TZe6*XyVcytq{>#8?4ps)8FwN*OH5xT1t^6D!d4H}stbxg1u1Y-+L)+* zN*|?zMyGC)Yh~KEqzxl_ct=loB=&@DB6HS>pwQA?dN#R6`~>7eE$E|kyK9^QYm-ec zvvJ$CDP=aNg(Npem32hnXZrC&M^%KsT(e51r>0Pyhv!0HAW<9H3Np+@%~VLK^w9F! zuhP>R>%Zi~XrVhBCdIP;&NV26Hd-eEe;p>wi2*lsYc&ah6k4uz`lPJwtn7wKTu5H2 zad0MCvJaxGI($pK(O}W=eN$xeeX zvYNW|s3)jtu(+V}H5B3jL=~jK>PP(=wl(3q z^@G-nG+CsnfS9Jw3(KC#r5lt$u7O>LzmAk~(0J#h-=o)2tFgbRT%fBPsAq7Cja;9& z)mt4tTPG85vLq@6TM}e?f(?l-B+7{6G!w=xPPYVLnw~Idk{Hk?N*butRWJ_1Ng3Jw? zF35?XJV)2)R^GL4=vwSb3Jcck%0^7S#77W|@ryhtO2kZ3A;H>|!-vFnc;)lI{%bpQ zVFRTrRWe5(tl06L0iN$)9M(~Cw$L1L`}nLr#(@MQd8S3 zr6{GbX>TJPI#86-z`-)xG#9GSf(e8wfG2Mysc< z$Lqq4iNmglc;rBjFyv86V`3zvG_&f+3K$K1BFqLOq>Q~{+Fb2y2V~`?RZ6IL1&e+| z!Qr_Up6fi-{BF(Bv%=Ga*My=8&kz-kjsT0OR*g=oKt|?5)g-xQ=?MMHw(qWI2Ps} zG~gY`n-|8{-tO-Si^5PBT4w_X=>q=HPS!?1?vS8g;-lHXB_oK$gf!5A@_Z%{F&#F+ z>{E)7DM&z3)}HI(xfY(Q@Cn)b`*aejw?5y3J~0iWm0G;(QM%)7I>nBC zC_pnv*{s@b==&(Dr=E&hLZb%)Wi*4ery;Vik2>P!O%l}>-&biNalRE0H!pe33su^} zx^6I$QxqOLOC{B?Bx8g4qQycH{oqYhqJJkA-3cw zD0M^TUz?B(%xW0BIOS5f)fB~n>vSYH#1(5b1j!>&dTttzHho&y z`9jWlb(<5+O*x22Wwn0YE;Job&>w&oPMvq#u4>bpPwc(QkSFpmr47M% z=vM)enk>dVk;B+=h*~PEJk-@P+x?20sm=O{4x4vzGlgqpo2l=8G~kr)eQJxT-a;{I zFV#db*4W49dua*7F43(5{-=_<+7^^uv5V1ms!hU`9)xG5^suZc>efIZewxYVk+Sx4 zgyD>HiW+G}w`TedUCyg6grKbsebg4RQ!smQV@(UY;s zXEhMAWjml0+<{W56FZi|;}w1Euw5UQw10-Yu=tm73TJ zzfuF=_v<{0cv&187$y}R8J`4yZ#j&LRbq$D9gd>PV}#o;XOoiDjkUlS#y!fcBTR6v zpR~Ni3y6eI@`Z^40i_^~1Q-Sm(C#WzSiEu_SA+tm6O0sS0FZfIoyN7a?^+&zeeWGe zfjBhVNr6-K$I^b0Y{AgHP!a`-CU2@e#Z*Yw9a3f9x4o>VrG?!e&4!c?p{yW^5G@Ow z=Sh`8-edbrqd{~)t$h&ohjGpz&DpQ3t^W-^#4aa%I1n~lQ`=bsWa-44{m_nC*WpJv z8;0dlYoBaA7dA}x7_8=#X)?@08b?-en6*N9?QkY$4dR2=Pj=8*zDW=^1IME-DnsPR zEL$`s($BR%p^^(r>ni7gS&#NTp-hY^7oVK!-~xG3<3JOif(I_G=U)962_K;qO7bsIxf&K5 z!w1?SB7srglN`b)j}xLg$h{q^+tN~Sm0Vc%%faQ93;LedXQ9wbHS;FZjk0Dw4H2hi z_Pn8O_oWpF?)Jy62TxAksn+EUKjtljfZb0EVU~_+{OW2C{4Rw_gUhASOq9NHn+@j8 zrmtnK{KEcPY5ic%ym1-}3+6q~2jodPn$T>xXwD{N6wqL>r#eUNuvTXnH&FhrKm6q0 zZWrnK4RCR9yTA!JpTj#LjqMY+Q>%LBy?j#Pq1bzi889-8Q=Ma`$Hvk&jw6bN?G8x9 zae*)Q@XImhMr|z&59A(NW^CgYULnjG*TSoWS3`J>@LC9)R$2&4(`_?^rRCP;P1Pw4 zw`mJcRA&&iEr#?Z$}ffT>x9<{3vDfsujhPt&V}c!o}7DUIE(#{M^D|6>!YWtmcj|- z9%b}IvKGpp4?Q_z+6T}h64PY|5&6{OdY@7apV`l{frfSzL{)+up&;F!;3$Y(5(5gl zWgjTWc90wesd=$U5GO?x)c9&qP|X{;I||}P-T8niK|#XW0h3yv6!!Mn5;7!g!&gE< z5iviB8yOqRuLuR9gc27aAK4iN-Bv5shz0L@eKJC`h;hVgL~yysmmS!*wOl*oX(}nT~Pb z5w7zSQENjtyY70` zcRkY?b6BA4Bf^;`hX$;Ct|0?M`FA(N;`^;u(&P@tTAgE@r43 ze@372o3v;)pBZt!hVzf{^youT!DgQioRK{O&wH>>-~m@2(E$M+O%EurOyHmbcjF_0 zhnN{)Pd9dzwIXM5-RejRCu6KSIOh>Qr60J(;%dl;oE^rku#6tKoylK;55SG;9$r#d zh6TKNuYQn5*k2kvjU4iN#jws)YU1(Gy0=LF^#p8juU4ywMAs<0L$I1b-r&JRaflQI5wpbz%VJ$DJ}y z!&-X6hhLln#v=}*&5Sq=HiYI)kZ~+^WkX%rr0D`4x?{jP4^#jFdDo^x*J4*DxMJCa z0|)IQHyS->O&9+pUg2uIdo!fC9T64h@w~$Qa0{H%x3i|C=F9 z?oq+4R3vSpb6Z6@+~UGCnB<5WXDY_WU_h*Se#e@QouyTwZy)JkcU|Oc=q^Z!uiS8m z62}P&772DC+)X|MxJ4O>@uSR;h2He$4x$8fz{=u81mql~~}+IkQZSZS3~!`5KQuMtvsl`yP$3$GA{A#dSj!pkANL3ksC zHwkZsa2FD(3%sbFX~NSXERn!cD6>v@-Abr7=E;87gg6Tf6hG<5LEvQ0-9&1f6{bmI zQ#sGGG^5Fnl;jE} zBzo4WV(JLr-JUAf9NSYpEgkAf1KG2DJ>OK{7+h@PVWn-+ z7%-W2X&qeEMY2y_`4 ziERH8V(`xj$=sN)&Q*8cz-@SVp(K5)Wm22aH=Vqs4a9ruD7@q~BiHNs1Ty4b+>bdp z(Da`4t!BzEYM@J$?5aYlHFIMpVSHSq#X`H0Z9#DoKs|#A7M&@H5&`HH#8wIz$wA;= zC=MQTWT3NZB&6%H^c$5)%B)0hA_NGZ(GOxe{-PdB5WV&ESST@#hf33QP*`3jWdlkW zy$XKU?R^M`;2kL_vJ7pZQg;-+SwE%7LOm#*l!+fQh2@y)e4thse+^umX{iTke!{4^ z7N(?YP-0ZMWW(YjL|0@XaoJjpJhQCH5}W`R_VhA|XHAtN5mli45y>fHhN5I`TqK!F zUFp{83hEvLod~%LbfqVGtC_}*x)!^FMpsddh3~9d!y)E#8m%W1a{!TsO+oyyLkHSW zrc{NvwKJ#y#>UMsx%sr-ql}5(gqpTYpae^Tw`p|?&7nTiV&SDlN$ZXBx0abm&{9gv zLDe5ec3IM5k-S14mdzemCGLir6ciFPAqxjGQKvymrYLwTU~RFsKpZ)?My!$!QY)39 zoRjv6I_*i_MB_;6HmiOhY2sI?t0rYUXiwXg=9qWAzT#pxxOrq(b)l}k;zq`X08RE* ziz2Pt^itPe-2{8FSfr7+jf5;HVIcBS`BDYb$X9I7D3>F-TyAFPawO;FP+yB1{xz?Z z56-GUZi8DGNb)wThIE9p>AwBK(<$}A#a?l=MFtyC36+DTBmfl|?8I;ZawIw{w#HRv zR5PflumC&#*V2I=Rr31YJCMNzQ5>okTX*3;WLj|-E|f%;g94zns+c;+cekgaP_;v< zr=fn6k0!L5ZC7k?wu!M}+1AFUroofE%!luK;IPY3Y6d~N0_ndZLn)AyP*FXX&9q?M z93tz<9N)g${Y&KGDq$-o(6{?j-C(^_9$O7-AU|u`+iDSrAQ+cgNamxScCY$u zX=gMJ7IM>5r_VuoLh&{Q7G59>2Fwk$|Il`;}3(pc>#prXqQiIUU`ekXkLh$4@3N(%lT1OX|iUlo~& zQokYRNa_}=(B6!kA~D6(7AF8{A@Sa>?QBbGUI+xB?I_y_Kp0dIfJI)~ zvVE(^M->Ars4??3<6*(0qGHsqjD-ie;#^1gZ^mST>go)tg!od%C(BuvXPj{fT?dsy z32`jVE8mb^147E22s-(UA^ebjg8EhP6r(+s0=>&WC^3UhjcIQw3>PZ0j^>PUmaAWt z{ZMaJX10U>j-1K~Z!=uQ0vp8CuZ#gEW*%%^8<^EFc5%wZ0@f78ffHw$My>`1ub7`> zwAYoH19uj-D@9EGs_2B;2?91OUo~uKTYyAw-QyF0`V|8bNAbAT2Z;i;4d2W7hFkiw zfN)OCXMsKDvm9F90dEmh-Dz*=Ui#+Fi~0*x1R z0?NO1kq4I>7&j5`HO^B!#U3m;q%8*IOHKtEcS`4loW}?T$R{lbMRTSZ^iDdUN&@?J zKBrtz zO4{e<;Auq$QuUz8^iv}k*16^?Mv>BFIw^}!UGr3vi-k=yrQu+S%vrXjVBC$mG*HAo z)18GNzq-sP#cUimYHOuFjtdudN7gk=O(R7J&q^LF@`LaUVGy!~#rQO`g!Bc%UG1xc z7YW;5OIUJc+kXj5o^5+FVKGoe%BcK2VfNyjNX}$(paYH_#~q;kz-*TZ2>ZECs~_5X zE7nih)QHu_t}D;a(E0h?*FJBCZ#ud*D>Qv2|B`G2)Yb~y2=i=<#EuX}P~<#LH9f5E ztOhl3Ffb5wRukKSqI;z_-m#rc{#M{Yn zh8!UwfK);u%5tu5#xwRJLmbc8CJIAFAaJEbkDE^k&gC2z{rxKeXQ(QBebrVCYgu>+ z93_E+38d>cO_x&<*wuT<};Rmxb{3CG??L@1CvkMbl zDp8hdET|_-HqQ|qJ70!g)MKd7AUo{QWG%N~WKuXEf|(g-04*m= zvA}nr6(`hg1aRE0_jTqmv}{m@^oaAh{bFd)Y1j!}=XD_=(k-r2ys54OmX>6!V+n^+ z&^SGltVgB*1Z5Q>QviZ87Jud8?M`cIY6|1;qb!oa$*b>!;Q5s={ev(6!iUy> zWGQ*H!<|i)_W@>Pi~zZkN>btzAN%e1ec*SN=RctmxMq{VAti<>Ax@K*Q^9J?haSl@ zSoT-n_sC@BQN0NoO5T7z|KuyCpMWs9dWqqqvNxbX7xB}x&n9oYNE?1~?g#(HFa1BC z{zt!^yfLj_xaehz$#3GKYdpx(kGX&O^wRIH|N0l+{H6;RQH&pa0)_5No%)j)nxtG> zHz);nf=w~)JlGPRBPg0oV^ura>3bi{35Kb~pwODfWPD`g4@X6ko9b}iE ziU0H8{qj}vV>cYp7EzrOB$cGNUnt;!mK4I9^4TP{BCpY6c`9?bKLw z>Cma8<24SBqQI(`wbc7?CBP6eFeob3FH`8e%+Lp^l;!4Mvkx%X%zTKVBUPblZ{OBS3yopwV7AKAN><w4{cCSCcAc{St70osUrNotVN&8zA=M2IxE3%N+{$@tm^DvSYnQH|4gq;r1z9=v* z4@Lm*zor&jx#NDf1$0b-2=bGwY&KEuS+GVW0nfflZ@^m5!2sa-nU zbm?i_ZpeC}Ub{ok)3|R^Z1l{p)AY0@(xB_I*wR09=!(OX+X$g#265$7G8@*Zc7h7>J6jeP*|m`!y$`4ptM)Y zIux?#4vYT`Stb0@wBv_G%Z?B z#dW9ksr6J`pPD2SONB*TTsV$p@ejoTyehmrQBAaoq&UN-C#i=FpIVyXSPL-I`Vbv3W9xK)9`~n|!6+?CZ`}(^3;~WmPRUfl;0dO<M*4n<(_)KA?wepoldTFH*FRe7dKOm|{FdET65=v2LV-HW1GE1#?Wp? z5|bmTpRU^yuSXuXK-}_|DgRbn^1$Al0uI{18Al#%fPsf#fkz_5tIN0r7^2Vhy%mp& zMpu+exs~g5Iwww#ipiqf?&w)<+t$vJJjg8&F?F5WWKFeSMP_;VkeB8r?)0z+xq>@A z=)nboH&{@Me2q1xZ;QLLsPK)MsAe%>+FZLs$}%T@0FL$BxkV3S+baO~rgMyDrH9gEepX(q5Wa}GEdXtBj6u#A8zgMs4ipIC_8S1&!>p8MTh2zk!{Gp~d85T?D zrXmTr3czJzY6ArMP|b#+i!&hMh-N5`8@y!NgrLJ@=!gVv79B#<$5LHQL*9a&b){&0 zt2g+l*abFqVs7O$=nf2`6F&Unkux4~5RD^eipCm3yYB}6Sg9*(>dGcf7w|-wmbeKB z$h$Tjx)!?vLwL;Q;pX%mS8*|H)q#Zyc(211qb|6>xQ8YF{fzjl8 zE)%F)hv^Ly8|W(v!?Sw?T|fJjZcB=tyRkP+FpAYV6phF1QUczZsYDKzHBXX;DN8A> z3N_{kH07}(tLTRGuqnhJOb zD=(FKo!fGs-jQBbo*=Pb&2qR1&V6LEr4P;m&dr>=$|gv&|@ zLb)u5Am3XesIK6CQHPjSK+g6k#U@3kj%HPMRHIV5wQDhn{nrSVZXIp~TSHehGWgTA z^oDB|sHYIH9X1f@@hAncfM>C6mBs#`1+1*Kn6>6v2k1k{Ldf860YrLh%)v=-A&c;= z4bP&xgsehD2cE@@=`E-V&7Izwi7iBzM_KG((&~xyHzYcjzM-I^L5zvFk$8LX-1TKv z4RCX8dWu3C-d>?Y<%{JG>uNg+Y2bT>1dx;6HG?~9(&bkwq$v?yzRnZa)g5>S3Z;dl zIquQ*1q4C`nn+$OHFL~wsasIiSh;Zr{NBBJWoZ!>nq;emlLAJ*M$uUJo$|XFLROo$?S6cMqY;9SNZ;9^#EIIsi)K732#RJ)zPnB4RgPrg~lH8S`OsY`x zt^|f=*1p)lHoJYhI76I1?B%3=D>>rXq>XPA3D=jww!a+$ztu^eV=gf(bh?rKo}+MzlJ$F4>_LW!_vW)W(nrzmF%Y> zi?)C6zuZt1_gTAyP*{T%J-gw_Vz4;t#hxrFd$Q{6$-=ZJvbQAq@tq(TTm#=t@Z`DZ zG?*4eU&5UI;%!762cMINs= zdC=R`A4mKF?|L$MdGaSV1TRm(3l{&w@cevu{y}&?9iG1*o}UZP&xR++$KL<%;rYkm z`GxTOZ{hhz;rU}~lNdAimS57o@G;VYB!r#Kxn%WUe~tU)r`m;a;&%CgXZuT9?Ip+ByfaVX`!P?Pt4?l-xnspeEkd zG=riQfguiihRs0{_~Zz8*wS#MgN-^Wj#C{s@b*iua82gE6qzgz5`H_Cd2<|O_FSw= zB6L7cW{vxB;sEfHG?8{8fB`2+ZIjRIP1i)`O^8<296yK9MqkOlH0L!hOM41Z%Z2EY z(iLezI##F>IgvHaC8d1Vsx$$5{0dxYnv2XIM8J6%qIXb%1<5~oO8yC6<$NQ_I!{T8 z@yjnsI?N)TsDg0*Bmg-H(a-s)VdjXWEXr4uL^^~)ar|<)(g7)V3uUDx+i}HqO3dpT zE(Ap?eGfqiHwiA<>!@GZpBc1Kj}%*W5TG}9Iv`mE(z~X%q$IyKLw%g4Gbuf>GP`9M zyg1V{jK8hh01k*FscNkP;mwn?8{>kAn5Lt`^>CQD-fsET7&v_XWvs}h{OC0Cfd zjN$_05l7LkduoOeGz|*6Ul7F`Eu@X!yOKAZt^fo2XON8i(cmHi0lEPAP^8Vn@d~qb zYXfKBT(+(2ih)mvFozJy_Ty^Yc0RJV?{z?tVg(oq?iND#FuD1>q6g_NAtg1ZUp@N` z=~v_n$f!1L^k7ZNzjVu}t%+_n*NIhh-8ET+U=DeOYo0@8RUof|9U%GSnyxxwVAS~rM+%WSj{nR}ZemR6BZj&ZS#H;*c^otdw7Lnfm8>B+}S~7cD`x}q8s90H0_t}!& zw2-K5A=V<=H8)TLtw+6;C()cMH?rRwDLp!Cq#V}MQEQ|ejB~WHuzZ)(q&^x{ZGV$| zLtP!$yQBd??M!EZUPGYL(JB@L94fuP)%vl)V+>KV_4(?zKKSr`=O1`$`nL1;z5P;h z>Gb)xrI$}%x}3i4z6Z{qerxi;gAcvyaytHv>9>F9>t2_<^IeyV(MzZAf9QoTdFizxg()y zUhTQl?|IP+^VnO?Kk(pN3-SBk`Hpuy&})Nb=Y?PO&Wq{gGY?!!FWvW!ht8kA(<3i^ z(evN(p3A4xOP4P`@Zj6icRz6ceEOEt>ANnSertN)rPMq1*848smn0kSzw+z9{Q2hd z8ehNm&=0)ui?^Qo#K*^f{@u^}xlez%?`J-D?sq0iO*`qR4`tPLl=Jea|JD=Wn@$K(=$LR+zzbt+3rNM25 zn1zcEQi}Pw^uVRdrysokJ?Z^tPTzknOs&6_R1*IF)l(lE{D)WH_|A#xk;-pA_RUXm zY8q<&gUX$6`lsJG{~M?O-8)`VX`$v;&KlZ5) z9DZK{@4i*(GHRo(_Vb^Yrs?r}j$cV89(>pN^LMbZjJC3|WH1>U8`HNN`bm-j{j~I> zzp-R=ko?+UKQl7WB7LBbpH|YRcl2iV)9u!Hq5PoAQ)^PCJY@z{Su4pt-ELKelI-`| ztwTeq*?tD>S7EX~FxIM!P~TYV&@ctKV}ied5&b6olJ&1C(Wa`g)~%yTwV#2uf(gI; ze}K?|0|%1qhYqwxV#M+XlI&j{XjN#*zdq19MEepok`H*>y^&v{1TFb{2U~aS+{onk z3tsr57r*4Ccb)i#Z1S7G<(02m9!#>ugYZqLs>;6_|LXh;qnY#()?a_ZEeoyc4BuZq t)T%VN6Ng7L$(}yc8q}DpF$?5Q9d1=%Q~dDZR>J@~$yN`yYIDP<{y%+)lT-iz literal 0 HcmV?d00001 From d7a827ba7f3e9bf55fb51b27a4421d809def0ea4 Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 6 Jul 2021 20:05:59 +0300 Subject: [PATCH 14/42] Update from transifex. --- frontend/src/locale/messages.nb.xlf | 15 +++++++++++++++ frontend/src/locale/messages.pl.xlf | 12 ++++++++++++ 2 files changed, 27 insertions(+) diff --git a/frontend/src/locale/messages.nb.xlf b/frontend/src/locale/messages.nb.xlf index 519c4db3d..0d5ce5754 100644 --- a/frontend/src/locale/messages.nb.xlf +++ b/frontend/src/locale/messages.nb.xlf @@ -1377,6 +1377,7 @@ The Mempool Open Source Project + Åpen kildekode-prosjektet The Mempool src/app/components/about/about.component.html 12,13 @@ -1385,6 +1386,7 @@ Building a mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, without any advertising, altcoins, or third-party trackers. + Bygger en mempool- og blokkjede-utforsker for Bitcoin-samfunnet, med fokus på transaksjonsgebyrmarkedet og flerlagsøkosystem, uten reklame, altcoins eller tredjepartstrackere. src/app/components/about/about.component.html 13,17 @@ -1419,6 +1421,7 @@ Navigate to https://mempool.space/sponsor to sponsor + Gå til https://mempool.space/sponsor for å sponse src/app/components/about/about.component.html 63 @@ -1590,6 +1593,7 @@ Endpoint + Endepunkt src/app/components/api-docs/api-docs.component.html 20,21 @@ -1746,6 +1750,7 @@ Description + Beskrivelse src/app/components/api-docs/api-docs.component.html 25,26 @@ -1921,6 +1926,7 @@ Get transaction history for the specified address/scripthash, sorted with newest first. Returns up to 50 mempool transactions plus the first 25 confirmed transactions. You can request more confirmed transactions using :last_seen_txid (see below). + Få transaksjonshistorikk for den angitte adressen / scripthash, sortert med detnyeste først. Returnerer opptil 50 mempool-transaksjoner pluss de 25 første bekreftede transaksjonene. Du kan be om flere bekreftede transaksjoner ved hjelp av : last_seen_txid (se nedenfor). src/app/components/api-docs/api-docs.component.html 44,45 @@ -2156,6 +2162,7 @@ Returns our currently suggested fees for new transactions. + Returnerer den for tiden foreslåtte avgiften for nye transaksjoner. src/app/components/api-docs/api-docs.component.html 531,533 @@ -2165,6 +2172,7 @@ Returns current mempool as projected blocks. + Returnerer gjeldende mempool som projiserte blokker. src/app/components/api-docs/api-docs.component.html 547,549 @@ -2174,6 +2182,7 @@ Returns the ancestors and the best descendant fees for a transaction. + Returnerer forfedrene og de beste etterkommeravgiftene for en transaksjon. src/app/components/api-docs/api-docs.component.html 563,565 @@ -2203,6 +2212,7 @@ Get the full list of txids in the mempool as an array. The order of the txids is arbitrary and does not match bitcoind. + Få den komplette listen over txidene i mempool som en matrise. Rekkefølgen på txidene er vilkårlig og samsvarer ikke med bitcoind. src/app/components/api-docs/api-docs.component.html 604,607 @@ -2339,6 +2349,7 @@ Code Example + Kodeeksempel src/app/components/api-docs/code-template.component.html 6 @@ -2355,6 +2366,7 @@ Install Package + Installer pakke src/app/components/api-docs/code-template.component.html 23,24 @@ -2363,6 +2375,7 @@ Response + Respons src/app/components/api-docs/code-template.component.html 36,37 @@ -2465,6 +2478,7 @@ of   + av src/app/components/asset/asset.component.html 76 @@ -3132,6 +3146,7 @@ Sponsor + Sponsor src/app/components/sponsor/sponsor.component.html 3 diff --git a/frontend/src/locale/messages.pl.xlf b/frontend/src/locale/messages.pl.xlf index feb7e669a..c937f9c95 100644 --- a/frontend/src/locale/messages.pl.xlf +++ b/frontend/src/locale/messages.pl.xlf @@ -1377,6 +1377,7 @@ The Mempool Open Source Project + Mempool - Projekt Open Source src/app/components/about/about.component.html 12,13 @@ -1385,6 +1386,7 @@ Building a mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, without any advertising, altcoins, or third-party trackers. + Budujemy eksplorator mempool i blockchain dla społeczności Bitcoin, koncentrując się na rynku opłat transakcyjnych i wielowarstwowym ekosystemie, bez żadnych reklam, altcoinów czy zewnętrznych trackerów. src/app/components/about/about.component.html 13,17 @@ -1591,6 +1593,7 @@ Endpoint + Końcówka src/app/components/api-docs/api-docs.component.html 20,21 @@ -1747,6 +1750,7 @@ Description + Opis src/app/components/api-docs/api-docs.component.html 25,26 @@ -2158,6 +2162,7 @@ Returns our currently suggested fees for new transactions. + Zwraca obecnie sugerowane przez nas opłaty za nowe transakcje. src/app/components/api-docs/api-docs.component.html 531,533 @@ -2167,6 +2172,7 @@ Returns current mempool as projected blocks. + Zwraca obecny mempool jako rzut bloków. src/app/components/api-docs/api-docs.component.html 547,549 @@ -2176,6 +2182,7 @@ Returns the ancestors and the best descendant fees for a transaction. + Zwraca przodków i najlepsze opłaty potomne za transakcję. src/app/components/api-docs/api-docs.component.html 563,565 @@ -2205,6 +2212,7 @@ Get the full list of txids in the mempool as an array. The order of the txids is arbitrary and does not match bitcoind. + Pobierz pełną listę ID transakcji w pamięci mempool jako tablicę. Kolejność txids jest dowolna i nie odpowiada bitcoind. src/app/components/api-docs/api-docs.component.html 604,607 @@ -2341,6 +2349,7 @@ Code Example + Przykład kodu src/app/components/api-docs/code-template.component.html 6 @@ -2357,6 +2366,7 @@ Install Package + Zainstaluj pakiet src/app/components/api-docs/code-template.component.html 23,24 @@ -2365,6 +2375,7 @@ Response + Odpowiedź src/app/components/api-docs/code-template.component.html 36,37 @@ -2467,6 +2478,7 @@ of   + a   src/app/components/asset/asset.component.html 76 From 7de2cf89f4d59d314a298670c04490edc3bc1282 Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Wed, 7 Jul 2021 09:22:25 -0300 Subject: [PATCH 15/42] Fix table overflow. (#612) fixes #303 --- frontend/src/app/dashboard/dashboard.component.html | 2 +- frontend/src/app/dashboard/dashboard.component.scss | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index ba2a4028b..ca8104489 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -112,7 +112,7 @@ - + diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss index 394040cf5..2d969db58 100644 --- a/frontend/src/app/dashboard/dashboard.component.scss +++ b/frontend/src/app/dashboard/dashboard.component.scss @@ -120,16 +120,17 @@ .latest-transactions { width: 100%; text-align: left; + table-layout:fixed; tr, td, th { border: 0px; } - .table-cell-txid { - width: 20%; + td { + overflow:hidden; + width: 25%; } .table-cell-satoshis { display: none; text-align: right; - width: 30%; @media (min-width: 576px) { display: table-cell; } @@ -143,7 +144,6 @@ .table-cell-fiat { display: none; text-align: right; - width: 30%; @media (min-width: 485px) { display: table-cell; } @@ -155,7 +155,6 @@ } } .table-cell-fees { - width: 25%; text-align: right; } } From 652f88770e655992c398629879fb1f58928b2e11 Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Wed, 7 Jul 2021 16:20:17 -0300 Subject: [PATCH 16/42] Fix mouse over tooltip width. (#614) --- .../app/components/fees-box/fees-box.component.html | 12 ++++++------ frontend/src/styles.scss | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/components/fees-box/fees-box.component.html b/frontend/src/app/components/fees-box/fees-box.component.html index 9fe2e66e3..a00ca4395 100644 --- a/frontend/src/app/components/fees-box/fees-box.component.html +++ b/frontend/src/app/components/fees-box/fees-box.component.html @@ -2,20 +2,20 @@
Low priority
-
-
{{ feeEstimations.hourFee }} sat/vB
+
+
{{ feeEstimations.hourFee }} sat/vB
Medium priority
-
-
{{ feeEstimations.halfHourFee }} sat/vB
+
+
{{ feeEstimations.halfHourFee }} sat/vB
High priority
-
-
{{ feeEstimations.fastestFee }} sat/vB
+
+
{{ feeEstimations.fastestFee }} sat/vB
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 4d1d5072c..5b6f6b9d4 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -692,4 +692,10 @@ th { padding-left: 5px; } } +} + +.fee-estimation-wrapper { + .tooltip.show { + width: 220px; + } } \ No newline at end of file From 71cf41362ff83348d0334b646bff50bdd6fd0da9 Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Sat, 10 Jul 2021 10:04:15 -0300 Subject: [PATCH 17/42] UI/UX - Add skeleton for blocks preload. (#615) * Add skeleton for blocks preload. * Add e2e testing for skeleton blocks preloader. * Fix reduce mempool blocks to fit the screen. * Fix variable naming. --- .../integration/mainnet/mainnet.spec.ts | 11 +++++++ .../blockchain-blocks.component.html | 11 ++++++- .../blockchain-blocks.component.scss | 12 +++++++ .../blockchain-blocks.component.ts | 32 ++++++++++++++++--- .../blockchain/blockchain.component.html | 12 ++----- .../mempool-blocks.component.html | 10 +++++- .../mempool-blocks.component.ts | 29 +++++++++++++++-- 7 files changed, 99 insertions(+), 18 deletions(-) diff --git a/frontend/cypress/integration/mainnet/mainnet.spec.ts b/frontend/cypress/integration/mainnet/mainnet.spec.ts index 060a3f293..55b73b8dc 100644 --- a/frontend/cypress/integration/mainnet/mainnet.spec.ts +++ b/frontend/cypress/integration/mainnet/mainnet.spec.ts @@ -16,6 +16,17 @@ describe('Mainnet', () => { cy.wait(1000); }); + it('loads the dashboard with the skeleton blocks', () => { + cy.visit('/'); + cy.get('#mempool-block-0').should('be.visible'); + cy.get('#mempool-block-1').should('be.visible'); + cy.get('#mempool-block-2').should('be.visible'); + cy.get(':nth-child(1) > #bitcoin-block-0').should('be.visible'); + cy.get(':nth-child(2) > #bitcoin-block-0').should('be.visible'); + cy.get(':nth-child(3) > #bitcoin-block-0').should('be.visible'); + cy.wait(1000); + }); + it('loads the blocks screen', () => { cy.visit('/'); cy.get('li:nth-of-type(2) > a').click().then(() => { diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html index 4584974e2..abe055968 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html @@ -1,4 +1,4 @@ -
+
  @@ -24,3 +24,12 @@
+ +
+
+
+
+
+
+
+ diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss index b456c3cd1..4f9657ad4 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss @@ -108,3 +108,15 @@ border-right: 35px solid transparent; border-bottom: 35px solid #FFF; } + +.flashing { + animation: opacityPulse 2s ease-out; + animation-iteration-count: infinite; + opacity: 1; +} + +@keyframes opacityPulse { + 0% {opacity: 0.7;} + 50% {opacity: 1.0;} + 100% {opacity: 0.7;} +} \ No newline at end of file diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts index 77434fec8..af6ac35c7 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; -import { Subscription } from 'rxjs'; +import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef, Input } from '@angular/core'; +import { Subscription, Observable } from 'rxjs'; import { Block } from 'src/app/interfaces/electrs.interface'; import { StateService } from 'src/app/services/state.service'; import { Router } from '@angular/router'; @@ -11,8 +11,10 @@ import { Router } from '@angular/router'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class BlockchainBlocksComponent implements OnInit, OnDestroy { + @Input() isLoading$: Observable; + network = ''; - blocks: Block[] = []; + blocks: Block[] = this.mountEmptyBlocks(); markHeight: number; blocksSubscription: Subscription; networkSubscriotion: Subscription; @@ -42,6 +44,7 @@ export class BlockchainBlocksComponent implements OnInit, OnDestroy { ) { } ngOnInit() { + this.blocks.forEach((b) => this.blockStyles.push(this.getStyleForBlock(b))); this.networkSubscriotion = this.stateService.networkChanged$.subscribe((network) => this.network = network); this.tabHiddenSubscription = this.stateService.isTabHidden$.subscribe((tabHidden) => this.tabHidden = tabHidden); @@ -178,5 +181,26 @@ export class BlockchainBlocksComponent implements OnInit, OnDestroy { )`, }; } - + mountEmptyBlocks() { + const emptyBlocks = []; + for (let i = 0; i < 9; i++) { + emptyBlocks.push({ + id: '', + height: 0, + version: 0, + timestamp: 0, + bits: 0, + nonce: 0, + difficulty: 0, + merkle_root: '', + tx_count: 0, + size: 0, + weight: 0, + previousblockhash: '', + matchRate: 0, + stage: 0, + }); + } + return emptyBlocks; + } } diff --git a/frontend/src/app/components/blockchain/blockchain.component.html b/frontend/src/app/components/blockchain/blockchain.component.html index db0b44e6f..21e1a7111 100644 --- a/frontend/src/app/components/blockchain/blockchain.component.html +++ b/frontend/src/app/components/blockchain/blockchain.component.html @@ -1,15 +1,9 @@
-
+
- - + +
-
-
-

Waiting for blocks...

- -
-
diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html index 6c6246103..ff18f198e 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html @@ -1,4 +1,4 @@ -
+
@@ -41,3 +41,11 @@ In ~{{ i }} minutes In ~{{ i }} minute + +
+
+ +
+ +
+
diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts index 4e327eced..51033ac6f 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; +import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef, Input } from '@angular/core'; import { Subscription, Observable, fromEvent, merge, of } from 'rxjs'; import { MempoolBlock } from 'src/app/interfaces/websocket.interface'; import { StateService } from 'src/app/services/state.service'; @@ -13,10 +13,12 @@ import { feeLevels, mempoolFeeColors } from 'src/app/app.constants'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class MempoolBlocksComponent implements OnInit, OnDestroy { - mempoolBlocks: MempoolBlock[]; + @Input() isLoading$: Observable; + + mempoolBlocks: MempoolBlock[] = this.mountEmptyBlocks(); mempoolBlocks$: Observable; - mempoolBlocksFull: MempoolBlock[]; + mempoolBlocksFull: MempoolBlock[] = this.mountEmptyBlocks(); mempoolBlockStyles = []; markBlocksSubscription: Subscription; blockSubscription: Subscription; @@ -45,6 +47,11 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { ) { } ngOnInit() { + this.mempoolBlocks.map(() => { + this.updateMempoolBlockStyles(); + this.calculateTransactionPosition(); + }); + this.reduceMempoolBlocksToFitScreen(this.mempoolBlocks); this.stateService.isTabHidden$.subscribe((tabHidden) => this.tabHidden = tabHidden); this.mempoolBlocks$ = merge( @@ -235,4 +242,20 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { } } + mountEmptyBlocks() { + const emptyBlocks = []; + const numberOfBlocks = 8; + for (let i = 0; i <= numberOfBlocks; i++) { + emptyBlocks.push({ + blockSize: 0, + blockVSize: 0, + feeRange: [], + index: 0, + medianFee: 0, + nTx: 0, + totalFees: 0 + }); + } + return emptyBlocks; + } } From 9a2428ad7975c3a3aece3129d7068cf65af91d3c Mon Sep 17 00:00:00 2001 From: softsimon Date: Sat, 10 Jul 2021 18:20:15 +0300 Subject: [PATCH 18/42] Update i18n. --- frontend/src/locale/messages.xlf | 169 +++++++++++++++---------------- 1 file changed, 80 insertions(+), 89 deletions(-) diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 54118f552..9d604369c 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -402,11 +402,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -426,11 +426,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -489,7 +489,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -951,11 +951,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -982,11 +982,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1003,11 +1003,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1020,7 +1020,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1032,7 +1032,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1045,11 +1045,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1075,11 +1075,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1095,7 +1095,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1108,7 +1108,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1126,7 +1126,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1425,7 +1425,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2418,11 +2418,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2454,23 +2454,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2491,15 +2491,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2577,11 +2577,11 @@ Details src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2590,7 +2590,7 @@ Error loading block data. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2601,15 +2601,6 @@ 106 - - Waiting for blocks... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! @@ -2621,7 +2612,7 @@ Low priority src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2633,7 +2624,7 @@ Medium priority src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2645,7 +2636,7 @@ High priority src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2716,7 +2707,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2732,7 +2723,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -2833,7 +2824,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -2842,11 +2833,11 @@ In ~ minute src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3102,7 +3093,7 @@ This transaction has been replaced by: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3111,11 +3102,11 @@ Unconfirmed src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3124,7 +3115,7 @@ Confirmed src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3133,7 +3124,7 @@ After src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3142,7 +3133,7 @@ First seen src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3151,7 +3142,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3160,7 +3151,7 @@ In several hours (or more) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3169,11 +3160,11 @@ Virtual size src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3182,11 +3173,11 @@ Fee rate src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3195,7 +3186,7 @@ Descendant src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3204,7 +3195,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3213,7 +3204,7 @@ Size src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3222,7 +3213,7 @@ Weight src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3231,7 +3222,7 @@ Transaction not found. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3239,7 +3230,7 @@ Waiting for it to appear in the mempool... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3247,7 +3238,7 @@ Fee src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3256,7 +3247,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3265,7 +3256,7 @@ Effective fee rate src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3274,7 +3265,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3282,7 +3273,7 @@ (Newly Generated Coins) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3290,7 +3281,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3298,7 +3289,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3307,7 +3298,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3316,7 +3307,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3324,7 +3315,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3332,7 +3323,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3340,7 +3331,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3348,7 +3339,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3356,11 +3347,11 @@ Load all src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3368,7 +3359,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3376,7 +3367,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3385,7 +3376,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3394,7 +3385,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3402,7 +3393,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat From 80d76ad1f4b54d4f3220fc0919fafb1a9c2c4f93 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sun, 11 Jul 2021 22:06:14 +0300 Subject: [PATCH 19/42] Updating from transifex. --- frontend/src/locale/messages.ar.xlf | 218 ++++++++++++++----------- frontend/src/locale/messages.ca.xlf | 170 +++++++++---------- frontend/src/locale/messages.cs.xlf | 170 +++++++++---------- frontend/src/locale/messages.de.xlf | 170 +++++++++---------- frontend/src/locale/messages.en_US.xlf | 169 +++++++++---------- frontend/src/locale/messages.es.xlf | 170 +++++++++---------- frontend/src/locale/messages.fa.xlf | 170 +++++++++---------- frontend/src/locale/messages.fi.xlf | 170 +++++++++---------- frontend/src/locale/messages.fr.xlf | 174 ++++++++++---------- frontend/src/locale/messages.he.xlf | 170 +++++++++---------- frontend/src/locale/messages.hr.xlf | 169 +++++++++---------- frontend/src/locale/messages.hu.xlf | 170 +++++++++---------- frontend/src/locale/messages.it.xlf | 170 +++++++++---------- frontend/src/locale/messages.ja.xlf | 170 +++++++++---------- frontend/src/locale/messages.ka.xlf | 170 +++++++++---------- frontend/src/locale/messages.ko.xlf | 170 +++++++++---------- frontend/src/locale/messages.nb.xlf | 170 +++++++++---------- frontend/src/locale/messages.nl.xlf | 170 +++++++++---------- frontend/src/locale/messages.pl.xlf | 170 +++++++++---------- frontend/src/locale/messages.pt.xlf | 170 +++++++++---------- frontend/src/locale/messages.ru.xlf | 170 +++++++++---------- frontend/src/locale/messages.sl.xlf | 170 +++++++++---------- frontend/src/locale/messages.sv.xlf | 170 +++++++++---------- frontend/src/locale/messages.tr.xlf | 170 +++++++++---------- frontend/src/locale/messages.uk.xlf | 170 +++++++++---------- frontend/src/locale/messages.vi.xlf | 170 +++++++++---------- frontend/src/locale/messages.zh.xlf | 170 +++++++++---------- 27 files changed, 2211 insertions(+), 2429 deletions(-) diff --git a/frontend/src/locale/messages.ar.xlf b/frontend/src/locale/messages.ar.xlf index ecf6fa9e7..d62c5c954 100644 --- a/frontend/src/locale/messages.ar.xlf +++ b/frontend/src/locale/messages.ar.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -1950,6 +1950,7 @@ Get the list of unspent transaction outputs associated with the address/scripthash. Available fields: txid, vout, value, and status (with the status of the funding tx).There is also a valuecommitment field that may appear in place of value, plus the following additional fields: asset/assetcommitment, nonce/noncecommitment, surjection_proof, and range_proof. + الحصول على قائمة الحوالات غير المدفوعة مرفقة بالعنوان/ تجزئة البرنامج النصي. الحقول المتوفرة: رقم تعريف المعاملة,رقم انتاجية المعاملات,القيمة,والحالة (مع حالة تمويل الحوالة).يوجد ايضاً القيمة الالزاميةحقل يمكن ان يظهر مكان :القيمة,الإضافة الى الحقول التالية:الأصول/الأصول الملزمة,رمز الإستخدام لمرة واحدة/رمز الزامي للإستخدام مرة واحدة,دليل شامل,ونطاق الإثبات. src/app/components/api-docs/api-docs.component.html 100,101 @@ -1975,6 +1976,7 @@ Returns transactions associated with the specified Liquid asset. For the network's native asset, returns a list of peg in, peg out, and burn transactions. For user-issued assets, returns a list of issuance, reissuance, and burn transactions. Does not include regular transactions transferring this asset. + ترجع المعاملات مرفقة بسيولة الأصول المالية المحددة .تعاد لائحة ربط المعاملات و إخراجها و المعاملات الملغية لشبكة الأصول الحقيقية. ترجع لائحة الإصدار و إعادة الاصدار و المعاملات الملغية لأصول المستخدم المعلنة. الحوالات العادية الصادرة لا تتضمن تحويل هذه الاصول . src/app/components/api-docs/api-docs.component.html 143,146 @@ -1982,6 +1984,7 @@ Get the current total supply of the specified asset. For the native asset (L-BTC), this is calculated as [chain,mempool]_stats.peg_in_amount - [chain,mempool]_stats.peg_out_amount - [chain,mempool]_stats.burned_amount. For issued assets, this is calculated as [chain,mempool]_stats.issued_amount - [chain,mempool]_stats.burned_amount. Not available for assets with blinded issuances. If /decimal is specified, returns the supply as a decimal according to the asset's divisibility. Otherwise, returned in base units. + إحصل على الإمدادات الكاملة الحالية لأصول محددة. يتم إحتساب الأصول الأصلية (L-BTC) على الشكل التالي [سلسلة عقود العملات الرقمية لتخزين المعلومات عن العمليات غير المعلنة]_إحصاءات.الكميات_ المربوطة-[سلسلة عقود العملات الرقمية لتخزين المعلومات عن العمليات غير المعلنة]_إحصاءات الكميات_غير_المربوطة-[سلسلة عقود العملات الرقمية لتخزين المعلومات عن العمليات غير المعلنة]_إحصاءات_ الكميات_ الملغاة. يتم إحتساب الأصول المعلنة على الشكل التالي[سلسلة عقود العملات الرقمية لتخزين المعلومات عن العمليات غير المعلنة]_احصاءات الكميات_المعلنة-[سلسلة عقود العملات الرقمية لتخزين المعلومات عن العمليات الغير المعلنة]_إحصاءات الكميات_الملغاة. ليست متوفرة لإصدار الأصول المخفية. اذا كانت الكسور العشرية مُعرفة تُرجع الإمدادات على شكل كسور عشرية بالنسبة لقابلية تجزئة الأصول وإلا تُرجع الى الوحدة الأساسية. src/app/components/api-docs/api-docs.component.html 162,165 @@ -2003,6 +2006,7 @@ Returns details about a block. Available fields: id, height, version, timestamp, bits, nonce, merkle_root, tx_count, size, weight,proof, and previousblockhash. + تفاصيل عوائد الكتلة. الحقول المتوفرة:سجل التعريف, حجم الكتلة و موقعها بالنسبة للكتل المؤكدة التي سبقتها ,الاصدار,الوقت,البروتوكول المعرف للهوية الرقمية,رمز إلزامي فردي الاستخدام,الحوسبة الجذمورية,عدد المعاملات,حجم المعاملات,قياس حجم كتلة البتكوين بالاضافة الى الشاهد المنفصل,الإثبات,و تجزئة الكتل السابقة. src/app/components/api-docs/api-docs.component.html 187,188 @@ -2010,6 +2014,7 @@ Returns the hash of the block currently at :height. + عوائد تجزئة الكتلة الحالية : الإرتفاع. src/app/components/api-docs/api-docs.component.html 204,205 @@ -2017,6 +2022,7 @@ Returns the raw block representation in binary. + عوائد تقرير الكتلة الأولية في الثنائية. src/app/components/api-docs/api-docs.component.html 220,223 @@ -2024,6 +2030,7 @@ Returns the confirmation status of a block. Available fields: in_best_chain (boolean, false for orphaned blocks), next_best (the hash of the next block, only available for blocks in the best chain). + عوائد الحالة المؤكدة في الكتلة. الحقول المتوفرة:في السلسلة الأفضل(الجبر المنطقيboolean, خطأ اذا كانت الكتل المهملة),الخيار الأفضل التالي (التجزئة النصية للكتلة التالية ,متوفرة فقط للكتل في السلسة الأفضل). src/app/components/api-docs/api-docs.component.html 239,240 @@ -2039,7 +2046,7 @@ Returns the hash of the last block. - إرجاع تجزئة في الكتلة الأخيرة. + عوائد التجزئة في الكتلة الأخيرة. src/app/components/api-docs/api-docs.component.html 278,281 @@ -2047,6 +2054,7 @@ Returns the transaction at index :index within the specified block. + عوائد المعاملات عند المؤشر : المؤشر ضمن سلسلة محددة. src/app/components/api-docs/api-docs.component.html 298,299 @@ -2054,6 +2062,7 @@ Returns a list of all txids in the block. + إرجاع لائحة بكل أرقام المعاملات في الكتلة. src/app/components/api-docs/api-docs.component.html 318,321 @@ -2061,6 +2070,7 @@ Returns a list of transactions in the block (up to 25 transactions beginning at start_index). Transactions returned here do not have the status field, since all the transactions share the same block and confirmation status. + عوائد لائحة المعاملات في الكتلة (ما يقارب 25 تبدأ عند مؤشر البداية).المعاملات العائدة لا تملك,حالة,ميدان, بما ان تتشارك جميع المعاملات الكتلة و حالة التأكيد ذاتها. src/app/components/api-docs/api-docs.component.html 337,338 @@ -2068,6 +2078,7 @@ Returns the 10 newest blocks starting at the tip or at :start_height if specified. + عوائد أجدد 10 كتل عند بداية القمة او عند:بداية حجم الكتلة و موقعها بالنسبة للكتل المؤكدة التي سبقتهااذا كانت معرفة. src/app/components/api-docs/api-docs.component.html 357,358 @@ -2085,6 +2096,7 @@ Returns all Bisq transactions belonging to a Bitcoin address, with 'B' prefixed in front of the address. + عوائد كافة معاملات شبكة التداول الندية التي تعود الى عنوان بتكوين مرفقة ب بادئة B امام العنوان. src/app/components/api-docs/api-docs.component.html 385,388 @@ -2092,6 +2104,7 @@ Returns all Bisq transactions that exist in a Bitcoin block. + عوائد كافة معاملات شبكة التداول الندية الموجودة في كتلة بتكوين. src/app/components/api-docs/api-docs.component.html 405,408 @@ -2099,6 +2112,7 @@ Returns the most recently processed Bitcoin block height processed by Bisq. + عوائد حجم الكتلة بتكوين وموقعها بالنسبة للكتل المؤكدة التي سبقتها المعالجة حديثاً في شبكة التداول الندية. src/app/components/api-docs/api-docs.component.html 424,427 @@ -2106,6 +2120,7 @@ Returns :length Bitcoin blocks that contain Bisq transactions, starting from :index. + عوائد: إمتداد البيانات الواقيعية بأرقام بيانات كتلة بتكوين التي تحتوي على معاملات شبكة المداولات الندية عند المؤشر. src/app/components/api-docs/api-docs.component.html 444,447 @@ -2113,6 +2128,7 @@ Returns statistics about all Bisq transactions. + إحصاءات عوائد جميع معاملات التداول الندية . src/app/components/api-docs/api-docs.component.html 465,468 @@ -2120,6 +2136,7 @@ Returns details about a Bisq transaction. + تفاصيل عوائد معاملات شبكة التداول الندية. src/app/components/api-docs/api-docs.component.html 485,488 @@ -2127,6 +2144,7 @@ Returns :length of latest Bisq transactions, starting from :index. + عوائد: إمتداد البيانات الواقعية للمعاملات, عند نقطة المؤشر. src/app/components/api-docs/api-docs.component.html 506,509 @@ -2144,6 +2162,7 @@ Returns our currently suggested fees for new transactions. + عوائد الرسوم المقترحة للمعاملات الجديدة. src/app/components/api-docs/api-docs.component.html 531,533 @@ -2153,6 +2172,7 @@ Returns current mempool as projected blocks. + عوائد عقود العملات الرقمية الحالية لتخزين المعلومات عن العمليات غير المعلنة ككتل متوقعة. src/app/components/api-docs/api-docs.component.html 547,549 @@ -2162,6 +2182,7 @@ Returns the ancestors and the best descendant fees for a transaction. + عوائد الرسوم السابقة و أفضل الرسوم اللاحقة للمعاملة. src/app/components/api-docs/api-docs.component.html 563,565 @@ -2181,6 +2202,7 @@ Returns current mempool backlog statistics. + عوائد احصاءات التراكمية لعقود العملات الرقمية لتخزين المعلومات عن العمليات غير المعلنة. src/app/components/api-docs/api-docs.component.html 588,590 @@ -2190,6 +2212,7 @@ Get the full list of txids in the mempool as an array. The order of the txids is arbitrary and does not match bitcoind. + الحصول على لائحة المعاملات الكاملة في عقود العملات الرقمية لتخزين المعلومات عن العمليات غير المعلنة.كمصفوفة. ترتيب المعاملات عشوائي لا يتناسب مع بيتكوين. src/app/components/api-docs/api-docs.component.html 604,607 @@ -2199,6 +2222,7 @@ Get a list of the last 10 transactions to enter the mempool. Each transaction object contains simplified overview data, with the following fields: txid, fee, vsize, and value. + الحصول على لائحة المعاملات ال10 الأخيرة لتدخل عقود العملات الرقمية لتخزين معلومات العمليات غير المعلنة. كل قاعدة لعملية المعاملات تحتوي على بيانات شاملة وملخصة مع الخانات التالية: تجزئة بيانات المعاملات, الرسوم, وحدة قياس إفتراضية بديلة,والقيمة. src/app/components/api-docs/api-docs.component.html 622,623 @@ -2218,6 +2242,7 @@ Returns details about a transaction. Available fields: txid, version, locktime, size, weight, fee, vin, vout, and status. + تفاصيل عوائد المعاملات. الحقول المتوقرة:المعاملات الكاملة في عقود العملات الرقمية لتخزين المعلومات عن العمليات غير المعلنة,الإصدار ,وقت الاغلاق,الحجم ,قياس حجم الكتلة,الرسم,الأرباح الشاملة,ناتج جميع المعاملات,والحالة. src/app/components/api-docs/api-docs.component.html 647,648 @@ -2225,6 +2250,7 @@ Returns a transaction serialized as hex. + عوائد معاملة كسلسلة أرقام سداسية عشرية. src/app/components/api-docs/api-docs.component.html 666,669 @@ -2232,6 +2258,7 @@ Returns a merkle inclusion proof for the transaction using bitcoind's merkleblock format. + عوائد دليل تضمين إستخدام المعاملة المحوسبة برنامج بتكوين الخفي الأساسي صيغة. src/app/components/api-docs/api-docs.component.html 684,685 @@ -2239,6 +2266,7 @@ Returns a merkle inclusion proof for the transaction using Electrum's blockchain.transaction.get_merkle format. + عوائد دليل تضمين إستخدام المعاملة المحوسبةسلسلة كتل الكهرمان المعدني. المعاملة. احصل_صيغة الحوسبة. src/app/components/api-docs/api-docs.component.html 704,705 @@ -2246,6 +2274,7 @@ Returns the spending status of a transaction output. Available fields: spent (boolean), txid (optional), vin (optional), and status (optional, the status of the spending tx). + عوائد حالة الإنفاق لناتج المعاملة. الحقول المتوفرة:الإنفاق(الجبر المنطقي boolean ),أرقام المعاملات في الكتلة(إختياري),و الأرباح الشاملة (إختياري),والحالة(إختياري, حالة إنفاق المعاملة). src/app/components/api-docs/api-docs.component.html 723,724 @@ -2253,6 +2282,7 @@ Returns the spending status of all transaction outputs. + عوائد حالة التكاليف كل نتائج المعاملات. src/app/components/api-docs/api-docs.component.html 742,745 @@ -2268,6 +2298,7 @@ Returns the confirmation status of a transaction. Available fields: confirmed (boolean), block_height (optional), and block_hash (optional). + عوائد الحالات المؤكدة للمعاملة. الحقول المتوفرة:مؤكدة(الجبر المنطقيboolean),موقع و حجم الكتلة(إختياري),والتجزئة النصية للكتلة (إختياري). src/app/components/api-docs/api-docs.component.html 780,781 @@ -2275,6 +2306,7 @@ Broadcast a raw transaction to the network. The transaction should be provided as hex in the request body. The txid will be returned on success. + بث معاملة أصلية الى الشبكة.المعاملة يجب أن تُقَدم كأرقام سداسية عشرية في نص الطلب.أرقام المعاملات في الكتلةيتم إسترجاعها عند نجاح العملية. src/app/components/api-docs/api-docs.component.html 800,801 @@ -2282,6 +2314,7 @@ Websocket + بروتوكول التواصل المحوسب. src/app/components/api-docs/api-docs.component.html 810,814 @@ -2291,6 +2324,7 @@ Default push: action: 'want', data: ['blocks', ...] to express what you want pushed. Available: blocks, mempool-blocks, live-2h-chart, and stats.Push transactions related to address: 'track-address': '3PbJ...bF9B' to receive all new transactions containing that address as input or output. Returns an array of transactions. address-transactions for new mempool transactions, and block-transactions for new block confirmed transactions. + الدفع الإعتيادي:إجراء:أريد, بيانات:[’الكتل’،...]لتحدديد ما تريد دفعه.متوفر:كتل،;كتل عقود للعمليات غير المعلنة،جدول-2h-مباشر،وإحصاءات .دفع المعاملات المرتبطة بالعنوان:’إتبع-عنوان’: ’3PbJ...bF98’للحصول على معاملة جديدة تحتوي ذلك العنوان كإدخال و إخراج. إرجاع مصفوف المعاملات.عنوان المعاملاتلكتل العقود غير المعلنة الجديدة، و معاملات الكتللالمعاملات المؤكدة في الكتل الجديدة. src/app/components/api-docs/api-docs.component.html 819,820 @@ -2444,6 +2478,7 @@ of   + من src/app/components/asset/asset.component.html 76 @@ -2461,6 +2496,7 @@ Issuance and Burn Transactions + إلغاء و إصدار المعاملات. src/app/components/asset/asset.component.html 78 @@ -2597,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2633,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2671,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2735,6 +2771,7 @@ Bits + وحدات صغيرة. src/app/components/block/block.component.html 100,102 @@ -2752,6 +2789,7 @@ Nonce + رمز أحادي فردي الإستخدام. src/app/components/block/block.component.html 114,116 @@ -2763,11 +2801,11 @@ التفاصيل src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2777,7 +2815,7 @@ خطأ في تحميل بيانات الكتلة. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2789,16 +2827,6 @@ 106 - - Waiting for blocks... - في انتظار الكتل ... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! منسوخ! @@ -2812,7 +2840,7 @@ أولوية منخفضة src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2825,7 +2853,7 @@ أولوية متوسطة src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2838,7 +2866,7 @@ أولوية عالية src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2848,6 +2876,7 @@ Tx vBytes per second: + معاملات وحدات العناوين الإفتراضية في الثانية: src/app/components/footer/footer.component.html 5,7 @@ -2869,6 +2898,7 @@ vB/s + الأسس البصرية\النصية src/app/components/footer/footer.component.html 11,15 @@ -2913,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2930,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3042,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3052,11 +3082,11 @@ في ~ دقيقه src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3164,6 +3194,7 @@ Mempool by vBytes (sat/vByte) + عوائد عقود العملات الرقمية الحالية لتخزين المعلومات عن العمليات غير المعلنة في وحدة تخزين العناوين الإفتراضية(رسوم العاملة سات\وحدة العناوين الإفتراضية) src/app/components/statistics/statistics.component.html 13 @@ -3345,7 +3376,7 @@ هذه الحوالة تم استبدالها بـ: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3355,11 +3386,11 @@ غير مؤكده src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3369,7 +3400,7 @@ تم تأكيد src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3379,7 +3410,7 @@ بعد src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3389,7 +3420,7 @@ اول رؤية src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3399,7 +3430,7 @@ الوقت المقدر للوصول src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3409,7 +3440,7 @@ بعد عدة ساعات (أو أكثر) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3419,11 +3450,11 @@ الحجم الافتراضي src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3433,11 +3464,11 @@ معدل الرسوم src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3447,7 +3478,7 @@ منحدر src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3457,7 +3488,7 @@ الاصل src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3467,7 +3498,7 @@ حجم src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3477,7 +3508,7 @@ وزن src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3487,7 +3518,7 @@ الحوالة غير موجودة. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3496,7 +3527,7 @@ في انتظار ظهورها على mempool src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3505,7 +3536,7 @@ الرسوم src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3515,7 +3546,7 @@ سات src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3525,7 +3556,7 @@ معدل الرسوم الفعلي src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3535,7 +3566,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3544,7 +3575,7 @@ (عملات تم إنشاؤها حديثًا) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3553,7 +3584,7 @@ ربط src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3562,7 +3593,7 @@ البرنامج النصي (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3572,7 +3603,7 @@ البرنامج النصي. (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3582,7 +3613,7 @@ شوهد src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3591,15 +3622,16 @@ البرنامج النصي استرداد P2SH src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script P2WSH witness script + نتائج التجزئة النصية العالقة 2 للشاهد النصي المنفصل. src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3608,15 +3640,16 @@ ن التسلسل src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence Previous output script + نص النتائج السابقة. src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3625,36 +3658,39 @@ تحميل الكل src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all Peg-out to + إخراج المعاملات الى src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to ScriptPubKey (ASM) + النتيجة النصية لمعاملات بتكوين(عملية عكسية لإلغاء الرموز النصية) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm ScriptPubKey (HEX) + النتيجة النصيةلمعاملات بتكوين (سلسلة ارقام سداسية عشرية) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3664,7 +3700,7 @@ البيانات src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3673,7 +3709,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.ca.xlf b/frontend/src/locale/messages.ca.xlf index e8be35e1b..e44babc3c 100644 --- a/frontend/src/locale/messages.ca.xlf +++ b/frontend/src/locale/messages.ca.xlf @@ -446,11 +446,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -471,11 +471,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -538,7 +538,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1036,11 +1036,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1069,11 +1069,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1091,11 +1091,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1109,7 +1109,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1122,7 +1122,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1136,11 +1136,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1168,11 +1168,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1189,7 +1189,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1203,7 +1203,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1223,7 +1223,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1541,7 +1541,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2558,11 +2558,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2594,23 +2594,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2631,15 +2631,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2721,11 +2721,11 @@ Detalls src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2734,7 +2734,7 @@ Error loading block data. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2746,16 +2746,6 @@ 106 - - Waiting for blocks... - Esperant blocs - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Copiat! @@ -2769,7 +2759,7 @@ Prioritat baixa src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2782,7 +2772,7 @@ Prioritat mitjana src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2795,7 +2785,7 @@ Prioritat alta src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2869,7 +2859,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2886,7 +2876,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -2989,7 +2979,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -2999,11 +2989,11 @@ En ~minut src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3281,7 +3271,7 @@ This transaction has been replaced by: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3290,11 +3280,11 @@ Unconfirmed src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3303,7 +3293,7 @@ Confirmed src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3312,7 +3302,7 @@ After src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3321,7 +3311,7 @@ First seen src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3331,7 +3321,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3340,7 +3330,7 @@ In several hours (or more) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3349,11 +3339,11 @@ Virtual size src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3362,11 +3352,11 @@ Fee rate src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3375,7 +3365,7 @@ Descendant src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3384,7 +3374,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3393,7 +3383,7 @@ Size src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3402,7 +3392,7 @@ Weight src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3411,7 +3401,7 @@ Transaction not found. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3419,7 +3409,7 @@ Waiting for it to appear in the mempool... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3427,7 +3417,7 @@ Fee src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3437,7 +3427,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3446,7 +3436,7 @@ Effective fee rate src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3456,7 +3446,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3464,7 +3454,7 @@ (Newly Generated Coins) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3472,7 +3462,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3481,7 +3471,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3491,7 +3481,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3500,7 +3490,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3508,7 +3498,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3516,7 +3506,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3525,7 +3515,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3533,7 +3523,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3541,11 +3531,11 @@ Load all src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3553,7 +3543,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3562,7 +3552,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3572,7 +3562,7 @@ ScriptPubKey (HEX)  src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3581,7 +3571,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3590,7 +3580,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.cs.xlf b/frontend/src/locale/messages.cs.xlf index 4084ec877..4d051303f 100644 --- a/frontend/src/locale/messages.cs.xlf +++ b/frontend/src/locale/messages.cs.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2633,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2669,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2707,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2801,11 +2801,11 @@ Detaily src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2815,7 +2815,7 @@ Chyba při načítání dat bloku. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2827,16 +2827,6 @@ 106 - - Waiting for blocks... - Čekání na bloky... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Zkopírováno! @@ -2850,7 +2840,7 @@ Nízká priorita src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2863,7 +2853,7 @@ Střední priorita src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2876,7 +2866,7 @@ Vysoká priorita src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2953,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2970,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3082,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3092,11 +3082,11 @@ Za ~ minuta src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3386,7 +3376,7 @@ Tato transakce byla nahrazena: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3396,11 +3386,11 @@ Nepotvrzeno src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3410,7 +3400,7 @@ Potvrzeno src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3420,7 +3410,7 @@ Po src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3430,7 +3420,7 @@ Poprvé viděna src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3440,7 +3430,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3450,7 +3440,7 @@ Za několik hodin (nebo více) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3460,11 +3450,11 @@ Virtuální velikost src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3474,11 +3464,11 @@ Poplatek src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3488,7 +3478,7 @@ Potomek src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3498,7 +3488,7 @@ Předek src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3508,7 +3498,7 @@ Velikost src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3518,7 +3508,7 @@ Váha src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3528,7 +3518,7 @@ Transakce nebyla nalezena. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3537,7 +3527,7 @@ Čekání na to, až se objeví v mempoolu... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3546,7 +3536,7 @@ Poplatek src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3556,7 +3546,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3566,7 +3556,7 @@ Efektivní poplatek src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3576,7 +3566,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3585,7 +3575,7 @@ (Nově vytvořené mince) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3594,7 +3584,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3603,7 +3593,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3603,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3613,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3632,7 +3622,7 @@ P2SH redeem skript src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3641,7 +3631,7 @@ P2WSH witness skript src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3650,7 +3640,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3659,7 +3649,7 @@ Předchozí výstupní skript src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3668,11 +3658,11 @@ Načíst vše src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3681,7 +3671,7 @@ Peg-out do src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3690,7 +3680,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3690,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3700,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3709,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.de.xlf b/frontend/src/locale/messages.de.xlf index 075943c08..3e3e53293 100644 --- a/frontend/src/locale/messages.de.xlf +++ b/frontend/src/locale/messages.de.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2633,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2669,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2707,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2801,11 +2801,11 @@ Details src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2815,7 +2815,7 @@ Fehler beim Laden der Blockdaten. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2827,16 +2827,6 @@ 106 - - Waiting for blocks... - Warten auf Blöcke ... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Kopiert! @@ -2850,7 +2840,7 @@ Niedrige Priorität src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2863,7 +2853,7 @@ Mittlere Priorität src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2876,7 +2866,7 @@ Hohe Priorität src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2953,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2970,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3082,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3092,11 +3082,11 @@ In ~ einer Minute src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3386,7 +3376,7 @@ Diese Transaktion wurde ersetzt durch: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3396,11 +3386,11 @@ Unbestätigt src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3410,7 +3400,7 @@ Bestätigt src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3420,7 +3410,7 @@ Nach src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3430,7 +3420,7 @@ Zuerst gesehen src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3440,7 +3430,7 @@ ca. Zeit bis geschürft ist src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3450,7 +3440,7 @@ In mehreren Stunden (oder mehr) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3460,11 +3450,11 @@ Virtuelle Größe src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3474,11 +3464,11 @@ Gebührensatz src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3488,7 +3478,7 @@ Nachfahre src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3498,7 +3488,7 @@ Vorfahr src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3508,7 +3498,7 @@ Größe src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3518,7 +3508,7 @@ Gewicht src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3528,7 +3518,7 @@ Transaktion nicht gefunden. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3537,7 +3527,7 @@ Warten bis sie im Mempool erscheint... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3546,7 +3536,7 @@ Gebühr src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3556,7 +3546,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3566,7 +3556,7 @@ Effektiver Gebührensatz src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3576,7 +3566,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3585,7 +3575,7 @@ (Neu generierte Coins) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3594,7 +3584,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3603,7 +3593,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3603,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3613,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3632,7 +3622,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3641,7 +3631,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3650,7 +3640,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3659,7 +3649,7 @@ Vorheriges Output Script src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3668,11 +3658,11 @@ Alle nachladen src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3681,7 +3671,7 @@ Peg-out zu src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3690,7 +3680,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3690,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3700,7 @@ Daten src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3709,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.en_US.xlf b/frontend/src/locale/messages.en_US.xlf index c24df8f47..f93522bcb 100644 --- a/frontend/src/locale/messages.en_US.xlf +++ b/frontend/src/locale/messages.en_US.xlf @@ -401,11 +401,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -425,11 +425,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -488,7 +488,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -950,11 +950,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -981,11 +981,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1002,11 +1002,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1019,7 +1019,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1031,7 +1031,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1044,11 +1044,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1074,11 +1074,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1094,7 +1094,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1107,7 +1107,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1125,7 +1125,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1424,7 +1424,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2417,11 +2417,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2453,23 +2453,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2490,15 +2490,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2576,11 +2576,11 @@ Details src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2589,7 +2589,7 @@ Error loading block data. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2600,15 +2600,6 @@ 106 - - Waiting for blocks... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! @@ -2620,7 +2611,7 @@ Low priority src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2632,7 +2623,7 @@ Medium priority src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2644,7 +2635,7 @@ High priority src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2715,7 +2706,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2731,7 +2722,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -2832,7 +2823,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -2841,11 +2832,11 @@ In ~ minute src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3101,7 +3092,7 @@ This transaction has been replaced by: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3110,11 +3101,11 @@ Unconfirmed src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3123,7 +3114,7 @@ Confirmed src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3132,7 +3123,7 @@ After src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3141,7 +3132,7 @@ First seen src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3150,7 +3141,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3159,7 +3150,7 @@ In several hours (or more) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3168,11 +3159,11 @@ Virtual size src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3181,11 +3172,11 @@ Fee rate src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3194,7 +3185,7 @@ Descendant src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3203,7 +3194,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3212,7 +3203,7 @@ Size src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3221,7 +3212,7 @@ Weight src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3230,7 +3221,7 @@ Transaction not found. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3238,7 +3229,7 @@ Waiting for it to appear in the mempool... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3246,7 +3237,7 @@ Fee src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3255,7 +3246,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3264,7 +3255,7 @@ Effective fee rate src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3273,7 +3264,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3281,7 +3272,7 @@ (Newly Generated Coins) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3289,7 +3280,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3297,7 +3288,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3306,7 +3297,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3315,7 +3306,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3323,7 +3314,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3331,7 +3322,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3339,7 +3330,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3347,7 +3338,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3355,11 +3346,11 @@ Load all src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3367,7 +3358,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3375,7 +3366,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3384,7 +3375,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3393,7 +3384,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3401,7 +3392,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.es.xlf b/frontend/src/locale/messages.es.xlf index fd824f1c6..c2bdd164a 100644 --- a/frontend/src/locale/messages.es.xlf +++ b/frontend/src/locale/messages.es.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2633,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2669,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2707,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2801,11 +2801,11 @@ Detalles src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2815,7 +2815,7 @@ Error cargando datos de bloque src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2827,16 +2827,6 @@ 106 - - Waiting for blocks... - Cargando bloques... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Copiado! @@ -2850,7 +2840,7 @@ Baja prioridad src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2863,7 +2853,7 @@ Media prioridad src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2876,7 +2866,7 @@ Alta prioridad src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2953,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2970,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3082,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3092,11 +3082,11 @@ En ~ minutos src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3386,7 +3376,7 @@ Esta transacción ha sido reemplazada por: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3396,11 +3386,11 @@ Sin confirmar src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3410,7 +3400,7 @@ Confirmado src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3420,7 +3410,7 @@ Después src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3430,7 +3420,7 @@ Visto por primera vez src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3440,7 +3430,7 @@ Tiempo esparado de llegada src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3450,7 +3440,7 @@ En unas cuantas horas (o más) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3460,11 +3450,11 @@ Tamaño virtual src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3474,11 +3464,11 @@ Tasa de intercambio src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3488,7 +3478,7 @@ Descendiente src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3498,7 +3488,7 @@ Ancestro src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3508,7 +3498,7 @@ Tamaño src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3518,7 +3508,7 @@ Peso src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3528,7 +3518,7 @@ Transacción no encontrada src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3537,7 +3527,7 @@ Esperando a que aparezca en la mempool... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3546,7 +3536,7 @@ Tasa src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3556,7 +3546,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3566,7 +3556,7 @@ Ratio de tasa efectiva src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3576,7 +3566,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3585,7 +3575,7 @@ (Monedas recién generadas) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3594,7 +3584,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3603,7 +3593,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3603,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3613,7 @@ Testigo src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3632,7 +3622,7 @@ script de canje P2SH src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3641,7 +3631,7 @@ script de testigo P2WSH src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3650,7 +3640,7 @@ nSecuencia src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3659,7 +3649,7 @@ Script de salida previo src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3668,11 +3658,11 @@ Cargar todas src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3681,7 +3671,7 @@ Peg-out a src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3690,7 +3680,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3690,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3700,7 @@ dato src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3709,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.fa.xlf b/frontend/src/locale/messages.fa.xlf index 3007e30b8..8fd704056 100644 --- a/frontend/src/locale/messages.fa.xlf +++ b/frontend/src/locale/messages.fa.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2637,11 +2637,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2673,23 +2673,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2711,15 +2711,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2805,11 +2805,11 @@ جزئیات src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2819,7 +2819,7 @@ خطا در بازکردن داده‌های بلاک. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2831,16 +2831,6 @@ 106 - - Waiting for blocks... - منتظر بلاک‌ها... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! کپی شد! @@ -2854,7 +2844,7 @@ اولویت پایین src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2867,7 +2857,7 @@ اولویت متوسط src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2880,7 +2870,7 @@ اولویت بالا src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2957,7 +2947,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2974,7 +2964,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3086,7 +3076,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3096,11 +3086,11 @@ در ~ دقیقه src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3390,7 +3380,7 @@ این تراکنش جایگزین شده است: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3400,11 +3390,11 @@ تأییدنشده src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3414,7 +3404,7 @@ تأیید شده src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3424,7 +3414,7 @@ بعد از src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3434,7 +3424,7 @@ اولین زمان دیده‌شدن src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3444,7 +3434,7 @@ تخمین src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3454,7 +3444,7 @@ در چند (یا چندین) ساعت آینده src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3464,11 +3454,11 @@ اندازه مجازی src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3478,11 +3468,11 @@ نرخ کارمزد src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3492,7 +3482,7 @@ نواده src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3502,7 +3492,7 @@ والد src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3512,7 +3502,7 @@ اندازه src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3522,7 +3512,7 @@ وزن src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3532,7 +3522,7 @@ تراکنش پیدا نشد. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3541,7 +3531,7 @@ منتظر دیده‌شدن در mempool... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3550,7 +3540,7 @@ کارمزد src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3560,7 +3550,7 @@ ساتوشی src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3570,7 +3560,7 @@ نرخ کارمزد مؤثر src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3580,7 +3570,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3589,7 +3579,7 @@ (سکه‌های تازه تولید شده) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3598,7 +3588,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3607,7 +3597,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3617,7 +3607,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3627,7 +3617,7 @@ شاهد src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3636,7 +3626,7 @@ اسکریپت نقد کردن P2SH src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3645,7 +3635,7 @@ اسکریپت شاهد P2WSH src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3654,7 +3644,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3663,7 +3653,7 @@ اسکریپت خروجی قبلی src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3672,11 +3662,11 @@ بازکردن همه src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3685,7 +3675,7 @@ ‏Peg-out به src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3694,7 +3684,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3704,7 +3694,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3714,7 +3704,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3723,7 +3713,7 @@ ساتوشی src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.fi.xlf b/frontend/src/locale/messages.fi.xlf index 61e01b91e..17c6d3faa 100644 --- a/frontend/src/locale/messages.fi.xlf +++ b/frontend/src/locale/messages.fi.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2633,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2669,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2707,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2801,11 +2801,11 @@ Yksityiskohdat src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2815,7 +2815,7 @@ Virhe lohkotietoja ladattaessa. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2827,16 +2827,6 @@ 106 - - Waiting for blocks... - Odotetaan lohkoja... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Kopioitu! @@ -2850,7 +2840,7 @@ Ei kiireellinen src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2863,7 +2853,7 @@ Keskimääräinen src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2876,7 +2866,7 @@ Kiireellinen src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2953,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2970,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3082,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3092,11 +3082,11 @@ ~ minuutin kuluttua src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3386,7 +3376,7 @@ Tämä siirtotapahtuma on korvattu seuraavalla: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3396,11 +3386,11 @@ Vahvistamatta src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3410,7 +3400,7 @@ Vahvistettu src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3420,7 +3410,7 @@ Jälkeen src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3430,7 +3420,7 @@ Ensimmäiseksi nähty src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3440,7 +3430,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3450,7 +3440,7 @@ Muutamassa tunnissa (tai enemmän) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3460,11 +3450,11 @@ Virtuaalikoko src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3474,11 +3464,11 @@ Siirtokulutaso src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3488,7 +3478,7 @@ Verso src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3498,7 +3488,7 @@ Juuri src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3508,7 +3498,7 @@ Koko src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3518,7 +3508,7 @@ Paino src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3528,7 +3518,7 @@ Siirtotapahtumaa ei löydy. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3537,7 +3527,7 @@ Odotetaan sen ilmestymistä mempooliin... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3546,7 +3536,7 @@ Siirtokulu src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3556,7 +3546,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3566,7 +3556,7 @@ Todellinen siirtokulutaso src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3576,7 +3566,7 @@ Kolikonluonti src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3585,7 +3575,7 @@ (Äskettäin luodut kolikot) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3594,7 +3584,7 @@ Kiinnitä src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3603,7 +3593,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3603,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3613,7 @@ Todistaja src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3632,7 +3622,7 @@ P2SH lunastusskripti src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3641,7 +3631,7 @@ P2WSH todistajaskripti src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3650,7 +3640,7 @@ nJärjestys src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3659,7 +3649,7 @@ Edellinen tulosteskripti src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3668,11 +3658,11 @@ Lataa kaikki src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3681,7 +3671,7 @@ Irrotetaan src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3690,7 +3680,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3690,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3700,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3709,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index 871c1dc9f..0f8a87e3f 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -433,11 +433,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -458,11 +458,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -525,7 +525,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1023,11 +1023,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1056,11 +1056,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1078,11 +1078,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1096,7 +1096,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1109,7 +1109,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1123,11 +1123,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1155,11 +1155,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1176,7 +1176,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1210,7 +1210,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1365,6 +1365,7 @@ Building a mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, without any advertising, altcoins, or third-party trackers. + Construire un exploreur du mempool et de la blockchain pour la communauté Bitcoin, en se concentrant sur le marché des frais de transactions et un écosystème à plusieurs couches, sans aucune publicité, sans altcoins, et sans cookies de pistage tiers. src/app/components/about/about.component.html 13,17 @@ -1372,6 +1373,7 @@ Enterprise Sponsors 🚀 + Entreprises sponsors 🚀 src/app/components/about/about.component.html 32,34 @@ -1380,6 +1382,7 @@ Community Sponsors ❤️ + Sponsors de la communauté ❤️ src/app/components/about/about.component.html 50,53 @@ -1397,6 +1400,7 @@ Navigate to https://mempool.space/sponsor to sponsor + Rendez-vous sur https://mempool.space/sponsor pour soutenir le projet src/app/components/about/about.component.html 63 @@ -1528,7 +1532,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2579,11 +2583,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2615,23 +2619,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2653,15 +2657,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2743,11 +2747,11 @@ Détails src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2757,7 +2761,7 @@ Erreur lors du chargement des données du bloc src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2769,16 +2773,6 @@ 106 - - Waiting for blocks... - En attente de blocs... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Copié! @@ -2792,7 +2786,7 @@ Priorité faible src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2805,7 +2799,7 @@ Priorité moyenne src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2818,7 +2812,7 @@ Priorité haute src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2895,7 +2889,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2912,7 +2906,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3024,7 +3018,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3034,11 +3028,11 @@ Dans ~ minute src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3327,7 +3321,7 @@ Cette transaction a été remplacée par: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3337,11 +3331,11 @@ non confirmée src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3351,7 +3345,7 @@ Confirmé src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3361,7 +3355,7 @@ Après src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3371,7 +3365,7 @@ Vu pour la première fois src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3381,7 +3375,7 @@ HAP src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3391,7 +3385,7 @@ Dans plusieurs heures (ou plus) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3401,11 +3395,11 @@ Taille virtuelle src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3414,11 +3408,11 @@ Fee rate src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3427,7 +3421,7 @@ Descendant src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3436,7 +3430,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3446,7 +3440,7 @@ Taille src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3456,7 +3450,7 @@ Poids src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3466,7 +3460,7 @@ Transaction introuvable. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3475,7 +3469,7 @@ Veuillez patienter pendant que nous attendons qu'elle apparaisse dans le mempool src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3484,7 +3478,7 @@ Frais src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3494,7 +3488,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3503,7 +3497,7 @@ Effective fee rate src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3513,7 +3507,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3522,7 +3516,7 @@ (Nouveaux bitcoins générés) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3531,7 +3525,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3540,7 +3534,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3550,7 +3544,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3560,7 +3554,7 @@ Témoin src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3569,7 +3563,7 @@ Script de rachat P2SH src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3578,7 +3572,7 @@ Script témoin PW2SH src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3587,7 +3581,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3596,7 +3590,7 @@ Script de sortie précédent src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3605,11 +3599,11 @@ Charger tout src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3618,7 +3612,7 @@ Peg-out vers src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3627,7 +3621,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3637,7 +3631,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3647,7 +3641,7 @@ Donnée src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3656,7 +3650,7 @@ Sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.he.xlf b/frontend/src/locale/messages.he.xlf index f957f43a5..c459bb9b3 100644 --- a/frontend/src/locale/messages.he.xlf +++ b/frontend/src/locale/messages.he.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1556,7 +1556,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2608,11 +2608,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2644,23 +2644,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2682,15 +2682,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2775,11 +2775,11 @@ פרטים src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2789,7 +2789,7 @@ שגיאה בטעינת נתוני הבלוק. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2801,16 +2801,6 @@ 106 - - Waiting for blocks... - ממתין לבלוקים... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! הועתק! @@ -2824,7 +2814,7 @@ עדיפות נמוכה src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2837,7 +2827,7 @@ עדיפות בינונית src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2850,7 +2840,7 @@ עדיפות גבוהה src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2927,7 +2917,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2944,7 +2934,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3056,7 +3046,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3066,11 +3056,11 @@ תוך ~ דקות src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3360,7 +3350,7 @@ טרנזקציה זו הוחלפה ב: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3370,11 +3360,11 @@ טרם אושרו src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3384,7 +3374,7 @@ אושר src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3394,7 +3384,7 @@ לאחר src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3404,7 +3394,7 @@ נראה לראשונה src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3414,7 +3404,7 @@ זמן אישור משוער src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3424,7 +3414,7 @@ בעוד מספר שעות (או יותר) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3434,11 +3424,11 @@ גודל וירטואלי src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3448,11 +3438,11 @@ שיעור עמלה src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3462,7 +3452,7 @@ צאצא src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3472,7 +3462,7 @@ אב קדמון src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3482,7 +3472,7 @@ גודל src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3492,7 +3482,7 @@ משקל src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3502,7 +3492,7 @@ טרנזקציה לא נמצאה. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3511,7 +3501,7 @@ ממתין להופעתה בממפול.. src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3520,7 +3510,7 @@ עמלה src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3530,7 +3520,7 @@ סאטושיז src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3540,7 +3530,7 @@ שיעור עמלה אפקטיבי src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3550,7 +3540,7 @@ מטבעה src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3559,7 +3549,7 @@ (מטבעות שזה עתה נוצרו) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3568,7 +3558,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3577,7 +3567,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3587,7 +3577,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3597,7 +3587,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3606,7 +3596,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3615,7 +3605,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3624,7 +3614,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3633,7 +3623,7 @@ פלט קודם src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3642,11 +3632,11 @@ טען הכל src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3655,7 +3645,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3664,7 +3654,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3674,7 +3664,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3684,7 +3674,7 @@ נתונים src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3693,7 +3683,7 @@ סאט src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.hr.xlf b/frontend/src/locale/messages.hr.xlf index 0f36fe2a9..6adf66c9d 100644 --- a/frontend/src/locale/messages.hr.xlf +++ b/frontend/src/locale/messages.hr.xlf @@ -401,11 +401,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -425,11 +425,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -489,7 +489,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -951,11 +951,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -982,11 +982,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1003,11 +1003,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1021,7 +1021,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1034,7 +1034,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1047,11 +1047,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1079,11 +1079,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1100,7 +1100,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1113,7 +1113,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1131,7 +1131,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1430,7 +1430,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2424,11 +2424,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2460,23 +2460,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2497,15 +2497,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2584,11 +2584,11 @@ Detalji src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2597,7 +2597,7 @@ Error loading block data. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2608,15 +2608,6 @@ 106 - - Waiting for blocks... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! @@ -2628,7 +2619,7 @@ Low priority src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2640,7 +2631,7 @@ Medium priority src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2652,7 +2643,7 @@ High priority src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2723,7 +2714,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2739,7 +2730,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -2840,7 +2831,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -2849,11 +2840,11 @@ In ~ minute src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3110,7 +3101,7 @@ Ova transakcija je zamijenja od: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3120,11 +3111,11 @@ Nepotvrđeno src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3134,7 +3125,7 @@ Potvrđena src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3143,7 +3134,7 @@ After src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3153,7 +3144,7 @@ Prvo viđeno src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3162,7 +3153,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3171,7 +3162,7 @@ In several hours (or more) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3181,11 +3172,11 @@ Virtualna veličina src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3194,11 +3185,11 @@ Fee rate src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3207,7 +3198,7 @@ Descendant src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3216,7 +3207,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3226,7 +3217,7 @@ Veličina src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3236,7 +3227,7 @@ Težina src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3245,7 +3236,7 @@ Transaction not found. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3253,7 +3244,7 @@ Waiting for it to appear in the mempool... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3262,7 +3253,7 @@ Naknada src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3272,7 +3263,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3281,7 +3272,7 @@ Effective fee rate src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3290,7 +3281,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3298,7 +3289,7 @@ (Newly Generated Coins) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3306,7 +3297,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3314,7 +3305,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3323,7 +3314,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3332,7 +3323,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3340,7 +3331,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3348,7 +3339,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3356,7 +3347,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3364,7 +3355,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3372,11 +3363,11 @@ Load all src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3384,7 +3375,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3392,7 +3383,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3401,7 +3392,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3410,7 +3401,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3418,7 +3409,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.hu.xlf b/frontend/src/locale/messages.hu.xlf index c06cde2f9..414ece8f0 100644 --- a/frontend/src/locale/messages.hu.xlf +++ b/frontend/src/locale/messages.hu.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2633,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2669,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2707,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2801,11 +2801,11 @@ Részletek src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2815,7 +2815,7 @@ Hiba történt a blokk infirmáció betöltésekor. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2827,16 +2827,6 @@ 106 - - Waiting for blocks... - Blokkokra vár... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Másolva! @@ -2850,7 +2840,7 @@ Lassú src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2863,7 +2853,7 @@ Normál src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2876,7 +2866,7 @@ Elsőbbségi src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2953,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2970,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3082,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3092,11 +3082,11 @@ ~ múlva src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3386,7 +3376,7 @@ Ezt a tranzakciót lecserélte egy másik: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3396,11 +3386,11 @@ Nem megerősített src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3410,7 +3400,7 @@ Megerősítve src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3420,7 +3410,7 @@ után src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3430,7 +3420,7 @@ Először látva src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3440,7 +3430,7 @@ Hátralévő idő src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3450,7 +3440,7 @@ Több órán belül (vagy később) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3460,11 +3450,11 @@ Virtuális méret src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3474,11 +3464,11 @@ Díj ráta src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3488,7 +3478,7 @@ Utód src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3498,7 +3488,7 @@ Felmenő src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3508,7 +3498,7 @@ Méret src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3518,7 +3508,7 @@ Súly src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3528,7 +3518,7 @@ Nem található tranzakció. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3537,7 +3527,7 @@ Várakozás arra hogy a mempoolban feltünjön... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3546,7 +3536,7 @@ Díj src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3556,7 +3546,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3566,7 +3556,7 @@ Effektív díj ráta src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3576,7 +3566,7 @@ Érmebázis src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3585,7 +3575,7 @@ (Újjonnan Létrehozott Érmék) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3594,7 +3584,7 @@ Bekötés src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3603,7 +3593,7 @@ SzkriptSzig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3603,7 @@ SzkriptSzig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3613,7 @@ Szemtanú src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3632,7 +3622,7 @@ P2SH kiváltási szkript src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3641,7 +3631,7 @@ P2WSH szemtanú szkript src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3650,7 +3640,7 @@ nSzekvencia src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3659,7 +3649,7 @@ Előző kimeneti szkript src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3668,11 +3658,11 @@ Minden betöltése src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3681,7 +3671,7 @@ Kivétel a -ra src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3690,7 +3680,7 @@ SzkriptPublikusKulcs (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3690,7 @@ SzkriptPublikusKulcs (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3700,7 @@ adat src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3709,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.it.xlf b/frontend/src/locale/messages.it.xlf index 9b6ffb1ec..78c225960 100644 --- a/frontend/src/locale/messages.it.xlf +++ b/frontend/src/locale/messages.it.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2634,11 +2634,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2670,23 +2670,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2708,15 +2708,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2802,11 +2802,11 @@ Dettagli src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2816,7 +2816,7 @@ Si è verificato un errore durante il caricamento dei dati del blocco. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2828,16 +2828,6 @@ 106 - - Waiting for blocks... - Aspettando i blocchi... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Copiato! @@ -2851,7 +2841,7 @@ Priorità bassa src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2864,7 +2854,7 @@ Priorità media src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2877,7 +2867,7 @@ Priorità alta src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2954,7 +2944,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2971,7 +2961,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3083,7 +3073,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3093,11 +3083,11 @@ Tra ~ minuto src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3387,7 +3377,7 @@ Questa transazione è stata sostituita da: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3397,11 +3387,11 @@ Non confermata src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3411,7 +3401,7 @@ Confermata src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3421,7 +3411,7 @@ Dopo src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3431,7 +3421,7 @@ Vista per la prima volta src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3441,7 +3431,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3451,7 +3441,7 @@ Tra diverse ore (o più) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3461,11 +3451,11 @@ Dimensione virtuale src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3475,11 +3465,11 @@ Prezzo della commissione src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3489,7 +3479,7 @@ Discendente src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3499,7 +3489,7 @@ Antenato src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3509,7 +3499,7 @@ Dimensione src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3519,7 +3509,7 @@ Peso src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3529,7 +3519,7 @@ Transazione non trovata. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3538,7 +3528,7 @@ Aspettando che appaia nella mempool... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3547,7 +3537,7 @@ Commissione src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3557,7 +3547,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3567,7 +3557,7 @@ Prezzo effettivo della commissione src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3577,7 +3567,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3586,7 +3576,7 @@ (Bitcoin Appena Generati) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3595,7 +3585,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3604,7 +3594,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3614,7 +3604,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3624,7 +3614,7 @@ Testimone src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3633,7 +3623,7 @@ Script di riscatto P2SH src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3642,7 +3632,7 @@ Script testimone P2WSH src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3651,7 +3641,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3660,7 +3650,7 @@ Script output precedente src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3669,11 +3659,11 @@ Carica tutto src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3682,7 +3672,7 @@ Peg-out verso src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3691,7 +3681,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3701,7 +3691,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3711,7 +3701,7 @@ dati src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3720,7 +3710,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.ja.xlf b/frontend/src/locale/messages.ja.xlf index f424d0b78..ccbc9dd69 100644 --- a/frontend/src/locale/messages.ja.xlf +++ b/frontend/src/locale/messages.ja.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2633,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2669,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2707,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2801,11 +2801,11 @@ 詳細 src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2815,7 +2815,7 @@ ブロックデータを読み込み中にエラーが発生しました。 src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2827,16 +2827,6 @@ 106 - - Waiting for blocks... - ブロックを待ち... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! コピー されました！ @@ -2850,7 +2840,7 @@ 低優先 src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2863,7 +2853,7 @@ 中優先 src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2876,7 +2866,7 @@ 高優先 src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2953,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2970,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3082,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3092,11 +3082,11 @@ 〜分で src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3386,7 +3376,7 @@ このトランザクションは以下のように置き換えられました。 src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3396,11 +3386,11 @@ 未確認 src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3410,7 +3400,7 @@ 確認済み src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3420,7 +3410,7 @@ の後 src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3430,7 +3420,7 @@ 最初に見た src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3440,7 +3430,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3450,7 +3440,7 @@ 数時間（またはそれ以上） src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3460,11 +3450,11 @@ vSize src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3474,11 +3464,11 @@ 手数料レート src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3488,7 +3478,7 @@ Descendant src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3498,7 +3488,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3508,7 +3498,7 @@ サイズ src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3518,7 +3508,7 @@ 重み src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3528,7 +3518,7 @@ トランザクションが見つかりません。 src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3537,7 +3527,7 @@ mempoolに表示されるのを待っています... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3546,7 +3536,7 @@ 手数料 src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3556,7 +3546,7 @@ ｻﾄｼ src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3566,7 +3556,7 @@ 実効手数料レート src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3576,7 +3566,7 @@ コインベース src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3585,7 +3575,7 @@ （新しく生成されたコイン） src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3594,7 +3584,7 @@ ペグイン src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3603,7 +3593,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3603,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3613,7 @@ ウィットネス src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3632,7 +3622,7 @@ P2SH引き換えスクリプト src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3641,7 +3631,7 @@ P2WSHウィットネススクリプト src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3650,7 +3640,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3659,7 +3649,7 @@ 前の出力スクリプト src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3668,11 +3658,11 @@ すべてをロード src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3681,7 +3671,7 @@ へのペグアウト src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3690,7 +3680,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3690,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3700,7 @@ データ src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3709,7 @@ ｻﾄｼ src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.ka.xlf b/frontend/src/locale/messages.ka.xlf index 5194f4c1c..dd7f3a418 100644 --- a/frontend/src/locale/messages.ka.xlf +++ b/frontend/src/locale/messages.ka.xlf @@ -416,11 +416,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -441,11 +441,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -508,7 +508,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -991,11 +991,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1023,11 +1023,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1045,11 +1045,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1063,7 +1063,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1076,7 +1076,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1090,11 +1090,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1122,11 +1122,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1143,7 +1143,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1157,7 +1157,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1176,7 +1176,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1485,7 +1485,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2509,11 +2509,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2545,23 +2545,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2583,15 +2583,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2673,11 +2673,11 @@ დეტალები src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2687,7 +2687,7 @@ შეცდომა მონაცემების მოძებვნაზე src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2699,16 +2699,6 @@ 106 - - Waiting for blocks... - ბლოკის მოლოდინში... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! დაკოპირდა @@ -2722,7 +2712,7 @@ ნელი src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2735,7 +2725,7 @@ საშუალო src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2748,7 +2738,7 @@ სწრაფი src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2825,7 +2815,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2842,7 +2832,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -2954,7 +2944,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -2964,11 +2954,11 @@ ~ წუთში src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3257,7 +3247,7 @@ ტრანსაქცია ჩანაცვლდა: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3267,11 +3257,11 @@ დაუდასტურებული src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3281,7 +3271,7 @@ დადასტურებული src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3290,7 +3280,7 @@ After src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3300,7 +3290,7 @@ პირველი src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3310,7 +3300,7 @@ სავარაუდო ლოდინის დრო src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3320,7 +3310,7 @@ რამდენიმე საათში (ან მეტი) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3330,11 +3320,11 @@ ვირტუალური ზომა src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3343,11 +3333,11 @@ Fee rate src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3356,7 +3346,7 @@ Descendant src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3365,7 +3355,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3375,7 +3365,7 @@ ზომა src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3385,7 +3375,7 @@ წონა src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3395,7 +3385,7 @@ ტრანსაქცია ვერ მოიძებნა. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3404,7 +3394,7 @@ დაელოდეთ mempool-ში რომ გამოჩნდეს... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3413,7 +3403,7 @@ საკომისიო src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3423,7 +3413,7 @@ სატ src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3432,7 +3422,7 @@ Effective fee rate src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3442,7 +3432,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3451,7 +3441,7 @@ (ახალი ქოინები) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3460,7 +3450,7 @@ მიბმული src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3468,7 +3458,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3477,7 +3467,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3486,7 +3476,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3494,7 +3484,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3502,7 +3492,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3510,7 +3500,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3518,7 +3508,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3527,11 +3517,11 @@ ყველა ჩატვირთვა src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3539,7 +3529,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3547,7 +3537,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3556,7 +3546,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3566,7 +3556,7 @@ მონაცემები src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3575,7 +3565,7 @@ სატ src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.ko.xlf b/frontend/src/locale/messages.ko.xlf index 1a2367ea1..59fc6af3b 100644 --- a/frontend/src/locale/messages.ko.xlf +++ b/frontend/src/locale/messages.ko.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1563,7 +1563,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2643,11 +2643,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2679,23 +2679,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2717,15 +2717,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2811,11 +2811,11 @@ 자세히 src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2825,7 +2825,7 @@ 블록 데이터 불러오기 실패 src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2837,16 +2837,6 @@ 106 - - Waiting for blocks... - 블록을 기다리는 중... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! 복사됨! @@ -2860,7 +2850,7 @@ 낮은 우선 순위 src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2873,7 +2863,7 @@ 중간 우선 순위 src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2886,7 +2876,7 @@ 높은 우선 순위 src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2963,7 +2953,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2980,7 +2970,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3092,7 +3082,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3102,11 +3092,11 @@ ~분 뒤 src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3396,7 +3386,7 @@ 이 트랜잭션은 다음 트랜잭션으로 대체되었습니다: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3406,11 +3396,11 @@ 컨펌되지 않음 src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3420,7 +3410,7 @@ 컨펌됨 src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3430,7 +3420,7 @@ 이후 src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3440,7 +3430,7 @@ 처음으로 감지됨 src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3450,7 +3440,7 @@ 컨펌까지 남은 예상시간 src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3460,7 +3450,7 @@ 몇 시간 후 (또는 그 이상) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3470,11 +3460,11 @@ 가상 크기 src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3484,11 +3474,11 @@ 수수료율 src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3498,7 +3488,7 @@ 자손 src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3508,7 +3498,7 @@ 조상 src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3518,7 +3508,7 @@ 크기 src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3528,7 +3518,7 @@ 무게 src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3538,7 +3528,7 @@ 트랜잭션을 찾을 수 없음 src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3547,7 +3537,7 @@ 멤풀에 포함될때까지 대기하는 중... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3556,7 +3546,7 @@ 수수료 src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3566,7 +3556,7 @@ 사토시 src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3576,7 +3566,7 @@ 유효 수수료율 src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3586,7 +3576,7 @@ 코인베이스 src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3595,7 +3585,7 @@ (새로 채굴된 코인들) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3604,7 +3594,7 @@ 페그 인 src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3613,7 +3603,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3623,7 +3613,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3633,7 +3623,7 @@ 증인 (디지털 서명) src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3642,7 +3632,7 @@ P2SH 사용 스크립트 src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3651,7 +3641,7 @@ P2WSH 증인 스크립트 src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3660,7 +3650,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3669,7 +3659,7 @@ 이전 아웃풋 스크립트 src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3678,11 +3668,11 @@ 모두 불러오기 src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3691,7 +3681,7 @@ 로 페그 아웃 됨 src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3700,7 +3690,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3710,7 +3700,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3720,7 +3710,7 @@ 데이터 src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3729,7 +3719,7 @@ 사토시 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.nb.xlf b/frontend/src/locale/messages.nb.xlf index 0d5ce5754..b7c635f3d 100644 --- a/frontend/src/locale/messages.nb.xlf +++ b/frontend/src/locale/messages.nb.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2633,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2669,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2707,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2801,11 +2801,11 @@ Detaljer src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2815,7 +2815,7 @@ Lasting av blokkdata feilet. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2827,16 +2827,6 @@ 106 - - Waiting for blocks... - Venter på blokker... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Kopiert! @@ -2850,7 +2840,7 @@ Lav prioritet src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2863,7 +2853,7 @@ Medium prioritet src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2876,7 +2866,7 @@ Høy prioritet src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2953,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2970,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3082,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3092,11 +3082,11 @@ Om ~ minutt src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3386,7 +3376,7 @@ Denne transaksjonen har blitt byttet ut med: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3396,11 +3386,11 @@ Ubekreftet src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3410,7 +3400,7 @@ Bekreftet src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3420,7 +3410,7 @@ Etter src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3430,7 +3420,7 @@ Først sett src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3440,7 +3430,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3450,7 +3440,7 @@ Om flere timer(eller mer) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3460,11 +3450,11 @@ Virtuell størrelse src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3474,11 +3464,11 @@ Avgift src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3488,7 +3478,7 @@ Etterkommer src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3498,7 +3488,7 @@ Forfader src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3508,7 +3498,7 @@ Størrelse src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3518,7 +3508,7 @@ Vekt src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3528,7 +3518,7 @@ Transaksjon ikke funnet src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3537,7 +3527,7 @@ Venter på at den kommer inn i mempool... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3546,7 +3536,7 @@ Avgift src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3556,7 +3546,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3566,7 +3556,7 @@ Effektiv avgift src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3576,7 +3566,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3585,7 +3575,7 @@ (Nygenererte Mynter) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3594,7 +3584,7 @@ Peg-inn src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3603,7 +3593,7 @@ ScriptSig(ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3603,7 @@ ScriptSig(HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3613,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3632,7 +3622,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3641,7 +3631,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3650,7 +3640,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3659,7 +3649,7 @@ Forrige utgangs-script src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3668,11 +3658,11 @@ Last alt src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3681,7 +3671,7 @@ Peg-ut til src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3690,7 +3680,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3690,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3700,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3709,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.nl.xlf b/frontend/src/locale/messages.nl.xlf index 451cd51fe..87a5f46b6 100644 --- a/frontend/src/locale/messages.nl.xlf +++ b/frontend/src/locale/messages.nl.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1558,7 +1558,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2630,11 +2630,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2666,23 +2666,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2704,15 +2704,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2798,11 +2798,11 @@ Details src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2812,7 +2812,7 @@ Fout bij het laden van de blokdata. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2824,16 +2824,6 @@ 106 - - Waiting for blocks... - Wachten op blokken... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Gekopiëerd! @@ -2847,7 +2837,7 @@ Lage prioriteit src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2860,7 +2850,7 @@ Gemiddelde prioriteit src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2873,7 +2863,7 @@ Hoge prioriteit src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2950,7 +2940,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2967,7 +2957,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3079,7 +3069,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3089,11 +3079,11 @@ Binnen ~ minuut src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3383,7 +3373,7 @@ Deze transactie is vervangen door: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3393,11 +3383,11 @@ Onbevestigd src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3407,7 +3397,7 @@ Bevestigd src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3417,7 +3407,7 @@ Na src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3427,7 +3417,7 @@ Eerst gezien src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3437,7 +3427,7 @@ Verwacht src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3447,7 +3437,7 @@ Binnen een aantal uren (of meer) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3457,11 +3447,11 @@ Virtuele grootte src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3471,11 +3461,11 @@ Vergoedingstarief src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3485,7 +3475,7 @@ Descendant src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3495,7 +3485,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3505,7 +3495,7 @@ Grootte src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3515,7 +3505,7 @@ Gewicht src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3525,7 +3515,7 @@ Transactie niet gevonden. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3534,7 +3524,7 @@ Wachten tot het in de mempool verschijnt... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3543,7 +3533,7 @@ Vergoeding src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3553,7 +3543,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3563,7 +3553,7 @@ Effectief vergoedingstarief src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3573,7 +3563,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3582,7 +3572,7 @@ (Nieuw-gegenereerde munten) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3591,7 +3581,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3600,7 +3590,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3610,7 +3600,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3620,7 +3610,7 @@ Getuige-data src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3629,7 +3619,7 @@ P2SH claim-script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3638,7 +3628,7 @@ P2WSH claim-script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3647,7 +3637,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3656,7 +3646,7 @@ Vorig output-script src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3665,11 +3655,11 @@ Laad alles src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3678,7 +3668,7 @@ Peg-out naar src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3687,7 +3677,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3697,7 +3687,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3707,7 +3697,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3716,7 +3706,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.pl.xlf b/frontend/src/locale/messages.pl.xlf index c937f9c95..7e5bdab50 100644 --- a/frontend/src/locale/messages.pl.xlf +++ b/frontend/src/locale/messages.pl.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2633,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2669,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2707,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2801,11 +2801,11 @@ Szczegóły src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2815,7 +2815,7 @@ Błąd podczas ładowania danych bloku. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2827,16 +2827,6 @@ 106 - - Waiting for blocks... - Oczekiwanie na bloki... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Skopiowano! @@ -2850,7 +2840,7 @@ Niski priorytet src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2863,7 +2853,7 @@ Średni priorytet src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2876,7 +2866,7 @@ Wysoki priorytet src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2953,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2970,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3082,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3092,11 +3082,11 @@ W ~ minutę src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3386,7 +3376,7 @@ Ta transakcja została zastąpiona przez: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3396,11 +3386,11 @@ Niepotwierdzone src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3410,7 +3400,7 @@ Potwierdzona src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3420,7 +3410,7 @@ Po src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3430,7 +3420,7 @@ Pierwszy raz widziana src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3440,7 +3430,7 @@ Szacowany czas src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3450,7 +3440,7 @@ W ciągu kilku godzin (lub dłużej) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3460,11 +3450,11 @@ Rozmiar wirtualny src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3474,11 +3464,11 @@ Poziom opłat src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3488,7 +3478,7 @@ Potomek src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3498,7 +3488,7 @@ Przodek src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3508,7 +3498,7 @@ Rozmiar src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3518,7 +3508,7 @@ Waga src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3528,7 +3518,7 @@ Transakcja nie odnaleziona. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3537,7 +3527,7 @@ Oczekiwanie aż pojawi się w mempool... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3546,7 +3536,7 @@ Opłata src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3556,7 +3546,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3566,7 +3556,7 @@ Efektywny poziom opłaty src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3576,7 +3566,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3585,7 +3575,7 @@ (Nowo Wygenerowane Monety) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3594,7 +3584,7 @@ Transfer do src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3603,7 +3593,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3603,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3613,7 @@ Świadek src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3632,7 +3622,7 @@ Skrypt realizacji P2SH src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3641,7 +3631,7 @@ Skrypt świadka P2WSH src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3650,7 +3640,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3659,7 +3649,7 @@ Poprzedni skrypt wyjściowy src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3668,11 +3658,11 @@ Załaduj wszystko src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3681,7 +3671,7 @@ Transfer z src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3690,7 +3680,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3690,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3700,7 @@ dane src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3709,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.pt.xlf b/frontend/src/locale/messages.pt.xlf index 535560579..385f326e7 100644 --- a/frontend/src/locale/messages.pt.xlf +++ b/frontend/src/locale/messages.pt.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2633,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2669,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2707,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2801,11 +2801,11 @@ Detalhes src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2815,7 +2815,7 @@ Erro ao carregar os dados do bloco. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2827,16 +2827,6 @@ 106 - - Waiting for blocks... - Aguardando os blocos... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Copiado! @@ -2850,7 +2840,7 @@ Baixa prioridade src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2863,7 +2853,7 @@ Média prioridade src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2876,7 +2866,7 @@ Alta prioridade src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2953,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2970,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3082,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3092,11 +3082,11 @@ Em ~ minuto src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3386,7 +3376,7 @@ Essa transação foi substituída por: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3396,11 +3386,11 @@ Sem confirmar src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3410,7 +3400,7 @@ Confirmado src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3420,7 +3410,7 @@ Depois de src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3430,7 +3420,7 @@ Visto pela primeira vez src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3440,7 +3430,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3450,7 +3440,7 @@ Em várias horas (ou mais) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3460,11 +3450,11 @@ Tamanho virtual src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3474,11 +3464,11 @@ Taxa de transação src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3488,7 +3478,7 @@ Descendente src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3498,7 +3488,7 @@ Ancestral src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3508,7 +3498,7 @@ Tamanho src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3518,7 +3508,7 @@ Peso src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3528,7 +3518,7 @@ Transação não encontrada. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3537,7 +3527,7 @@ Aguardando que apareça no mempool... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3546,7 +3536,7 @@ Taxa src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3556,7 +3546,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3566,7 +3556,7 @@ Taxa de transação efetiva src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3576,7 +3566,7 @@ Conteúdo no bloco src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3585,7 +3575,7 @@ (Moedas Recém-Geradas) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3594,7 +3584,7 @@ Indexado em src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3603,7 +3593,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3603,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3613,7 @@ Testemunho src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3632,7 +3622,7 @@ P2SH script de resgate src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3641,7 +3631,7 @@ P2WSH script de testemunho src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3650,7 +3640,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3659,7 +3649,7 @@ Script de saída anterior src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3668,11 +3658,11 @@ Carregar tudo src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3681,7 +3671,7 @@ Atrelado para src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3690,7 +3680,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3690,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3700,7 @@ dados src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3709,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.ru.xlf b/frontend/src/locale/messages.ru.xlf index 056569f6c..75a2565a8 100644 --- a/frontend/src/locale/messages.ru.xlf +++ b/frontend/src/locale/messages.ru.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2634,11 +2634,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2670,23 +2670,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2708,15 +2708,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2802,11 +2802,11 @@ Подробности src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2816,7 +2816,7 @@ Ошибка при загрузке данных о блоке. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2828,16 +2828,6 @@ 106 - - Waiting for blocks... - Ожидание блоков... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Скопировано! @@ -2852,7 +2842,7 @@ приоритет src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2866,7 +2856,7 @@ приоритет src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2880,7 +2870,7 @@ приоритет src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2957,7 +2947,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2974,7 +2964,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3086,7 +3076,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3096,11 +3086,11 @@ Через ~ минуту src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3390,7 +3380,7 @@ Эта транзакция была заменена на: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3400,11 +3390,11 @@ Неподтвержденные src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3414,7 +3404,7 @@ Подтверждено src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3424,7 +3414,7 @@ После src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3434,7 +3424,7 @@ Впервые замечен src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3444,7 +3434,7 @@ Расчетное время src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3454,7 +3444,7 @@ Через несколько часов (или больше) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3464,11 +3454,11 @@ Виртуальный размер src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3478,11 +3468,11 @@ Комиссионная ставка src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3492,7 +3482,7 @@ Потомок src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3502,7 +3492,7 @@ Предок src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3512,7 +3502,7 @@ Размер src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3522,7 +3512,7 @@ Вес src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3532,7 +3522,7 @@ Транзакция не найдена. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3541,7 +3531,7 @@ Ожидаем ее появления в мемпуле ... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3550,7 +3540,7 @@ Комиссия src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3560,7 +3550,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3570,7 +3560,7 @@ Эффективная комиссионная ставка src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3580,7 +3570,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3589,7 +3579,7 @@ (Новые сгенерированные монеты) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3598,7 +3588,7 @@ Привязка src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3607,7 +3597,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3617,7 +3607,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3627,7 +3617,7 @@ Свидетель src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3636,7 +3626,7 @@ Скрипт оплаты P2SH src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3645,7 +3635,7 @@ Скрипт свидетеля P2WSH src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3654,7 +3644,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3663,7 +3653,7 @@ Скрипт предыдущего вывода src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3672,11 +3662,11 @@ Загрузить все src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3685,7 +3675,7 @@ Отвязать на src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3694,7 +3684,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3704,7 +3694,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3714,7 +3704,7 @@ данные src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3723,7 +3713,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.sl.xlf b/frontend/src/locale/messages.sl.xlf index d41bc5340..c6ff7b577 100644 --- a/frontend/src/locale/messages.sl.xlf +++ b/frontend/src/locale/messages.sl.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1559,7 +1559,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2632,11 +2632,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2668,23 +2668,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2706,15 +2706,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2800,11 +2800,11 @@ Podrobnosti src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2814,7 +2814,7 @@ Napaka pri nalaganju podatkov bloka. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2826,16 +2826,6 @@ 106 - - Waiting for blocks... - Čakanje na prikaz blokov... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Kopirano! @@ -2849,7 +2839,7 @@ Počasi src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2862,7 +2852,7 @@ Srednje src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2875,7 +2865,7 @@ Hitro src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2952,7 +2942,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2969,7 +2959,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3081,7 +3071,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3091,11 +3081,11 @@ Čez ~ minuto src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3385,7 +3375,7 @@ Ta transakcija je bila nadomeščena z: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3395,11 +3385,11 @@ Nepotrjeno src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3409,7 +3399,7 @@ Potrjeno src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3419,7 +3409,7 @@ Po src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3429,7 +3419,7 @@ Prejeto src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3439,7 +3429,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3449,7 +3439,7 @@ V nekaj urah (ali več) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3459,11 +3449,11 @@ Navidezna velikost src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3473,11 +3463,11 @@ Stopnja omrežnine src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3487,7 +3477,7 @@ Potomec src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3497,7 +3487,7 @@ Prednik src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3507,7 +3497,7 @@ Velikost src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3517,7 +3507,7 @@ Utež src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3527,7 +3517,7 @@ Transakcije ni mogoče najti. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3536,7 +3526,7 @@ Čakanje, da se prikaže v mempool-u... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3545,7 +3535,7 @@ Omrežnina src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3555,7 +3545,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3565,7 +3555,7 @@ Efektivna stopnja omrežnine src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3575,7 +3565,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3584,7 +3574,7 @@ (Novo ustvarjeni kovanci) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3593,7 +3583,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3602,7 +3592,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3612,7 +3602,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3622,7 +3612,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3631,7 +3621,7 @@ P2SH redeem skripta src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3640,7 +3630,7 @@ P2WSH witness skripta src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3649,7 +3639,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3658,7 +3648,7 @@ Skripta prejšnjega izhoda src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3667,11 +3657,11 @@ Prikaži vse src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3680,7 +3670,7 @@ Peg-out v src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3689,7 +3679,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3699,7 +3689,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3709,7 +3699,7 @@ podatki src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3718,7 +3708,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.sv.xlf b/frontend/src/locale/messages.sv.xlf index 3edbce076..eebabcd94 100644 --- a/frontend/src/locale/messages.sv.xlf +++ b/frontend/src/locale/messages.sv.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2633,11 +2633,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2669,23 +2669,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2707,15 +2707,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2801,11 +2801,11 @@ Detaljer src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2815,7 +2815,7 @@ Kunde inte ladda blockdata. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2827,16 +2827,6 @@ 106 - - Waiting for blocks... - Väntar på block... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Kopierad! @@ -2850,7 +2840,7 @@ Låg prioritet src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2863,7 +2853,7 @@ Medium prioritet src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2876,7 +2866,7 @@ Hög prioritet src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2953,7 +2943,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2970,7 +2960,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3082,7 +3072,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3092,11 +3082,11 @@ Om ~ minut src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3386,7 +3376,7 @@ Transaktionen har blivit ersatt av: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3396,11 +3386,11 @@ Obekräftad src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3410,7 +3400,7 @@ Bekräftad src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3420,7 +3410,7 @@ Efter src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3430,7 +3420,7 @@ Först sedd src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3440,7 +3430,7 @@ ETA src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3450,7 +3440,7 @@ Om flera timmar (eller mer) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3460,11 +3450,11 @@ Virtuell storlek src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3474,11 +3464,11 @@ Avgiftssats src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3488,7 +3478,7 @@ Ättling src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3498,7 +3488,7 @@ Förfader src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3508,7 +3498,7 @@ Storlek src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3518,7 +3508,7 @@ Viktenheter src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3528,7 +3518,7 @@ Transaktionen hittades inte src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3537,7 +3527,7 @@ Väntar på den att dyka upp i mempoolen... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3546,7 +3536,7 @@ Avgift src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3556,7 +3546,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3566,7 +3556,7 @@ Effektiv avgiftssats src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3576,7 +3566,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3585,7 +3575,7 @@ (Nyskapade mynt) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3594,7 +3584,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3603,7 +3593,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3603,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3613,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3632,7 +3622,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3641,7 +3631,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3650,7 +3640,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3659,7 +3649,7 @@ Föregående outputscript src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3668,11 +3658,11 @@ Ladda alla src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3681,7 +3671,7 @@ Peg-out till src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3690,7 +3680,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3690,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3700,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3709,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.tr.xlf b/frontend/src/locale/messages.tr.xlf index de53b8d06..8034d2b5b 100644 --- a/frontend/src/locale/messages.tr.xlf +++ b/frontend/src/locale/messages.tr.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2634,11 +2634,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2670,23 +2670,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2708,15 +2708,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2802,11 +2802,11 @@ Detaylar src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2816,7 +2816,7 @@ Blok datası yüklenirken hata oldu. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2828,16 +2828,6 @@ 106 - - Waiting for blocks... - Bloklar bekleniyor... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Kopyalandı! @@ -2851,7 +2841,7 @@ Düşük öncelik src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2864,7 +2854,7 @@ Orta öncelik src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2877,7 +2867,7 @@ Yüksek öncelik src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2954,7 +2944,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2971,7 +2961,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3083,7 +3073,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3093,11 +3083,11 @@ ~ dakika içinde src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3387,7 +3377,7 @@ Bu işlem takip eden işlemle değiştirilmiştir: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3397,11 +3387,11 @@ Onaylanmamış src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3411,7 +3401,7 @@ Onaylı src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3421,7 +3411,7 @@ 'dan sonra src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3431,7 +3421,7 @@ İlk görüldüğü an src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3441,7 +3431,7 @@ Tahmini Varış Süresi src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3451,7 +3441,7 @@ Bir kaç saat içinde (veya daha sonra) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3461,11 +3451,11 @@ Sanal Boyut src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3475,11 +3465,11 @@ Ücret değeri src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3489,7 +3479,7 @@ Varis src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3499,7 +3489,7 @@ Ata src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3509,7 +3499,7 @@ Boyut src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3519,7 +3509,7 @@ Ağırlık src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3529,7 +3519,7 @@ İşlem bulunamadı. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3538,7 +3528,7 @@ Mempool'a dahil olmayı bekliyor. src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3547,7 +3537,7 @@ Ücret src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3557,7 +3547,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3567,7 +3557,7 @@ Effektik ücret değeri src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3577,7 +3567,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3586,7 +3576,7 @@ (Yeni çıkarılmış coinler) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3595,7 +3585,7 @@ İçeri geçir src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3604,7 +3594,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3614,7 +3604,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3624,7 +3614,7 @@ Tanık src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3633,7 +3623,7 @@ P2SH alım scripti src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3642,7 +3632,7 @@ P2WSH tanık scripti src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3651,7 +3641,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3660,7 +3650,7 @@ Önceki çıkış scripti src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3669,11 +3659,11 @@ Hepsini yükle src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3682,7 +3672,7 @@ 'a çıkış src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3691,7 +3681,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3701,7 +3691,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3711,7 +3701,7 @@ Data src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3720,7 +3710,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.uk.xlf b/frontend/src/locale/messages.uk.xlf index b7d1d0aa3..cb1c58b5f 100644 --- a/frontend/src/locale/messages.uk.xlf +++ b/frontend/src/locale/messages.uk.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1558,7 +1558,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2625,11 +2625,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2661,23 +2661,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2699,15 +2699,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2793,11 +2793,11 @@ Деталі src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2807,7 +2807,7 @@ Не вдалося завантажити дані про блок. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2819,16 +2819,6 @@ 106 - - Waiting for blocks... - Очікуємо на блоки... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Скопійовано! @@ -2842,7 +2832,7 @@ Повільно src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2855,7 +2845,7 @@ Помірно src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2868,7 +2858,7 @@ Швидко src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2945,7 +2935,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2962,7 +2952,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3074,7 +3064,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3084,11 +3074,11 @@ Через ~ хвилину src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3378,7 +3368,7 @@ Транзакція була замінена на: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3388,11 +3378,11 @@ Непідтверджена src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3402,7 +3392,7 @@ Підтверджена src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3412,7 +3402,7 @@ Після src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3422,7 +3412,7 @@ Вперше помічена src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3432,7 +3422,7 @@ Орієнтовний час src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3442,7 +3432,7 @@ За кілька годин (або довше) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3452,11 +3442,11 @@ Віртуальний розмір src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3466,11 +3456,11 @@ Ставка комісії src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3480,7 +3470,7 @@ Нащадок src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3490,7 +3480,7 @@ Предок src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3500,7 +3490,7 @@ Розмір src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3510,7 +3500,7 @@ Вага src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3520,7 +3510,7 @@ Транзакція не знайдена. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3529,7 +3519,7 @@ Чекаємо її появи в мемпулі... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3538,7 +3528,7 @@ Комісія src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3548,7 +3538,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3558,7 +3548,7 @@ Поточна ставка комісії src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3568,7 +3558,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3577,7 +3567,7 @@ (Нові монети) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3586,7 +3576,7 @@ Закріплення src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3595,7 +3585,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3605,7 +3595,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3615,7 +3605,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3624,7 +3614,7 @@ P2SH redeem скрипт src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3633,7 +3623,7 @@ P2WSH witness скрипт src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3642,7 +3632,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3651,7 +3641,7 @@ Скрипт попереднього виходу src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3660,11 +3650,11 @@ Завантажити всі src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3673,7 +3663,7 @@ Розкріплення до src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3682,7 +3672,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3692,7 +3682,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3702,7 +3692,7 @@ дані src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3711,7 +3701,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.vi.xlf b/frontend/src/locale/messages.vi.xlf index 2b5100eb0..4ea973bbe 100644 --- a/frontend/src/locale/messages.vi.xlf +++ b/frontend/src/locale/messages.vi.xlf @@ -447,11 +447,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -472,11 +472,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -539,7 +539,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1037,11 +1037,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1070,11 +1070,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1092,11 +1092,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1110,7 +1110,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1123,7 +1123,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1137,11 +1137,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1169,11 +1169,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1190,7 +1190,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1204,7 +1204,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1224,7 +1224,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1558,7 +1558,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2630,11 +2630,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2666,23 +2666,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2704,15 +2704,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2798,11 +2798,11 @@ Chi tiết src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2812,7 +2812,7 @@ Lỗi khi tải dữ liệu khối. src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2824,16 +2824,6 @@ 106 - - Waiting for blocks... - Đang chờ các khối ... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! Đã sao chép! @@ -2847,7 +2837,7 @@ Ưu tiên thấp src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2860,7 +2850,7 @@ Ưu tiên trung bình src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2873,7 +2863,7 @@ Ưu tiên cao src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2950,7 +2940,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2967,7 +2957,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3079,7 +3069,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3089,11 +3079,11 @@ Trong ~ phút src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3383,7 +3373,7 @@ Giao dịch này đã được thay thế bằng: src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3393,11 +3383,11 @@ Chưa xác nhận src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3407,7 +3397,7 @@ Đã xác nhận src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3417,7 +3407,7 @@ Sau src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3427,7 +3417,7 @@ Lần đầu thấy src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3437,7 +3427,7 @@ Thời gian dự kiến src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3447,7 +3437,7 @@ Trong vài giờ (hoặc hơn) src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3457,11 +3447,11 @@ Kích thước ảo src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3471,11 +3461,11 @@ Tỷ lệ phí src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3485,7 +3475,7 @@ Descendant src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3495,7 +3485,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3505,7 +3495,7 @@ Kích thước src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3515,7 +3505,7 @@ Khối lượng src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3525,7 +3515,7 @@ Không tìm thấy giao dịch. src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3534,7 +3524,7 @@ Đang đợi nó xuất hiện trong mempool ... src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3543,7 +3533,7 @@ Phí src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3553,7 +3543,7 @@ sat src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3563,7 +3553,7 @@ Tỷ lệ phí hiệu quả src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3573,7 +3563,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3582,7 +3572,7 @@ (Coin mới được tạo) src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3591,7 +3581,7 @@ Cố định src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3600,7 +3590,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3610,7 +3600,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3620,7 +3610,7 @@ Chứng kiến src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3629,7 +3619,7 @@ Mã thu hồi P2SH src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3638,7 +3628,7 @@ Mã chứng kiến P2WSH src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3647,7 +3637,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3656,7 +3646,7 @@ Mã đầu ra trước đó src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3665,11 +3655,11 @@ Tải tất cả src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3678,7 +3668,7 @@ Peg-out src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3687,7 +3677,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3697,7 +3687,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3707,7 +3697,7 @@ dữ liệu src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3716,7 +3706,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat diff --git a/frontend/src/locale/messages.zh.xlf b/frontend/src/locale/messages.zh.xlf index 115e47c9f..e36d92fb3 100644 --- a/frontend/src/locale/messages.zh.xlf +++ b/frontend/src/locale/messages.zh.xlf @@ -437,11 +437,11 @@ src/app/components/block/block.component.html - 132,133 + 131,132 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 18 + 18,19 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -462,11 +462,11 @@ src/app/components/block/block.component.html - 133,134 + 132,133 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 19 + 19,20 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -529,7 +529,7 @@ src/app/components/transaction/transaction.component.html - 51 + 51,53 Transaction Timestamp transaction.timestamp @@ -1021,11 +1021,11 @@ src/app/components/transaction/transaction.component.html - 153 + 153,155 src/app/components/transactions-list/transactions-list.component.html - 169,170 + 172,173 @@ -1054,11 +1054,11 @@ src/app/components/transaction/transaction.component.html - 29 + 29,30 src/app/components/transactions-list/transactions-list.component.html - 208,209 + 211,212 Transaction singular confirmation count shared.confirmation-count.singular @@ -1076,11 +1076,11 @@ src/app/components/transaction/transaction.component.html - 30 + 30,31 src/app/components/transactions-list/transactions-list.component.html - 209,210 + 212,213 Transaction plural confirmation count shared.confirmation-count.plural @@ -1094,7 +1094,7 @@ src/app/components/transaction/transaction.component.html - 14 + 14,18 shared.transaction @@ -1107,7 +1107,7 @@ src/app/components/transaction/transaction.component.html - 60 + 60,62 Transaction included in block transaction.included-in-block @@ -1121,11 +1121,11 @@ src/app/components/transaction/transaction.component.html - 72 + 72,75 src/app/components/transaction/transaction.component.html - 130 + 130,133 Transaction features transaction.features @@ -1153,11 +1153,11 @@ src/app/components/transaction/transaction.component.html - 203 + 203,205 src/app/components/transaction/transaction.component.html - 279 + 279,281 transaction.details @@ -1174,7 +1174,7 @@ src/app/components/transaction/transaction.component.html - 195 + 195,197 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1188,7 +1188,7 @@ src/app/components/transaction/transaction.component.ts - 79 + 101,100 @@ -1208,7 +1208,7 @@ src/app/components/transaction/transaction.component.html - 154 + 154,155 src/app/dashboard/dashboard.component.html @@ -1539,7 +1539,7 @@ src/app/components/transactions-list/transactions-list.component.html - 217,219 + 220,222 shared.confidential @@ -2565,11 +2565,11 @@ src/app/components/blockchain-blocks/blockchain-blocks.component.html - 10 + 10,13 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 13 + 13,15 src/app/components/fees-box/fees-box.component.html @@ -2601,23 +2601,23 @@ src/app/components/transaction/transaction.component.html - 171 + 171,172 src/app/components/transaction/transaction.component.html - 184 + 184,185 src/app/components/transaction/transaction.component.html - 337 + 337,340 src/app/components/transaction/transaction.component.html - 348 + 348,350 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 src/app/dashboard/dashboard.component.html @@ -2639,15 +2639,15 @@ src/app/components/fees-box/fees-box.component.html - 6,10 + 5,6 src/app/components/fees-box/fees-box.component.html - 12,16 + 11,12 src/app/components/fees-box/fees-box.component.html - 18,24 + 17,18 src/app/components/mempool-block/mempool-block.component.html @@ -2729,11 +2729,11 @@ 明细 src/app/components/block/block.component.html - 125,131 + 125,130 src/app/components/transaction/transaction.component.html - 197 + 197,201 Transaction Details transaction.details @@ -2743,7 +2743,7 @@ 在加载区块数据时出错 src/app/components/block/block.component.html - 221,229 + 219,227 block.error.loading-block-data @@ -2755,16 +2755,6 @@ 106 - - Waiting for blocks... - 区块加载中... - - src/app/components/blockchain/blockchain.component.html - 11,16 - - Loading text - blockchain.waiting-for-blocks - Copied! 已复制！ @@ -2778,7 +2768,7 @@ 低优先级 src/app/components/fees-box/fees-box.component.html - 4,6 + 4,5 src/app/components/fees-box/fees-box.component.html @@ -2791,7 +2781,7 @@ 中优先级 src/app/components/fees-box/fees-box.component.html - 10,12 + 10,11 src/app/components/fees-box/fees-box.component.html @@ -2804,7 +2794,7 @@ 高优先级 src/app/components/fees-box/fees-box.component.html - 16,18 + 16,17 src/app/components/fees-box/fees-box.component.html @@ -2881,7 +2871,7 @@ src/app/components/transaction/transaction.component.html - 324 + 324,325 shared.block @@ -2898,7 +2888,7 @@ src/app/components/transaction/transaction.component.html - 325 + 325,327 shared.blocks @@ -3010,7 +3000,7 @@ src/app/components/transaction/transaction.component.html - 320 + 320,322 Block Frequency (plural) mempool-blocks.eta-of-next-block-plural @@ -3020,11 +3010,11 @@ 大约分钟之后 src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 43,45 src/app/components/transaction/transaction.component.html - 322 + 322,324 Block Frequency mempool-blocks.eta-of-next-block @@ -3313,7 +3303,7 @@ 交易已被代替为： src/app/components/transaction/transaction.component.html - 5 + 5,6 RBF replacement transaction.rbf.replacement @@ -3323,11 +3313,11 @@ 未确认 src/app/components/transaction/transaction.component.html - 34 + 34,41 src/app/components/transactions-list/transactions-list.component.html - 212,216 + 215,219 Transaction unconfirmed state transaction.unconfirmed @@ -3337,7 +3327,7 @@ 已确认 src/app/components/transaction/transaction.component.html - 67 + 67,68 Transaction Confirmed state transaction.confirmed @@ -3347,7 +3337,7 @@ 之后 src/app/components/transaction/transaction.component.html - 68 + 68,69 Transaction confirmed after transaction.confirmed.after @@ -3357,7 +3347,7 @@ 初次发现时间 src/app/components/transaction/transaction.component.html - 103 + 103,104 Transaction first seen transaction.first-seen @@ -3367,7 +3357,7 @@ 预估时间 src/app/components/transaction/transaction.component.html - 109 + 109,111 Transaction ETA transaction.eta @@ -3377,7 +3367,7 @@ 在几个小时内（或更多） src/app/components/transaction/transaction.component.html - 116 + 116,119 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -3387,11 +3377,11 @@ 虚拟大小 src/app/components/transaction/transaction.component.html - 155 + 155,157 src/app/components/transaction/transaction.component.html - 212 + 212,216 Transaction Virtual Size transaction.vsize @@ -3401,11 +3391,11 @@ 费率 src/app/components/transaction/transaction.component.html - 156 + 156,160 src/app/components/transaction/transaction.component.html - 335 + 335,337 Transaction fee rate transaction.fee-rate @@ -3415,7 +3405,7 @@ 后裔 src/app/components/transaction/transaction.component.html - 163 + 163,165 Descendant transaction.descendant @@ -3425,7 +3415,7 @@ 祖先 src/app/components/transaction/transaction.component.html - 177 + 177,179 Transaction Ancestor transaction.ancestor @@ -3435,7 +3425,7 @@ 大小 src/app/components/transaction/transaction.component.html - 208 + 208,212 Transaction Size transaction.size @@ -3445,7 +3435,7 @@ 权重 src/app/components/transaction/transaction.component.html - 216 + 216,220 Transaction Weight transaction.weight @@ -3455,7 +3445,7 @@ 交易未找到 src/app/components/transaction/transaction.component.html - 304 + 304,305 transaction.error.transaction-not-found @@ -3464,7 +3454,7 @@ 等待交易出现在内存池 src/app/components/transaction/transaction.component.html - 305 + 305,309 transaction.error.waiting-for-it-to-appear @@ -3473,7 +3463,7 @@ 手续费 src/app/components/transaction/transaction.component.html - 331 + 331,332 Transaction fee transaction.fee @@ -3483,7 +3473,7 @@ 聪 src/app/components/transaction/transaction.component.html - 332 + 332,335 Transaction Fee sat transaction.fee.sat @@ -3493,7 +3483,7 @@ 有效收费率 src/app/components/transaction/transaction.component.html - 345 + 345,348 Effective transaction fee rate transaction.effective-fee-rate @@ -3503,7 +3493,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.coinbase @@ -3512,7 +3502,7 @@ （新产生的货币） src/app/components/transactions-list/transactions-list.component.html - 39 + 42 transactions-list.newly-generated-coins @@ -3520,7 +3510,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 41,43 + 44,46 transactions-list.peg-in @@ -3529,7 +3519,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 74,76 + 77,79 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3539,7 +3529,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 78,80 + 81,83 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3549,7 +3539,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 83,84 + 86,87 transactions-list.witness @@ -3558,7 +3548,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 87,88 + 90,91 transactions-list.p2sh-redeem-script @@ -3567,7 +3557,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 91,92 + 94,95 transactions-list.p2wsh-witness-script @@ -3576,7 +3566,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 95,96 + 98,99 transactions-list.nsequence @@ -3584,7 +3574,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 99,100 + 102,103 transactions-list.previous-output-script @@ -3593,11 +3583,11 @@ 加载全部 src/app/components/transactions-list/transactions-list.component.html - 109,112 + 112,115 src/app/components/transactions-list/transactions-list.component.html - 191,194 + 194,197 transactions-list.load-all @@ -3605,7 +3595,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 128,129 + 131,132 transactions-list.peg-out-to @@ -3614,7 +3604,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 173,175 + 176,178 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3624,7 +3614,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 177,179 + 180,182 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3634,7 +3624,7 @@ 数据 src/app/components/transactions-list/transactions-list.component.html - 181,182 + 184,185 transactions-list.vout.scriptpubkey-type.data @@ -3643,7 +3633,7 @@ 聪 src/app/components/transactions-list/transactions-list.component.html - 201 + 204 sat shared.sat From 2c5ccab77c78dda040de7d8350705471c88b8ccb Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Mon, 12 Jul 2021 11:19:58 -0300 Subject: [PATCH 20/42] UI/UX - Blocks not visible on the TV page. (#626) * Fix blocks not visible on the TV page. * Add e2e testing for tv screen. --- frontend/cypress/integration/mainnet/mainnet.spec.ts | 3 +++ .../app/components/television/television.component.html | 8 ++++---- .../src/app/components/television/television.component.ts | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/frontend/cypress/integration/mainnet/mainnet.spec.ts b/frontend/cypress/integration/mainnet/mainnet.spec.ts index 55b73b8dc..1f0b8d796 100644 --- a/frontend/cypress/integration/mainnet/mainnet.spec.ts +++ b/frontend/cypress/integration/mainnet/mainnet.spec.ts @@ -49,6 +49,9 @@ describe('Mainnet', () => { cy.viewport('macbook-16'); cy.wait(1000); cy.get('.blockchain-wrapper').should('be.visible'); + cy.get('#mempool-block-0').should('be.visible'); + cy.get('#mempool-block-1').should('be.visible'); + cy.get('#mempool-block-2').should('be.visible'); }); }); diff --git a/frontend/src/app/components/television/television.component.html b/frontend/src/app/components/television/television.component.html index a541630a4..404e10ece 100644 --- a/frontend/src/app/components/television/television.component.html +++ b/frontend/src/app/components/television/television.component.html @@ -1,10 +1,10 @@
-
+
-
+
@@ -12,8 +12,8 @@
- - + +
diff --git a/frontend/src/app/components/television/television.component.ts b/frontend/src/app/components/television/television.component.ts index e4d12051e..7ed56d663 100644 --- a/frontend/src/app/components/television/television.component.ts +++ b/frontend/src/app/components/television/television.component.ts @@ -4,6 +4,7 @@ import { OptimizedMempoolStats } from '../../interfaces/node-api.interface'; import { StateService } from 'src/app/services/state.service'; import { ApiService } from 'src/app/services/api.service'; import { SeoService } from 'src/app/services/seo.service'; +import { Observable } from 'rxjs'; @Component({ selector: 'app-television', @@ -11,7 +12,7 @@ import { SeoService } from 'src/app/services/seo.service'; styleUrls: ['./television.component.scss'] }) export class TelevisionComponent implements OnInit { - loading = true; + isLoading$: Observable; mempoolStats: OptimizedMempoolStats[] = []; mempoolVsizeFeesData: any; @@ -26,11 +27,11 @@ export class TelevisionComponent implements OnInit { ngOnInit() { this.seoService.setTitle($localize`:@@46ce8155c9ab953edeec97e8950b5a21e67d7c4e:TV view`); this.websocketService.want(['blocks', 'live-2h-chart', 'mempool-blocks']); + this.isLoading$ = this.stateService.isLoadingWebSocket$; this.apiService.list2HStatistics$() .subscribe((mempoolStats) => { this.mempoolStats = mempoolStats; - this.loading = false; }); this.stateService.live2Chart$ From cdfc03f352c5e76ae082f7f9ef6a0d61b4e6877c Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 13 Jul 2021 11:49:04 +0300 Subject: [PATCH 21/42] Adding Hindi --- frontend/angular.json | 4 ++++ frontend/src/app/app.constants.ts | 1 + frontend/src/locale/messages.xlf | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/angular.json b/frontend/angular.json index 31372c766..3a2c2d94c 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -114,6 +114,10 @@ "ru": { "translation": "src/locale/messages.ru.xlf", "baseHref": "/ru/" + }, + "hi": { + "translation": "src/locale/messages.hi.xlf", + "baseHref": "/hi/" } } }, diff --git a/frontend/src/app/app.constants.ts b/frontend/src/app/app.constants.ts index 0215de014..5821b0164 100644 --- a/frontend/src/app/app.constants.ts +++ b/frontend/src/app/app.constants.ts @@ -87,4 +87,5 @@ export const languages: Language[] = [ { code: 'uk', name: 'Українська' }, // Ukrainian { code: 'vi', name: 'Tiếng Việt' }, // Vietnamese { code: 'zh', name: '中文' }, // Chinese + { code: 'hi', name: 'हिन्दी' }, // Hindi ]; diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 9d604369c..de1d655d3 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -2775,7 +2775,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview From b4eea3dc7276b7ab9e131ed7637b8f876b8e264a Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 13 Jul 2021 11:49:46 +0300 Subject: [PATCH 22/42] Updating from transifex. --- frontend/src/locale/messages.ar.xlf | 2 +- frontend/src/locale/messages.ca.xlf | 2 +- frontend/src/locale/messages.cs.xlf | 2 +- frontend/src/locale/messages.de.xlf | 2 +- frontend/src/locale/messages.en_US.xlf | 2 +- frontend/src/locale/messages.es.xlf | 2 +- frontend/src/locale/messages.fa.xlf | 2 +- frontend/src/locale/messages.fi.xlf | 2 +- frontend/src/locale/messages.fr.xlf | 2 +- frontend/src/locale/messages.he.xlf | 2 +- frontend/src/locale/messages.hi.xlf | 3744 ++++++++++++++++++++++++ frontend/src/locale/messages.hr.xlf | 2 +- frontend/src/locale/messages.hu.xlf | 2 +- frontend/src/locale/messages.it.xlf | 2 +- frontend/src/locale/messages.ja.xlf | 2 +- frontend/src/locale/messages.ka.xlf | 2 +- frontend/src/locale/messages.ko.xlf | 2 +- frontend/src/locale/messages.nb.xlf | 2 +- frontend/src/locale/messages.nl.xlf | 2 +- frontend/src/locale/messages.pl.xlf | 2 +- frontend/src/locale/messages.pt.xlf | 2 +- frontend/src/locale/messages.ru.xlf | 2 +- frontend/src/locale/messages.sl.xlf | 2 +- frontend/src/locale/messages.sv.xlf | 2 +- frontend/src/locale/messages.tr.xlf | 2 +- frontend/src/locale/messages.uk.xlf | 2 +- frontend/src/locale/messages.vi.xlf | 2 +- frontend/src/locale/messages.zh.xlf | 2 +- 28 files changed, 3771 insertions(+), 27 deletions(-) create mode 100644 frontend/src/locale/messages.hi.xlf diff --git a/frontend/src/locale/messages.ar.xlf b/frontend/src/locale/messages.ar.xlf index d62c5c954..42bc9fa51 100644 --- a/frontend/src/locale/messages.ar.xlf +++ b/frontend/src/locale/messages.ar.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.ca.xlf b/frontend/src/locale/messages.ca.xlf index e44babc3c..164fcaa1d 100644 --- a/frontend/src/locale/messages.ca.xlf +++ b/frontend/src/locale/messages.ca.xlf @@ -2928,7 +2928,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.cs.xlf b/frontend/src/locale/messages.cs.xlf index 4d051303f..3b3ad5255 100644 --- a/frontend/src/locale/messages.cs.xlf +++ b/frontend/src/locale/messages.cs.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.de.xlf b/frontend/src/locale/messages.de.xlf index 3e3e53293..b5a81fb29 100644 --- a/frontend/src/locale/messages.de.xlf +++ b/frontend/src/locale/messages.de.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.en_US.xlf b/frontend/src/locale/messages.en_US.xlf index f93522bcb..ba772e7a9 100644 --- a/frontend/src/locale/messages.en_US.xlf +++ b/frontend/src/locale/messages.en_US.xlf @@ -2774,7 +2774,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.es.xlf b/frontend/src/locale/messages.es.xlf index c2bdd164a..8d401093f 100644 --- a/frontend/src/locale/messages.es.xlf +++ b/frontend/src/locale/messages.es.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.fa.xlf b/frontend/src/locale/messages.fa.xlf index 8fd704056..80b1a1ed4 100644 --- a/frontend/src/locale/messages.fa.xlf +++ b/frontend/src/locale/messages.fa.xlf @@ -3021,7 +3021,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.fi.xlf b/frontend/src/locale/messages.fi.xlf index 17c6d3faa..356e77904 100644 --- a/frontend/src/locale/messages.fi.xlf +++ b/frontend/src/locale/messages.fi.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index 0f8a87e3f..01601859b 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -2963,7 +2963,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.he.xlf b/frontend/src/locale/messages.he.xlf index c459bb9b3..b3b043034 100644 --- a/frontend/src/locale/messages.he.xlf +++ b/frontend/src/locale/messages.he.xlf @@ -2991,7 +2991,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.hi.xlf b/frontend/src/locale/messages.hi.xlf new file mode 100644 index 000000000..cde271a35 --- /dev/null +++ b/frontend/src/locale/messages.hi.xlf @@ -0,0 +1,3744 @@ + + + + + Close + बंद + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/alert/alert.ts + 74 + + + + Previous + पिछला + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/carousel/carousel.ts + 349 + + + + Next + अगला + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/carousel/carousel.ts + 349 + + + + Previous month + पिछ्ला महिना + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-month.ts + 62,64 + + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation.ts + 69 + + + + Next month + अगला महीना + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-month.ts + 72 + + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-month.ts + 72 + + + + Select month + महीना चुनिए + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.ts + 74 + + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.ts + 74 + + + + Select year + वर्ष चुनें + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.ts + 74 + + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.ts + 74 + + + + «« + «« + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/pagination/pagination.ts + 404 + + + + « + « + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/pagination/pagination.ts + 404 + + + + » + » + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/pagination/pagination.ts + 404 + + + + »» + »» + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/pagination/pagination.ts + 404 + + + + First + प्रथम + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/pagination/pagination.ts + 404 + + + + Previous + पिछला + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/pagination/pagination.ts + 404 + + + + Next + अगला + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/pagination/pagination.ts + 404 + + + + Last + अंतिम + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/pagination/pagination.ts + 404 + + + + + + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/progressbar/progressbar.ts + 101 + + + + HH + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + Hours + घंटे + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + MM + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + Minutes + मिनट + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + Increment hours + घंटे बढ़ाए + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + Decrement hours + घंटे घटाये + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + Increment minutes + मिनट बढ़ाये + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + Decrement minutes + मिनट घटाये + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + SS + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + Seconds + सेकंड + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + Increment seconds + सेकंड बढ़ाये + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + Decrement seconds + सेकंड घटाये + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + + + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + + + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts + 296 + + + + Close + बंद + + node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/toast/toast.ts + 137 + + + + Registered assets + पंजीकृत संपत्ति + + src/app/assets/assets.component.html + 2,7 + + Registered assets page header + + + Search asset + संपत्ति खोजें + + src/app/assets/assets.component.html + 9,11 + + Search Assets Placeholder Text + + + Clear + साफ़ करे + + src/app/assets/assets.component.html + 11,16 + + Search Clear Button + + + Name + नाम + + src/app/assets/assets.component.html + 19,21 + + + src/app/assets/assets.component.html + 46,48 + + Asset name header + + + Ticker + + src/app/assets/assets.component.html + 20,21 + + + src/app/assets/assets.component.html + 47,49 + + Asset ticker header + + + Issuer domain + जारीकर्ता डोमेन + + src/app/assets/assets.component.html + 21,23 + + + src/app/assets/assets.component.html + 48,50 + + Asset Issuer Domain header + + + Asset ID + एसेट आईडी + + src/app/assets/assets.component.html + 22,23 + + + src/app/assets/assets.component.html + 49,51 + + Asset ID header + + + Issuance TX + निर्गम TX + + src/app/assets/assets.component.html + 23,26 + + + src/app/assets/assets.component.html + 50,54 + + Asset issuance transaction header + + + Error loading assets data. + एसेट डेटा लोड करने में गड़बड़ी. + + src/app/assets/assets.component.html + 67,72 + + Asset data load error + + + Assets + संपत्ति + + src/app/assets/assets.component.ts + 40 + + + src/app/components/master-page/master-page.component.html + 56,58 + + + + Address + पता + + src/app/bisq/bisq-address/bisq-address.component.html + 2 + + + src/app/components/address/address.component.html + 2,4 + + shared.address + + + Total received + कुल प्राप्त + + src/app/bisq/bisq-address/bisq-address.component.html + 22 + + + src/app/components/address/address.component.html + 23,24 + + address.total-received + + + Total sent + कुल भेजा गया + + src/app/bisq/bisq-address/bisq-address.component.html + 26 + + + src/app/bisq/bisq-blocks/bisq-blocks.component.html + 14,15 + + + src/app/components/address/address.component.html + 27,28 + + address.total-sent + + + Balance + शेष + + src/app/bisq/bisq-address/bisq-address.component.html + 30 + + + src/app/components/address/address.component.html + 32,33 + + address.balance + + + transaction + चलाना + + src/app/bisq/bisq-address/bisq-address.component.html + 50 + + + src/app/bisq/bisq-block/bisq-block.component.html + 49 + + + src/app/components/block/block.component.html + 131,132 + + + src/app/components/blockchain-blocks/blockchain-blocks.component.html + 18,19 + + + src/app/components/mempool-blocks/mempool-blocks.component.html + 16,17 + + shared.transaction-count.singular + + + transactions + चालान सूची + + src/app/bisq/bisq-address/bisq-address.component.html + 51 + + + src/app/bisq/bisq-block/bisq-block.component.html + 50 + + + src/app/components/block/block.component.html + 132,133 + + + src/app/components/blockchain-blocks/blockchain-blocks.component.html + 19,20 + + + src/app/components/mempool-blocks/mempool-blocks.component.html + 17,18 + + shared.transaction-count.plural + + + Address: + पता: + + src/app/bisq/bisq-address/bisq-address.component.ts + 43 + + + + Block + ब्लॉक + + src/app/bisq/bisq-block/bisq-block.component.html + 4 + + + src/app/components/block/block.component.html + 4 + + block.block + + + Hash + हैश + + src/app/bisq/bisq-block/bisq-block.component.html + 17 + + + src/app/bisq/bisq-block/bisq-block.component.html + 80 + + + src/app/components/block/block.component.html + 18,19 + + block.hash + + + Timestamp + समय-चिह्न + + src/app/bisq/bisq-block/bisq-block.component.html + 21 + + + src/app/bisq/bisq-block/bisq-block.component.html + 84 + + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 29,32 + + + src/app/components/transaction/transaction.component.html + 51,53 + + Transaction Timestamp + transaction.timestamp + + + Previous hash + पिछला हैश + + src/app/bisq/bisq-block/bisq-block.component.html + 35 + + + src/app/bisq/bisq-block/bisq-block.component.html + 93 + + Transaction Previous Hash + block.previous_hash + + + Block : + ब्लॉक : + + src/app/bisq/bisq-block/bisq-block.component.ts + 89 + + + + BSQ Blocks + बीएसक्यू ब्लॉक + + src/app/bisq/bisq-blocks/bisq-blocks.component.html + 2,7 + + Bisq blocks header + + + Height + ऊंचाई + + src/app/bisq/bisq-blocks/bisq-blocks.component.html + 12,13 + + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 22,24 + + + src/app/components/latest-blocks/latest-blocks.component.html + 9,10 + + + src/app/dashboard/dashboard.component.html + 78,79 + + Bisq block height header + + + Confirmed + पूर्ण + + src/app/bisq/bisq-blocks/bisq-blocks.component.html + 13,14 + + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 21,23 + + Bisq block confirmed time header + + + Transactions + चालान सूची + + src/app/bisq/bisq-blocks/bisq-blocks.component.html + 15,18 + + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 80 + + + src/app/components/latest-blocks/latest-blocks.component.html + 12,15 + + + src/app/components/master-page/master-page.component.html + 35,38 + + + src/app/components/mempool-block/mempool-block.component.html + 28,32 + + Bisq block transactions title + + + Blocks + ब्लाकों + + src/app/bisq/bisq-blocks/bisq-blocks.component.ts + 38 + + + src/app/components/latest-blocks/latest-blocks.component.html + 2,7 + + + src/app/components/master-page/master-page.component.html + 38,40 + + + src/app/components/master-page/master-page.component.html + 46,48 + + + + Bisq Trading Volume + बिस्क ट्रेडिंग वॉल्यूम + + src/app/bisq/bisq-dashboard/bisq-dashboard.component.html + 3,7 + + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 48,50 + + Bisq markets title + + + Markets + बाजार + + src/app/bisq/bisq-dashboard/bisq-dashboard.component.html + 20,21 + + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 66,67 + + Bisq All Markets + + + Bitcoin Markets + बिटकॉइन बाजार + + src/app/bisq/bisq-dashboard/bisq-dashboard.component.html + 21,23 + + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 67,71 + + Bisq Bitcoin Markets + + + Currency + मुद्रा + + src/app/bisq/bisq-dashboard/bisq-dashboard.component.html + 27 + + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 73 + + + + Price + कीमत + + src/app/bisq/bisq-dashboard/bisq-dashboard.component.html + 28,29 + + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 74,75 + + + src/app/bisq/bisq-market/bisq-market.component.html + 79,80 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 36 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 78 + + + src/app/bisq/bisq-trades/bisq-trades.component.html + 5,6 + + + + Volume (7d) + वॉल्यूम (7डी) + + src/app/bisq/bisq-dashboard/bisq-dashboard.component.html + 29 + + Trading volume 7D + + + Trades (7d) + ट्रेड्स (7डी) + + src/app/bisq/bisq-dashboard/bisq-dashboard.component.html + 30 + + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 75 + + Trades amount 7D + + + Latest Trades + हाल के ट्रेड्स + + src/app/bisq/bisq-dashboard/bisq-dashboard.component.html + 52,55 + + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 99,101 + + + src/app/bisq/bisq-market/bisq-market.component.html + 59,61 + + Latest Trades header + + + Bisq Price Index + बिस्क प्राइस इंडेक्स + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 9,11 + + bisq-dashboard.price-index-title + + + Bisq Market Price + बिस्क बाजार मूल्य + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 21,23 + + bisq-dashboard.market-price-title + + + View all » + सभी देखें » + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 92,97 + + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 101,107 + + + src/app/dashboard/dashboard.component.html + 97,101 + + dashboard.view-all + + + Terms of Service + नियम और शर्तें + + src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html + 111,118 + + + src/app/components/about/about.component.html + 202,206 + + + src/app/components/api-docs/api-docs.component.html + 833,837 + + + src/app/dashboard/dashboard.component.html + 139,148 + + Terms of Service + shared.terms-of-service + + + Buy Offers + खरीदने के ऑफर + + src/app/bisq/bisq-market/bisq-market.component.html + 73,74 + + Bisq Buy Offers + + + Sell Offers + बेचने के ऑफर + + src/app/bisq/bisq-market/bisq-market.component.html + 74,77 + + Bisq Sell Offers + + + Amount () + राशि ( ) + + src/app/bisq/bisq-market/bisq-market.component.html + 112,113 + + + src/app/bisq/bisq-trades/bisq-trades.component.html + 46,47 + + Trade amount (Symbol) + + + BSQ statistics + बीएसक्यू आंकड़े + + src/app/bisq/bisq-stats/bisq-stats.component.html + 2 + + + src/app/bisq/bisq-stats/bisq-stats.component.ts + 28 + + BSQ statistics header + + + Existing amount + मौजूदा राशि + + src/app/bisq/bisq-stats/bisq-stats.component.html + 12 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 54 + + BSQ existing amount + + + Minted amount + ढाला राशि + + src/app/bisq/bisq-stats/bisq-stats.component.html + 16 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 58 + + BSQ minted amount + + + Burnt amount + जली हुई राशि + + src/app/bisq/bisq-stats/bisq-stats.component.html + 20 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 62 + + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 59,61 + + + src/app/bisq/bisq-transfers/bisq-transfers.component.html + 62 + + BSQ burnt amount + + + Addresses + पतों + + src/app/bisq/bisq-stats/bisq-stats.component.html + 24 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 66 + + BSQ addresses + + + Unspent TXOs + अव्ययित TXOs + + src/app/bisq/bisq-stats/bisq-stats.component.html + 28 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 70 + + BSQ unspent transaction outputs + + + Spent TXOs + खरचे गए TXOs + + src/app/bisq/bisq-stats/bisq-stats.component.html + 32 + + BSQ spent transaction outputs + + + Market cap + बाज़ार आकार + + src/app/bisq/bisq-stats/bisq-stats.component.html + 40 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 82 + + BSQ token market cap + + + Date + तारीख + + src/app/bisq/bisq-trades/bisq-trades.component.html + 4,6 + + + + Amount + राशी + + src/app/bisq/bisq-trades/bisq-trades.component.html + 9,12 + + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 20,22 + + + src/app/dashboard/dashboard.component.html + 108,109 + + + + Inputs + इनपुट + + src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html + 7 + + transaction.inputs + + + Outputs + आउटपुट + + src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html + 11 + + transaction.outputs + + + Issued amount + जारी की गई राशि + + src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html + 15 + + + src/app/components/asset/asset.component.html + 51 + + Liquid Asset issued amount + asset.issued-amount + + + Type + प्रकार + + src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html + 25 + + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 19,21 + + + src/app/components/transaction/transaction.component.html + 153,155 + + + src/app/components/transactions-list/transactions-list.component.html + 172,173 + + + + Version + वर्शन + + src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html + 29 + + + src/app/components/block/block.component.html + 92,93 + + transaction.version + + + confirmation + पुष्टिकरण + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 7,8 + + + src/app/bisq/bisq-transfers/bisq-transfers.component.html + 69,70 + + + src/app/components/transaction/transaction.component.html + 29,30 + + + src/app/components/transactions-list/transactions-list.component.html + 211,212 + + Transaction singular confirmation count + shared.confirmation-count.singular + + + confirmations + पुष्टिकरण + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 8,9 + + + src/app/bisq/bisq-transfers/bisq-transfers.component.html + 70,71 + + + src/app/components/transaction/transaction.component.html + 30,31 + + + src/app/components/transactions-list/transactions-list.component.html + 212,213 + + Transaction plural confirmation count + shared.confirmation-count.plural + + + Transaction + चालान + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 12,15 + + + src/app/components/transaction/transaction.component.html + 14,18 + + shared.transaction + + + Included in block + ब्लॉक में शामिल + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 38,40 + + + src/app/components/transaction/transaction.component.html + 60,62 + + Transaction included in block + transaction.included-in-block + + + Features + विशेषताएं + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 44,46 + + + src/app/components/transaction/transaction.component.html + 72,75 + + + src/app/components/transaction/transaction.component.html + 130,133 + + Transaction features + transaction.features + + + Fee per vByte + शुल्क प्रति वीबाइट + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 64,66 + + Transaction fee + transaction.fee-per-vbyte + + + Details + विवरण + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 83,86 + + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 129,131 + + + src/app/components/transaction/transaction.component.html + 203,205 + + + src/app/components/transaction/transaction.component.html + 279,281 + + transaction.details + + + Inputs & Outputs + इनपुट और आउटपुट + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 90,98 + + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 150,155 + + + src/app/components/transaction/transaction.component.html + 195,197 + + Transaction inputs and outputs + transaction.inputs-and-outputs + + + Transaction: + चालान: + + src/app/bisq/bisq-transaction/bisq-transaction.component.ts + 50 + + + src/app/components/transaction/transaction.component.ts + 101,100 + + + + BSQ Transactions + बीएसक्यू चालान सुचि + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 2,5 + + + + TXID + टी एक्स आई डी + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 18,19 + + + src/app/components/transaction/transaction.component.html + 154,155 + + + src/app/dashboard/dashboard.component.html + 107,108 + + + + Asset listing fee + एसेट लिस्टिंग शुल्क + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 30 + + + + Blind vote + नेत्रहीन वोट + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 31 + + + + Compensation request + मुआवजे का अनुरोध + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 32 + + + + Genesis + आरंभ + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 33 + + + + Irregular + अनियमित + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 34 + + + + Lockup + लॉकअप + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 35 + + + + Pay trade fee + ट्रेड फी का भुगतान करें + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 36 + + + + Proof of burn + प्रूफ ऑफ़ बर्न + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 37 + + + + Proposal + प्रस्ताव + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 38 + + + + Reimbursement request + प्रतिपूर्ति अनुरोध + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 39 + + + + Transfer BSQ + बीएसक्यू ट्रान्सफर + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 40 + + + + Unlock + अनलॉक + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 41 + + + + Vote reveal + वोट रिवील + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 42 + + + + Filter + फ़िल्टर + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 56,55 + + + + Select all + सभी का चयन करे + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 57,55 + + + + Unselect all + सभी का चयन रद्द + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 58 + + + + Trades + ट्रेडों + + src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts + 90 + + + + Volume + आयतन + + src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts + 91 + + + + The Mempool Open Source Project + मेमपूल ओपन सोर्स प्रोजेक्ट + + src/app/components/about/about.component.html + 12,13 + + about.about-the-project + + + Building a mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, without any advertising, altcoins, or third-party trackers. + बिटकॉइन समुदाय के लिए एक मेमपूल और ब्लॉकचेन एक्सप्लोरर का निर्माण, बिना किसी विज्ञापन, ॉटकॉइन या तीसरे पक्ष के ट्रैकर्स के लेनदेन शुल्क बाजार और बहु-परत पारिस्थितिकी तंत्र पर ध्यान केंद्रित करना। + + src/app/components/about/about.component.html + 13,17 + + + + Enterprise Sponsors 🚀 + एंटरप्राइज़ प्रायोजक + + src/app/components/about/about.component.html + 32,34 + + about.sponsors.enterprise.withRocket + + + Community Sponsors ❤️ + समुदाय प्रायोजक ❤️ + + src/app/components/about/about.component.html + 50,53 + + about.sponsors.withHeart + + + Become a sponsor ❤️ + प्रायोजक बनें ❤️ + + src/app/components/about/about.component.html + 62,63 + + about.become-a-sponsor + + + Navigate to https://mempool.space/sponsor to sponsor + प्रायोजक के लिए https://mempool.space/sponsor पर नेविगेट करें + + src/app/components/about/about.component.html + 63 + + + src/app/components/sponsor/sponsor.component.html + 6 + + about.navigate-to-sponsor + + + Community Integrations + सामुदायिक एकीकरण + + src/app/components/about/about.component.html + 67,70 + + about.integrations + + + Community Alliances + सामुदायिक गठबंधन + + src/app/components/about/about.component.html + 134,136 + + about.alliances + + + Project Contributors + परियोजना योगदानकर्ता + + src/app/components/about/about.component.html + 149,151 + + about.contributors + + + Project Maintainers + परियोजना अनुरक्षक + + src/app/components/about/about.component.html + 163,165 + + about.maintainers + + + About + विवरण + + src/app/components/about/about.component.ts + 35 + + + src/app/components/master-page/master-page.component.html + 62,65 + + + + multisig of + मल्टीसिग of + + src/app/components/address-labels/address-labels.component.html + 5 + + address-labels.multisig + + + Lightning + लाइटनिंग + + src/app/components/address-labels/address-labels.component.html + 11 + + address-labels.upper-layer-peg-out + + + Liquid + लिक्विड + + src/app/components/address-labels/address-labels.component.html + 17 + + address-labels.upper-layer-peg-out + + + of transaction + of चलाना + + src/app/components/address/address.component.html + 52,53 + + X of X Address Transaction + + + of transactions + + src/app/components/address/address.component.html + 53,54 + + X of X Address Transactions (Plural) + + + Error loading address data. + + src/app/components/address/address.component.html + 122,125 + + address.error.loading-address-data + + + The number of transactions on this address exceeds the Electrum server limit Consider viewing this address on the official Mempool website instead: + + src/app/components/address/address.component.html + 127,130 + + Electrum server limit exceeded error + + + Confidential + + src/app/components/address/address.component.html + 144,146 + + + src/app/components/amount/amount.component.html + 6,9 + + + src/app/components/asset/asset.component.html + 147 + + + src/app/components/transactions-list/transactions-list.component.html + 220,222 + + shared.confidential + + + Address: + + src/app/components/address/address.component.ts + 72 + + + + API Service + + src/app/components/api-docs/api-docs.component.html + 4,7 + + api-docs.title + + + Addresses + + src/app/components/api-docs/api-docs.component.html + 10,12 + + API Docs tab for Addresses + api-docs.tab.addresses + + + Endpoint + + src/app/components/api-docs/api-docs.component.html + 20,21 + + + src/app/components/api-docs/api-docs.component.html + 39,40 + + + src/app/components/api-docs/api-docs.component.html + 56,57 + + + src/app/components/api-docs/api-docs.component.html + 74,75 + + + src/app/components/api-docs/api-docs.component.html + 94,95 + + + src/app/components/api-docs/api-docs.component.html + 120,121 + + + src/app/components/api-docs/api-docs.component.html + 157,158 + + + src/app/components/api-docs/api-docs.component.html + 182,183 + + + src/app/components/api-docs/api-docs.component.html + 199,200 + + + src/app/components/api-docs/api-docs.component.html + 234,235 + + + src/app/components/api-docs/api-docs.component.html + 253,254 + + + src/app/components/api-docs/api-docs.component.html + 273,274 + + + src/app/components/api-docs/api-docs.component.html + 292,293 + + + src/app/components/api-docs/api-docs.component.html + 313,314 + + + src/app/components/api-docs/api-docs.component.html + 332,333 + + + src/app/components/api-docs/api-docs.component.html + 351,352 + + + src/app/components/api-docs/api-docs.component.html + 379,380 + + + src/app/components/api-docs/api-docs.component.html + 399,400 + + + src/app/components/api-docs/api-docs.component.html + 419,420 + + + src/app/components/api-docs/api-docs.component.html + 438,439 + + + src/app/components/api-docs/api-docs.component.html + 459,460 + + + src/app/components/api-docs/api-docs.component.html + 479,480 + + + src/app/components/api-docs/api-docs.component.html + 500,501 + + + src/app/components/api-docs/api-docs.component.html + 526,527 + + + src/app/components/api-docs/api-docs.component.html + 542,543 + + + src/app/components/api-docs/api-docs.component.html + 558,559 + + + src/app/components/api-docs/api-docs.component.html + 582,583 + + + src/app/components/api-docs/api-docs.component.html + 599,600 + + + src/app/components/api-docs/api-docs.component.html + 617,618 + + + src/app/components/api-docs/api-docs.component.html + 661,662 + + + src/app/components/api-docs/api-docs.component.html + 679,680 + + + src/app/components/api-docs/api-docs.component.html + 698,699 + + + src/app/components/api-docs/api-docs.component.html + 718,719 + + + src/app/components/api-docs/api-docs.component.html + 737,738 + + + src/app/components/api-docs/api-docs.component.html + 756,757 + + + src/app/components/api-docs/api-docs.component.html + 775,776 + + + src/app/components/api-docs/api-docs.component.html + 794,795 + + + src/app/components/api-docs/api-docs.component.html + 814,815 + + Api docs endpoint + + + Description + + src/app/components/api-docs/api-docs.component.html + 25,26 + + + src/app/components/api-docs/api-docs.component.html + 43,44 + + + src/app/components/api-docs/api-docs.component.html + 60,61 + + + src/app/components/api-docs/api-docs.component.html + 79,80 + + + src/app/components/api-docs/api-docs.component.html + 99,100 + + + src/app/components/api-docs/api-docs.component.html + 124,125 + + + src/app/components/api-docs/api-docs.component.html + 142,143 + + + src/app/components/api-docs/api-docs.component.html + 161,162 + + + src/app/components/api-docs/api-docs.component.html + 186,187 + + + src/app/components/api-docs/api-docs.component.html + 203,204 + + + src/app/components/api-docs/api-docs.component.html + 219,220 + + + src/app/components/api-docs/api-docs.component.html + 238,239 + + + src/app/components/api-docs/api-docs.component.html + 258,259 + + + src/app/components/api-docs/api-docs.component.html + 277,278 + + + src/app/components/api-docs/api-docs.component.html + 297,298 + + + src/app/components/api-docs/api-docs.component.html + 317,318 + + + src/app/components/api-docs/api-docs.component.html + 336,337 + + + src/app/components/api-docs/api-docs.component.html + 356,357 + + + src/app/components/api-docs/api-docs.component.html + 384,385 + + + src/app/components/api-docs/api-docs.component.html + 404,405 + + + src/app/components/api-docs/api-docs.component.html + 423,424 + + + src/app/components/api-docs/api-docs.component.html + 443,444 + + + src/app/components/api-docs/api-docs.component.html + 464,465 + + + src/app/components/api-docs/api-docs.component.html + 484,485 + + + src/app/components/api-docs/api-docs.component.html + 505,506 + + + src/app/components/api-docs/api-docs.component.html + 530,531 + + + src/app/components/api-docs/api-docs.component.html + 546,547 + + + src/app/components/api-docs/api-docs.component.html + 562,563 + + + src/app/components/api-docs/api-docs.component.html + 587,588 + + + src/app/components/api-docs/api-docs.component.html + 603,604 + + + src/app/components/api-docs/api-docs.component.html + 621,622 + + + src/app/components/api-docs/api-docs.component.html + 646,647 + + + src/app/components/api-docs/api-docs.component.html + 665,666 + + + src/app/components/api-docs/api-docs.component.html + 683,684 + + + src/app/components/api-docs/api-docs.component.html + 703,704 + + + src/app/components/api-docs/api-docs.component.html + 722,723 + + + src/app/components/api-docs/api-docs.component.html + 741,742 + + + src/app/components/api-docs/api-docs.component.html + 760,761 + + + src/app/components/api-docs/api-docs.component.html + 779,780 + + + src/app/components/api-docs/api-docs.component.html + 799,800 + + + src/app/components/api-docs/api-docs.component.html + 818,819 + + + + Returns details about an address. Available fields: address, chain_stats, and mempool_stats. chain,mempool_stats each contain an object with tx_count, funded_txo_count, funded_txo_sum, spent_txo_count, and spent_txo_sum. + + src/app/components/api-docs/api-docs.component.html + 26,27 + + + + Get transaction history for the specified address/scripthash, sorted with newest first. Returns up to 50 mempool transactions plus the first 25 confirmed transactions. You can request more confirmed transactions using :last_seen_txid (see below). + + src/app/components/api-docs/api-docs.component.html + 44,45 + + + + Get confirmed transaction history for the specified address/scripthash, sorted with newest first. Returns 25 transactions per page. More can be requested by specifying the last txid seen by the previous query. + + src/app/components/api-docs/api-docs.component.html + 61,63 + + + + Get unconfirmed transaction history for the specified address/scripthash. Returns up to 50 transactions (no paging). + + src/app/components/api-docs/api-docs.component.html + 80,83 + + + + Get the list of unspent transaction outputs associated with the address/scripthash. Available fields: txid, vout, value, and status (with the status of the funding tx).There is also a valuecommitment field that may appear in place of value, plus the following additional fields: asset/assetcommitment, nonce/noncecommitment, surjection_proof, and range_proof. + + src/app/components/api-docs/api-docs.component.html + 100,101 + + + + Assets + + src/app/components/api-docs/api-docs.component.html + 111,113 + + API Docs tab for Assets + api-docs.tab.assets + + + Returns information about a Liquid asset. + + src/app/components/api-docs/api-docs.component.html + 125,128 + + + + Returns transactions associated with the specified Liquid asset. For the network's native asset, returns a list of peg in, peg out, and burn transactions. For user-issued assets, returns a list of issuance, reissuance, and burn transactions. Does not include regular transactions transferring this asset. + + src/app/components/api-docs/api-docs.component.html + 143,146 + + + + Get the current total supply of the specified asset. For the native asset (L-BTC), this is calculated as [chain,mempool]_stats.peg_in_amount - [chain,mempool]_stats.peg_out_amount - [chain,mempool]_stats.burned_amount. For issued assets, this is calculated as [chain,mempool]_stats.issued_amount - [chain,mempool]_stats.burned_amount. Not available for assets with blinded issuances. If /decimal is specified, returns the supply as a decimal according to the asset's divisibility. Otherwise, returned in base units. + + src/app/components/api-docs/api-docs.component.html + 162,165 + + + + Blocks + + src/app/components/api-docs/api-docs.component.html + 173,175 + + + src/app/components/latest-blocks/latest-blocks.component.ts + 39 + + API Docs tab for Blocks + api-docs.tab.blocks + + + Returns details about a block. Available fields: id, height, version, timestamp, bits, nonce, merkle_root, tx_count, size, weight,proof, and previousblockhash. + + src/app/components/api-docs/api-docs.component.html + 187,188 + + + + Returns the hash of the block currently at :height. + + src/app/components/api-docs/api-docs.component.html + 204,205 + + + + Returns the raw block representation in binary. + + src/app/components/api-docs/api-docs.component.html + 220,223 + + + + Returns the confirmation status of a block. Available fields: in_best_chain (boolean, false for orphaned blocks), next_best (the hash of the next block, only available for blocks in the best chain). + + src/app/components/api-docs/api-docs.component.html + 239,240 + + + + Returns the height of the last block. + + src/app/components/api-docs/api-docs.component.html + 259,262 + + + + Returns the hash of the last block. + + src/app/components/api-docs/api-docs.component.html + 278,281 + + + + Returns the transaction at index :index within the specified block. + + src/app/components/api-docs/api-docs.component.html + 298,299 + + + + Returns a list of all txids in the block. + + src/app/components/api-docs/api-docs.component.html + 318,321 + + + + Returns a list of transactions in the block (up to 25 transactions beginning at start_index). Transactions returned here do not have the status field, since all the transactions share the same block and confirmation status. + + src/app/components/api-docs/api-docs.component.html + 337,338 + + + + Returns the 10 newest blocks starting at the tip or at :start_height if specified. + + src/app/components/api-docs/api-docs.component.html + 357,358 + + + + BSQ + + src/app/components/api-docs/api-docs.component.html + 368,370 + + API Docs tab for BSQ + api-docs.tab.bsq + + + Returns all Bisq transactions belonging to a Bitcoin address, with 'B' prefixed in front of the address. + + src/app/components/api-docs/api-docs.component.html + 385,388 + + + + Returns all Bisq transactions that exist in a Bitcoin block. + + src/app/components/api-docs/api-docs.component.html + 405,408 + + + + Returns the most recently processed Bitcoin block height processed by Bisq. + + src/app/components/api-docs/api-docs.component.html + 424,427 + + + + Returns :length Bitcoin blocks that contain Bisq transactions, starting from :index. + + src/app/components/api-docs/api-docs.component.html + 444,447 + + + + Returns statistics about all Bisq transactions. + + src/app/components/api-docs/api-docs.component.html + 465,468 + + + + Returns details about a Bisq transaction. + + src/app/components/api-docs/api-docs.component.html + 485,488 + + + + Returns :length of latest Bisq transactions, starting from :index. + + src/app/components/api-docs/api-docs.component.html + 506,509 + + + + Fees + + src/app/components/api-docs/api-docs.component.html + 517,519 + + API Docs tab for Fees + api-docs.tab.fees + + + Returns our currently suggested fees for new transactions. + + src/app/components/api-docs/api-docs.component.html + 531,533 + + API Docs for /api/v1/fees/recommended + api-docs.fees.recommended + + + Returns current mempool as projected blocks. + + src/app/components/api-docs/api-docs.component.html + 547,549 + + API Docs for /api/v1/fees/mempool-blocks + api-docs.fees.mempool-blocks + + + Returns the ancestors and the best descendant fees for a transaction. + + src/app/components/api-docs/api-docs.component.html + 563,565 + + API Docs for /api/v1/fees/cpfp + api-docs.fees.cpfp + + + Mempool + + src/app/components/api-docs/api-docs.component.html + 573,575 + + API Docs tab for Mempool + api-docs.tab.mempool + + + Returns current mempool backlog statistics. + + src/app/components/api-docs/api-docs.component.html + 588,590 + + API Docs for /api/mempool + api-docs.mempool.mempool + + + Get the full list of txids in the mempool as an array. The order of the txids is arbitrary and does not match bitcoind. + + src/app/components/api-docs/api-docs.component.html + 604,607 + + API Docs for /api/mempool/txids + api-docs.mempool.txids + + + Get a list of the last 10 transactions to enter the mempool. Each transaction object contains simplified overview data, with the following fields: txid, fee, vsize, and value. + + src/app/components/api-docs/api-docs.component.html + 622,623 + + API Docs for /api/mempool/recent + api-docs.mempool.recent + + + Transactions + + src/app/components/api-docs/api-docs.component.html + 633,636 + + API Docs tab for Transactions + api-docs.tab.transactions + + + Returns details about a transaction. Available fields: txid, version, locktime, size, weight, fee, vin, vout, and status. + + src/app/components/api-docs/api-docs.component.html + 647,648 + + + + Returns a transaction serialized as hex. + + src/app/components/api-docs/api-docs.component.html + 666,669 + + + + Returns a merkle inclusion proof for the transaction using bitcoind's merkleblock format. + + src/app/components/api-docs/api-docs.component.html + 684,685 + + + + Returns a merkle inclusion proof for the transaction using Electrum's blockchain.transaction.get_merkle format. + + src/app/components/api-docs/api-docs.component.html + 704,705 + + + + Returns the spending status of a transaction output. Available fields: spent (boolean), txid (optional), vin (optional), and status (optional, the status of the spending tx). + + src/app/components/api-docs/api-docs.component.html + 723,724 + + + + Returns the spending status of all transaction outputs. + + src/app/components/api-docs/api-docs.component.html + 742,745 + + + + Returns a transaction as binary data. + + src/app/components/api-docs/api-docs.component.html + 761,764 + + + + Returns the confirmation status of a transaction. Available fields: confirmed (boolean), block_height (optional), and block_hash (optional). + + src/app/components/api-docs/api-docs.component.html + 780,781 + + + + Broadcast a raw transaction to the network. The transaction should be provided as hex in the request body. The txid will be returned on success. + + src/app/components/api-docs/api-docs.component.html + 800,801 + + + + Websocket + + src/app/components/api-docs/api-docs.component.html + 810,814 + + API Docs tab for Websocket + api-docs.tab.websocket + + + Default push: action: 'want', data: ['blocks', ...] to express what you want pushed. Available: blocks, mempool-blocks, live-2h-chart, and stats.Push transactions related to address: 'track-address': '3PbJ...bF9B' to receive all new transactions containing that address as input or output. Returns an array of transactions. address-transactions for new mempool transactions, and block-transactions for new block confirmed transactions. + + src/app/components/api-docs/api-docs.component.html + 819,820 + + api-docs.websocket.websocket + + + API + + src/app/components/api-docs/api-docs.component.ts + 1138 + + + src/app/components/bisq-master-page/bisq-master-page.component.html + 19,28 + + + src/app/components/master-page/master-page.component.html + 59,61 + + + + Code Example + + src/app/components/api-docs/code-template.component.html + 6 + + + src/app/components/api-docs/code-template.component.html + 13 + + + src/app/components/api-docs/code-template.component.html + 29 + + API Docs code example + + + Install Package + + src/app/components/api-docs/code-template.component.html + 23,24 + + API Docs install lib + + + Response + + src/app/components/api-docs/code-template.component.html + 36,37 + + API Docs API response + + + Asset + + src/app/components/asset/asset.component.html + 2 + + Liquid Asset page title + asset + + + Name + + src/app/components/asset/asset.component.html + 20 + + Liquid Asset name + asset.name + + + Precision + + src/app/components/asset/asset.component.html + 24 + + Liquid Asset precision + asset.precision + + + Issuer + + src/app/components/asset/asset.component.html + 28 + + Liquid Asset issuer + asset.issuer + + + Issuance TX + + src/app/components/asset/asset.component.html + 32 + + Liquid Asset issuance TX + asset.issuance-tx + + + Pegged in + + src/app/components/asset/asset.component.html + 43 + + Liquid Asset pegged-in amount + asset.pegged-in + + + Pegged out + + src/app/components/asset/asset.component.html + 47 + + Liquid Asset pegged-out amount + asset.pegged-out + + + Burned amount + + src/app/components/asset/asset.component.html + 55 + + Liquid Asset burned amount + asset.burned-amount + + + Circulating amount + + src/app/components/asset/asset.component.html + 59 + + + src/app/components/asset/asset.component.html + 63 + + Liquid Asset circulating amount + asset.circulating-amount + + + of   + + src/app/components/asset/asset.component.html + 76 + + asset.M_of_N + + + Peg In/Out and Burn Transactions + + src/app/components/asset/asset.component.html + 77 + + Liquid native asset transactions title + + + Issuance and Burn Transactions + + src/app/components/asset/asset.component.html + 78 + + Default asset transactions title + + + Error loading asset data. + + src/app/components/asset/asset.component.html + 136 + + asset.error.loading-asset-data + + + Asset: + + src/app/components/asset/asset.component.ts + 73 + + + + Offline + + src/app/components/bisq-master-page/bisq-master-page.component.html + 7,8 + + + src/app/components/master-page/master-page.component.html + 8,9 + + master-page.offline + + + Reconnecting... + + src/app/components/bisq-master-page/bisq-master-page.component.html + 8,13 + + + src/app/components/master-page/master-page.component.html + 9,14 + + master-page.reconnecting + + + Dashboard + + src/app/components/bisq-master-page/bisq-master-page.component.html + 16,18 + + + src/app/components/master-page/master-page.component.html + 31,33 + + master-page.dashboard + + + Genesis + + src/app/components/block/block.component.html + 4 + + block.genesis + + + Timestamp + + src/app/components/block/block.component.html + 22,24 + + + src/app/components/latest-blocks/latest-blocks.component.html + 10,12 + + block.timestamp + + + Size + + src/app/components/block/block.component.html + 31,33 + + + src/app/components/latest-blocks/latest-blocks.component.html + 13,16 + + + src/app/components/mempool-block/mempool-block.component.html + 32,35 + + + src/app/dashboard/dashboard.component.html + 81,84 + + block.size + + + Weight + + src/app/components/block/block.component.html + 35,37 + + block.weight + + + Median fee + + src/app/components/block/block.component.html + 45,46 + + + src/app/components/mempool-block/mempool-block.component.html + 16,17 + + block.median-fee + + + sat/vB + + src/app/components/block/block.component.html + 46 + + + src/app/components/blockchain-blocks/blockchain-blocks.component.html + 10,13 + + + src/app/components/blockchain-blocks/blockchain-blocks.component.html + 13,15 + + + src/app/components/fees-box/fees-box.component.html + 6 + + + src/app/components/fees-box/fees-box.component.html + 12 + + + src/app/components/fees-box/fees-box.component.html + 18 + + + src/app/components/mempool-block/mempool-block.component.html + 17 + + + src/app/components/mempool-block/mempool-block.component.html + 21,24 + + + src/app/components/mempool-blocks/mempool-blocks.component.html + 8,11 + + + src/app/components/mempool-blocks/mempool-blocks.component.html + 11,13 + + + src/app/components/transaction/transaction.component.html + 171,172 + + + src/app/components/transaction/transaction.component.html + 184,185 + + + src/app/components/transaction/transaction.component.html + 337,340 + + + src/app/components/transaction/transaction.component.html + 348,350 + + + src/app/components/transactions-list/transactions-list.component.html + 204 + + + src/app/dashboard/dashboard.component.html + 117,121 + + + src/app/dashboard/dashboard.component.html + 164,168 + + sat/vB + shared.sat-vbyte + + + Based on average native segwit transaction of 140 vBytes + + src/app/components/block/block.component.html + 46,48 + + + src/app/components/fees-box/fees-box.component.html + 5,6 + + + src/app/components/fees-box/fees-box.component.html + 11,12 + + + src/app/components/fees-box/fees-box.component.html + 17,18 + + + src/app/components/mempool-block/mempool-block.component.html + 17,20 + + Transaction fee tooltip + + + Total fees + + src/app/components/block/block.component.html + 50,51 + + + src/app/components/block/block.component.html + 65,67 + + Total fees in a block + block.total-fees + + + Subsidy + fees: + + src/app/components/block/block.component.html + 57,59 + + + src/app/components/block/block.component.html + 69,72 + + Total subsidy and fees in a block + block.subsidy-and-fees + + + Miner + + src/app/components/block/block.component.html + 74,75 + + block.miner + + + Merkle root + + src/app/components/block/block.component.html + 96,98 + + block.merkle-root + + + Bits + + src/app/components/block/block.component.html + 100,102 + + block.bits + + + Difficulty + + src/app/components/block/block.component.html + 110,113 + + block.difficulty + + + Nonce + + src/app/components/block/block.component.html + 114,116 + + block.nonce + + + Details + + src/app/components/block/block.component.html + 125,130 + + + src/app/components/transaction/transaction.component.html + 197,201 + + Transaction Details + transaction.details + + + Error loading block data. + + src/app/components/block/block.component.html + 219,227 + + block.error.loading-block-data + + + Block : + + src/app/components/block/block.component.ts + 106 + + + + Copied! + + src/app/components/clipboard/clipboard.component.ts + 15 + + + + Low priority + + src/app/components/fees-box/fees-box.component.html + 4,5 + + + src/app/components/fees-box/fees-box.component.html + 27,30 + + fees-box.low-priority + + + Medium priority + + src/app/components/fees-box/fees-box.component.html + 10,11 + + + src/app/components/fees-box/fees-box.component.html + 34,37 + + fees-box.medium-priority + + + High priority + + src/app/components/fees-box/fees-box.component.html + 16,17 + + + src/app/components/fees-box/fees-box.component.html + 41,44 + + fees-box.high-priority + + + Tx vBytes per second: + + src/app/components/footer/footer.component.html + 5,7 + + footer.tx-vbytes-per-second + + + Backend is synchronizing + + src/app/components/footer/footer.component.html + 7,11 + + + src/app/dashboard/dashboard.component.html + 189,191 + + footer.backend-is-synchronizing + + + vB/s + + src/app/components/footer/footer.component.html + 11,15 + + + src/app/dashboard/dashboard.component.html + 194,200 + + vB/s + shared.vbytes-per-second + + + Unconfirmed + + src/app/components/footer/footer.component.html + 16,17 + + + src/app/dashboard/dashboard.component.html + 168,170 + + Unconfirmed count + dashboard.unconfirmed + + + Mempool size + + src/app/components/footer/footer.component.html + 20,21 + + Mempool size + dashboard.mempool-size + + + block + + src/app/components/footer/footer.component.html + 22,23 + + + src/app/components/transaction/transaction.component.html + 324,325 + + shared.block + + + blocks + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/mempool-blocks/mempool-blocks.component.html + 30,31 + + + src/app/components/transaction/transaction.component.html + 325,327 + + shared.blocks + + + Mined + + src/app/components/latest-blocks/latest-blocks.component.html + 11,12 + + + src/app/dashboard/dashboard.component.html + 79,80 + + latest-blocks.mined + + + Layer 2 Networks + + src/app/components/master-page/master-page.component.html + 22,23 + + master-page.layer2-networks-header + + + Stats + + src/app/components/master-page/master-page.component.html + 41,45 + + master-page.stats + + + Graphs + + src/app/components/master-page/master-page.component.html + 49,51 + + + src/app/components/statistics/statistics.component.ts + 52 + + master-page.graphs + + + TV view + + src/app/components/master-page/master-page.component.html + 52,55 + + + src/app/components/television/television.component.ts + 28 + + master-page.tvview + + + Fee span + + src/app/components/mempool-block/mempool-block.component.html + 20,21 + + mempool-block.fee-span + + + Total fees + + src/app/components/mempool-block/mempool-block.component.html + 24,25 + + mempool-block.total-fees + + + Next block + + src/app/components/mempool-block/mempool-block.component.ts + 71 + + + + Stack of mempool blocks + + src/app/components/mempool-block/mempool-block.component.ts + 73 + + + + Mempool block + + src/app/components/mempool-block/mempool-block.component.ts + 75 + + + + In ~ minutes + + src/app/components/mempool-blocks/mempool-blocks.component.html + 41,43 + + + src/app/components/transaction/transaction.component.html + 320,322 + + Block Frequency (plural) + mempool-blocks.eta-of-next-block-plural + + + In ~ minute + + src/app/components/mempool-blocks/mempool-blocks.component.html + 43,45 + + + src/app/components/transaction/transaction.component.html + 322,324 + + Block Frequency + mempool-blocks.eta-of-next-block + + + Unknown + + src/app/components/miner/miner.component.html + 10 + + miner.tag.unknown-miner + + + Identified by payout address: '' + + src/app/components/miner/miner.component.ts + 42 + + + + Identified by coinbase tag: '' + + src/app/components/miner/miner.component.ts + 52 + + + + TXID, block height, hash or address + + src/app/components/search-form/search-form.component.html + 4 + + search-form.searchbar-placeholder + + + Search + + src/app/components/search-form/search-form.component.html + 7 + + search-form.search-title + + + Sponsor + + src/app/components/sponsor/sponsor.component.html + 3 + + + src/app/components/sponsor/sponsor.component.ts + 34 + + sponsor.title + + + Request invoice + + src/app/components/sponsor/sponsor.component.html + 49 + + about.sponsor.request-invoice + + + Waiting for transaction... + + src/app/components/sponsor/sponsor.component.html + 138 + + about.sponsor.waiting-for-transaction + + + Donation confirmed! + + src/app/components/sponsor/sponsor.component.html + 144 + + about.sponsor.donation-confirmed + + + Thank you! + + src/app/components/sponsor/sponsor.component.html + 145 + + about.sponsor.thank-you + + + Loading graphs... + + src/app/components/statistics/statistics.component.html + 5 + + statistics.loading-graphs + + + Mempool by vBytes (sat/vByte) + + src/app/components/statistics/statistics.component.html + 13 + + statistics.memory-by-vBytes + + + Invert + + src/app/components/statistics/statistics.component.html + 39 + + statistics.component-invert.title + + + Transaction vBytes per second (vB/s) + + src/app/components/statistics/statistics.component.html + 53 + + statistics.transaction-vbytes-per-second + + + Just now + + src/app/components/time-since/time-since.component.ts + 56 + + + + year ago + + src/app/components/time-since/time-since.component.ts + 65 + + + + month ago + + src/app/components/time-since/time-since.component.ts + 66 + + + + week ago + + src/app/components/time-since/time-since.component.ts + 67 + + + + day ago + + src/app/components/time-since/time-since.component.ts + 68 + + + + hour ago + + src/app/components/time-since/time-since.component.ts + 69 + + + + min ago + + src/app/components/time-since/time-since.component.ts + 72 + + + + minute ago + + src/app/components/time-since/time-since.component.ts + 74 + + + + sec ago + + src/app/components/time-since/time-since.component.ts + 77 + + + + second ago + + src/app/components/time-since/time-since.component.ts + 79 + + + + years ago + + src/app/components/time-since/time-since.component.ts + 83 + + + + months ago + + src/app/components/time-since/time-since.component.ts + 84 + + + + weeks ago + + src/app/components/time-since/time-since.component.ts + 85 + + + + days ago + + src/app/components/time-since/time-since.component.ts + 86 + + + + hours ago + + src/app/components/time-since/time-since.component.ts + 87 + + + + mins ago + + src/app/components/time-since/time-since.component.ts + 90 + + + + minutes ago + + src/app/components/time-since/time-since.component.ts + 92 + + + + secs ago + + src/app/components/time-since/time-since.component.ts + 95 + + + + seconds ago + + src/app/components/time-since/time-since.component.ts + 97 + + + + This transaction has been replaced by: + + src/app/components/transaction/transaction.component.html + 5,6 + + RBF replacement + transaction.rbf.replacement + + + Unconfirmed + + src/app/components/transaction/transaction.component.html + 34,41 + + + src/app/components/transactions-list/transactions-list.component.html + 215,219 + + Transaction unconfirmed state + transaction.unconfirmed + + + Confirmed + + src/app/components/transaction/transaction.component.html + 67,68 + + Transaction Confirmed state + transaction.confirmed + + + After + + src/app/components/transaction/transaction.component.html + 68,69 + + Transaction confirmed after + transaction.confirmed.after + + + First seen + + src/app/components/transaction/transaction.component.html + 103,104 + + Transaction first seen + transaction.first-seen + + + ETA + + src/app/components/transaction/transaction.component.html + 109,111 + + Transaction ETA + transaction.eta + + + In several hours (or more) + + src/app/components/transaction/transaction.component.html + 116,119 + + Transaction ETA in several hours or more + transaction.eta.in-several-hours + + + Virtual size + + src/app/components/transaction/transaction.component.html + 155,157 + + + src/app/components/transaction/transaction.component.html + 212,216 + + Transaction Virtual Size + transaction.vsize + + + Fee rate + + src/app/components/transaction/transaction.component.html + 156,160 + + + src/app/components/transaction/transaction.component.html + 335,337 + + Transaction fee rate + transaction.fee-rate + + + Descendant + + src/app/components/transaction/transaction.component.html + 163,165 + + Descendant + transaction.descendant + + + Ancestor + + src/app/components/transaction/transaction.component.html + 177,179 + + Transaction Ancestor + transaction.ancestor + + + Size + + src/app/components/transaction/transaction.component.html + 208,212 + + Transaction Size + transaction.size + + + Weight + + src/app/components/transaction/transaction.component.html + 216,220 + + Transaction Weight + transaction.weight + + + Transaction not found. + + src/app/components/transaction/transaction.component.html + 304,305 + + transaction.error.transaction-not-found + + + Waiting for it to appear in the mempool... + + src/app/components/transaction/transaction.component.html + 305,309 + + transaction.error.waiting-for-it-to-appear + + + Fee + + src/app/components/transaction/transaction.component.html + 331,332 + + Transaction fee + transaction.fee + + + sat + + src/app/components/transaction/transaction.component.html + 332,335 + + Transaction Fee sat + transaction.fee.sat + + + Effective fee rate + + src/app/components/transaction/transaction.component.html + 345,348 + + Effective transaction fee rate + transaction.effective-fee-rate + + + Coinbase + + src/app/components/transactions-list/transactions-list.component.html + 42 + + transactions-list.coinbase + + + (Newly Generated Coins) + + src/app/components/transactions-list/transactions-list.component.html + 42 + + transactions-list.newly-generated-coins + + + Peg-in + + src/app/components/transactions-list/transactions-list.component.html + 44,46 + + transactions-list.peg-in + + + ScriptSig (ASM) + + src/app/components/transactions-list/transactions-list.component.html + 77,79 + + ScriptSig (ASM) + transactions-list.scriptsig.asm + + + ScriptSig (HEX) + + src/app/components/transactions-list/transactions-list.component.html + 81,83 + + ScriptSig (HEX) + transactions-list.scriptsig.hex + + + Witness + + src/app/components/transactions-list/transactions-list.component.html + 86,87 + + transactions-list.witness + + + P2SH redeem script + + src/app/components/transactions-list/transactions-list.component.html + 90,91 + + transactions-list.p2sh-redeem-script + + + P2WSH witness script + + src/app/components/transactions-list/transactions-list.component.html + 94,95 + + transactions-list.p2wsh-witness-script + + + nSequence + + src/app/components/transactions-list/transactions-list.component.html + 98,99 + + transactions-list.nsequence + + + Previous output script + + src/app/components/transactions-list/transactions-list.component.html + 102,103 + + transactions-list.previous-output-script + + + Load all + + src/app/components/transactions-list/transactions-list.component.html + 112,115 + + + src/app/components/transactions-list/transactions-list.component.html + 194,197 + + transactions-list.load-all + + + Peg-out to + + src/app/components/transactions-list/transactions-list.component.html + 131,132 + + transactions-list.peg-out-to + + + ScriptPubKey (ASM) + + src/app/components/transactions-list/transactions-list.component.html + 176,178 + + ScriptPubKey (ASM) + transactions-list.scriptpubkey.asm + + + ScriptPubKey (HEX) + + src/app/components/transactions-list/transactions-list.component.html + 180,182 + + ScriptPubKey (HEX) + transactions-list.scriptpubkey.hex + + + data + + src/app/components/transactions-list/transactions-list.component.html + 184,185 + + transactions-list.vout.scriptpubkey-type.data + + + sat + + src/app/components/transactions-list/transactions-list.component.html + 204 + + sat + shared.sat + + + This transaction saved % on fees by using native SegWit-Bech32 + + src/app/components/tx-features/tx-features.component.html + 1 + + ngbTooltip about segwit gains + + + SegWit + + src/app/components/tx-features/tx-features.component.html + 1 + + + src/app/components/tx-features/tx-features.component.html + 3 + + + src/app/components/tx-features/tx-features.component.html + 5 + + SegWit + tx-features.tag.segwit + + + This transaction saved % on fees by using SegWit and could save % more by fully upgrading to native SegWit-Bech32 + + src/app/components/tx-features/tx-features.component.html + 3 + + ngbTooltip about double segwit gains + + + This transaction could save % on fees by upgrading to native SegWit-Bech32 or % by upgrading to SegWit-P2SH + + src/app/components/tx-features/tx-features.component.html + 5 + + ngbTooltip about missed out gains + + + This transaction support Replace-By-Fee (RBF) allowing fee bumping + + src/app/components/tx-features/tx-features.component.html + 8 + + RBF tooltip + + + RBF + + src/app/components/tx-features/tx-features.component.html + 8 + + + src/app/components/tx-features/tx-features.component.html + 9 + + RBF + tx-features.tag.rbf + + + This transaction does NOT support Replace-By-Fee (RBF) and cannot be fee bumped using this method + + src/app/components/tx-features/tx-features.component.html + 9 + + RBF disabled tooltip + + + Optimal + + src/app/components/tx-fee-rating/tx-fee-rating.component.html + 1 + + TX Fee Rating is Optimal + tx-fee-rating.optimal + + + Only ~ sat/vB was needed to get into this block + + src/app/components/tx-fee-rating/tx-fee-rating.component.html + 2 + + + src/app/components/tx-fee-rating/tx-fee-rating.component.html + 3 + + tx-fee-rating.warning-tooltip + + + Overpaid x + + src/app/components/tx-fee-rating/tx-fee-rating.component.html + 2 + + + src/app/components/tx-fee-rating/tx-fee-rating.component.html + 3 + + TX Fee Rating is Warning + tx-fee-rating.overpaid.warning + + + Latest blocks + + src/app/dashboard/dashboard.component.html + 75,78 + + dashboard.latest-blocks + + + TXs + + src/app/dashboard/dashboard.component.html + 80,82 + + + src/app/dashboard/dashboard.component.html + 170,174 + + dashboard.latest-blocks.transaction-count + + + Latest transactions + + src/app/dashboard/dashboard.component.html + 104,107 + + dashboard.latest-transactions + + + USD + + src/app/dashboard/dashboard.component.html + 109,110 + + dashboard.latest-transactions.USD + + + Fee + + src/app/dashboard/dashboard.component.html + 110,113 + + dashboard.latest-transactions.fee + + + Expand + + src/app/dashboard/dashboard.component.html + 131,132 + + dashboard.expand + + + Collapse + + src/app/dashboard/dashboard.component.html + 132,136 + + dashboard.collapse + + + Minimum fee + + src/app/dashboard/dashboard.component.html + 161,162 + + Minimum mempool fee + dashboard.minimum-fee + + + Purging + + src/app/dashboard/dashboard.component.html + 162,164 + + Purgin below fee + dashboard.purging + + + Memory usage + + src/app/dashboard/dashboard.component.html + 174,176 + + Memory usage + dashboard.memory-usage + + + Incoming transactions + + src/app/dashboard/dashboard.component.html + 186,188 + + dashboard.incoming-transactions + + + Difficulty adjustment + + src/app/dashboard/dashboard.component.html + 203,204 + + dashboard.difficulty-adjustment + + + Transaction fee + + src/app/shared/pipes/scriptpubkey-type-pipe/scriptpubkey-type.pipe.ts + 11 + + + + + \ No newline at end of file diff --git a/frontend/src/locale/messages.hr.xlf b/frontend/src/locale/messages.hr.xlf index 6adf66c9d..9a2037925 100644 --- a/frontend/src/locale/messages.hr.xlf +++ b/frontend/src/locale/messages.hr.xlf @@ -2782,7 +2782,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.hu.xlf b/frontend/src/locale/messages.hu.xlf index 414ece8f0..d6a713101 100644 --- a/frontend/src/locale/messages.hu.xlf +++ b/frontend/src/locale/messages.hu.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.it.xlf b/frontend/src/locale/messages.it.xlf index 78c225960..64eb871c0 100644 --- a/frontend/src/locale/messages.it.xlf +++ b/frontend/src/locale/messages.it.xlf @@ -3018,7 +3018,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.ja.xlf b/frontend/src/locale/messages.ja.xlf index ccbc9dd69..87dd04306 100644 --- a/frontend/src/locale/messages.ja.xlf +++ b/frontend/src/locale/messages.ja.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.ka.xlf b/frontend/src/locale/messages.ka.xlf index dd7f3a418..b97b94fa7 100644 --- a/frontend/src/locale/messages.ka.xlf +++ b/frontend/src/locale/messages.ka.xlf @@ -2889,7 +2889,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.ko.xlf b/frontend/src/locale/messages.ko.xlf index 59fc6af3b..bc16375c8 100644 --- a/frontend/src/locale/messages.ko.xlf +++ b/frontend/src/locale/messages.ko.xlf @@ -3027,7 +3027,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.nb.xlf b/frontend/src/locale/messages.nb.xlf index b7c635f3d..75d771976 100644 --- a/frontend/src/locale/messages.nb.xlf +++ b/frontend/src/locale/messages.nb.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.nl.xlf b/frontend/src/locale/messages.nl.xlf index 87a5f46b6..03810436e 100644 --- a/frontend/src/locale/messages.nl.xlf +++ b/frontend/src/locale/messages.nl.xlf @@ -3014,7 +3014,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.pl.xlf b/frontend/src/locale/messages.pl.xlf index 7e5bdab50..283d3bcaa 100644 --- a/frontend/src/locale/messages.pl.xlf +++ b/frontend/src/locale/messages.pl.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.pt.xlf b/frontend/src/locale/messages.pt.xlf index 385f326e7..8d7f413b8 100644 --- a/frontend/src/locale/messages.pt.xlf +++ b/frontend/src/locale/messages.pt.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.ru.xlf b/frontend/src/locale/messages.ru.xlf index 75a2565a8..29615acff 100644 --- a/frontend/src/locale/messages.ru.xlf +++ b/frontend/src/locale/messages.ru.xlf @@ -3021,7 +3021,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.sl.xlf b/frontend/src/locale/messages.sl.xlf index c6ff7b577..7a7453272 100644 --- a/frontend/src/locale/messages.sl.xlf +++ b/frontend/src/locale/messages.sl.xlf @@ -3016,7 +3016,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.sv.xlf b/frontend/src/locale/messages.sv.xlf index eebabcd94..2bd72bdaa 100644 --- a/frontend/src/locale/messages.sv.xlf +++ b/frontend/src/locale/messages.sv.xlf @@ -3017,7 +3017,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.tr.xlf b/frontend/src/locale/messages.tr.xlf index 8034d2b5b..d34a954d9 100644 --- a/frontend/src/locale/messages.tr.xlf +++ b/frontend/src/locale/messages.tr.xlf @@ -3018,7 +3018,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.uk.xlf b/frontend/src/locale/messages.uk.xlf index cb1c58b5f..f5abc092f 100644 --- a/frontend/src/locale/messages.uk.xlf +++ b/frontend/src/locale/messages.uk.xlf @@ -3009,7 +3009,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.vi.xlf b/frontend/src/locale/messages.vi.xlf index 4ea973bbe..a91dc6bc9 100644 --- a/frontend/src/locale/messages.vi.xlf +++ b/frontend/src/locale/messages.vi.xlf @@ -3014,7 +3014,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview diff --git a/frontend/src/locale/messages.zh.xlf b/frontend/src/locale/messages.zh.xlf index e36d92fb3..21ea07217 100644 --- a/frontend/src/locale/messages.zh.xlf +++ b/frontend/src/locale/messages.zh.xlf @@ -2945,7 +2945,7 @@ src/app/components/television/television.component.ts - 27 + 28 master-page.tvview From f2e0a71b01af598c317cc1c47c4df9fff1ceb01d Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 13 Jul 2021 12:00:05 +0300 Subject: [PATCH 23/42] Only display Trade Mark sign on english language. (#608) --- frontend/src/app/components/about/about.component.html | 2 +- frontend/src/app/components/about/about.component.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 3ddff0926..997bd5448 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -9,7 +9,7 @@
-
The Mempool Open Source Project ™
+
The Mempool Open Source Project ™

Building a mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, without any advertising, altcoins, or third-party trackers.

diff --git a/frontend/src/app/components/about/about.component.ts b/frontend/src/app/components/about/about.component.ts index 2ea120601..2fa20716f 100644 --- a/frontend/src/app/components/about/about.component.ts +++ b/frontend/src/app/components/about/about.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, LOCALE_ID, OnInit } from '@angular/core'; import { WebsocketService } from '../../services/websocket.service'; import { SeoService } from 'src/app/services/seo.service'; import { StateService } from 'src/app/services/state.service'; @@ -28,6 +28,7 @@ export class AboutComponent implements OnInit { private stateService: StateService, private apiService: ApiService, private router: Router, + @Inject(LOCALE_ID) public locale: string, ) { } ngOnInit() { From 8749b8b0fa7333b39f28e41ea3daddd17ca213fb Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 13 Jul 2021 18:43:10 +0300 Subject: [PATCH 24/42] Updating @mempool/node-bitcoin to support new methods --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 36a729b5d..50f260804 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9,7 +9,7 @@ "version": "2.2.1-dev", "license": "GNU Affero General Public License v3.0", "dependencies": { - "@mempool/bitcoin": "^3.0.2", + "@mempool/bitcoin": "^3.0.3", "@mempool/electrum-client": "^1.1.7", "axios": "^0.21.1", "bitcoinjs-lib": "^5.2.0", @@ -56,9 +56,9 @@ } }, "node_modules/@mempool/bitcoin": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@mempool/bitcoin/-/bitcoin-3.0.2.tgz", - "integrity": "sha512-WNHFTDJEEBmakSPAbrJ933mGgm1uYxmOElyQYZVW7D7CRUd8mKek+QlViin63e71vyfMVOGXtWwSb87dxghggQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@mempool/bitcoin/-/bitcoin-3.0.3.tgz", + "integrity": "sha512-10UdbwchnevlebDTN+Xhv75AEhDmTMy9UgWHlqx5MG2mheFG6+eqmtHsdxeYnv3IAtTtlRfA6fY0RbV/x4TNFQ==", "engines": { "node": ">= 0.10.0" } @@ -1590,9 +1590,9 @@ } }, "@mempool/bitcoin": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@mempool/bitcoin/-/bitcoin-3.0.2.tgz", - "integrity": "sha512-WNHFTDJEEBmakSPAbrJ933mGgm1uYxmOElyQYZVW7D7CRUd8mKek+QlViin63e71vyfMVOGXtWwSb87dxghggQ==" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@mempool/bitcoin/-/bitcoin-3.0.3.tgz", + "integrity": "sha512-10UdbwchnevlebDTN+Xhv75AEhDmTMy9UgWHlqx5MG2mheFG6+eqmtHsdxeYnv3IAtTtlRfA6fY0RbV/x4TNFQ==" }, "@mempool/electrum-client": { "version": "1.1.8", diff --git a/backend/package.json b/backend/package.json index 8c1169f46..d1d5ecbbd 100644 --- a/backend/package.json +++ b/backend/package.json @@ -28,7 +28,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "@mempool/bitcoin": "^3.0.2", + "@mempool/bitcoin": "^3.0.3", "@mempool/electrum-client": "^1.1.7", "axios": "^0.21.1", "bitcoinjs-lib": "^5.2.0", From d13e18a72a3334725b997a7a95bf0758cd4cb93f Mon Sep 17 00:00:00 2001 From: softsimon Date: Wed, 14 Jul 2021 14:11:38 +0300 Subject: [PATCH 25/42] Fix for liquid network redirect in staging proxy. --- frontend/proxy.stg.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/proxy.stg.conf.json b/frontend/proxy.stg.conf.json index 380222d43..c07122510 100644 --- a/frontend/proxy.stg.conf.json +++ b/frontend/proxy.stg.conf.json @@ -78,7 +78,7 @@ "secure": false, "changeOrigin": true, "pathRewrite": { - "^/liquid/api/": "/api/v1/liquid/" + "^/liquid/api/": "/api/liquid/" }, "timeout": 3600000 }, From ecbd18087b267ba61b74477c973281b740edaf30 Mon Sep 17 00:00:00 2001 From: softsimon Date: Wed, 14 Jul 2021 22:42:48 +0300 Subject: [PATCH 26/42] Effective fee could go below 0 due to rounding error. (#623) fixes #606 --- backend/src/api/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts index e1021c234..a560bfdfe 100644 --- a/backend/src/api/common.ts +++ b/backend/src/api/common.ts @@ -105,7 +105,7 @@ export class Common { totalFees += tx.bestDescendant.fee; } - tx.effectiveFeePerVsize = totalFees / (totalWeight / 4); + tx.effectiveFeePerVsize = Math.max(1, totalFees / (totalWeight / 4)); tx.cpfpChecked = true; return { From 52aea12f22bbeafd37f22e8d219f494690883742 Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Thu, 15 Jul 2021 17:23:37 -0300 Subject: [PATCH 27/42] UI/UX - Fix arrow position. (#627) * Fix arrow position. * Add arrows from font-awesome. * Add icons to bisq transfers. * Fix icon size in mobile view. --- frontend/src/app/app.module.ts | 3 +- .../bisq-transfers.component.html | 18 +++-- .../bisq-transfers.component.scss | 64 ++++------------- .../transactions-list.component.html | 30 +++++--- .../transactions-list.component.scss | 72 +++++-------------- 5 files changed, 64 insertions(+), 123 deletions(-) diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 482c91f08..1d246561c 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -45,7 +45,7 @@ import { FeesBoxComponent } from './components/fees-box/fees-box.component'; import { DashboardComponent } from './dashboard/dashboard.component'; import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome'; import { faAngleDown, faAngleUp, faBolt, faChartArea, faCogs, faCubes, faDatabase, faExchangeAlt, faInfoCircle, - faLink, faList, faSearch, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faAngleDoubleUp, faChevronDown, faFileAlt, faRedoAlt } from '@fortawesome/free-solid-svg-icons'; + faLink, faList, faSearch, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faAngleDoubleUp, faChevronDown, faFileAlt, faRedoAlt, faArrowAltCircleRight } from '@fortawesome/free-solid-svg-icons'; import { ApiDocsComponent } from './components/api-docs/api-docs.component'; import { CodeTemplateComponent } from './components/api-docs/code-template.component'; import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component'; @@ -136,5 +136,6 @@ export class AppModule { library.addIcons(faChevronDown); library.addIcons(faFileAlt); library.addIcons(faRedoAlt); + library.addIcons(faArrowAltCircleRight); } } diff --git a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html index 229e84dbc..0388ea418 100644 --- a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html +++ b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html @@ -7,11 +7,13 @@
@@ -44,10 +46,14 @@ - diff --git a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.scss b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.scss index 123007d3f..bffd646d8 100644 --- a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.scss +++ b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.scss @@ -1,62 +1,26 @@ + .arrow-td { - width: 22px; + width: 20px; } - -.arrow { - display: inline-block!important; +.green, .grey, .red { + font-size: 16px; + top: -2px; position: relative; - width: 14px; - height: 22px; - box-sizing: content-box + @media( min-width: 576px){ + font-size: 19px; + } } -.arrow:before { - position: absolute; - content: ''; - margin: auto; - top: 0; - bottom: 0; - left: 0; - right: calc(-1*30px/3); - width: 0; - height: 0; - border-top: 6.66px solid transparent; - border-bottom: 6.66px solid transparent +.green { + color:#28a745; } -.arrow:after { - position: absolute; - content: ''; - margin: auto; - top: 0; - bottom: 0; - left: 0; - right: calc(30px/6); - width: calc(30px/3); - height: calc(20px/3); - background: rgba(0, 0, 0, 0); +.red { + color:#dc3545; } -.arrow.green:before { - border-left: 10px solid #28a745; -} -.arrow.green:after { - background-color:#28a745; -} - -.arrow.red:before { - border-left: 10px solid #dc3545; -} -.arrow.red:after { - background-color:#dc3545; -} - -.arrow.grey:before { - border-left: 10px solid #6c757d; -} - -.arrow.grey:after { - background-color:#6c757d; +.grey { + color:#6c757d; } @media (max-width: 767.98px) { diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index 20dee92e5..f445e1b20 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -18,21 +18,23 @@
{{ errorUnblinded }}
-
{{ transaction.txid | shortenString : 10 }} {{ transaction.fee / transaction.vsize | number : '1.1-1' }} sat/vB
- + + + - - + + - + + + + - + + +
+
- - +
- + + + - - + + - - + + @@ -117,7 +119,7 @@
- +
@@ -154,12 +156,18 @@ - diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.scss b/frontend/src/app/components/transactions-list/transactions-list.component.scss index b85069650..42da648d6 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.scss +++ b/frontend/src/app/components/transactions-list/transactions-list.component.scss @@ -1,63 +1,25 @@ + .arrow-td { - width: 22px; + width: 20px; +} +.green, .grey, .red { + font-size: 16px; + top: -2px; + position: relative; + @media( min-width: 576px){ + font-size: 19px; + } +} +.green { + color:#28a745; } -.arrow { - display: inline-block!important; - position: absolute; - width: 14px; - margin-top: 10px; - margin-left: -5px; - box-sizing: content-box +.red { + color:#dc3545; } -.arrow:before { - position: absolute; - content: ''; - margin: auto; - top: 0; - bottom: 0; - left: 0; - right: calc(-1*30px/3); - width: 0; - height: 0; - border-top: 6.66px solid transparent; - border-bottom: 6.66px solid transparent -} - -.arrow:after { - position: absolute; - content: ''; - margin: auto; - top: 0; - bottom: 0; - left: 0; - right: calc(30px/6); - width: calc(30px/3); - height: calc(20px/3); - background: rgba(0, 0, 0, 0); -} - -.arrow.green:before { - border-left: 10px solid #28a745; -} -.arrow.green:after { - background-color:#28a745; -} - -.arrow.red:before { - border-left: 10px solid #dc3545; -} -.arrow.red:after { - background-color:#dc3545; -} - -.arrow.grey:before { - border-left: 10px solid #6c757d; -} - -.arrow.grey:after { - background-color:#6c757d; +.grey { + color:#6c757d; } .mobile-bottomcol { From 38aee1a89704403aaeb45be4c61f9c3a89c86104 Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Fri, 16 Jul 2021 09:33:22 -0300 Subject: [PATCH 28/42] UI/UX - Scroll by clicking on the pagination button. (#613) * Add scrollIntoView when click on pagination. * Add padding top. * Fix access DOM from ViewChild. * Fix scrolling position. * Fix chrome and firefox compatibility. --- .../app/components/block/block.component.html | 8 +++---- .../app/components/block/block.component.scss | 24 +++++++++++++++---- .../app/components/block/block.component.ts | 6 +++-- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index a07ad3e04..b26922bef 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -122,17 +122,17 @@
- +
-
+

{{ i }} transaction {{ i }} transactions

- +
@@ -166,7 +166,7 @@
- + diff --git a/frontend/src/app/components/block/block.component.scss b/frontend/src/app/components/block/block.component.scss index b5bae22f1..9813b0293 100644 --- a/frontend/src/app/components/block/block.component.scss +++ b/frontend/src/app/components/block/block.component.scss @@ -73,26 +73,40 @@ h1 { } } +.btn-details { + position: relative; + top: 7px; + @media (min-width: 550px) { + top: 0px; + } +} + .block-tx-title { - margin-top: -1.5rem; + padding-top: 10px; display: block; text-align: right; + margin-top: -30px; @media (min-width: 550px) { - margin-top: 1rem; + margin-top: 0px; + padding-top: 10px; } h2 { - width: auto; display: inline-block; float: left; - margin: 0; line-height: 1.6; + margin: 0; + margin-bottom: -15px; padding-right: 10px; - top: -10px; + padding-top: 15px; position: relative; + top: -22px; + width: auto; @media (min-width: 550px) { + padding-top: 0px; top: 0px; } @media (min-width: 768px) { + padding-top: 5px; line-height: 1; } } diff --git a/frontend/src/app/components/block/block.component.ts b/frontend/src/app/components/block/block.component.ts index fedf17c46..38ebc43a1 100644 --- a/frontend/src/app/components/block/block.component.ts +++ b/frontend/src/app/components/block/block.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnInit, OnDestroy, ViewChild, ElementRef } from '@angular/core'; import { Location } from '@angular/common'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { ElectrsApiService } from '../../services/electrs-api.service'; @@ -173,15 +173,17 @@ export class BlockComponent implements OnInit, OnDestroy { } } - pageChange(page: number) { + pageChange(page: number, target: HTMLElement) { const start = (page - 1) * this.itemsPerPage; this.isLoadingTransactions = true; this.transactions = null; + target.scrollIntoView(); // works for chrome this.electrsApiService.getBlockTransactions$(this.block.id, start) .subscribe((transactions) => { this.transactions = transactions; this.isLoadingTransactions = false; + target.scrollIntoView(); // works for firefox }); } From d405334109243d30bde16cc5c332c94a4553f60f Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Sat, 17 Jul 2021 08:58:16 -0300 Subject: [PATCH 29/42] UI/UX - New component for difficult adjustment. (#602) * Add next difficulty blocks. Add next difficulty target date. Add next difficulty total progress. Add ajustment difficulty avg min per block. * Fix typo. * Trigger difficulty calculation every 5 seconds. * Add rxjs timer to difficultyEpoch. * Fix pipe. * Fix small bar position. * Change i18n strings. * Fix typo. * Add time-until component. * Speed up difficultyEpoch timer to 1000 ms. * Fix values to 2 decimal places. * Add title to fee and difficulty adjustment cards. * Add title outside the card. * Fix title to center position. * Add other titles. * Add new transalations strings. Refactor time span component. * Fix difficulty adjustment i18n string. Fix duplicated i18n strings. --- frontend/src/app/app.module.ts | 4 +- .../components/footer/footer.component.html | 4 +- .../mempool-blocks.component.html | 2 +- .../time-since/time-since.component.ts | 46 +++---- .../time-span/time-span.component.ts | 107 ++++++++++++++++ .../time-until/time-until.component.ts | 108 +++++++++++++++++ .../components/timespan/timespan.component.ts | 45 ------- .../transaction/transaction.component.html | 6 +- .../app/dashboard/dashboard.component.html | 70 +++++++++-- .../app/dashboard/dashboard.component.scss | 114 +++++++++++++++++- .../src/app/dashboard/dashboard.component.ts | 95 ++++++++++----- frontend/src/app/shared/i18n/dates.ts | 22 ++++ frontend/src/app/shared/shared.module.ts | 3 + 13 files changed, 509 insertions(+), 117 deletions(-) create mode 100644 frontend/src/app/components/time-span/time-span.component.ts create mode 100644 frontend/src/app/components/time-until/time-until.component.ts delete mode 100644 frontend/src/app/components/timespan/timespan.component.ts create mode 100644 frontend/src/app/shared/i18n/dates.ts diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 1d246561c..09ea8c047 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -32,7 +32,7 @@ import { FooterComponent } from './components/footer/footer.component'; import { AudioService } from './services/audio.service'; import { MempoolBlockComponent } from './components/mempool-block/mempool-block.component'; import { FeeDistributionGraphComponent } from './components/fee-distribution-graph/fee-distribution-graph.component'; -import { TimespanComponent } from './components/timespan/timespan.component'; +import { TimeSpanComponent } from './components/time-span/time-span.component'; import { SeoService } from './services/seo.service'; import { MempoolGraphComponent } from './components/mempool-graph/mempool-graph.component'; import { AssetComponent } from './components/asset/asset.component'; @@ -71,7 +71,7 @@ import { SponsorComponent } from './components/sponsor/sponsor.component'; AmountComponent, LatestBlocksComponent, SearchFormComponent, - TimespanComponent, + TimeSpanComponent, AddressLabelsComponent, MempoolBlocksComponent, ChartistComponent, diff --git a/frontend/src/app/components/footer/footer.component.html b/frontend/src/app/components/footer/footer.component.html index 9584ec2a2..b8a73288e 100644 --- a/frontend/src/app/components/footer/footer.component.html +++ b/frontend/src/app/components/footer/footer.component.html @@ -19,8 +19,8 @@
Mempool size:
()
- {{ i }} block - {{ i }} blocks + {{ i }} blocks + {{ i }} block
diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html index ff18f198e..8e3655724 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html @@ -27,7 +27,7 @@
() - {{ i }} blocks + {{ i }} blocks
diff --git a/frontend/src/app/components/time-since/time-since.component.ts b/frontend/src/app/components/time-since/time-since.component.ts index 377e4b91c..e87ab9ab6 100644 --- a/frontend/src/app/components/time-since/time-since.component.ts +++ b/frontend/src/app/components/time-since/time-since.component.ts @@ -1,5 +1,6 @@ -import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnChanges, PLATFORM_ID, Inject } from '@angular/core'; +import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnChanges } from '@angular/core'; import { StateService } from 'src/app/services/state.service'; +import { dates } from 'src/app/shared/i18n/dates'; @Component({ selector: 'app-time-since', @@ -53,48 +54,49 @@ export class TimeSinceComponent implements OnInit, OnChanges, OnDestroy { calculate() { const seconds = Math.floor((+new Date() - +new Date(this.time * 1000)) / 1000); if (seconds < 60) { - return $localize`:@@time-since.just-now:Just now`; + return $localize`:@@date-base.just-now:Just now`; } let counter; for (const i in this.intervals) { if (this.intervals.hasOwnProperty(i)) { counter = Math.floor(seconds / this.intervals[i]); + const dateStrings = dates(counter); if (counter > 0) { if (counter === 1) { - switch (i) { // singular (1 day ago) - case 'year': return $localize`:@@time-since.year.ago:${counter}:INTERPOLATION: year ago`; break; - case 'month': return $localize`:@@time-since.month.ago:${counter}:INTERPOLATION: month ago`; break; - case 'week': return $localize`:@@time-since.week.ago:${counter}:INTERPOLATION: week ago`; break; - case 'day': return $localize`:@@time-since.day.ago:${counter}:INTERPOLATION: day ago`; break; - case 'hour': return $localize`:@@time-since.hour.ago:${counter}:INTERPOLATION: hour ago`; break; + switch (i) { // singular (1 day) + case 'year': return $localize`:@@time-since:${dateStrings.i18nYear}:DATE: ago`; break; + case 'month': return $localize`:@@time-since:${dateStrings.i18nMonth}:DATE: ago`; break; + case 'week': return $localize`:@@time-since:${dateStrings.i18nWeek}:DATE: ago`; break; + case 'day': return $localize`:@@time-since:${dateStrings.i18nDay}:DATE: ago`; break; + case 'hour': return $localize`:@@time-since:${dateStrings.i18nHour}:DATE: ago`; break; case 'minute': if (document.body.clientWidth < 768) { - return $localize`:@@time-since.min.ago:${counter}:INTERPOLATION: min ago`; + return $localize`:@@time-since:${dateStrings.i18nMin}:DATE: ago`; } - return $localize`:@@time-since.minute.ago:${counter}:INTERPOLATION: minute ago`; + return $localize`:@@time-since:${dateStrings.i18nMinute}:DATE: ago`; case 'second': if (document.body.clientWidth < 768) { - return $localize`:@@time-since.sec.ago:${counter}:INTERPOLATION: sec ago`; + return $localize`:@@time-since:${dateStrings.i18nSec}:DATE: ago`; } - return $localize`:@@time-since.second.ago:${counter}:INTERPOLATION: second ago`; + return $localize`:@@time-since:${dateStrings.i18nSecond}:DATE: ago`; } } else { - switch (i) { // plural (2 days ago) - case 'year': return $localize`:@@time-since.years.ago:${counter}:INTERPOLATION: years ago`; break; - case 'month': return $localize`:@@time-since.months.ago:${counter}:INTERPOLATION: months ago`; break; - case 'week': return $localize`:@@time-since.weeks.ago:${counter}:INTERPOLATION: weeks ago`; break; - case 'day': return $localize`:@@time-since.days.ago:${counter}:INTERPOLATION: days ago`; break; - case 'hour': return $localize`:@@time-since.hours.ago:${counter}:INTERPOLATION: hours ago`; break; + switch (i) { // plural (2 days) + case 'year': return $localize`:@@time-since:${dateStrings.i18nYears}:DATE: ago`; break; + case 'month': return $localize`:@@time-since:${dateStrings.i18nMonths}:DATE: ago`; break; + case 'week': return $localize`:@@time-since:${dateStrings.i18nWeeks}:DATE: ago`; break; + case 'day': return $localize`:@@time-since:${dateStrings.i18nDays}:DATE: ago`; break; + case 'hour': return $localize`:@@time-since:${dateStrings.i18nHours}:DATE: ago`; break; case 'minute': if (document.body.clientWidth < 768) { - return $localize`:@@time-since.mins.ago:${counter}:INTERPOLATION: mins ago`; + return $localize`:@@time-since:${dateStrings.i18nMins}:DATE: ago`; } - return $localize`:@@time-since.minutes.ago:${counter}:INTERPOLATION: minutes ago`; + return $localize`:@@time-since:${dateStrings.i18nMinutes}:DATE: ago`; case 'second': if (document.body.clientWidth < 768) { - return $localize`:@@time-since.secs.ago:${counter}:INTERPOLATION: secs ago`; + return $localize`:@@time-since:${dateStrings.i18nSecs}:DATE: ago`; } - return $localize`:@@time-since.seconds.ago:${counter}:INTERPOLATION: seconds ago`; + return $localize`:@@time-since:${dateStrings.i18nSeconds}:DATE: ago`; } } } diff --git a/frontend/src/app/components/time-span/time-span.component.ts b/frontend/src/app/components/time-span/time-span.component.ts new file mode 100644 index 000000000..f5a0ca99f --- /dev/null +++ b/frontend/src/app/components/time-span/time-span.component.ts @@ -0,0 +1,107 @@ +import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnChanges } from '@angular/core'; +import { StateService } from 'src/app/services/state.service'; +import { dates } from 'src/app/shared/i18n/dates'; + +@Component({ + selector: 'app-time-span', + template: `{{ text }}`, + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class TimeSpanComponent implements OnInit, OnChanges, OnDestroy { + interval: number; + text: string; + intervals = {}; + + @Input() time: number; + @Input() fastRender = false; + + constructor( + private ref: ChangeDetectorRef, + private stateService: StateService, + ) { + this.intervals = { + year: 31536000, + month: 2592000, + week: 604800, + day: 86400, + hour: 3600, + minute: 60, + second: 1 + }; + } + + ngOnInit() { + if (!this.stateService.isBrowser) { + this.text = this.calculate(); + this.ref.markForCheck(); + return; + } + this.interval = window.setInterval(() => { + this.text = this.calculate(); + this.ref.markForCheck(); + }, 1000 * (this.fastRender ? 1 : 60)); + } + + ngOnChanges() { + this.text = this.calculate(); + this.ref.markForCheck(); + } + + ngOnDestroy() { + clearInterval(this.interval); + } + + calculate() { + const seconds = Math.floor((+new Date() - +new Date(this.time * 1000)) / 1000); + if (seconds < 60) { + return $localize`:@@date-base.just-now:Just now`; + } + let counter; + for (const i in this.intervals) { + if (this.intervals.hasOwnProperty(i)) { + counter = Math.floor(seconds / this.intervals[i]); + const dateStrings = dates(counter); + if (counter > 0) { + if (counter === 1) { + switch (i) { // singular (1 day) + case 'year': return $localize`:@@time-span:After ${dateStrings.i18nYear}:DATE:`; break; + case 'month': return $localize`:@@time-span:After ${dateStrings.i18nMonth}:DATE:`; break; + case 'week': return $localize`:@@time-span:After ${dateStrings.i18nWeek}:DATE:`; break; + case 'day': return $localize`:@@time-span:After ${dateStrings.i18nDay}:DATE:`; break; + case 'hour': return $localize`:@@time-span:After ${dateStrings.i18nHour}:DATE:`; break; + case 'minute': + if (document.body.clientWidth < 768) { + return $localize`:@@time-span:After ${dateStrings.i18nMin}:DATE:`; + } + return $localize`:@@time-span:After ${dateStrings.i18nMinute}:DATE:`; + case 'second': + if (document.body.clientWidth < 768) { + return $localize`:@@time-span:After ${dateStrings.i18nSec}:DATE:`; + } + return $localize`:@@time-span:After ${dateStrings.i18nSecond}:DATE:`; + } + } else { + switch (i) { // plural (2 days) + case 'year': return $localize`:@@time-span:After ${dateStrings.i18nYears}:DATE:`; break; + case 'month': return $localize`:@@time-span:After ${dateStrings.i18nMonths}:DATE:`; break; + case 'week': return $localize`:@@time-span:After ${dateStrings.i18nWeeks}:DATE:`; break; + case 'day': return $localize`:@@time-span:After ${dateStrings.i18nDays}:DATE:`; break; + case 'hour': return $localize`:@@time-span:After ${dateStrings.i18nHours}:DATE:`; break; + case 'minute': + if (document.body.clientWidth < 768) { + return $localize`:@@time-span:After ${dateStrings.i18nMins}:DATE:`; + } + return $localize`:@@time-span:After ${dateStrings.i18nMinutes}:DATE:`; + case 'second': + if (document.body.clientWidth < 768) { + return $localize`:@@time-span:After ${dateStrings.i18nSecs}:DATE:`; + } + return $localize`:@@time-span:After ${dateStrings.i18nSeconds}:DATE:`; + } + } + } + } + } + } + +} diff --git a/frontend/src/app/components/time-until/time-until.component.ts b/frontend/src/app/components/time-until/time-until.component.ts new file mode 100644 index 000000000..b85d909cd --- /dev/null +++ b/frontend/src/app/components/time-until/time-until.component.ts @@ -0,0 +1,108 @@ +import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnChanges } from '@angular/core'; +import { StateService } from 'src/app/services/state.service'; +import { dates } from 'src/app/shared/i18n/dates'; + +@Component({ + selector: 'app-time-until', + template: `{{ text }}`, + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class TimeUntilComponent implements OnInit, OnChanges, OnDestroy { + interval: number; + text: string; + intervals = {}; + + @Input() time: number; + @Input() fastRender = false; + + constructor( + private ref: ChangeDetectorRef, + private stateService: StateService, + ) { + this.intervals = { + year: 31536000, + month: 2592000, + week: 604800, + day: 86400, + hour: 3600, + minute: 60, + second: 1 + }; + } + + ngOnInit() { + if (!this.stateService.isBrowser) { + this.text = this.calculate(); + this.ref.markForCheck(); + return; + } + this.interval = window.setInterval(() => { + this.text = this.calculate(); + this.ref.markForCheck(); + }, 1000 * (this.fastRender ? 1 : 60)); + } + + ngOnChanges() { + this.text = this.calculate(); + this.ref.markForCheck(); + } + + ngOnDestroy() { + clearInterval(this.interval); + } + + calculate() { + const seconds = Math.floor((+new Date(this.time) - +new Date()) / 1000); + + if (seconds < 60) { + return $localize`:@@date-base.last-minute:In ~1 min`; + } + let counter; + for (const i in this.intervals) { + if (this.intervals.hasOwnProperty(i)) { + counter = Math.floor(seconds / this.intervals[i]); + const dateStrings = dates(counter); + if (counter > 0) { + if (counter === 1) { + switch (i) { // singular (In ~1 day) + case 'year': return $localize`:@@time-until:In ~${dateStrings.i18nYear}:DATE:`; break; + case 'month': return $localize`:@@time-until:In ~${dateStrings.i18nMonth}:DATE:`; break; + case 'week': return $localize`:@@time-until:In ~${dateStrings.i18nWeek}:DATE:`; break; + case 'day': return $localize`:@@time-until:In ~${dateStrings.i18nDay}:DATE:`; break; + case 'hour': return $localize`:@@time-until:In ~${dateStrings.i18nHour}:DATE:`; break; + case 'minute': + if (document.body.clientWidth < 768) { + return $localize`:@@time-until:In ~${dateStrings.i18nMin}:DATE:`; + } + return $localize`:@@time-until:In ~${dateStrings.i18nMinute}:DATE:`; + case 'second': + if (document.body.clientWidth < 768) { + return $localize`:@@time-until:In ~${dateStrings.i18nSec}:DATE:`; + } + return $localize`:@@time-until:In ~${dateStrings.i18nSecond}:DATE:`; + } + } else { + switch (i) { // plural (In ~2 days) + case 'year': return $localize`:@@time-until:In ~${dateStrings.i18nYears}:DATE:`; break; + case 'month': return $localize`:@@time-until:In ~${dateStrings.i18nMonths}:DATE:`; break; + case 'week': return $localize`:@@time-until:In ~${dateStrings.i18nWeeks}:DATE:`; break; + case 'day': return $localize`:@@time-until:In ~${dateStrings.i18nDays}:DATE:`; break; + case 'hour': return $localize`:@@time-until:In ~${dateStrings.i18nHours}:DATE:`; break; + case 'minute': + if (document.body.clientWidth < 768) { + return $localize`:@@time-until:In ~${dateStrings.i18nMins}:DATE:`; + } + return $localize`:@@time-until:In ~${dateStrings.i18nMinutes}:DATE:`; + case 'second': + if (document.body.clientWidth < 768) { + return $localize`:@@time-until:In ~${dateStrings.i18nSecs}:DATE:`; + } + return $localize`:@@time-until:In ~${dateStrings.i18nSeconds}:DATE:`; + } + } + } + } + } + } + +} diff --git a/frontend/src/app/components/timespan/timespan.component.ts b/frontend/src/app/components/timespan/timespan.component.ts deleted file mode 100644 index 4edba3df0..000000000 --- a/frontend/src/app/components/timespan/timespan.component.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { Component, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core'; - -@Component({ - selector: 'app-timespan', - template: `{{ text }}`, - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class TimespanComponent implements OnChanges { - @Input() time: number; - text: string; - - constructor() { } - - ngOnChanges() { - const seconds = this.time; - if (seconds < 60) { - this.text = '< 1 minute'; - return; - } - const intervals = { - year: 31536000, - month: 2592000, - week: 604800, - day: 86400, - hour: 3600, - minute: 60, - second: 1 - }; - let counter; - for (const i in intervals) { - if (intervals.hasOwnProperty(i)) { - counter = Math.floor(seconds / intervals[i]); - if (counter > 0) { - if (counter === 1) { - this.text = counter + ' ' + i; // singular (1 day ago) - break; - } else { - this.text = counter + ' ' + i + 's'; // plural (2 days ago) - break; - } - } - } - } - } -} diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index d2080498b..844ed0c33 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -65,7 +65,7 @@ - + @@ -321,8 +321,8 @@ In ~{{ i }} minute -{{ i }} block -{{ i }} blocks +{{ i }} block +{{ i }} blocks
- + + + + - + + + - + + +
ConfirmedAfter
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index ca8104489..59294e53a 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -1,9 +1,9 @@
-
-
+
+
Fee Estimates
@@ -29,7 +29,8 @@
-
+
+
Fee Estimates
@@ -198,14 +199,61 @@ -
-
-
Difficulty adjustment
-
-
 
-
-
-
+{{ epochData.change | number: '1.0-2' }}%
+
Difficulty Adjustment
+
+
+
+
+
+
Remaining
+
+ + {{ i }} blocks + {{ i }} block +
+
+
+
+
Estimate
+
{{ epochData.change | number: '1.2-2' }} %
+
~{{ epochData.timeAvg }} mins per block
+
+
+
Current Period
+
{{ epochData.progress | number: '1.2-2' }} %
+
+
 
+
+
+
+
+
+
+
+ + + + +
+
+
Remaining
+
+
+
+
+
+
+
Estimate
+
+
+
+
+
+
+
Current Period
+
+
+
diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss index 2d969db58..30f1c4fb9 100644 --- a/frontend/src/app/dashboard/dashboard.component.scss +++ b/frontend/src/app/dashboard/dashboard.component.scss @@ -42,7 +42,7 @@ } .more-padding { - padding: 1.25rem 2rem 1.25rem 2rem; + padding: 18px; } .graph-card { @@ -212,4 +212,116 @@ .terms-of-service { margin-top: 1rem; +} + +.small-bar { + height: 8px; + top: -4px; +} + +.difficulty-adjustment-container { + display: flex; + flex-direction: row; + justify-content: space-around; + height: 76px; + .shared-block { + color: #ffffff66; + font-size: 12px; + } + .item { + max-width: 130px; + padding: 0 5px; + width: 100%; + &:nth-child(1){ + display: none; + @media (min-width: 485px) { + display: table-cell; + } + @media (min-width: 768px) { + display: none; + } + @media (min-width: 992px) { + display: table-cell; + } + } + } + .card-text { + font-size: 22px; + margin-top: -9px; + position: relative; + } +} + + +.difficulty-skeleton { + display: flex; + justify-content: space-between; + @media (min-width: 376px) { + flex-direction: row; + } + .item { + max-width: 150px; + margin: 0; + width: -webkit-fill-available; + @media (min-width: 376px) { + margin: 0 auto 0px; + } + &:first-child{ + display: none; + @media (min-width: 485px) { + display: block; + } + @media (min-width: 768px) { + display: none; + } + @media (min-width: 992px) { + display: block; + } + } + &:last-child { + margin-bottom: 0; + } + } +} + +.loading-container{ + min-height: 76px; +} + +.card-text { + .skeleton-loader { + width: 100%; + display: block; + margin: 7px auto; + &:first-child { + max-width: 80px; + } + &:last-child { + max-width: 110px; + } + } +} + +.main-title { + position: relative; + color: #ffffff91; + margin-top: -13px; + font-size: 10px; + text-transform: uppercase; + font-weight: 500; + text-align: center; + padding-bottom: 3px; +} +.card-wrapper { + .card { + height: auto !important; + } + .card-body { + display: flex; + flex: inherit; + text-align: center; + flex-direction: column; + justify-content: space-around; + padding: 22px 20px; + } } \ No newline at end of file diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts index 8000ba912..92fadecbf 100644 --- a/frontend/src/app/dashboard/dashboard.component.ts +++ b/frontend/src/app/dashboard/dashboard.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Inject, LOCALE_ID, OnInit } from '@angular/core'; -import { combineLatest, merge, Observable, of } from 'rxjs'; +import { combineLatest, merge, Observable, of, timer } from 'rxjs'; import { filter, map, scan, share, switchMap, tap } from 'rxjs/operators'; import { Block } from '../interfaces/electrs.interface'; import { OptimizedMempoolStats } from '../interfaces/node-api.interface'; @@ -22,6 +22,12 @@ interface EpochProgress { green: string; red: string; change: number; + progress: string; + remainingBlocks: number; + newDifficultyHeight: number; + colorAdjustments: string; + timeAvg: string; + remainingTime: number; } interface MempoolInfoData { @@ -108,38 +114,67 @@ export class DashboardComponent implements OnInit { }) ); - this.difficultyEpoch$ = combineLatest([ - this.stateService.blocks$.pipe(map(([block]) => block)), - this.stateService.lastDifficultyAdjustment$ - ]) - .pipe( - map(([block, DATime]) => { - const now = new Date().getTime() / 1000; - const diff = now - DATime; - const blocksInEpoch = block.height % 2016; - const estimatedBlocks = Math.round(diff / 60 / 10); - const difficultyChange = (600 / (diff / blocksInEpoch ) - 1) * 100; + this.difficultyEpoch$ = timer(0, 1000) + .pipe( + switchMap(() => combineLatest([ + this.stateService.blocks$.pipe(map(([block]) => block)), + this.stateService.lastDifficultyAdjustment$ + ])), + map(([block, DATime]) => { + const now = new Date().getTime() / 1000; + const diff = now - DATime; + const blocksInEpoch = block.height % 2016; + const estimatedBlocks = Math.round(diff / 60 / 10); + let difficultyChange = 0; + if (blocksInEpoch > 0) { + difficultyChange = (600 / (diff / blocksInEpoch ) - 1) * 100; + } - let base = 0; - let green = 0; - let red = 0; + let base = 0; + let green = 0; + let red = 0; - if (blocksInEpoch >= estimatedBlocks) { - base = estimatedBlocks / 2016 * 100; - green = (blocksInEpoch - estimatedBlocks) / 2016 * 100; - } else { - base = blocksInEpoch / 2016 * 100; - red = Math.min((estimatedBlocks - blocksInEpoch) / 2016 * 100, 100 - base); - } + if (blocksInEpoch >= estimatedBlocks) { + base = estimatedBlocks / 2016 * 100; + green = (blocksInEpoch - estimatedBlocks) / 2016 * 100; + } else { + base = blocksInEpoch / 2016 * 100; + red = Math.min((estimatedBlocks - blocksInEpoch) / 2016 * 100, 100 - base); + } - return { - base: base + '%', - green: green + '%', - red: red + '%', - change: difficultyChange, - }; - }) - ); + let colorAdjustments = '#dc3545'; + if (difficultyChange >= 0) { + colorAdjustments = '#299435'; + } + + const timeAvgDiff = difficultyChange * 0.1; + + let timeAvgMins = 10; + if (timeAvgDiff > 0 ){ + timeAvgMins -= Math.abs(timeAvgDiff); + } else { + timeAvgMins += Math.abs(timeAvgDiff); + } + const remainingBlocks = 2016 - blocksInEpoch; + const nowMilliseconds = now * 1000; + const timeAvgMilliseconds = timeAvgMins * 60 * 1000; + const remainingBlocsMilliseconds = remainingBlocks * timeAvgMilliseconds; + + return { + base: base + '%', + green: green + '%', + red: red + '%', + change: difficultyChange, + progress: base.toFixed(2), + remainingBlocks, + timeAvg: timeAvgMins.toFixed(0), + colorAdjustments, + blocksInEpoch, + newDifficultyHeight: block.height + remainingBlocks, + remainingTime: remainingBlocsMilliseconds + nowMilliseconds + }; + }) + ); this.mempoolBlocksData$ = this.stateService.mempoolBlocks$ .pipe( diff --git a/frontend/src/app/shared/i18n/dates.ts b/frontend/src/app/shared/i18n/dates.ts new file mode 100644 index 000000000..24e8272c6 --- /dev/null +++ b/frontend/src/app/shared/i18n/dates.ts @@ -0,0 +1,22 @@ +export const dates = (counter: number) => { + return { + i18nYear: $localize`:@@date-base.year:${counter}:DATE: year`, + i18nYears: $localize`:@@date-base.years:${counter}:DATE: years`, + i18nMonth: $localize`:@@date-base.month:${counter}:DATE: month`, + i18nMonths: $localize`:@@date-base.months:${counter}:DATE: months`, + i18nWeek: $localize`:@@date-base.week:${counter}:DATE: week`, + i18nWeeks: $localize`:@@date-base.weeks:${counter}:DATE: weeks`, + i18nDay: $localize`:@@date-base.day:${counter}:DATE: day`, + i18nDays: $localize`:@@date-base.days:${counter}:DATE: days`, + i18nHour: $localize`:@@date-base.hour:${counter}:DATE: hour`, + i18nHours: $localize`:@@date-base.hours:${counter}:DATE: hours`, + i18nMinute: $localize`:@@date-base.minute:${counter}:DATE: minute`, + i18nMinutes: $localize`:@@date-base.minutes:${counter}:DATE: minutes`, + i18nMin: $localize`:@@date-base.min:${counter}:DATE: min`, + i18nMins: $localize`:@@date-base.mins:${counter}:DATE: mins`, + i18nSecond: $localize`:@@date-base.second:${counter}:DATE: second`, + i18nSeconds: $localize`:@@date-base.seconds:${counter}:DATE: seconds`, + i18nSec: $localize`:@@date-base.sec:${counter}:DATE: sec`, + i18nSecs: $localize`:@@date-base.secs:${counter}:DATE: secs`, + } +} \ No newline at end of file diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts index 61c57a92d..0d7d9bc32 100644 --- a/frontend/src/app/shared/shared.module.ts +++ b/frontend/src/app/shared/shared.module.ts @@ -11,6 +11,7 @@ import { ScriptpubkeyTypePipe } from './pipes/scriptpubkey-type-pipe/scriptpubke import { BytesPipe } from './pipes/bytes-pipe/bytes.pipe'; import { WuBytesPipe } from './pipes/bytes-pipe/wubytes.pipe'; import { TimeSinceComponent } from '../components/time-since/time-since.component'; +import { TimeUntilComponent } from '../components/time-until/time-until.component'; import { ClipboardComponent } from '../components/clipboard/clipboard.component'; import { QrcodeComponent } from '../components/qrcode/qrcode.component'; import { FiatComponent } from '../fiat/fiat.component'; @@ -25,6 +26,7 @@ import { ColoredPriceDirective } from './directives/colored-price.directive'; declarations: [ ClipboardComponent, TimeSinceComponent, + TimeUntilComponent, QrcodeComponent, FiatComponent, TxFeaturesComponent, @@ -65,6 +67,7 @@ import { ColoredPriceDirective } from './directives/colored-price.directive'; NgbPaginationModule, NgbDropdownModule, TimeSinceComponent, + TimeUntilComponent, ClipboardComponent, QrcodeComponent, FiatComponent, From 9a715871c506cb60c19d9f9db05ccfd78341427a Mon Sep 17 00:00:00 2001 From: softsimon Date: Sat, 17 Jul 2021 14:59:10 +0300 Subject: [PATCH 30/42] Updating i18n strings. --- frontend/src/locale/messages.xlf | 587 +++++++++++++++++++++++-------- 1 file changed, 439 insertions(+), 148 deletions(-) diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index de1d655d3..abf90ed16 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -538,7 +538,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -735,7 +735,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -755,7 +755,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -840,7 +840,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -907,7 +907,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -955,7 +955,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -978,7 +978,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -986,7 +986,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -999,7 +999,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1007,7 +1007,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1130,7 +1130,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1263,7 +1263,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1346,7 +1346,7 @@ About src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1425,7 +1425,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2386,7 +2386,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2470,15 +2470,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2660,7 +2660,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2672,7 +2672,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2685,7 +2685,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2699,24 +2699,12 @@ Mempool size dashboard.mempool-size - - block + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2725,8 +2713,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined @@ -2735,7 +2743,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -2956,138 +2964,248 @@ statistics.transaction-vbytes-per-second - + Just now src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago src/app/components/time-since/time-since.component.ts 68 - - - hour ago src/app/components/time-since/time-since.component.ts 69 - - - min ago src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago src/app/components/time-since/time-since.component.ts 74 - - - sec ago src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago src/app/components/time-since/time-since.component.ts 79 - - - years ago src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago src/app/components/time-since/time-since.component.ts 85 - - - days ago src/app/components/time-since/time-since.component.ts 86 - - - hours ago src/app/components/time-since/time-since.component.ts 87 - - - mins ago src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago src/app/components/time-since/time-since.component.ts 92 - - - secs ago src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3106,7 +3224,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3120,15 +3238,6 @@ Transaction Confirmed state transaction.confirmed - - After - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen @@ -3265,7 +3374,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3273,7 +3382,7 @@ (Newly Generated Coins) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3281,7 +3390,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3289,7 +3398,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3298,7 +3407,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3307,7 +3416,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3315,7 +3424,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3323,7 +3432,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3331,7 +3440,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3339,7 +3448,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3347,11 +3456,11 @@ Load all src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3359,7 +3468,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3367,7 +3476,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3376,7 +3485,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3385,7 +3494,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3393,7 +3502,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3502,11 +3611,23 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3514,11 +3635,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3526,7 +3647,7 @@ Latest transactions src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3534,7 +3655,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3542,7 +3663,7 @@ Fee src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3550,7 +3671,7 @@ Expand src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3558,7 +3679,7 @@ Collapse src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3566,7 +3687,7 @@ Minimum fee src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3575,7 +3696,7 @@ Purging src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3584,7 +3705,7 @@ Memory usage src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3593,18 +3714,188 @@ Incoming transactions src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee From 08fd4a4835c8219a38a6a61059cc5ea8bcee61a7 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sat, 17 Jul 2021 15:37:34 +0300 Subject: [PATCH 31/42] Updating from transifex. --- frontend/src/locale/messages.ar.xlf | 630 +++++++++++++++++------- frontend/src/locale/messages.ca.xlf | 608 ++++++++++++++++------- frontend/src/locale/messages.cs.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.de.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.en_US.xlf | 587 ++++++++++++++++------ frontend/src/locale/messages.es.xlf | 639 +++++++++++++++++------- frontend/src/locale/messages.fa.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.fi.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.fr.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.he.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.hi.xlf | 587 ++++++++++++++++------ frontend/src/locale/messages.hr.xlf | 587 ++++++++++++++++------ frontend/src/locale/messages.hu.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.it.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.ja.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.ka.xlf | 609 ++++++++++++++++------- frontend/src/locale/messages.ko.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.nb.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.nl.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.pl.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.pt.xlf | 641 ++++++++++++++++++------- frontend/src/locale/messages.ru.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.sl.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.sv.xlf | 639 +++++++++++++++++------- frontend/src/locale/messages.tr.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.uk.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.vi.xlf | 610 ++++++++++++++++------- frontend/src/locale/messages.zh.xlf | 641 ++++++++++++++++++------- 28 files changed, 12425 insertions(+), 4723 deletions(-) diff --git a/frontend/src/locale/messages.ar.xlf b/frontend/src/locale/messages.ar.xlf index 42bc9fa51..fdfaa12ed 100644 --- a/frontend/src/locale/messages.ar.xlf +++ b/frontend/src/locale/messages.ar.xlf @@ -63,7 +63,7 @@ Select year - اختر السنه + اختر السنة node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.ts 74 @@ -147,7 +147,7 @@ HH - ساعه + ساعة node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts 296 @@ -163,7 +163,7 @@ MM - دقيقه + دقيقة node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts 296 @@ -179,7 +179,7 @@ Increment hours - ساعات اضافيه + ساعات إضافية node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts 296 @@ -195,7 +195,7 @@ Increment minutes - دقائق اضافيه + دقائق إضافية node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts 296 @@ -211,7 +211,7 @@ SS - ثانيه + ثانية node_modules/@ng-bootstrap/ng-bootstrap/__ivy_ngcc__/fesm2015/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.ts 296 @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -669,7 +669,7 @@ Markets - الاسواق + الأسواق src/app/bisq/bisq-dashboard/bisq-dashboard.component.html 20,21 @@ -682,7 +682,7 @@ Bitcoin Markets - اسواق البتكوين + أسواق البتكوين src/app/bisq/bisq-dashboard/bisq-dashboard.component.html 21,23 @@ -695,7 +695,7 @@ Currency - العمله + العملة src/app/bisq/bisq-dashboard/bisq-dashboard.component.html 27 @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ مشروع Mempool مفتوح المصدر src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ حول src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,12 @@ Mempool size dashboard.mempool-size - - block - الكتلة + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - كتل - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2948,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined تم تعدينه @@ -2973,7 +2979,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3212,164 +3218,255 @@ Transaction vBytes per second (vB/s) - التحويلات ف بايت في الثانية (ف بايت / سات) + حجم التحويلات في الثانية (بايت افتراضي / سات) src/app/components/statistics/statistics.component.html 53 statistics.transaction-vbytes-per-second - + Just now - الآن src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - منذ سنه - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - منذ شهر - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - منذ اسبوع + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - منذ يوم src/app/components/time-since/time-since.component.ts 68 - - - hour ago - منذ ساعه src/app/components/time-since/time-since.component.ts 69 - - - min ago - منذ دقيقه src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - منذ دقيقه src/app/components/time-since/time-since.component.ts 74 - - - sec ago - منذ ثانيه src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - منذ ثانيه src/app/components/time-since/time-since.component.ts 79 - - - years ago - منذ سنوات src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - منذ اشهر - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - منذ اسابيع src/app/components/time-since/time-since.component.ts 85 - - - days ago - منذ ايام src/app/components/time-since/time-since.component.ts 86 - - - hours ago - منذ ساعات src/app/components/time-since/time-since.component.ts 87 - - - mins ago - منذ دقائق src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - منذ دقيقة src/app/components/time-since/time-since.component.ts 92 - - - secs ago - منذ ثوان src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - منذ ثوان src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3487,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3502,6 @@ Transaction Confirmed state transaction.confirmed - - After - بعد - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen اول رؤية @@ -3566,7 +3653,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3662,7 @@ (عملات تم إنشاؤها حديثًا) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3671,7 @@ ربط src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3680,7 @@ البرنامج النصي (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3690,7 @@ البرنامج النصي. (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3700,7 @@ شوهد src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3709,7 @@ البرنامج النصي استرداد P2SH src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3718,7 @@ نتائج التجزئة النصية العالقة 2 للشاهد النصي المنفصل. src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3727,7 @@ ن التسلسل src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3736,7 @@ نص النتائج السابقة. src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3745,11 @@ تحميل الكل src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3758,7 @@ إخراج المعاملات الى src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3767,7 @@ النتيجة النصية لمعاملات بتكوين(عملية عكسية لإلغاء الرموز النصية) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3777,7 @@ النتيجة النصيةلمعاملات بتكوين (سلسلة ارقام سداسية عشرية) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3787,7 @@ البيانات src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3796,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3915,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks احدث الكتل src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3941,11 @@ التحويلات src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3954,7 @@ احدث التحويلات src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3963,7 @@ دولار src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3972,7 @@ رسوم src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3981,7 @@ توسيع src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3990,7 @@ انهيار src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +3999,7 @@ الحد الادنى للعمولة src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4009,7 @@ تطهير src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4019,7 @@ استخدام الذاكرة src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4029,188 @@ الحوالات الواردة src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - تعديل الصعوبة + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee رسوم التحويل diff --git a/frontend/src/locale/messages.ca.xlf b/frontend/src/locale/messages.ca.xlf index 164fcaa1d..189116f8b 100644 --- a/frontend/src/locale/messages.ca.xlf +++ b/frontend/src/locale/messages.ca.xlf @@ -591,7 +591,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -802,7 +802,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -823,7 +823,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -915,7 +915,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -988,7 +988,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1040,7 +1040,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1065,7 +1065,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1073,7 +1073,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1087,7 +1087,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1095,7 +1095,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1227,7 +1227,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1367,7 +1367,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1456,7 +1456,7 @@ Sobre src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1541,7 +1541,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2524,7 +2524,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2610,15 +2610,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2810,7 +2810,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2823,7 +2823,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2836,7 +2836,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2850,26 +2850,12 @@ Mempool size dashboard.mempool-size - - block - bloc + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - blocs - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2878,8 +2864,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined @@ -2888,7 +2894,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3115,157 +3121,248 @@ statistics.transaction-vbytes-per-second - + Just now - Ara src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - Faany - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - Fames - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - Fasetmana + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - Fadia src/app/components/time-since/time-since.component.ts 68 - - - hour ago - Fahora src/app/components/time-since/time-since.component.ts 69 - - - min ago - Faminut src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - Faminut src/app/components/time-since/time-since.component.ts 74 - - - sec ago - Fasegon src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - Fasegon src/app/components/time-since/time-since.component.ts 79 - - - years ago - Faanys src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - Famesos - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - Fasetmanes src/app/components/time-since/time-since.component.ts 85 - - - days ago - Fadies src/app/components/time-since/time-since.component.ts 86 - - - hours ago - Fahores src/app/components/time-since/time-since.component.ts 87 - - - mins ago - Faminuts src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - Faminuts src/app/components/time-since/time-since.component.ts 92 - - - secs ago - Fasegons src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - Fasegons src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3284,7 +3381,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3298,15 +3395,6 @@ Transaction Confirmed state transaction.confirmed - - After - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen @@ -3446,7 +3534,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3454,7 +3542,7 @@ (Newly Generated Coins) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3462,7 +3550,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3471,7 +3559,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3481,7 +3569,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3490,7 +3578,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3498,7 +3586,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3506,7 +3594,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3515,7 +3603,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3523,7 +3611,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3531,11 +3619,11 @@ Load all src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3543,7 +3631,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3552,7 +3640,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3562,7 +3650,7 @@ ScriptPubKey (HEX)  src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3571,7 +3659,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3580,7 +3668,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3691,12 +3779,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Últims blocs src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3705,11 +3805,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3717,7 +3817,7 @@ Latest transactions src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3726,7 +3826,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3734,7 +3834,7 @@ Fee src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3742,7 +3842,7 @@ Expand src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3750,7 +3850,7 @@ Collapse src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3758,7 +3858,7 @@ Minimum fee src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3767,7 +3867,7 @@ Purging src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3776,7 +3876,7 @@ Memory usage src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3785,18 +3885,188 @@ Incoming transactions src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee diff --git a/frontend/src/locale/messages.cs.xlf b/frontend/src/locale/messages.cs.xlf index 3b3ad5255..7d36363a3 100644 --- a/frontend/src/locale/messages.cs.xlf +++ b/frontend/src/locale/messages.cs.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Open source projekt Mempool src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ O projektu src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,12 @@ Mempool size dashboard.mempool-size - - block - blok + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - bloků - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2948,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Vytěžen @@ -2973,7 +2979,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3219,157 +3225,248 @@ statistics.transaction-vbytes-per-second - + Just now - Právě teď src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - před rokem - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - před měsícem - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - před týdnem + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - před dnem src/app/components/time-since/time-since.component.ts 68 - - - hour ago - před hodinou src/app/components/time-since/time-since.component.ts 69 - - - min ago - před min. src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - před minutou src/app/components/time-since/time-since.component.ts 74 - - - sec ago - před s. src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - před sekundou src/app/components/time-since/time-since.component.ts 79 - - - years ago - před roky src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - před měsíci - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - před týdny src/app/components/time-since/time-since.component.ts 85 - - - days ago - před dny src/app/components/time-since/time-since.component.ts 86 - - - hours ago - před hodinami src/app/components/time-since/time-since.component.ts 87 - - - mins ago - před min. src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - před minutami src/app/components/time-since/time-since.component.ts 92 - - - secs ago - před s. src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - před sekundami src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3487,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3502,6 @@ Transaction Confirmed state transaction.confirmed - - After - Po - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Poprvé viděna @@ -3566,7 +3653,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3662,7 @@ (Nově vytvořené mince) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3671,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3680,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3690,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3700,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3709,7 @@ P2SH redeem skript src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3718,7 @@ P2WSH witness skript src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3727,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3736,7 @@ Předchozí výstupní skript src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3745,11 @@ Načíst vše src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3758,7 @@ Peg-out do src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3767,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3777,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3787,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3796,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3915,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Poslední bloky src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3941,11 @@ Počet TX src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3954,7 @@ Poslední transakce src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3963,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3972,7 @@ Poplatek src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3981,7 @@ Rozšířit src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3990,7 @@ Zavřít src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +3999,7 @@ Minimální poplatek src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4009,7 @@ Čištění src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4019,7 @@ Využití paměti src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4029,188 @@ Příchozí transakce src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Úprava obtížnosti + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Transakční poplatek diff --git a/frontend/src/locale/messages.de.xlf b/frontend/src/locale/messages.de.xlf index b5a81fb29..df6ba9c76 100644 --- a/frontend/src/locale/messages.de.xlf +++ b/frontend/src/locale/messages.de.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Das Open-Source-Projekt Mempool src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ Über src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,12 @@ Mempool size dashboard.mempool-size - - block - Block + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - Blöcke - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2948,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Geschürft @@ -2973,7 +2979,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3219,157 +3225,248 @@ statistics.transaction-vbytes-per-second - + Just now - Gerade eben src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - vor einem Jahr - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - vor einem Monat - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - vor einer Woche + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - vor einem Tag src/app/components/time-since/time-since.component.ts 68 - - - hour ago - vor einer Stunde src/app/components/time-since/time-since.component.ts 69 - - - min ago - vor einer Min. src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - vor einer Minute src/app/components/time-since/time-since.component.ts 74 - - - sec ago - vor einer Sek. src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - vor Sekunden src/app/components/time-since/time-since.component.ts 79 - - - years ago - vor Jahren src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - vor Monaten - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - vor Wochen src/app/components/time-since/time-since.component.ts 85 - - - days ago - vor Tagen src/app/components/time-since/time-since.component.ts 86 - - - hours ago - vor Stunden src/app/components/time-since/time-since.component.ts 87 - - - mins ago - vor Min. src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - vor Minuten src/app/components/time-since/time-since.component.ts 92 - - - secs ago - vor Sek. src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - vor Sekunden src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3487,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3502,6 @@ Transaction Confirmed state transaction.confirmed - - After - Nach - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Zuerst gesehen @@ -3566,7 +3653,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3662,7 @@ (Neu generierte Coins) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3671,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3680,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3690,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3700,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3709,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3718,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3727,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3736,7 @@ Vorheriges Output Script src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3745,11 @@ Alle nachladen src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3758,7 @@ Peg-out zu src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3767,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3777,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3787,7 @@ Daten src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3796,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3915,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Neueste Blöcke src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3941,11 @@ TX src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3954,7 @@ Neueste Transaktionen src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3963,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3972,7 @@ Gebühr src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3981,7 @@ Erweitern src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3990,7 @@ Reduzieren src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +3999,7 @@ Mindestgebühr src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4009,7 @@ Streichung src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4019,7 @@ Speicherausnutzung src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4029,188 @@ Eingehende Transaktionen src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Schwierigkeitsanpassung + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Transaktionsgebühr diff --git a/frontend/src/locale/messages.en_US.xlf b/frontend/src/locale/messages.en_US.xlf index ba772e7a9..efa8cd565 100644 --- a/frontend/src/locale/messages.en_US.xlf +++ b/frontend/src/locale/messages.en_US.xlf @@ -537,7 +537,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -734,7 +734,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -754,7 +754,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -839,7 +839,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -906,7 +906,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -954,7 +954,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -977,7 +977,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -985,7 +985,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -998,7 +998,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1006,7 +1006,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1129,7 +1129,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1262,7 +1262,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1345,7 +1345,7 @@ About src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1424,7 +1424,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2385,7 +2385,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2469,15 +2469,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2659,7 +2659,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2671,7 +2671,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2684,7 +2684,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2698,24 +2698,12 @@ Mempool size dashboard.mempool-size - - block + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2724,8 +2712,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined @@ -2734,7 +2742,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -2955,138 +2963,248 @@ statistics.transaction-vbytes-per-second - + Just now src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago src/app/components/time-since/time-since.component.ts 68 - - - hour ago src/app/components/time-since/time-since.component.ts 69 - - - min ago src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago src/app/components/time-since/time-since.component.ts 74 - - - sec ago src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago src/app/components/time-since/time-since.component.ts 79 - - - years ago src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago src/app/components/time-since/time-since.component.ts 85 - - - days ago src/app/components/time-since/time-since.component.ts 86 - - - hours ago src/app/components/time-since/time-since.component.ts 87 - - - mins ago src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago src/app/components/time-since/time-since.component.ts 92 - - - secs ago src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3105,7 +3223,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3119,15 +3237,6 @@ Transaction Confirmed state transaction.confirmed - - After - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen @@ -3264,7 +3373,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3272,7 +3381,7 @@ (Newly Generated Coins) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3280,7 +3389,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3288,7 +3397,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3297,7 +3406,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3306,7 +3415,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3314,7 +3423,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3322,7 +3431,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3330,7 +3439,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3338,7 +3447,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3346,11 +3455,11 @@ Load all src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3358,7 +3467,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3366,7 +3475,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3375,7 +3484,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3384,7 +3493,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3392,7 +3501,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3501,11 +3610,23 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3513,11 +3634,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3525,7 +3646,7 @@ Latest transactions src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3533,7 +3654,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3541,7 +3662,7 @@ Fee src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3549,7 +3670,7 @@ Expand src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3557,7 +3678,7 @@ Collapse src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3565,7 +3686,7 @@ Minimum fee src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3574,7 +3695,7 @@ Purging src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3583,7 +3704,7 @@ Memory usage src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3592,18 +3713,188 @@ Incoming transactions src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee diff --git a/frontend/src/locale/messages.es.xlf b/frontend/src/locale/messages.es.xlf index 8d401093f..755210301 100644 --- a/frontend/src/locale/messages.es.xlf +++ b/frontend/src/locale/messages.es.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Proyecto de Código Abierto The Mempool src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ Sobre nosotros src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,13 @@ Mempool size dashboard.mempool-size - - block - bloque + + blocks + bloques src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - bloques - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2949,29 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + bloque + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Minado @@ -2973,7 +2981,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3219,157 +3227,253 @@ statistics.transaction-vbytes-per-second - + Just now Justo ahora src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - Hace año - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - Hace mes - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - Hace semana + + ago + Hace src/app/components/time-since/time-since.component.ts 67 - - - day ago - Hace día src/app/components/time-since/time-since.component.ts 68 - - - hour ago - Hace hora src/app/components/time-since/time-since.component.ts 69 - - - min ago - Hace min. src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - Hace minuto src/app/components/time-since/time-since.component.ts 74 - - - sec ago - Hace seg. src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - Hace segundo src/app/components/time-since/time-since.component.ts 79 - - - years ago - Hace año src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - Hace meses - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - Hace semanas src/app/components/time-since/time-since.component.ts 85 - - - days ago - Hace días src/app/components/time-since/time-since.component.ts 86 - - - hours ago - Hace horas src/app/components/time-since/time-since.component.ts 87 - - - mins ago - Hace min. src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - Hace minutos src/app/components/time-since/time-since.component.ts 92 - - - secs ago - Hace seg. src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - Hace segundos src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + Después de + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + En ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + En ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3494,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3509,6 @@ Transaction Confirmed state transaction.confirmed - - After - Después - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Visto por primera vez @@ -3566,7 +3660,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3669,7 @@ (Monedas recién generadas) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3678,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3687,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3697,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3707,7 @@ Testigo src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3716,7 @@ script de canje P2SH src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3725,7 @@ script de testigo P2WSH src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3734,7 @@ nSecuencia src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3743,7 @@ Script de salida previo src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3752,11 @@ Cargar todas src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3765,7 @@ Peg-out a src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3774,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3784,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3794,7 @@ dato src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3803,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3922,25 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + Estimaciones de Tasas + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Últimos bloques src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3949,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3962,7 @@ Últimas transacciones src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3971,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3980,7 @@ Tasa src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3989,7 @@ Expandir src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3998,7 @@ Colapsar src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +4007,7 @@ Tarifa mínima src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4017,7 @@ Purga src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4027,7 @@ Uso de memoria src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4037,211 @@ Transacciones entrantes src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Ajuste de dificultad + + Difficulty Adjustment + Ajuste de Dificultad src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + Restante + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + Estimar + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + min por bloque + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + Período Actual + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + año + + src/app/shared/i18n/dates.ts + 3 + + + + years + años + + src/app/shared/i18n/dates.ts + 4 + + + + month + mes + + src/app/shared/i18n/dates.ts + 5 + + + + months + meses + + src/app/shared/i18n/dates.ts + 6 + + + + week + semana + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + semanas + + src/app/shared/i18n/dates.ts + 8 + + + + day + día + + src/app/shared/i18n/dates.ts + 9 + + + + days + días + + src/app/shared/i18n/dates.ts + 10 + + + + hour + hora + + src/app/shared/i18n/dates.ts + 11 + + + + hours + horas + + src/app/shared/i18n/dates.ts + 12 + + + + minute + minuto + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + minutos + + src/app/shared/i18n/dates.ts + 14 + + + + min + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + segundo + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + segundos + + src/app/shared/i18n/dates.ts + 18 + + + + sec + seg + + src/app/shared/i18n/dates.ts + 19 + + + + secs + segs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Tasa de transacción diff --git a/frontend/src/locale/messages.fa.xlf b/frontend/src/locale/messages.fa.xlf index 80b1a1ed4..fda32a232 100644 --- a/frontend/src/locale/messages.fa.xlf +++ b/frontend/src/locale/messages.fa.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ پروژهٔ متن‌باز ممپول src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ درباره src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2602,7 +2602,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2689,15 +2689,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2896,7 +2896,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2909,7 +2909,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2923,7 +2923,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2938,26 +2938,12 @@ Mempool size dashboard.mempool-size - - block - بلاک + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - بلاک - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2966,8 +2952,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined استخراج‌شده @@ -2977,7 +2983,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3223,157 +3229,248 @@ statistics.transaction-vbytes-per-second - + Just now - همین الان src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - سال پیش - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - ماه پیش - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - هفته پیش + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - روز پیش src/app/components/time-since/time-since.component.ts 68 - - - hour ago - ساعت پیش src/app/components/time-since/time-since.component.ts 69 - - - min ago - دقیقه پیش src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - دقیقه پیش src/app/components/time-since/time-since.component.ts 74 - - - sec ago - ثانیه پیش src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - ثانیه پیش src/app/components/time-since/time-since.component.ts 79 - - - years ago - سال پیش src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - ماه پیش - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - هفته پیش src/app/components/time-since/time-since.component.ts 85 - - - days ago - روز پیش src/app/components/time-since/time-since.component.ts 86 - - - hours ago - ساعت پیش src/app/components/time-since/time-since.component.ts 87 - - - mins ago - دقیقه پیش src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - دقیقه پیش src/app/components/time-since/time-since.component.ts 92 - - - secs ago - ثانیه پیش src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - ثانیه پیش src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3394,7 +3491,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3409,16 +3506,6 @@ Transaction Confirmed state transaction.confirmed - - After - بعد از - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen اولین زمان دیده‌شدن @@ -3570,7 +3657,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3579,7 +3666,7 @@ (سکه‌های تازه تولید شده) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3588,7 +3675,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3597,7 +3684,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3607,7 +3694,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3617,7 +3704,7 @@ شاهد src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3626,7 +3713,7 @@ اسکریپت نقد کردن P2SH src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3635,7 +3722,7 @@ اسکریپت شاهد P2WSH src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3644,7 +3731,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3653,7 +3740,7 @@ اسکریپت خروجی قبلی src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3662,11 +3749,11 @@ بازکردن همه src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3675,7 +3762,7 @@ ‏Peg-out به src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3684,7 +3771,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3694,7 +3781,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3704,7 +3791,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3713,7 +3800,7 @@ ساتوشی src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3832,12 +3919,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks آخرین بلاک‌ها src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3846,11 +3945,11 @@ تراکنش src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3859,7 +3958,7 @@ آخرین تراکنش‌ها src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3868,7 +3967,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3877,7 +3976,7 @@ کارمزد src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3886,7 +3985,7 @@ بستن src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3895,7 +3994,7 @@ بازکردن src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3904,7 +4003,7 @@ حداقل کارمزد src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3914,7 +4013,7 @@ آستانه حذف src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3924,7 +4023,7 @@ حافظه مصرف‌شده src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3934,19 +4033,188 @@ تراکنش‌های منتشرشده src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - تنظیم سختی بلاک‌ها + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee کارمزد تراکنش diff --git a/frontend/src/locale/messages.fi.xlf b/frontend/src/locale/messages.fi.xlf index 356e77904..2872a3d15 100644 --- a/frontend/src/locale/messages.fi.xlf +++ b/frontend/src/locale/messages.fi.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Mempool avoimen lähdekoodin projekti src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ Tietoja src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,12 @@ Mempool size dashboard.mempool-size - - block - lohko + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - lohkoa - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2948,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Louhittu @@ -2973,7 +2979,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3219,157 +3225,248 @@ statistics.transaction-vbytes-per-second - + Just now - Juuri nyt src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - vuotta sitten - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - kuukautta sitten - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - viikkoa sitten + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - päivää sitten src/app/components/time-since/time-since.component.ts 68 - - - hour ago - tuntia sitten src/app/components/time-since/time-since.component.ts 69 - - - min ago - m sitten src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - minuuttia sitten src/app/components/time-since/time-since.component.ts 74 - - - sec ago - s sitten src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - sekunttia sitten src/app/components/time-since/time-since.component.ts 79 - - - years ago - vuotta sitten src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - kuukautta sitten - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - viikkoa sitten src/app/components/time-since/time-since.component.ts 85 - - - days ago - päivää sitten src/app/components/time-since/time-since.component.ts 86 - - - hours ago - tuntia sitten src/app/components/time-since/time-since.component.ts 87 - - - mins ago - m sitten src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - minuuttia sitten src/app/components/time-since/time-since.component.ts 92 - - - secs ago - s sitten src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - sekunttia sitten src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3487,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3502,6 @@ Transaction Confirmed state transaction.confirmed - - After - Jälkeen - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Ensimmäiseksi nähty @@ -3566,7 +3653,7 @@ Kolikonluonti src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3662,7 @@ (Äskettäin luodut kolikot) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3671,7 @@ Kiinnitä src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3680,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3690,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3700,7 @@ Todistaja src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3709,7 @@ P2SH lunastusskripti src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3718,7 @@ P2WSH todistajaskripti src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3727,7 @@ nJärjestys src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3736,7 @@ Edellinen tulosteskripti src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3745,11 @@ Lataa kaikki src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3758,7 @@ Irrotetaan src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3767,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3777,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3787,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3796,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3915,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Viimeisimmät lohkot src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3941,11 @@ Siirtoa src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3954,7 @@ Viimeisimmät siirtotapahtumat src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3963,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3972,7 @@ Siirtokulu src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3981,7 @@ Laajenna src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3990,7 @@ Paina kokoon src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +3999,7 @@ Vähimmäiskulu src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4009,7 @@ Tyhjennys src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4019,7 @@ Muistin käyttö src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4029,188 @@ Saapuvat siirtotapahtumat src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Vaikeudensäätö + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Siirtokulu diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index 01601859b..445447e23 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -578,7 +578,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -789,7 +789,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -810,7 +810,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -902,7 +902,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -975,7 +975,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1027,7 +1027,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1052,7 +1052,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1060,7 +1060,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1074,7 +1074,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1082,7 +1082,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1214,7 +1214,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1359,7 +1359,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1448,7 +1448,7 @@ A propos src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1532,7 +1532,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2548,7 +2548,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2635,15 +2635,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2838,7 +2838,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2851,7 +2851,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2865,7 +2865,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2880,26 +2880,12 @@ Mempool size dashboard.mempool-size - - block - bloc + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - blocs - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2908,8 +2894,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Miné @@ -2919,7 +2925,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3164,157 +3170,248 @@ statistics.transaction-vbytes-per-second - + Just now - À l'instant même src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - il y a an - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - il y a mois - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - il y a semaine + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - il y a jour src/app/components/time-since/time-since.component.ts 68 - - - hour ago - il y a heure src/app/components/time-since/time-since.component.ts 69 - - - min ago - il y a min src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - il y a minute src/app/components/time-since/time-since.component.ts 74 - - - sec ago - il y a sec src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - il y a seconde src/app/components/time-since/time-since.component.ts 79 - - - years ago - il y a ans src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - il y a mois - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - il y a semaines src/app/components/time-since/time-since.component.ts 85 - - - days ago - il y a jours src/app/components/time-since/time-since.component.ts 86 - - - hours ago - il y a heures src/app/components/time-since/time-since.component.ts 87 - - - mins ago - il y a mins src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - il y a minutes src/app/components/time-since/time-since.component.ts 92 - - - secs ago - il y a secs src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - il y a secondes src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3335,7 +3432,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3350,16 +3447,6 @@ Transaction Confirmed state transaction.confirmed - - After - Après - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Vu pour la première fois @@ -3507,7 +3594,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3516,7 +3603,7 @@ (Nouveaux bitcoins générés) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3525,7 +3612,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3534,7 +3621,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3544,7 +3631,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3554,7 +3641,7 @@ Témoin src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3563,7 +3650,7 @@ Script de rachat P2SH src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3572,7 +3659,7 @@ Script témoin PW2SH src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3581,7 +3668,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3590,7 +3677,7 @@ Script de sortie précédent src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3599,11 +3686,11 @@ Charger tout src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3612,7 +3699,7 @@ Peg-out vers src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3621,7 +3708,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3631,7 +3718,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3641,7 +3728,7 @@ Donnée src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3650,7 +3737,7 @@ Sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3765,12 +3852,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Derniers blocs src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3779,11 +3878,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3792,7 +3891,7 @@ Dernières transactions src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3801,7 +3900,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3810,7 +3909,7 @@ Frais src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3819,7 +3918,7 @@ Etendre src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3828,7 +3927,7 @@ Ecraser src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3837,7 +3936,7 @@ Frais minimums src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3847,7 +3946,7 @@ Purgées src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3857,7 +3956,7 @@ Mémoire utilisée src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3867,19 +3966,188 @@ Transactions entrantes src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Ajustement de la difficulté + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee diff --git a/frontend/src/locale/messages.he.xlf b/frontend/src/locale/messages.he.xlf index b3b043034..e5874b455 100644 --- a/frontend/src/locale/messages.he.xlf +++ b/frontend/src/locale/messages.he.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1379,7 +1379,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1470,7 +1470,7 @@ אודות src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1556,7 +1556,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2573,7 +2573,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2660,15 +2660,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2866,7 +2866,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2879,7 +2879,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2893,7 +2893,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2908,26 +2908,12 @@ Mempool size dashboard.mempool-size - - block - בלוק + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - בלוקים - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2936,8 +2922,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined נכרה @@ -2947,7 +2953,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3193,157 +3199,248 @@ statistics.transaction-vbytes-per-second - + Just now - זה עתה src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - לפני שנים - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - לפני חודשים - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - לפני שבועות + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - לפני ימים src/app/components/time-since/time-since.component.ts 68 - - - hour ago - לפני שעות src/app/components/time-since/time-since.component.ts 69 - - - min ago - לפני דקות src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - לפני דקות src/app/components/time-since/time-since.component.ts 74 - - - sec ago - לפני שניות src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - לפני שניות src/app/components/time-since/time-since.component.ts 79 - - - years ago - לפני שנים src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - לפני חודשים - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - לפני שבועות src/app/components/time-since/time-since.component.ts 85 - - - days ago - לפני ימים src/app/components/time-since/time-since.component.ts 86 - - - hours ago - לפני שעות src/app/components/time-since/time-since.component.ts 87 - - - mins ago - לפני דקות src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - לפני דקות src/app/components/time-since/time-since.component.ts 92 - - - secs ago - לפני שניות src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - לפני שניות src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3364,7 +3461,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3379,16 +3476,6 @@ Transaction Confirmed state transaction.confirmed - - After - לאחר - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen נראה לראשונה @@ -3540,7 +3627,7 @@ מטבעה src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3549,7 +3636,7 @@ (מטבעות שזה עתה נוצרו) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3558,7 +3645,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3567,7 +3654,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3577,7 +3664,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3587,7 +3674,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3596,7 +3683,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3605,7 +3692,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3614,7 +3701,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3623,7 +3710,7 @@ פלט קודם src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3632,11 +3719,11 @@ טען הכל src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3645,7 +3732,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3654,7 +3741,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3664,7 +3751,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3674,7 +3761,7 @@ נתונים src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3683,7 +3770,7 @@ סאט src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3802,12 +3889,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks בלוקים אחרונים src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3816,11 +3915,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3829,7 +3928,7 @@ טרנזקציות אחרונות src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3838,7 +3937,7 @@ דולר אמריקאי src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3847,7 +3946,7 @@ עמלה src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3856,7 +3955,7 @@ הרחב src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3865,7 +3964,7 @@ מזער src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3874,7 +3973,7 @@ עמלה מינימלית src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3884,7 +3983,7 @@ סף עמלה src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3894,7 +3993,7 @@ שימוש בזיכרון src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3904,19 +4003,188 @@ טרנזקציות נכנסות src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - התאמת קושי הכרייה + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee עמלת טרנזקציה diff --git a/frontend/src/locale/messages.hi.xlf b/frontend/src/locale/messages.hi.xlf index cde271a35..1c10641eb 100644 --- a/frontend/src/locale/messages.hi.xlf +++ b/frontend/src/locale/messages.hi.xlf @@ -588,7 +588,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -799,7 +799,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -820,7 +820,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -912,7 +912,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -985,7 +985,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1037,7 +1037,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1062,7 +1062,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1070,7 +1070,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1084,7 +1084,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1092,7 +1092,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1224,7 +1224,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1376,7 +1376,7 @@ मेमपूल ओपन सोर्स प्रोजेक्ट src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1469,7 +1469,7 @@ विवरण src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1552,7 +1552,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2513,7 +2513,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2597,15 +2597,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2787,7 +2787,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2799,7 +2799,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2812,7 +2812,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2826,24 +2826,12 @@ Mempool size dashboard.mempool-size - - block + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2852,8 +2840,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined @@ -2862,7 +2870,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3083,138 +3091,248 @@ statistics.transaction-vbytes-per-second - + Just now src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago src/app/components/time-since/time-since.component.ts 68 - - - hour ago src/app/components/time-since/time-since.component.ts 69 - - - min ago src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago src/app/components/time-since/time-since.component.ts 74 - - - sec ago src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago src/app/components/time-since/time-since.component.ts 79 - - - years ago src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago src/app/components/time-since/time-since.component.ts 85 - - - days ago src/app/components/time-since/time-since.component.ts 86 - - - hours ago src/app/components/time-since/time-since.component.ts 87 - - - mins ago src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago src/app/components/time-since/time-since.component.ts 92 - - - secs ago src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3233,7 +3351,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3247,15 +3365,6 @@ Transaction Confirmed state transaction.confirmed - - After - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen @@ -3392,7 +3501,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3400,7 +3509,7 @@ (Newly Generated Coins) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3408,7 +3517,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3416,7 +3525,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3425,7 +3534,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3434,7 +3543,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3442,7 +3551,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3450,7 +3559,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3458,7 +3567,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3466,7 +3575,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3474,11 +3583,11 @@ Load all src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3486,7 +3595,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3494,7 +3603,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3503,7 +3612,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3512,7 +3621,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3520,7 +3629,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3629,11 +3738,23 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3641,11 +3762,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3653,7 +3774,7 @@ Latest transactions src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3661,7 +3782,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3669,7 +3790,7 @@ Fee src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3677,7 +3798,7 @@ Expand src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3685,7 +3806,7 @@ Collapse src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3693,7 +3814,7 @@ Minimum fee src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3702,7 +3823,7 @@ Purging src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3711,7 +3832,7 @@ Memory usage src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3720,18 +3841,188 @@ Incoming transactions src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee diff --git a/frontend/src/locale/messages.hr.xlf b/frontend/src/locale/messages.hr.xlf index 9a2037925..d6cad29e0 100644 --- a/frontend/src/locale/messages.hr.xlf +++ b/frontend/src/locale/messages.hr.xlf @@ -538,7 +538,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -735,7 +735,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -755,7 +755,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -840,7 +840,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -907,7 +907,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -955,7 +955,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -978,7 +978,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -986,7 +986,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -999,7 +999,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1007,7 +1007,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1135,7 +1135,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1268,7 +1268,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1351,7 +1351,7 @@ About src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1430,7 +1430,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2391,7 +2391,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2476,15 +2476,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2667,7 +2667,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2679,7 +2679,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2692,7 +2692,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2706,24 +2706,12 @@ Mempool size dashboard.mempool-size - - block + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2732,8 +2720,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined @@ -2742,7 +2750,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -2963,138 +2971,248 @@ statistics.transaction-vbytes-per-second - + Just now src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago src/app/components/time-since/time-since.component.ts 68 - - - hour ago src/app/components/time-since/time-since.component.ts 69 - - - min ago src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago src/app/components/time-since/time-since.component.ts 74 - - - sec ago src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago src/app/components/time-since/time-since.component.ts 79 - - - years ago src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago src/app/components/time-since/time-since.component.ts 85 - - - days ago src/app/components/time-since/time-since.component.ts 86 - - - hours ago src/app/components/time-since/time-since.component.ts 87 - - - mins ago src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago src/app/components/time-since/time-since.component.ts 92 - - - secs ago src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3115,7 +3233,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3130,15 +3248,6 @@ Transaction Confirmed state transaction.confirmed - - After - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Prvo viđeno @@ -3281,7 +3390,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3289,7 +3398,7 @@ (Newly Generated Coins) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3297,7 +3406,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3305,7 +3414,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3314,7 +3423,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3323,7 +3432,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3331,7 +3440,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3339,7 +3448,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3347,7 +3456,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3355,7 +3464,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3363,11 +3472,11 @@ Load all src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3375,7 +3484,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3383,7 +3492,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3392,7 +3501,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3401,7 +3510,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3409,7 +3518,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3518,11 +3627,23 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3530,11 +3651,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3542,7 +3663,7 @@ Latest transactions src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3550,7 +3671,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3558,7 +3679,7 @@ Fee src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3566,7 +3687,7 @@ Expand src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3574,7 +3695,7 @@ Collapse src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3582,7 +3703,7 @@ Minimum fee src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3591,7 +3712,7 @@ Purging src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3600,7 +3721,7 @@ Memory usage src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3609,18 +3730,188 @@ Incoming transactions src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee diff --git a/frontend/src/locale/messages.hu.xlf b/frontend/src/locale/messages.hu.xlf index d6a713101..0bb2c5380 100644 --- a/frontend/src/locale/messages.hu.xlf +++ b/frontend/src/locale/messages.hu.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ A Mempool Nyílt Forráskódú Projekt src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ Részletek src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,12 @@ Mempool size dashboard.mempool-size - - block - blokk + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - blokknyi - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2948,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Bányászott @@ -2973,7 +2979,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3219,157 +3225,248 @@ statistics.transaction-vbytes-per-second - + Just now - Épp most src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - éve - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - hónapja - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - hete + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - napja src/app/components/time-since/time-since.component.ts 68 - - - hour ago - órája src/app/components/time-since/time-since.component.ts 69 - - - min ago - perce src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - percel ezelőtt src/app/components/time-since/time-since.component.ts 74 - - - sec ago - másodperce src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - másodpercel ezelőtt src/app/components/time-since/time-since.component.ts 79 - - - years ago - évvel ezelőtt src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - hónappal ezelőtt - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - héttel ezelőtt src/app/components/time-since/time-since.component.ts 85 - - - days ago - nappal ezelőtt src/app/components/time-since/time-since.component.ts 86 - - - hours ago - órával ezelőtt src/app/components/time-since/time-since.component.ts 87 - - - mins ago - perce src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - percel ezelőtt src/app/components/time-since/time-since.component.ts 92 - - - secs ago - másodperce src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - másodpercel ezelőtt src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3487,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3502,6 @@ Transaction Confirmed state transaction.confirmed - - After - után - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Először látva @@ -3566,7 +3653,7 @@ Érmebázis src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3662,7 @@ (Újjonnan Létrehozott Érmék) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3671,7 @@ Bekötés src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3680,7 @@ SzkriptSzig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3690,7 @@ SzkriptSzig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3700,7 @@ Szemtanú src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3709,7 @@ P2SH kiváltási szkript src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3718,7 @@ P2WSH szemtanú szkript src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3727,7 @@ nSzekvencia src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3736,7 @@ Előző kimeneti szkript src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3745,11 @@ Minden betöltése src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3758,7 @@ Kivétel a -ra src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3767,7 @@ SzkriptPublikusKulcs (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3777,7 @@ SzkriptPublikusKulcs (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3787,7 @@ adat src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3796,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3915,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Legutóbbi blokkok src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3941,11 @@ TXek src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3954,7 @@ Legutóbbi tranzakciók src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3963,7 @@ USA Dollár src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3972,7 @@ Díj src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3981,7 @@ Kibővít src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3990,7 @@ Becsuk src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +3999,7 @@ Minimum Díj src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4009,7 @@ Törlés src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4019,7 @@ Memória használat src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4029,188 @@ Beérkező tranzakciók src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Bányászási nehézségifok + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Tranzakciós díj diff --git a/frontend/src/locale/messages.it.xlf b/frontend/src/locale/messages.it.xlf index 64eb871c0..186a4e306 100644 --- a/frontend/src/locale/messages.it.xlf +++ b/frontend/src/locale/messages.it.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Il Progetto Open Source Mempool src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ Su di noi src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2599,7 +2599,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2686,15 +2686,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2893,7 +2893,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2906,7 +2906,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2920,7 +2920,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2935,26 +2935,12 @@ Mempool size dashboard.mempool-size - - block - blocco + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - blocchi - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2963,8 +2949,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Minato @@ -2974,7 +2980,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3220,157 +3226,248 @@ statistics.transaction-vbytes-per-second - + Just now - Proprio ora src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - anno fa - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - mese fa - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - settimana fa + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - giorno fa src/app/components/time-since/time-since.component.ts 68 - - - hour ago - ora fa src/app/components/time-since/time-since.component.ts 69 - - - min ago - min fa src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - minuto fa src/app/components/time-since/time-since.component.ts 74 - - - sec ago - sec fa src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - secondo fa src/app/components/time-since/time-since.component.ts 79 - - - years ago - anni fa src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - mesi fa - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - settimane fa src/app/components/time-since/time-since.component.ts 85 - - - days ago - giorni fa src/app/components/time-since/time-since.component.ts 86 - - - hours ago - ore fa src/app/components/time-since/time-since.component.ts 87 - - - mins ago - min fa src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - minuti fa src/app/components/time-since/time-since.component.ts 92 - - - secs ago - sec fa src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - secondi fa src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3391,7 +3488,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3406,16 +3503,6 @@ Transaction Confirmed state transaction.confirmed - - After - Dopo - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Vista per la prima volta @@ -3567,7 +3654,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3576,7 +3663,7 @@ (Bitcoin Appena Generati) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3585,7 +3672,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3594,7 +3681,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3604,7 +3691,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3614,7 +3701,7 @@ Testimone src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3623,7 +3710,7 @@ Script di riscatto P2SH src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3632,7 +3719,7 @@ Script testimone P2WSH src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3641,7 +3728,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3650,7 +3737,7 @@ Script output precedente src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3659,11 +3746,11 @@ Carica tutto src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3672,7 +3759,7 @@ Peg-out verso src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3681,7 +3768,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3691,7 +3778,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3701,7 +3788,7 @@ dati src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3710,7 +3797,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3829,12 +3916,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Ultimi blocchi src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3843,11 +3942,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3856,7 +3955,7 @@ Ultime transazioni src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3865,7 +3964,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3874,7 +3973,7 @@ Commissione src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3883,7 +3982,7 @@ Espandi src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3892,7 +3991,7 @@ Comprimi src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3901,7 +4000,7 @@ Commissione minima src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3911,7 +4010,7 @@ Eliminazione src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3921,7 +4020,7 @@ Memoria in uso src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3931,19 +4030,188 @@ Transazioni in arrivo src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Aggiustamento della difficoltà + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Commissione di transazione diff --git a/frontend/src/locale/messages.ja.xlf b/frontend/src/locale/messages.ja.xlf index 87dd04306..9df8cb2e5 100644 --- a/frontend/src/locale/messages.ja.xlf +++ b/frontend/src/locale/messages.ja.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ メムプール・オープンソース・プロジェクト src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ このアプリについて src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,12 @@ Mempool size dashboard.mempool-size - - block - ブロック + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - ブロック - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2948,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined 採掘された @@ -2973,7 +2979,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3219,157 +3225,248 @@ statistics.transaction-vbytes-per-second - + Just now - ちょうど今 src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - 年前 - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - ヶ月前 - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - 週間前 + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - 日前 src/app/components/time-since/time-since.component.ts 68 - - - hour ago - 時間前 src/app/components/time-since/time-since.component.ts 69 - - - min ago - 分前 src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - 分前 src/app/components/time-since/time-since.component.ts 74 - - - sec ago - 秒前 src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - 秒前 src/app/components/time-since/time-since.component.ts 79 - - - years ago - 年前 src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - ヶ月前 - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - 週間前 src/app/components/time-since/time-since.component.ts 85 - - - days ago - 日前 src/app/components/time-since/time-since.component.ts 86 - - - hours ago - 時間前 src/app/components/time-since/time-since.component.ts 87 - - - mins ago - 分前 src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - 分前 src/app/components/time-since/time-since.component.ts 92 - - - secs ago - 秒前 src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - 秒前 src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3487,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3502,6 @@ Transaction Confirmed state transaction.confirmed - - After - の後 - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen 最初に見た @@ -3566,7 +3653,7 @@ コインベース src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3662,7 @@ （新しく生成されたコイン） src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3671,7 @@ ペグイン src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3680,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3690,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3700,7 @@ ウィットネス src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3709,7 @@ P2SH引き換えスクリプト src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3718,7 @@ P2WSHウィットネススクリプト src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3727,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3736,7 @@ 前の出力スクリプト src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3745,11 @@ すべてをロード src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3758,7 @@ へのペグアウト src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3767,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3777,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3787,7 @@ データ src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3796,7 @@ ｻﾄｼ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3915,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks 最新のブロック src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3941,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3954,7 @@ 最新のトランザクション src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3963,7 @@ 米ドル src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3972,7 @@ 手数料 src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3981,7 @@ 展開 src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3990,7 @@ 折りたたみ src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +3999,7 @@ 最低料金 src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4009,7 @@ 削除中 src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4019,7 @@ メモリ使用量 src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4029,188 @@ 着信トランザクション src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - 難易度調整 + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee トランザクション手数料 diff --git a/frontend/src/locale/messages.ka.xlf b/frontend/src/locale/messages.ka.xlf index b97b94fa7..8bdeade78 100644 --- a/frontend/src/locale/messages.ka.xlf +++ b/frontend/src/locale/messages.ka.xlf @@ -559,7 +559,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -761,7 +761,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -782,7 +782,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -871,7 +871,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -943,7 +943,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -995,7 +995,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1019,7 +1019,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1027,7 +1027,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1041,7 +1041,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1049,7 +1049,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1180,7 +1180,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1316,7 +1316,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1401,7 +1401,7 @@ ჩვენს შესახებ src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1485,7 +1485,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2474,7 +2474,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2561,15 +2561,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2764,7 +2764,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2777,7 +2777,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2791,7 +2791,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2806,26 +2806,12 @@ Mempool size dashboard.mempool-size - - block - ბლოკი + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - ბლოკი - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2834,8 +2820,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined მოპოვებული @@ -2845,7 +2851,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3090,157 +3096,248 @@ statistics.transaction-vbytes-per-second - + Just now - ზუსტად ახლა src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - წლის წინ - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - თვის წინ - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - კვირის წინ + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - დღის წინ src/app/components/time-since/time-since.component.ts 68 - - - hour ago - საათის წინ src/app/components/time-since/time-since.component.ts 69 - - - min ago - წუთის წინ src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - წუთის წინ src/app/components/time-since/time-since.component.ts 74 - - - sec ago - წამის წინ src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - წამის წინ src/app/components/time-since/time-since.component.ts 79 - - - years ago - წლის წინ src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - თვის წინ - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - კვირის წინ src/app/components/time-since/time-since.component.ts 85 - - - days ago - დღის წინ src/app/components/time-since/time-since.component.ts 86 - - - hours ago - საათის წინ src/app/components/time-since/time-since.component.ts 87 - - - mins ago - წუთის წინ src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - წუთის წინ src/app/components/time-since/time-since.component.ts 92 - - - secs ago - წამის წინ src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - წამის წინ src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3261,7 +3358,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3276,15 +3373,6 @@ Transaction Confirmed state transaction.confirmed - - After - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen პირველი @@ -3432,7 +3520,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3441,7 +3529,7 @@ (ახალი ქოინები) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3450,7 +3538,7 @@ მიბმული src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3458,7 +3546,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3467,7 +3555,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3476,7 +3564,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3484,7 +3572,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3492,7 +3580,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3500,7 +3588,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3508,7 +3596,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3517,11 +3605,11 @@ ყველა ჩატვირთვა src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3529,7 +3617,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3537,7 +3625,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3546,7 +3634,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3556,7 +3644,7 @@ მონაცემები src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3565,7 +3653,7 @@ სატ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3679,12 +3767,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks ბოლო ბლოკები src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3693,11 +3793,11 @@ ტრანზაქცია src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3706,7 +3806,7 @@ ბოლო ტრანზაქციები src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3715,7 +3815,7 @@ დოლარი src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3724,7 +3824,7 @@ საკომისიო src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3733,7 +3833,7 @@ მეტის ნახვა src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3742,7 +3842,7 @@ დახურვა src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3751,7 +3851,7 @@ მინ. საკომისიო src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3761,7 +3861,7 @@ წაშლა src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3771,7 +3871,7 @@ მეხსიერება src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3781,19 +3881,188 @@ მიმდინარე ტრანზაქციები src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - სირთულე + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee diff --git a/frontend/src/locale/messages.ko.xlf b/frontend/src/locale/messages.ko.xlf index bc16375c8..4583863bb 100644 --- a/frontend/src/locale/messages.ko.xlf +++ b/frontend/src/locale/messages.ko.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ 맴풀 오픈 소스 프로젝트 src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1475,7 +1475,7 @@ 대하여 src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1563,7 +1563,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2608,7 +2608,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2695,15 +2695,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2902,7 +2902,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2915,7 +2915,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2929,7 +2929,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2944,26 +2944,12 @@ Mempool size dashboard.mempool-size - - block - 블록 + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - 블록 - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2972,8 +2958,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined 채굴됨 @@ -2983,7 +2989,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3229,157 +3235,248 @@ statistics.transaction-vbytes-per-second - + Just now - 방금 src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - 년 전 - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - 개월 전 - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - 주일 전 + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - 일 전 src/app/components/time-since/time-since.component.ts 68 - - - hour ago - 시간 전 src/app/components/time-since/time-since.component.ts 69 - - - min ago - 분 전 src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - 분 전 src/app/components/time-since/time-since.component.ts 74 - - - sec ago - 초 전 src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - 초 전 src/app/components/time-since/time-since.component.ts 79 - - - years ago - 년 전 src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - 개월 전 - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - 주일 전 src/app/components/time-since/time-since.component.ts 85 - - - days ago - 일 전 src/app/components/time-since/time-since.component.ts 86 - - - hours ago - 시간 전 src/app/components/time-since/time-since.component.ts 87 - - - mins ago - 분 전 src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - 분 전 src/app/components/time-since/time-since.component.ts 92 - - - secs ago - 초 전 src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - 초 전 src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3400,7 +3497,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3415,16 +3512,6 @@ Transaction Confirmed state transaction.confirmed - - After - 이후 - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen 처음으로 감지됨 @@ -3576,7 +3663,7 @@ 코인베이스 src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3585,7 +3672,7 @@ (새로 채굴된 코인들) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3594,7 +3681,7 @@ 페그 인 src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3603,7 +3690,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3613,7 +3700,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3623,7 +3710,7 @@ 증인 (디지털 서명) src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3632,7 +3719,7 @@ P2SH 사용 스크립트 src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3641,7 +3728,7 @@ P2WSH 증인 스크립트 src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3650,7 +3737,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3659,7 +3746,7 @@ 이전 아웃풋 스크립트 src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3668,11 +3755,11 @@ 모두 불러오기 src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3681,7 +3768,7 @@ 로 페그 아웃 됨 src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3690,7 +3777,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3700,7 +3787,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3710,7 +3797,7 @@ 데이터 src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3719,7 +3806,7 @@ 사토시 src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3838,12 +3925,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks 최신 블록 src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3852,11 +3951,11 @@ 트랜잭션 src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3865,7 +3964,7 @@ 최신 트랜잭션 src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3874,7 +3973,7 @@ 달러 src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3883,7 +3982,7 @@ 수수료 src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3892,7 +3991,7 @@ 자세히 src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3901,7 +4000,7 @@ 간단히 src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3910,7 +4009,7 @@ 최소 수수료 src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3920,7 +4019,7 @@ 퍼징 src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3930,7 +4029,7 @@ 멤풀 메모리 사용량 src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3940,19 +4039,188 @@ 들어오는 트랜잭션 src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - 난이도 조정 + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee 트랜잭션 비용 diff --git a/frontend/src/locale/messages.nb.xlf b/frontend/src/locale/messages.nb.xlf index 75d771976..0fdaf8b42 100644 --- a/frontend/src/locale/messages.nb.xlf +++ b/frontend/src/locale/messages.nb.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Åpen kildekode-prosjektet The Mempool src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ Om src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,12 @@ Mempool size dashboard.mempool-size - - block - blokk + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - blokker - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2948,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Utvunnet @@ -2973,7 +2979,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3219,157 +3225,248 @@ statistics.transaction-vbytes-per-second - + Just now - Akkurat nå src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - år siden - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - måned siden - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - uke siden + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - dag siden src/app/components/time-since/time-since.component.ts 68 - - - hour ago - time siden src/app/components/time-since/time-since.component.ts 69 - - - min ago - min siden src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - minutt siden src/app/components/time-since/time-since.component.ts 74 - - - sec ago - sek siden src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - sekund siden src/app/components/time-since/time-since.component.ts 79 - - - years ago - år siden src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - måneder siden - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - uker siden src/app/components/time-since/time-since.component.ts 85 - - - days ago - dager siden src/app/components/time-since/time-since.component.ts 86 - - - hours ago - timer siden src/app/components/time-since/time-since.component.ts 87 - - - mins ago - min siden src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - minutter siden src/app/components/time-since/time-since.component.ts 92 - - - secs ago - sek siden src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - sekunder siden src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3487,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3502,6 @@ Transaction Confirmed state transaction.confirmed - - After - Etter - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Først sett @@ -3566,7 +3653,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3662,7 @@ (Nygenererte Mynter) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3671,7 @@ Peg-inn src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3680,7 @@ ScriptSig(ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3690,7 @@ ScriptSig(HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3700,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3709,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3718,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3727,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3736,7 @@ Forrige utgangs-script src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3745,11 @@ Last alt src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3758,7 @@ Peg-ut til src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3767,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3777,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3787,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3796,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3915,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Nyeste blokker src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3941,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3954,7 @@ Nyeste transaksjoner src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3963,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3972,7 @@ Avgift src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3981,7 @@ Utvid src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3990,7 @@ Slå sammen src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +3999,7 @@ Minimumsavgift src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4009,7 @@ Fjerner src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4019,7 @@ Minnebruk src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4029,188 @@ Innkommende transaksjoner src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Vanskelighetsgradjustering + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Transaksjonsavgift diff --git a/frontend/src/locale/messages.nl.xlf b/frontend/src/locale/messages.nl.xlf index 03810436e..56e1f08f0 100644 --- a/frontend/src/locale/messages.nl.xlf +++ b/frontend/src/locale/messages.nl.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1379,7 +1379,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1471,7 +1471,7 @@ Over src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1558,7 +1558,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2595,7 +2595,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2682,15 +2682,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2889,7 +2889,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2902,7 +2902,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2916,7 +2916,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2931,26 +2931,12 @@ Mempool size dashboard.mempool-size - - block - blok + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - blokken - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2959,8 +2945,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Gedolven @@ -2970,7 +2976,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3216,157 +3222,248 @@ statistics.transaction-vbytes-per-second - + Just now - Zojuist src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - jaar geleden - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - maand geleden - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - week geleden + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - dag geleden src/app/components/time-since/time-since.component.ts 68 - - - hour ago - uur geleden src/app/components/time-since/time-since.component.ts 69 - - - min ago - min geleden src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - minuut geleden src/app/components/time-since/time-since.component.ts 74 - - - sec ago - sec geleden src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - seconde geleden src/app/components/time-since/time-since.component.ts 79 - - - years ago - jaar geleden src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - maanden geleden - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - weken geleden src/app/components/time-since/time-since.component.ts 85 - - - days ago - dagen geleden src/app/components/time-since/time-since.component.ts 86 - - - hours ago - uur geleden src/app/components/time-since/time-since.component.ts 87 - - - mins ago - min geleden src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - minuten geleden src/app/components/time-since/time-since.component.ts 92 - - - secs ago - sec geleden src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - seconden geleden src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3387,7 +3484,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3402,16 +3499,6 @@ Transaction Confirmed state transaction.confirmed - - After - Na - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Eerst gezien @@ -3563,7 +3650,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3572,7 +3659,7 @@ (Nieuw-gegenereerde munten) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3581,7 +3668,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3590,7 +3677,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3600,7 +3687,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3610,7 +3697,7 @@ Getuige-data src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3619,7 +3706,7 @@ P2SH claim-script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3628,7 +3715,7 @@ P2WSH claim-script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3637,7 +3724,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3646,7 +3733,7 @@ Vorig output-script src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3655,11 +3742,11 @@ Laad alles src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3668,7 +3755,7 @@ Peg-out naar src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3677,7 +3764,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3687,7 +3774,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3697,7 +3784,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3706,7 +3793,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3825,12 +3912,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Laatste blokken src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3839,11 +3938,11 @@ TX's src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3852,7 +3951,7 @@ Laatste transacties src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3861,7 +3960,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3870,7 +3969,7 @@ Vergoeding src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3879,7 +3978,7 @@ Uitvouwen src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3888,7 +3987,7 @@ Invouwen src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3897,7 +3996,7 @@ Minimumvergoeding src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3907,7 +4006,7 @@ Weggooien src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3917,7 +4016,7 @@ Geheugengebruik src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3927,19 +4026,188 @@ Inkomende transacties src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Moeilijkheidsaanpassing + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Transactievergoeding diff --git a/frontend/src/locale/messages.pl.xlf b/frontend/src/locale/messages.pl.xlf index 283d3bcaa..0147abfa4 100644 --- a/frontend/src/locale/messages.pl.xlf +++ b/frontend/src/locale/messages.pl.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Mempool - Projekt Open Source src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ O stronie src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,12 @@ Mempool size dashboard.mempool-size - - block - blok + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - bloków - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2948,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Wydobyty @@ -2973,7 +2979,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3219,157 +3225,248 @@ statistics.transaction-vbytes-per-second - + Just now - Przed chwilą src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - rok temu - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - miesiąc temu - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - tydzień temu + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - dzień temu src/app/components/time-since/time-since.component.ts 68 - - - hour ago - godzina temu src/app/components/time-since/time-since.component.ts 69 - - - min ago - minut temu src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - minuta temu src/app/components/time-since/time-since.component.ts 74 - - - sec ago - sekund temu src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - sekunda temu src/app/components/time-since/time-since.component.ts 79 - - - years ago - lat temu src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - miesięcy temu - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - tygodni temu src/app/components/time-since/time-since.component.ts 85 - - - days ago - dni temu src/app/components/time-since/time-since.component.ts 86 - - - hours ago - godzin temu src/app/components/time-since/time-since.component.ts 87 - - - mins ago - minut temu src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - minut temu src/app/components/time-since/time-since.component.ts 92 - - - secs ago - sekund temu src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - sekund temu src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3487,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3502,6 @@ Transaction Confirmed state transaction.confirmed - - After - Po - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Pierwszy raz widziana @@ -3566,7 +3653,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3662,7 @@ (Nowo Wygenerowane Monety) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3671,7 @@ Transfer do src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3680,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3690,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3700,7 @@ Świadek src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3709,7 @@ Skrypt realizacji P2SH src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3718,7 @@ Skrypt świadka P2WSH src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3727,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3736,7 @@ Poprzedni skrypt wyjściowy src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3745,11 @@ Załaduj wszystko src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3758,7 @@ Transfer z src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3767,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3777,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3787,7 @@ dane src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3796,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3915,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Ostatnie bloki src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3941,11 @@ Transakcje src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3954,7 @@ Ostatnie transkacje src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3963,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3972,7 @@ Opłata src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3981,7 @@ Rozwiń src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3990,7 @@ Zwiń src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +3999,7 @@ Minimalna opłata src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4009,7 @@ Próg odrzucenia src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4019,7 @@ Zużycie pamięci src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4029,188 @@ Transakcje przychodzące src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Dostosowanie trudności + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Opłaty transakcyjne diff --git a/frontend/src/locale/messages.pt.xlf b/frontend/src/locale/messages.pt.xlf index 8d7f413b8..db35f1cfd 100644 --- a/frontend/src/locale/messages.pt.xlf +++ b/frontend/src/locale/messages.pt.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ O Projeto de código aberto da Mempool src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ Sobre src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,13 @@ Mempool size dashboard.mempool-size - - block - bloco + + blocks + blocos src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - blocos - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2949,29 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + bloco + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Minerado @@ -2973,7 +2981,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3219,157 +3227,253 @@ statistics.transaction-vbytes-per-second - + Just now - Agora + Agora mesmo src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - ano atrás - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - mês atrás - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - semana atrás + + ago + atrás src/app/components/time-since/time-since.component.ts 67 - - - day ago - dia atrás src/app/components/time-since/time-since.component.ts 68 - - - hour ago - hora atrás src/app/components/time-since/time-since.component.ts 69 - - - min ago - min atrás src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - minuto atrás src/app/components/time-since/time-since.component.ts 74 - - - sec ago - seg atrás src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - segundo atrás src/app/components/time-since/time-since.component.ts 79 - - - years ago - anos atrás src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - meses atrás - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - semanas atrás src/app/components/time-since/time-since.component.ts 85 - - - days ago - dias atrás src/app/components/time-since/time-since.component.ts 86 - - - hours ago - horas atrás src/app/components/time-since/time-since.component.ts 87 - - - mins ago - mins atrás src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - minutos atrás src/app/components/time-since/time-since.component.ts 92 - - - secs ago - segs atrás src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - segundos atrás src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + Depois de + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + Em ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + Em ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3494,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3509,6 @@ Transaction Confirmed state transaction.confirmed - - After - Depois de - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Visto pela primeira vez @@ -3566,7 +3660,7 @@ Conteúdo no bloco src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3669,7 @@ (Moedas Recém-Geradas) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3678,7 @@ Indexado em src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3687,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3697,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3707,7 @@ Testemunho src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3716,7 @@ P2SH script de resgate src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3725,7 @@ P2WSH script de testemunho src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3734,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3743,7 @@ Script de saída anterior src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3752,11 @@ Carregar tudo src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3765,7 @@ Atrelado para src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3774,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3784,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3794,7 @@ dados src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3803,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3922,25 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + Estimativa de Taxas + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Últimos blocos src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3949,11 @@ Transações src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3962,7 @@ Últimas transações src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3971,7 @@ Dólar src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3980,7 @@ Taxa src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3989,7 @@ Expandir src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3998,7 @@ Colapso src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +4007,7 @@ Mínimo exigido src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4017,7 @@ Mínimo exigido src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4027,7 @@ Uso do Mempool src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4037,211 @@ Transações de entrada src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Próximo ajuste de dificuldade + + Difficulty Adjustment + Ajuste de Dificuldade src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + Faltando + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + Estimativa + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + mins por bloco + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + Período Atual + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + ano + + src/app/shared/i18n/dates.ts + 3 + + + + years + anos + + src/app/shared/i18n/dates.ts + 4 + + + + month + mês + + src/app/shared/i18n/dates.ts + 5 + + + + months + meses + + src/app/shared/i18n/dates.ts + 6 + + + + week + semana + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + semanas + + src/app/shared/i18n/dates.ts + 8 + + + + day + dia + + src/app/shared/i18n/dates.ts + 9 + + + + days + dias + + src/app/shared/i18n/dates.ts + 10 + + + + hour + hora + + src/app/shared/i18n/dates.ts + 11 + + + + hours + horas + + src/app/shared/i18n/dates.ts + 12 + + + + minute + minuto + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + minutos + + src/app/shared/i18n/dates.ts + 14 + + + + min + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + segundo + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + segundos + + src/app/shared/i18n/dates.ts + 18 + + + + sec + seg + + src/app/shared/i18n/dates.ts + 19 + + + + secs + segs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Taxa de transação diff --git a/frontend/src/locale/messages.ru.xlf b/frontend/src/locale/messages.ru.xlf index 29615acff..880b4f75d 100644 --- a/frontend/src/locale/messages.ru.xlf +++ b/frontend/src/locale/messages.ru.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Проект Mempool с открытым исходным кодом src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ О проекте src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2599,7 +2599,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2686,15 +2686,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2896,7 +2896,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2909,7 +2909,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2923,7 +2923,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2938,26 +2938,12 @@ Mempool size dashboard.mempool-size - - block - блок + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - блоков - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2966,8 +2952,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Намайнено @@ -2977,7 +2983,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3223,157 +3229,248 @@ statistics.transaction-vbytes-per-second - + Just now - Только что src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - год назад - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - месяц назад - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - неделю назад + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - день назад src/app/components/time-since/time-since.component.ts 68 - - - hour ago - час назад src/app/components/time-since/time-since.component.ts 69 - - - min ago - минуту назад src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - минуту назад src/app/components/time-since/time-since.component.ts 74 - - - sec ago - секунду назад src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - секунду назад src/app/components/time-since/time-since.component.ts 79 - - - years ago - лет назад src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - месяцев назад - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - недель назад src/app/components/time-since/time-since.component.ts 85 - - - days ago - дней назад src/app/components/time-since/time-since.component.ts 86 - - - hours ago - часов назад src/app/components/time-since/time-since.component.ts 87 - - - mins ago - минут назад src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - минут назад src/app/components/time-since/time-since.component.ts 92 - - - secs ago - секунд назад src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - секунд назад src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3394,7 +3491,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3409,16 +3506,6 @@ Transaction Confirmed state transaction.confirmed - - After - После - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Впервые замечен @@ -3570,7 +3657,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3579,7 +3666,7 @@ (Новые сгенерированные монеты) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3588,7 +3675,7 @@ Привязка src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3597,7 +3684,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3607,7 +3694,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3617,7 +3704,7 @@ Свидетель src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3626,7 +3713,7 @@ Скрипт оплаты P2SH src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3635,7 +3722,7 @@ Скрипт свидетеля P2WSH src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3644,7 +3731,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3653,7 +3740,7 @@ Скрипт предыдущего вывода src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3662,11 +3749,11 @@ Загрузить все src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3675,7 +3762,7 @@ Отвязать на src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3684,7 +3771,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3694,7 +3781,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3704,7 +3791,7 @@ данные src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3713,7 +3800,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3832,12 +3919,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Последние блоки src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3846,11 +3945,11 @@ Транзакции src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3859,7 +3958,7 @@ Последние транзакции src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3868,7 +3967,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3877,7 +3976,7 @@ Комиссия src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3886,7 +3985,7 @@ Расширить src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3895,7 +3994,7 @@ Уменьшить src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3904,7 +4003,7 @@ Мин. комиссия src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3914,7 +4013,7 @@ Очистка src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3924,7 +4023,7 @@ Использование памяти src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3934,19 +4033,188 @@ Входящие транзакции src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Корректировка сложности + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Комиссия за транзакцию diff --git a/frontend/src/locale/messages.sl.xlf b/frontend/src/locale/messages.sl.xlf index 7a7453272..d5f4d39e1 100644 --- a/frontend/src/locale/messages.sl.xlf +++ b/frontend/src/locale/messages.sl.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Odprtokodni projekt Mempool src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1472,7 +1472,7 @@ O projektu src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1559,7 +1559,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2597,7 +2597,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2684,15 +2684,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2891,7 +2891,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2904,7 +2904,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2918,7 +2918,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2933,26 +2933,12 @@ Mempool size dashboard.mempool-size - - block - blok + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - blokov - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2961,8 +2947,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Narudarjeno @@ -2972,7 +2978,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3218,157 +3224,248 @@ statistics.transaction-vbytes-per-second - + Just now - Pravkar src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - pred letom - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - pred mesecem - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - pred tednom + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - pred d src/app/components/time-since/time-since.component.ts 68 - - - hour ago - pred h src/app/components/time-since/time-since.component.ts 69 - - - min ago - pred min src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - pred min src/app/components/time-since/time-since.component.ts 74 - - - sec ago - pred s src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - pred s src/app/components/time-since/time-since.component.ts 79 - - - years ago - pred leti src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - pred meseci - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - pred tedni src/app/components/time-since/time-since.component.ts 85 - - - days ago - pred d src/app/components/time-since/time-since.component.ts 86 - - - hours ago - pred h src/app/components/time-since/time-since.component.ts 87 - - - mins ago - pred min src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - pred min src/app/components/time-since/time-since.component.ts 92 - - - secs ago - pred s src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - pred s src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3389,7 +3486,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3404,16 +3501,6 @@ Transaction Confirmed state transaction.confirmed - - After - Po - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Prejeto @@ -3565,7 +3652,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3574,7 +3661,7 @@ (Novo ustvarjeni kovanci) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3583,7 +3670,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3592,7 +3679,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3602,7 +3689,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3612,7 +3699,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3621,7 +3708,7 @@ P2SH redeem skripta src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3630,7 +3717,7 @@ P2WSH witness skripta src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3639,7 +3726,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3648,7 +3735,7 @@ Skripta prejšnjega izhoda src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3657,11 +3744,11 @@ Prikaži vse src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3670,7 +3757,7 @@ Peg-out v src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3679,7 +3766,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3689,7 +3776,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3699,7 +3786,7 @@ podatki src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3708,7 +3795,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3827,12 +3914,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Najnovejši bloki src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3841,11 +3940,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3854,7 +3953,7 @@ Najnovejše transakcije src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3863,7 +3962,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3872,7 +3971,7 @@ Omrežnina src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3881,7 +3980,7 @@ Razširi src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3890,7 +3989,7 @@ Strni src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3899,7 +3998,7 @@ Najnižja omrežnina src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3909,7 +4008,7 @@ Prag src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3919,7 +4018,7 @@ Velikost src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3929,19 +4028,188 @@ Pretočnost src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Prilagoditev težavnosti + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Omrežnina transakcije diff --git a/frontend/src/locale/messages.sv.xlf b/frontend/src/locale/messages.sv.xlf index 2bd72bdaa..26a278897 100644 --- a/frontend/src/locale/messages.sv.xlf +++ b/frontend/src/locale/messages.sv.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Open Source-projektet Mempool src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ Om src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2598,7 +2598,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2685,15 +2685,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2892,7 +2892,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2905,7 +2905,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2919,7 +2919,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2934,26 +2934,13 @@ Mempool size dashboard.mempool-size - - block - block + + blocks + block src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - block - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2962,8 +2949,29 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Minead @@ -2973,7 +2981,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3219,157 +3227,253 @@ statistics.transaction-vbytes-per-second - + Just now - Just nu + Precis nu src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - år sedan - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - månad sedan - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - veckor sedan + + ago + sedan src/app/components/time-since/time-since.component.ts 67 - - - day ago - dag sedan src/app/components/time-since/time-since.component.ts 68 - - - hour ago - timme sedan src/app/components/time-since/time-since.component.ts 69 - - - min ago - min sedan src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - minut sedan src/app/components/time-since/time-since.component.ts 74 - - - sec ago - sek sedan src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - sekund sedan src/app/components/time-since/time-since.component.ts 79 - - - years ago - år sedan src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - månad sedan - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - veckor sedan src/app/components/time-since/time-since.component.ts 85 - - - days ago - dagar sedan src/app/components/time-since/time-since.component.ts 86 - - - hours ago - timmar sedan src/app/components/time-since/time-since.component.ts 87 - - - mins ago - min sedan src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - minuter sedan src/app/components/time-since/time-since.component.ts 92 - - - secs ago - sek sedan src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - sekunder sedan src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + Efter + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + Om ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + Om ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3390,7 +3494,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3405,16 +3509,6 @@ Transaction Confirmed state transaction.confirmed - - After - Efter - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Först sedd @@ -3566,7 +3660,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3575,7 +3669,7 @@ (Nyskapade mynt) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3584,7 +3678,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3593,7 +3687,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3603,7 +3697,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3613,7 +3707,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3622,7 +3716,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3631,7 +3725,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3640,7 +3734,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3649,7 +3743,7 @@ Föregående outputscript src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3658,11 +3752,11 @@ Ladda alla src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3671,7 +3765,7 @@ Peg-out till src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3680,7 +3774,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3690,7 +3784,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3700,7 +3794,7 @@ data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3709,7 +3803,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3828,12 +3922,25 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + Avgiftsestimat + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Senaste blocken src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3842,11 +3949,11 @@ TXs src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3855,7 +3962,7 @@ Senaste transaktionerna src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3864,7 +3971,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3873,7 +3980,7 @@ Avgift src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3882,7 +3989,7 @@ Expandera src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3891,7 +3998,7 @@ Kollapsa src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3900,7 +4007,7 @@ Minimumavgift src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3910,7 +4017,7 @@ Förkastar src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3920,7 +4027,7 @@ Minnesanvändning src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3930,19 +4037,211 @@ Inkommande transaktioner src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment + + Difficulty Adjustment Svårighetsjustering src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + Återstående + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + Estimat + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + minuter per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + Nuvarande period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + år + + src/app/shared/i18n/dates.ts + 3 + + + + years + år + + src/app/shared/i18n/dates.ts + 4 + + + + month + månad + + src/app/shared/i18n/dates.ts + 5 + + + + months + månader + + src/app/shared/i18n/dates.ts + 6 + + + + week + vecka + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + veckor + + src/app/shared/i18n/dates.ts + 8 + + + + day + dag + + src/app/shared/i18n/dates.ts + 9 + + + + days + dagar + + src/app/shared/i18n/dates.ts + 10 + + + + hour + timme + + src/app/shared/i18n/dates.ts + 11 + + + + hours + timmar + + src/app/shared/i18n/dates.ts + 12 + + + + minute + minut + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + minuter + + src/app/shared/i18n/dates.ts + 14 + + + + min + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + minuter + + src/app/shared/i18n/dates.ts + 16 + + + + second + sekund + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + sekunder + + src/app/shared/i18n/dates.ts + 18 + + + + sec + sek + + src/app/shared/i18n/dates.ts + 19 + + + + secs + sek + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Transaktionsavgift diff --git a/frontend/src/locale/messages.tr.xlf b/frontend/src/locale/messages.tr.xlf index d34a954d9..32d1dc078 100644 --- a/frontend/src/locale/messages.tr.xlf +++ b/frontend/src/locale/messages.tr.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1380,7 +1380,7 @@ Açık kaynak Mempool Projesi src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1473,7 +1473,7 @@ Hakkında src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1560,7 +1560,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2599,7 +2599,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2686,15 +2686,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2893,7 +2893,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2906,7 +2906,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2920,7 +2920,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2935,26 +2935,12 @@ Mempool size dashboard.mempool-size - - block - block + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - blokl - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2963,8 +2949,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Çıkarıldı @@ -2974,7 +2980,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3220,157 +3226,248 @@ statistics.transaction-vbytes-per-second - + Just now - Şimdi src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - yıl önce - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - ay önce - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - hafta önce + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - gün önce src/app/components/time-since/time-since.component.ts 68 - - - hour ago - saat önce src/app/components/time-since/time-since.component.ts 69 - - - min ago - dak. önce src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - dakika önce src/app/components/time-since/time-since.component.ts 74 - - - sec ago - san. önce src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - san. önce src/app/components/time-since/time-since.component.ts 79 - - - years ago - yıl önce src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - ay önce - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - hafta önce src/app/components/time-since/time-since.component.ts 85 - - - days ago - gün önce src/app/components/time-since/time-since.component.ts 86 - - - hours ago - saat önce src/app/components/time-since/time-since.component.ts 87 - - - mins ago - dak. önce src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - dakika önce src/app/components/time-since/time-since.component.ts 92 - - - secs ago - san. önce src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - saniye önce src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3391,7 +3488,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3406,16 +3503,6 @@ Transaction Confirmed state transaction.confirmed - - After - 'dan sonra - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen İlk görüldüğü an @@ -3567,7 +3654,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3576,7 +3663,7 @@ (Yeni çıkarılmış coinler) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3585,7 +3672,7 @@ İçeri geçir src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3594,7 +3681,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3604,7 +3691,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3614,7 +3701,7 @@ Tanık src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3623,7 +3710,7 @@ P2SH alım scripti src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3632,7 +3719,7 @@ P2WSH tanık scripti src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3641,7 +3728,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3650,7 +3737,7 @@ Önceki çıkış scripti src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3659,11 +3746,11 @@ Hepsini yükle src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3672,7 +3759,7 @@ 'a çıkış src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3681,7 +3768,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3691,7 +3778,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3701,7 +3788,7 @@ Data src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3710,7 +3797,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3829,12 +3916,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Son bloklar src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3843,11 +3942,11 @@ İşlemler src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3856,7 +3955,7 @@ Son işlemler src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3865,7 +3964,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3874,7 +3973,7 @@ Ücret src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3883,7 +3982,7 @@ Genişlet src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3892,7 +3991,7 @@ Daralt src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3901,7 +4000,7 @@ Minimum ücret src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3911,7 +4010,7 @@ Temizleme src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3921,7 +4020,7 @@ Hafıza kullanımı src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3931,19 +4030,188 @@ Gelen işlemler src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Zorluk ayarı + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee İşlem ücreti diff --git a/frontend/src/locale/messages.uk.xlf b/frontend/src/locale/messages.uk.xlf index f5abc092f..0bddfacae 100644 --- a/frontend/src/locale/messages.uk.xlf +++ b/frontend/src/locale/messages.uk.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1379,7 +1379,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1471,7 +1471,7 @@ Про src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1558,7 +1558,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2590,7 +2590,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2677,15 +2677,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2884,7 +2884,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2897,7 +2897,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2911,7 +2911,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2926,26 +2926,12 @@ Mempool size dashboard.mempool-size - - block - блок + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - блоків - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2954,8 +2940,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined Добутий @@ -2965,7 +2971,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3211,157 +3217,248 @@ statistics.transaction-vbytes-per-second - + Just now - Щойно src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - рік тому - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - місяць тому - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - тиждень тому + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - день тому src/app/components/time-since/time-since.component.ts 68 - - - hour ago - годину тому src/app/components/time-since/time-since.component.ts 69 - - - min ago - хв тому src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - хвилину тому src/app/components/time-since/time-since.component.ts 74 - - - sec ago - сек тому src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - секунду тому src/app/components/time-since/time-since.component.ts 79 - - - years ago - років тому src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - місяців тому - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - тижнів тому src/app/components/time-since/time-since.component.ts 85 - - - days ago - днів тому src/app/components/time-since/time-since.component.ts 86 - - - hours ago - годин тому src/app/components/time-since/time-since.component.ts 87 - - - mins ago - хв тому src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - хвилин тому src/app/components/time-since/time-since.component.ts 92 - - - secs ago - сек тому src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - секунд тому src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3382,7 +3479,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3397,16 +3494,6 @@ Transaction Confirmed state transaction.confirmed - - After - Після - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Вперше помічена @@ -3558,7 +3645,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3567,7 +3654,7 @@ (Нові монети) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3576,7 +3663,7 @@ Закріплення src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3585,7 +3672,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3595,7 +3682,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3605,7 +3692,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3614,7 +3701,7 @@ P2SH redeem скрипт src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3623,7 +3710,7 @@ P2WSH witness скрипт src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3632,7 +3719,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3641,7 +3728,7 @@ Скрипт попереднього виходу src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3650,11 +3737,11 @@ Завантажити всі src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3663,7 +3750,7 @@ Розкріплення до src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3672,7 +3759,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3682,7 +3769,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3692,7 +3779,7 @@ дані src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3701,7 +3788,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3820,12 +3907,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Останні блоки src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3834,11 +3933,11 @@ Транзакцій src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3847,7 +3946,7 @@ Останні транзакції src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3856,7 +3955,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3865,7 +3964,7 @@ Комісія src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3874,7 +3973,7 @@ Розгорнути src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3883,7 +3982,7 @@ Згорнути src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3892,7 +3991,7 @@ Мінімальна комісія src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3902,7 +4001,7 @@ Очищення src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3912,7 +4011,7 @@ Використання пам'яті src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3922,19 +4021,188 @@ Вхідні транзакції src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Регулювання складності + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Комісія транзакції diff --git a/frontend/src/locale/messages.vi.xlf b/frontend/src/locale/messages.vi.xlf index a91dc6bc9..424f957f9 100644 --- a/frontend/src/locale/messages.vi.xlf +++ b/frontend/src/locale/messages.vi.xlf @@ -592,7 +592,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -803,7 +803,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -824,7 +824,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -916,7 +916,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -989,7 +989,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1041,7 +1041,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1066,7 +1066,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1074,7 +1074,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1088,7 +1088,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1096,7 +1096,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1228,7 +1228,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1379,7 +1379,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1471,7 +1471,7 @@ Về chúng tôi src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1558,7 +1558,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2595,7 +2595,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2682,15 +2682,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2889,7 +2889,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2902,7 +2902,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2916,7 +2916,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2931,26 +2931,12 @@ Mempool size dashboard.mempool-size - - block - khối + + blocks src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - khối - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2959,8 +2945,28 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined đã đào @@ -2970,7 +2976,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3216,157 +3222,248 @@ statistics.transaction-vbytes-per-second - + Just now - Vừa mới đây src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - năm trước - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - tháng trước - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - tuần trước + + ago src/app/components/time-since/time-since.component.ts 67 - - - day ago - ngày trước src/app/components/time-since/time-since.component.ts 68 - - - hour ago - giờ trước src/app/components/time-since/time-since.component.ts 69 - - - min ago - phút trước src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - phút trước src/app/components/time-since/time-since.component.ts 74 - - - sec ago - giây trước src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - giây trước src/app/components/time-since/time-since.component.ts 79 - - - years ago - năm trước src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - tháng trước - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - tuần trước src/app/components/time-since/time-since.component.ts 85 - - - days ago - ngày trước src/app/components/time-since/time-since.component.ts 86 - - - hours ago - giờ trước src/app/components/time-since/time-since.component.ts 87 - - - mins ago - phút trước src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - phút trước src/app/components/time-since/time-since.component.ts 92 - - - secs ago - giây trước src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - giây trước src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3387,7 +3484,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3402,16 +3499,6 @@ Transaction Confirmed state transaction.confirmed - - After - Sau - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen Lần đầu thấy @@ -3563,7 +3650,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3572,7 +3659,7 @@ (Coin mới được tạo) src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3581,7 +3668,7 @@ Cố định src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3590,7 +3677,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3600,7 +3687,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3610,7 +3697,7 @@ Chứng kiến src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3619,7 +3706,7 @@ Mã thu hồi P2SH src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3628,7 +3715,7 @@ Mã chứng kiến P2WSH src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3637,7 +3724,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3646,7 +3733,7 @@ Mã đầu ra trước đó src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3655,11 +3742,11 @@ Tải tất cả src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3668,7 +3755,7 @@ Peg-out src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3677,7 +3764,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3687,7 +3774,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3697,7 +3784,7 @@ dữ liệu src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3706,7 +3793,7 @@ sat src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3825,12 +3912,24 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks Khối mới nhất src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3839,11 +3938,11 @@ Các giao dịch src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3852,7 +3951,7 @@ Giao dịch mới nhất src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3861,7 +3960,7 @@ USD src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3870,7 +3969,7 @@ Phí src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3879,7 +3978,7 @@ Mở rộng src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3888,7 +3987,7 @@ Thu gọn src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3897,7 +3996,7 @@ Phí tối thiểu src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3907,7 +4006,7 @@ Thanh lọc src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3917,7 +4016,7 @@ Sử dụng bộ nhớ src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3927,19 +4026,188 @@ Giao dịch đến src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment - Điều chỉnh độ khó + + Difficulty Adjustment src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + + src/app/shared/i18n/dates.ts + 3 + + + + years + + src/app/shared/i18n/dates.ts + 4 + + + + month + + src/app/shared/i18n/dates.ts + 5 + + + + months + + src/app/shared/i18n/dates.ts + 6 + + + + week + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + + src/app/shared/i18n/dates.ts + 8 + + + + day + + src/app/shared/i18n/dates.ts + 9 + + + + days + + src/app/shared/i18n/dates.ts + 10 + + + + hour + + src/app/shared/i18n/dates.ts + 11 + + + + hours + + src/app/shared/i18n/dates.ts + 12 + + + + minute + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + + src/app/shared/i18n/dates.ts + 14 + + + + min + + src/app/shared/i18n/dates.ts + 15 + + + + mins + + src/app/shared/i18n/dates.ts + 16 + + + + second + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + + src/app/shared/i18n/dates.ts + 18 + + + + sec + + src/app/shared/i18n/dates.ts + 19 + + + + secs + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee Phí giao dịch diff --git a/frontend/src/locale/messages.zh.xlf b/frontend/src/locale/messages.zh.xlf index 21ea07217..50c044004 100644 --- a/frontend/src/locale/messages.zh.xlf +++ b/frontend/src/locale/messages.zh.xlf @@ -581,7 +581,7 @@ src/app/dashboard/dashboard.component.html - 78,79 + 79,80 Bisq block height header @@ -789,7 +789,7 @@ src/app/dashboard/dashboard.component.html - 97,101 + 98,102 dashboard.view-all @@ -810,7 +810,7 @@ src/app/dashboard/dashboard.component.html - 139,148 + 140,149 Terms of Service shared.terms-of-service @@ -902,7 +902,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 62 + 68 BSQ burnt amount @@ -975,7 +975,7 @@ src/app/dashboard/dashboard.component.html - 108,109 + 109,110 @@ -1025,7 +1025,7 @@ src/app/components/transactions-list/transactions-list.component.html - 172,173 + 180,181 @@ -1050,7 +1050,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 69,70 + 75,76 src/app/components/transaction/transaction.component.html @@ -1058,7 +1058,7 @@ src/app/components/transactions-list/transactions-list.component.html - 211,212 + 219,220 Transaction singular confirmation count shared.confirmation-count.singular @@ -1072,7 +1072,7 @@ src/app/bisq/bisq-transfers/bisq-transfers.component.html - 70,71 + 76,77 src/app/components/transaction/transaction.component.html @@ -1080,7 +1080,7 @@ src/app/components/transactions-list/transactions-list.component.html - 212,213 + 220,221 Transaction plural confirmation count shared.confirmation-count.plural @@ -1212,7 +1212,7 @@ src/app/dashboard/dashboard.component.html - 107,108 + 108,109 @@ -1363,7 +1363,7 @@ The Mempool Open Source Project src/app/components/about/about.component.html - 12,13 + 12 about.about-the-project @@ -1454,7 +1454,7 @@ 关于 src/app/components/about/about.component.ts - 35 + 36 src/app/components/master-page/master-page.component.html @@ -1539,7 +1539,7 @@ src/app/components/transactions-list/transactions-list.component.html - 220,222 + 228,230 shared.confidential @@ -2530,7 +2530,7 @@ src/app/dashboard/dashboard.component.html - 81,84 + 82,85 block.size @@ -2617,15 +2617,15 @@ src/app/components/transactions-list/transactions-list.component.html - 204 + 212 src/app/dashboard/dashboard.component.html - 117,121 + 118,122 src/app/dashboard/dashboard.component.html - 164,168 + 165,169 sat/vB shared.sat-vbyte @@ -2710,6 +2710,7 @@ Difficulty + 难度 src/app/components/block/block.component.html 110,113 @@ -2820,7 +2821,7 @@ src/app/dashboard/dashboard.component.html - 189,191 + 190,192 footer.backend-is-synchronizing @@ -2833,7 +2834,7 @@ src/app/dashboard/dashboard.component.html - 194,200 + 195,201 vB/s shared.vbytes-per-second @@ -2847,7 +2848,7 @@ src/app/dashboard/dashboard.component.html - 168,170 + 169,171 Unconfirmed count dashboard.unconfirmed @@ -2862,26 +2863,13 @@ Mempool size dashboard.mempool-size - - block - 个区块 + + blocks + 个区块 src/app/components/footer/footer.component.html 22,23 - - src/app/components/transaction/transaction.component.html - 324,325 - - shared.block - - - blocks - 个区块 - - src/app/components/footer/footer.component.html - 23,24 - src/app/components/mempool-blocks/mempool-blocks.component.html 30,31 @@ -2890,8 +2878,29 @@ src/app/components/transaction/transaction.component.html 325,327 + + src/app/dashboard/dashboard.component.html + 211,212 + shared.blocks + + block + 个区块 + + src/app/components/footer/footer.component.html + 23,24 + + + src/app/components/transaction/transaction.component.html + 324,325 + + + src/app/dashboard/dashboard.component.html + 212,213 + + shared.block + Mined 已出块 @@ -2901,7 +2910,7 @@ src/app/dashboard/dashboard.component.html - 79,80 + 80,81 latest-blocks.mined @@ -3064,6 +3073,7 @@ Sponsor + 赞助 src/app/components/sponsor/sponsor.component.html 3 @@ -3146,157 +3156,253 @@ statistics.transaction-vbytes-per-second - + Just now - 刚刚 + 现在 src/app/components/time-since/time-since.component.ts - 56 + 57 - - - year ago - 年前 - src/app/components/time-since/time-since.component.ts - 65 + src/app/components/time-span/time-span.component.ts + 57 - - month ago - 个月前 - - src/app/components/time-since/time-since.component.ts - 66 - - - - week ago - 周前 + + ago + 之前 src/app/components/time-since/time-since.component.ts 67 - - - day ago - 天前 src/app/components/time-since/time-since.component.ts 68 - - - hour ago - 小时前 src/app/components/time-since/time-since.component.ts 69 - - - min ago - 分钟前 src/app/components/time-since/time-since.component.ts - 72 + 70 + + + src/app/components/time-since/time-since.component.ts + 71 - - - minute ago - 分钟前 src/app/components/time-since/time-since.component.ts 74 - - - sec ago - 秒前 src/app/components/time-since/time-since.component.ts - 77 + 76 - - - second ago - 秒前 src/app/components/time-since/time-since.component.ts 79 - - - years ago - 年前 src/app/components/time-since/time-since.component.ts - 83 + 81 - - - months ago - 个月前 - - src/app/components/time-since/time-since.component.ts - 84 - - - - weeks ago - 周前 src/app/components/time-since/time-since.component.ts 85 - - - days ago - 天前 src/app/components/time-since/time-since.component.ts 86 - - - hours ago - 小时前 src/app/components/time-since/time-since.component.ts 87 - - - mins ago - 分钟前 src/app/components/time-since/time-since.component.ts - 90 + 88 + + + src/app/components/time-since/time-since.component.ts + 89 - - - minutes ago - 分钟前 src/app/components/time-since/time-since.component.ts 92 - - - secs ago - 秒前 src/app/components/time-since/time-since.component.ts - 95 + 94 - - - seconds ago - 秒前 src/app/components/time-since/time-since.component.ts 97 + + src/app/components/time-since/time-since.component.ts + 99 + + + + After + 后 + + src/app/components/time-span/time-span.component.ts + 67 + + + src/app/components/time-span/time-span.component.ts + 68 + + + src/app/components/time-span/time-span.component.ts + 69 + + + src/app/components/time-span/time-span.component.ts + 70 + + + src/app/components/time-span/time-span.component.ts + 71 + + + src/app/components/time-span/time-span.component.ts + 74 + + + src/app/components/time-span/time-span.component.ts + 76 + + + src/app/components/time-span/time-span.component.ts + 79 + + + src/app/components/time-span/time-span.component.ts + 81 + + + src/app/components/time-span/time-span.component.ts + 85 + + + src/app/components/time-span/time-span.component.ts + 86 + + + src/app/components/time-span/time-span.component.ts + 87 + + + src/app/components/time-span/time-span.component.ts + 88 + + + src/app/components/time-span/time-span.component.ts + 89 + + + src/app/components/time-span/time-span.component.ts + 92 + + + src/app/components/time-span/time-span.component.ts + 94 + + + src/app/components/time-span/time-span.component.ts + 97 + + + src/app/components/time-span/time-span.component.ts + 99 + + + + In ~1 min + ~1分钟之后 + + src/app/components/time-until/time-until.component.ts + 58 + + + + In ~ + ~之后 + + src/app/components/time-until/time-until.component.ts + 68 + + + src/app/components/time-until/time-until.component.ts + 69 + + + src/app/components/time-until/time-until.component.ts + 70 + + + src/app/components/time-until/time-until.component.ts + 71 + + + src/app/components/time-until/time-until.component.ts + 72 + + + src/app/components/time-until/time-until.component.ts + 75 + + + src/app/components/time-until/time-until.component.ts + 77 + + + src/app/components/time-until/time-until.component.ts + 80 + + + src/app/components/time-until/time-until.component.ts + 82 + + + src/app/components/time-until/time-until.component.ts + 86 + + + src/app/components/time-until/time-until.component.ts + 87 + + + src/app/components/time-until/time-until.component.ts + 88 + + + src/app/components/time-until/time-until.component.ts + 89 + + + src/app/components/time-until/time-until.component.ts + 90 + + + src/app/components/time-until/time-until.component.ts + 93 + + + src/app/components/time-until/time-until.component.ts + 95 + + + src/app/components/time-until/time-until.component.ts + 98 + + + src/app/components/time-until/time-until.component.ts + 100 + This transaction has been replaced by: @@ -3317,7 +3423,7 @@ src/app/components/transactions-list/transactions-list.component.html - 215,219 + 223,227 Transaction unconfirmed state transaction.unconfirmed @@ -3332,16 +3438,6 @@ Transaction Confirmed state transaction.confirmed - - After - 之后 - - src/app/components/transaction/transaction.component.html - 68,69 - - Transaction confirmed after - transaction.confirmed.after - First seen 初次发现时间 @@ -3493,7 +3589,7 @@ Coinbase src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.coinbase @@ -3502,7 +3598,7 @@ （新产生的货币） src/app/components/transactions-list/transactions-list.component.html - 42 + 44 transactions-list.newly-generated-coins @@ -3510,7 +3606,7 @@ Peg-in src/app/components/transactions-list/transactions-list.component.html - 44,46 + 46,48 transactions-list.peg-in @@ -3519,7 +3615,7 @@ ScriptSig (ASM) src/app/components/transactions-list/transactions-list.component.html - 77,79 + 79,81 ScriptSig (ASM) transactions-list.scriptsig.asm @@ -3529,7 +3625,7 @@ ScriptSig (HEX) src/app/components/transactions-list/transactions-list.component.html - 81,83 + 83,85 ScriptSig (HEX) transactions-list.scriptsig.hex @@ -3539,7 +3635,7 @@ Witness src/app/components/transactions-list/transactions-list.component.html - 86,87 + 88,89 transactions-list.witness @@ -3548,7 +3644,7 @@ P2SH redeem script src/app/components/transactions-list/transactions-list.component.html - 90,91 + 92,93 transactions-list.p2sh-redeem-script @@ -3557,7 +3653,7 @@ P2WSH witness script src/app/components/transactions-list/transactions-list.component.html - 94,95 + 96,97 transactions-list.p2wsh-witness-script @@ -3566,7 +3662,7 @@ nSequence src/app/components/transactions-list/transactions-list.component.html - 98,99 + 100,101 transactions-list.nsequence @@ -3574,7 +3670,7 @@ Previous output script src/app/components/transactions-list/transactions-list.component.html - 102,103 + 104,105 transactions-list.previous-output-script @@ -3583,11 +3679,11 @@ 加载全部 src/app/components/transactions-list/transactions-list.component.html - 112,115 + 114,117 src/app/components/transactions-list/transactions-list.component.html - 194,197 + 202,205 transactions-list.load-all @@ -3595,7 +3691,7 @@ Peg-out to src/app/components/transactions-list/transactions-list.component.html - 131,132 + 133,134 transactions-list.peg-out-to @@ -3604,7 +3700,7 @@ ScriptPubKey (ASM) src/app/components/transactions-list/transactions-list.component.html - 176,178 + 184,186 ScriptPubKey (ASM) transactions-list.scriptpubkey.asm @@ -3614,7 +3710,7 @@ ScriptPubKey (HEX) src/app/components/transactions-list/transactions-list.component.html - 180,182 + 188,190 ScriptPubKey (HEX) transactions-list.scriptpubkey.hex @@ -3624,7 +3720,7 @@ 数据 src/app/components/transactions-list/transactions-list.component.html - 184,185 + 192,193 transactions-list.vout.scriptpubkey-type.data @@ -3633,7 +3729,7 @@ 聪 src/app/components/transactions-list/transactions-list.component.html - 204 + 212 sat shared.sat @@ -3747,12 +3843,25 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning + + Fee Estimates + 费用估算 + + src/app/dashboard/dashboard.component.html + 6,9 + + + src/app/dashboard/dashboard.component.html + 33,36 + + fees-box.fee-estimates + Latest blocks 最新区块 src/app/dashboard/dashboard.component.html - 75,78 + 76,79 dashboard.latest-blocks @@ -3761,11 +3870,11 @@ 交易 src/app/dashboard/dashboard.component.html - 80,82 + 81,83 src/app/dashboard/dashboard.component.html - 170,174 + 171,175 dashboard.latest-blocks.transaction-count @@ -3774,7 +3883,7 @@ 最新交易 src/app/dashboard/dashboard.component.html - 104,107 + 105,108 dashboard.latest-transactions @@ -3783,7 +3892,7 @@ 美元 src/app/dashboard/dashboard.component.html - 109,110 + 110,111 dashboard.latest-transactions.USD @@ -3792,7 +3901,7 @@ 费用 src/app/dashboard/dashboard.component.html - 110,113 + 111,114 dashboard.latest-transactions.fee @@ -3801,7 +3910,7 @@ 更多 src/app/dashboard/dashboard.component.html - 131,132 + 132,133 dashboard.expand @@ -3810,7 +3919,7 @@ 收起 src/app/dashboard/dashboard.component.html - 132,136 + 133,137 dashboard.collapse @@ -3819,7 +3928,7 @@ 最低费用 src/app/dashboard/dashboard.component.html - 161,162 + 162,163 Minimum mempool fee dashboard.minimum-fee @@ -3829,7 +3938,7 @@ 吹扫中 src/app/dashboard/dashboard.component.html - 162,164 + 163,165 Purgin below fee dashboard.purging @@ -3839,7 +3948,7 @@ 内存占用 src/app/dashboard/dashboard.component.html - 174,176 + 175,177 Memory usage dashboard.memory-usage @@ -3849,19 +3958,211 @@ 收款交易 src/app/dashboard/dashboard.component.html - 186,188 + 187,189 dashboard.incoming-transactions - - Difficulty adjustment + + Difficulty Adjustment 难度调整 src/app/dashboard/dashboard.component.html - 203,204 + 202,205 dashboard.difficulty-adjustment + + Remaining + 其余的 + + src/app/dashboard/dashboard.component.html + 208,210 + + + src/app/dashboard/dashboard.component.html + 239,242 + + difficulty-box.remaining + + + Estimate + 估计 + + src/app/dashboard/dashboard.component.html + 217,218 + + + src/app/dashboard/dashboard.component.html + 246,249 + + difficulty-box.estimate + + + mins per block + 每块分钟 + + src/app/dashboard/dashboard.component.html + 219,222 + + difficulty-box.mins-per-block + + + Current Period + 现时阶段 + + src/app/dashboard/dashboard.component.html + 222,223 + + + src/app/dashboard/dashboard.component.html + 253,256 + + difficulty-box.current-period + + + year + 年 + + src/app/shared/i18n/dates.ts + 3 + + + + years + 年 + + src/app/shared/i18n/dates.ts + 4 + + + + month + 个月 + + src/app/shared/i18n/dates.ts + 5 + + + + months + 个月 + + src/app/shared/i18n/dates.ts + 6 + + + + week + 周 + + src/app/shared/i18n/dates.ts + 7 + + + + weeks + 周 + + src/app/shared/i18n/dates.ts + 8 + + + + day + 天 + + src/app/shared/i18n/dates.ts + 9 + + + + days + 天 + + src/app/shared/i18n/dates.ts + 10 + + + + hour + 个小时 + + src/app/shared/i18n/dates.ts + 11 + + + + hours + 个小时 + + src/app/shared/i18n/dates.ts + 12 + + + + minute + 分钟 + + src/app/shared/i18n/dates.ts + 13 + + + + minutes + 分钟 + + src/app/shared/i18n/dates.ts + 14 + + + + min + 分钟 + + src/app/shared/i18n/dates.ts + 15 + + + + mins + 分钟 + + src/app/shared/i18n/dates.ts + 16 + + + + second + 秒 + + src/app/shared/i18n/dates.ts + 17 + + + + seconds + 秒 + + src/app/shared/i18n/dates.ts + 18 + + + + sec + 秒 + + src/app/shared/i18n/dates.ts + 19 + + + + secs + 秒 + + src/app/shared/i18n/dates.ts + 20 + + Transaction fee 手续费 From 7bf9d604b9e29a60f564eb0469af07cac4c788fe Mon Sep 17 00:00:00 2001 From: softsimon Date: Sat, 17 Jul 2021 16:36:21 +0300 Subject: [PATCH 32/42] Reusing hard coded In~1 min with base date minute i18n string. --- .../components/time-until/time-until.component.ts | 2 +- frontend/src/locale/messages.xlf | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/components/time-until/time-until.component.ts b/frontend/src/app/components/time-until/time-until.component.ts index b85d909cd..9ff0d9e0b 100644 --- a/frontend/src/app/components/time-until/time-until.component.ts +++ b/frontend/src/app/components/time-until/time-until.component.ts @@ -55,7 +55,7 @@ export class TimeUntilComponent implements OnInit, OnChanges, OnDestroy { const seconds = Math.floor((+new Date(this.time) - +new Date()) / 1000); if (seconds < 60) { - return $localize`:@@date-base.last-minute:In ~1 min`; + return $localize`:@@date-base.minute:${1}:DATE: minute`; } let counter; for (const i in this.intervals) { diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index abf90ed16..39f4f20aa 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -3125,12 +3125,16 @@ 99 - - In ~1 min + + minute src/app/components/time-until/time-until.component.ts 58 + + src/app/shared/i18n/dates.ts + 13 + In ~ @@ -3840,13 +3844,6 @@ 12 - - minute - - src/app/shared/i18n/dates.ts - 13 - - minutes From 723473405628753cab223278c89f86cc013f0644 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sat, 17 Jul 2021 18:23:50 +0300 Subject: [PATCH 33/42] Updated "mins per block" i18n string. --- frontend/src/app/dashboard/dashboard.component.html | 2 +- frontend/src/locale/messages.xlf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index 59294e53a..add7b46b6 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -216,7 +216,7 @@
Estimate
{{ epochData.change | number: '1.2-2' }} %
-
~{{ epochData.timeAvg }} mins per block
+
~{{ epochData.timeAvg }} mins per block
Current Period
diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 39f4f20aa..f187ccad7 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -3754,11 +3754,11 @@ difficulty-box.estimate - - mins per block + + ~ mins per block src/app/dashboard/dashboard.component.html - 219,222 + 219,220 difficulty-box.mins-per-block From 21db5a41024284e285996d021bbb6578ebc0e356 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sun, 18 Jul 2021 01:02:02 +0300 Subject: [PATCH 34/42] Removing shortened date i18n strings. --- .../time-since/time-since.component.ts | 24 +-- .../time-span/time-span.component.ts | 24 +-- .../time-until/time-until.component.ts | 24 +-- frontend/src/app/shared/i18n/dates.ts | 4 - frontend/src/locale/messages.xlf | 176 +++++------------- 5 files changed, 62 insertions(+), 190 deletions(-) diff --git a/frontend/src/app/components/time-since/time-since.component.ts b/frontend/src/app/components/time-since/time-since.component.ts index e87ab9ab6..3acfc11c5 100644 --- a/frontend/src/app/components/time-since/time-since.component.ts +++ b/frontend/src/app/components/time-since/time-since.component.ts @@ -69,16 +69,8 @@ export class TimeSinceComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-since:${dateStrings.i18nWeek}:DATE: ago`; break; case 'day': return $localize`:@@time-since:${dateStrings.i18nDay}:DATE: ago`; break; case 'hour': return $localize`:@@time-since:${dateStrings.i18nHour}:DATE: ago`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-since:${dateStrings.i18nMin}:DATE: ago`; - } - return $localize`:@@time-since:${dateStrings.i18nMinute}:DATE: ago`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-since:${dateStrings.i18nSec}:DATE: ago`; - } - return $localize`:@@time-since:${dateStrings.i18nSecond}:DATE: ago`; + case 'minute': return $localize`:@@time-since:${dateStrings.i18nMinute}:DATE: ago`; + case 'second': return $localize`:@@time-since:${dateStrings.i18nSecond}:DATE: ago`; } } else { switch (i) { // plural (2 days) @@ -87,16 +79,8 @@ export class TimeSinceComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-since:${dateStrings.i18nWeeks}:DATE: ago`; break; case 'day': return $localize`:@@time-since:${dateStrings.i18nDays}:DATE: ago`; break; case 'hour': return $localize`:@@time-since:${dateStrings.i18nHours}:DATE: ago`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-since:${dateStrings.i18nMins}:DATE: ago`; - } - return $localize`:@@time-since:${dateStrings.i18nMinutes}:DATE: ago`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-since:${dateStrings.i18nSecs}:DATE: ago`; - } - return $localize`:@@time-since:${dateStrings.i18nSeconds}:DATE: ago`; + case 'minute': return $localize`:@@time-since:${dateStrings.i18nMinutes}:DATE: ago`; + case 'second': return $localize`:@@time-since:${dateStrings.i18nSeconds}:DATE: ago`; } } } diff --git a/frontend/src/app/components/time-span/time-span.component.ts b/frontend/src/app/components/time-span/time-span.component.ts index f5a0ca99f..81f64bc35 100644 --- a/frontend/src/app/components/time-span/time-span.component.ts +++ b/frontend/src/app/components/time-span/time-span.component.ts @@ -69,16 +69,8 @@ export class TimeSpanComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-span:After ${dateStrings.i18nWeek}:DATE:`; break; case 'day': return $localize`:@@time-span:After ${dateStrings.i18nDay}:DATE:`; break; case 'hour': return $localize`:@@time-span:After ${dateStrings.i18nHour}:DATE:`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-span:After ${dateStrings.i18nMin}:DATE:`; - } - return $localize`:@@time-span:After ${dateStrings.i18nMinute}:DATE:`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-span:After ${dateStrings.i18nSec}:DATE:`; - } - return $localize`:@@time-span:After ${dateStrings.i18nSecond}:DATE:`; + case 'minute': return $localize`:@@time-span:After ${dateStrings.i18nMinute}:DATE:`; + case 'second': return $localize`:@@time-span:After ${dateStrings.i18nSecond}:DATE:`; } } else { switch (i) { // plural (2 days) @@ -87,16 +79,8 @@ export class TimeSpanComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-span:After ${dateStrings.i18nWeeks}:DATE:`; break; case 'day': return $localize`:@@time-span:After ${dateStrings.i18nDays}:DATE:`; break; case 'hour': return $localize`:@@time-span:After ${dateStrings.i18nHours}:DATE:`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-span:After ${dateStrings.i18nMins}:DATE:`; - } - return $localize`:@@time-span:After ${dateStrings.i18nMinutes}:DATE:`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-span:After ${dateStrings.i18nSecs}:DATE:`; - } - return $localize`:@@time-span:After ${dateStrings.i18nSeconds}:DATE:`; + case 'minute': return $localize`:@@time-span:After ${dateStrings.i18nMinutes}:DATE:`; + case 'second': return $localize`:@@time-span:After ${dateStrings.i18nSeconds}:DATE:`; } } } diff --git a/frontend/src/app/components/time-until/time-until.component.ts b/frontend/src/app/components/time-until/time-until.component.ts index 9ff0d9e0b..ee67e712b 100644 --- a/frontend/src/app/components/time-until/time-until.component.ts +++ b/frontend/src/app/components/time-until/time-until.component.ts @@ -70,16 +70,8 @@ export class TimeUntilComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-until:In ~${dateStrings.i18nWeek}:DATE:`; break; case 'day': return $localize`:@@time-until:In ~${dateStrings.i18nDay}:DATE:`; break; case 'hour': return $localize`:@@time-until:In ~${dateStrings.i18nHour}:DATE:`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-until:In ~${dateStrings.i18nMin}:DATE:`; - } - return $localize`:@@time-until:In ~${dateStrings.i18nMinute}:DATE:`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-until:In ~${dateStrings.i18nSec}:DATE:`; - } - return $localize`:@@time-until:In ~${dateStrings.i18nSecond}:DATE:`; + case 'minute': return $localize`:@@time-until:In ~${dateStrings.i18nMinute}:DATE:`; + case 'second': return $localize`:@@time-until:In ~${dateStrings.i18nSecond}:DATE:`; } } else { switch (i) { // plural (In ~2 days) @@ -88,16 +80,8 @@ export class TimeUntilComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-until:In ~${dateStrings.i18nWeeks}:DATE:`; break; case 'day': return $localize`:@@time-until:In ~${dateStrings.i18nDays}:DATE:`; break; case 'hour': return $localize`:@@time-until:In ~${dateStrings.i18nHours}:DATE:`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-until:In ~${dateStrings.i18nMins}:DATE:`; - } - return $localize`:@@time-until:In ~${dateStrings.i18nMinutes}:DATE:`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-until:In ~${dateStrings.i18nSecs}:DATE:`; - } - return $localize`:@@time-until:In ~${dateStrings.i18nSeconds}:DATE:`; + case 'minute': return $localize`:@@time-until:In ~${dateStrings.i18nMinutes}:DATE:`; + case 'second': return $localize`:@@time-until:In ~${dateStrings.i18nSeconds}:DATE:`; } } } diff --git a/frontend/src/app/shared/i18n/dates.ts b/frontend/src/app/shared/i18n/dates.ts index 24e8272c6..188adedf1 100644 --- a/frontend/src/app/shared/i18n/dates.ts +++ b/frontend/src/app/shared/i18n/dates.ts @@ -12,11 +12,7 @@ export const dates = (counter: number) => { i18nHours: $localize`:@@date-base.hours:${counter}:DATE: hours`, i18nMinute: $localize`:@@date-base.minute:${counter}:DATE: minute`, i18nMinutes: $localize`:@@date-base.minutes:${counter}:DATE: minutes`, - i18nMin: $localize`:@@date-base.min:${counter}:DATE: min`, - i18nMins: $localize`:@@date-base.mins:${counter}:DATE: mins`, i18nSecond: $localize`:@@date-base.second:${counter}:DATE: second`, i18nSeconds: $localize`:@@date-base.seconds:${counter}:DATE: seconds`, - i18nSec: $localize`:@@date-base.sec:${counter}:DATE: sec`, - i18nSecs: $localize`:@@date-base.secs:${counter}:DATE: secs`, } } \ No newline at end of file diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index f187ccad7..c9364b37a 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -2999,55 +2999,39 @@ src/app/components/time-since/time-since.component.ts - 74 + 72 src/app/components/time-since/time-since.component.ts - 76 + 73 + + + src/app/components/time-since/time-since.component.ts + 77 + + + src/app/components/time-since/time-since.component.ts + 78 src/app/components/time-since/time-since.component.ts 79 + + src/app/components/time-since/time-since.component.ts + 80 + src/app/components/time-since/time-since.component.ts 81 src/app/components/time-since/time-since.component.ts - 85 + 82 src/app/components/time-since/time-since.component.ts - 86 - - - src/app/components/time-since/time-since.component.ts - 87 - - - src/app/components/time-since/time-since.component.ts - 88 - - - src/app/components/time-since/time-since.component.ts - 89 - - - src/app/components/time-since/time-since.component.ts - 92 - - - src/app/components/time-since/time-since.component.ts - 94 - - - src/app/components/time-since/time-since.component.ts - 97 - - - src/app/components/time-since/time-since.component.ts - 99 + 83 @@ -3074,55 +3058,39 @@ src/app/components/time-span/time-span.component.ts - 74 + 72 src/app/components/time-span/time-span.component.ts - 76 + 73 + + + src/app/components/time-span/time-span.component.ts + 77 + + + src/app/components/time-span/time-span.component.ts + 78 src/app/components/time-span/time-span.component.ts 79 + + src/app/components/time-span/time-span.component.ts + 80 + src/app/components/time-span/time-span.component.ts 81 src/app/components/time-span/time-span.component.ts - 85 + 82 src/app/components/time-span/time-span.component.ts - 86 - - - src/app/components/time-span/time-span.component.ts - 87 - - - src/app/components/time-span/time-span.component.ts - 88 - - - src/app/components/time-span/time-span.component.ts - 89 - - - src/app/components/time-span/time-span.component.ts - 92 - - - src/app/components/time-span/time-span.component.ts - 94 - - - src/app/components/time-span/time-span.component.ts - 97 - - - src/app/components/time-span/time-span.component.ts - 99 + 83 @@ -3160,55 +3128,39 @@ src/app/components/time-until/time-until.component.ts - 75 + 73 src/app/components/time-until/time-until.component.ts - 77 + 74 + + + src/app/components/time-until/time-until.component.ts + 78 + + + src/app/components/time-until/time-until.component.ts + 79 src/app/components/time-until/time-until.component.ts 80 + + src/app/components/time-until/time-until.component.ts + 81 + src/app/components/time-until/time-until.component.ts 82 src/app/components/time-until/time-until.component.ts - 86 + 83 src/app/components/time-until/time-until.component.ts - 87 - - - src/app/components/time-until/time-until.component.ts - 88 - - - src/app/components/time-until/time-until.component.ts - 89 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 98 - - - src/app/components/time-until/time-until.component.ts - 100 + 84 @@ -3851,46 +3803,18 @@ 14 - - min - - src/app/shared/i18n/dates.ts - 15 - - - - mins - - src/app/shared/i18n/dates.ts - 16 - - second src/app/shared/i18n/dates.ts - 17 + 15 seconds src/app/shared/i18n/dates.ts - 18 - - - - sec - - src/app/shared/i18n/dates.ts - 19 - - - - secs - - src/app/shared/i18n/dates.ts - 20 + 16 From 03ce592ab0d5dc1ca48ec09146efdc47971ba3c3 Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Sun, 18 Jul 2021 09:42:59 -0300 Subject: [PATCH 35/42] Fix time-span calculation. (#635) --- frontend/src/app/components/time-span/time-span.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/components/time-span/time-span.component.ts b/frontend/src/app/components/time-span/time-span.component.ts index 81f64bc35..7d3b987fe 100644 --- a/frontend/src/app/components/time-span/time-span.component.ts +++ b/frontend/src/app/components/time-span/time-span.component.ts @@ -52,7 +52,7 @@ export class TimeSpanComponent implements OnInit, OnChanges, OnDestroy { } calculate() { - const seconds = Math.floor((+new Date() - +new Date(this.time * 1000)) / 1000); + const seconds = Math.floor(this.time); if (seconds < 60) { return $localize`:@@date-base.just-now:Just now`; } From 08328cbf0fd399be8ebd2b5449ed983f7f2e48f1 Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Sun, 18 Jul 2021 09:47:47 -0300 Subject: [PATCH 36/42] Bugfix: Overflow in difficulty adjustment component. (#638) * Remove green progress bar. * Fix itens overflow. --- frontend/src/app/dashboard/dashboard.component.html | 1 - frontend/src/app/dashboard/dashboard.component.scss | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index add7b46b6..f98779fda 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -223,7 +223,6 @@
{{ epochData.progress | number: '1.2-2' }} %
 
-
diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss index 30f1c4fb9..c9aa45c28 100644 --- a/frontend/src/app/dashboard/dashboard.component.scss +++ b/frontend/src/app/dashboard/dashboard.component.scss @@ -31,6 +31,7 @@ width: 100%; background-color: #2d3348; height: 1.1rem; + max-width: 130px; } .bg-warning { @@ -229,7 +230,6 @@ font-size: 12px; } .item { - max-width: 130px; padding: 0 5px; width: 100%; &:nth-child(1){ From ad08c3a907bb52442add884c151da86fff014f45 Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Sun, 18 Jul 2021 10:42:02 -0300 Subject: [PATCH 37/42] Add min-height to mempool-info-data. (#639) --- frontend/src/app/dashboard/dashboard.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss index c9aa45c28..de68f8af6 100644 --- a/frontend/src/app/dashboard/dashboard.component.scss +++ b/frontend/src/app/dashboard/dashboard.component.scss @@ -54,6 +54,7 @@ } .mempool-info-data { + min-height: 56px; display: block; @media (min-width: 485px) { display: flex; From 9e0a5300b004080d95582df2a0ae0d29f37e9086 Mon Sep 17 00:00:00 2001 From: Priyansh <43826321+priyanshiiit@users.noreply.github.com> Date: Mon, 19 Jul 2021 03:15:45 +0530 Subject: [PATCH 38/42] Expose the difficulty adjustment information in an API #622 (#628) * Added difficulty adjustment information API * Added Difficulty API in API docs frontend * Added link to API * Updated the API implementation of difficulty-adjustment * Updated API End Point in frontend * Updated sample API response in frontend --- backend/package-lock.json | 3 +- backend/src/index.ts | 1 + backend/src/routes.ts | 40 +++++++++++++++++++ frontend/angular.json | 3 ++ .../api-docs/api-docs.component.html | 17 ++++++++ .../api-docs/api-docs.component.scss | 4 ++ .../components/api-docs/api-docs.component.ts | 19 ++++++++- .../api-docs/code-template.component.scss | 4 ++ 8 files changed, 88 insertions(+), 3 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 50f260804..815cee5bf 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -2820,8 +2820,7 @@ "ws": { "version": "7.4.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", - "requires": {} + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" }, "yallist": { "version": "4.0.0", diff --git a/backend/src/index.ts b/backend/src/index.ts index ec9c53cab..5381790ac 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -248,6 +248,7 @@ class Server { .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs', routes.getAddressTransactions) .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs/chain/:txId', routes.getAddressTransactions) .get(config.MEMPOOL.API_URL_PREFIX + 'address-prefix/:prefix', routes.getAddressPrefix) + .get(config.MEMPOOL.API_URL_PREFIX + 'difficulty-adjustment', routes.getDifficultyChange) ; } } diff --git a/backend/src/routes.ts b/backend/src/routes.ts index 7d4bd844e..a40a23895 100644 --- a/backend/src/routes.ts +++ b/backend/src/routes.ts @@ -666,6 +666,46 @@ class Routes { public getTransactionOutspends(req: Request, res: Response) { res.status(501).send('Not implemented'); } + + public getDifficultyChange(req: Request, res: Response) { + try { + const now = new Date().getTime() / 1000; + const DATime=blocks.getLastDifficultyAdjustmentTime(); + const diff = now - DATime; + const blockHeight=blocks.getCurrentBlockHeight(); + const blocksInEpoch = blockHeight % 2016; + const estimatedBlocks = Math.round(diff / 60 / 10); + const difficultyChange = (600 / (diff / blocksInEpoch ) - 1) * 100; + + const timeAvgDiff = difficultyChange * 0.1; + + let timeAvgMins = 10; + if (timeAvgDiff > 0 ){ + timeAvgMins -= Math.abs(timeAvgDiff); + } else { + timeAvgMins += Math.abs(timeAvgDiff); + } + + const remainingBlocks = 2016 - blocksInEpoch; + const timeAvgSeconds = timeAvgMins * 60; + const remainingTime = remainingBlocks * timeAvgSeconds; + const estimatedRetargetDate=(remainingTime + now); + const totalTime=estimatedRetargetDate-DATime; + const progressPercent=100-((remainingTime*100)/totalTime); + + const result={ + progressPercent, + difficultyChange, + estimatedRetargetDate, + remainingBlocks, + remainingTime, + } + res.json(result); + + } catch (e) { + res.status(500).send(e.message || e); + } + } } export default new Routes(); diff --git a/frontend/angular.json b/frontend/angular.json index 3a2c2d94c..05b784aea 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -1,5 +1,8 @@ { "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "cli": { + "analytics": "ed0ff723-05da-4a22-b43d-692b797b5243" + }, "version": 1, "newProjectRoot": "projects", "projects": { diff --git a/frontend/src/app/components/api-docs/api-docs.component.html b/frontend/src/app/components/api-docs/api-docs.component.html index 5d4ab2faa..9c7fe0e65 100644 --- a/frontend/src/app/components/api-docs/api-docs.component.html +++ b/frontend/src/app/components/api-docs/api-docs.component.html @@ -823,6 +823,23 @@ +
  • + Difficulty + +
    +
    +
    Endpoint
    + GET {{ network.val === '' ? '' : '/' + network.val }}/api/difficulty-adjustment +
    +
    +
    Description
    +
    Returns details about difficulty adjustment.
    +
    + +
    +     +
    • +
    diff --git a/frontend/src/app/components/api-docs/api-docs.component.scss b/frontend/src/app/components/api-docs/api-docs.component.scss index c8a938e66..2fbadd123 100644 --- a/frontend/src/app/components/api-docs/api-docs.component.scss +++ b/frontend/src/app/components/api-docs/api-docs.component.scss @@ -69,4 +69,8 @@ li.nav-item { } .websocket { padding: 15px; +} + +.difficulty { + padding: 15px; } \ No newline at end of file diff --git a/frontend/src/app/components/api-docs/api-docs.component.ts b/frontend/src/app/components/api-docs/api-docs.component.ts index ce40a8adb..21ca2d2ae 100644 --- a/frontend/src/app/components/api-docs/api-docs.component.ts +++ b/frontend/src/app/components/api-docs/api-docs.component.ts @@ -1125,7 +1125,24 @@ responseSample: `{ curl: ``, }, responseSample: ``, - } + }, + + difficulty: { + codeSample: { + esModule:``, + commonJS:``, + curl: `curl -X GET "https://mempool.space/api/difficulty-adjustment"`, + }, + responseSample: `{ + progressPercent: 18.55392610846515, + difficultyChange: -1.2440503501069622, + estimatedRetargetDate: 1627400849.2000492, + remainingBlocks: 1642, + remainingTime: 997456.3840492539 + +}`, + }, + }; constructor( diff --git a/frontend/src/app/components/api-docs/code-template.component.scss b/frontend/src/app/components/api-docs/code-template.component.scss index 714f7325c..448ddc6aa 100644 --- a/frontend/src/app/components/api-docs/code-template.component.scss +++ b/frontend/src/app/components/api-docs/code-template.component.scss @@ -71,6 +71,10 @@ li.nav-item { padding: 15px; } +.difficulty { + padding: 15px; +} + .links { margin-bottom: 5px; a { From 853e2fcb8fda13d25235e8673559bd71a4dfabe9 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 19 Jul 2021 00:50:09 +0300 Subject: [PATCH 39/42] Minor fixes to difficulty adjustment api. --- backend/src/index.ts | 2 +- frontend/src/app/components/api-docs/api-docs.component.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/src/index.ts b/backend/src/index.ts index 5381790ac..0685b5e61 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -153,6 +153,7 @@ class Server { this.app .get(config.MEMPOOL.API_URL_PREFIX + 'transaction-times', routes.getTransactionTimes) .get(config.MEMPOOL.API_URL_PREFIX + 'cpfp/:txId', routes.getCpfpInfo) + .get(config.MEMPOOL.API_URL_PREFIX + 'difficulty-adjustment', routes.getDifficultyChange) .get(config.MEMPOOL.API_URL_PREFIX + 'fees/recommended', routes.getRecommendedFees) .get(config.MEMPOOL.API_URL_PREFIX + 'fees/mempool-blocks', routes.getMempoolBlocks) .get(config.MEMPOOL.API_URL_PREFIX + 'backend-info', routes.getBackendInfo) @@ -248,7 +249,6 @@ class Server { .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs', routes.getAddressTransactions) .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs/chain/:txId', routes.getAddressTransactions) .get(config.MEMPOOL.API_URL_PREFIX + 'address-prefix/:prefix', routes.getAddressPrefix) - .get(config.MEMPOOL.API_URL_PREFIX + 'difficulty-adjustment', routes.getDifficultyChange) ; } } diff --git a/frontend/src/app/components/api-docs/api-docs.component.ts b/frontend/src/app/components/api-docs/api-docs.component.ts index 21ca2d2ae..2d0948084 100644 --- a/frontend/src/app/components/api-docs/api-docs.component.ts +++ b/frontend/src/app/components/api-docs/api-docs.component.ts @@ -1139,7 +1139,6 @@ responseSample: `{ estimatedRetargetDate: 1627400849.2000492, remainingBlocks: 1642, remainingTime: 997456.3840492539 - }`, }, From 2e54f4ca94cd403ec07da2036d065e7f1f6096c4 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Mon, 19 Jul 2021 04:56:16 +0530 Subject: [PATCH 40/42] Added missing block header API (#630) * header API frontend * Block Header API endpoint added to Node.js backend * updated package-lock.json Co-authored-by: Rishabh --- .../bitcoin/bitcoin-api-abstract-factory.ts | 1 + backend/src/api/bitcoin/bitcoin-api.ts | 4 ++++ backend/src/api/bitcoin/esplora-api.ts | 5 +++++ backend/src/index.ts | 1 + backend/src/routes.ts | 9 +++++++++ .../api-docs/api-docs.component.html | 20 +++++++++++++++++++ .../components/api-docs/api-docs.component.ts | 10 +++++++++- .../app/components/block/block.component.html | 5 +++++ 8 files changed, 54 insertions(+), 1 deletion(-) diff --git a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts index 697c68e43..906cc0f95 100644 --- a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts +++ b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts @@ -6,6 +6,7 @@ export interface AbstractBitcoinApi { $getBlockHeightTip(): Promise; $getTxIdsForBlock(hash: string): Promise; $getBlockHash(height: number): Promise; + $getBlockHeader(hash: string): Promise; $getBlock(hash: string): Promise; $getAddress(address: string): Promise; $getAddressTransactions(address: string, lastSeenTxId: string): Promise; diff --git a/backend/src/api/bitcoin/bitcoin-api.ts b/backend/src/api/bitcoin/bitcoin-api.ts index 48119d709..0af44d2a8 100644 --- a/backend/src/api/bitcoin/bitcoin-api.ts +++ b/backend/src/api/bitcoin/bitcoin-api.ts @@ -60,6 +60,10 @@ class BitcoinApi implements AbstractBitcoinApi { return this.bitcoindClient.getBlockHash(height); } + $getBlockHeader(hash: string): Promise { + return this.bitcoindClient.getBlockHeader(hash,false); + } + async $getBlock(hash: string): Promise { const foundBlock = blocks.getBlocks().find((block) => block.id === hash); if (foundBlock) { diff --git a/backend/src/api/bitcoin/esplora-api.ts b/backend/src/api/bitcoin/esplora-api.ts index 5aa9f7fec..86d4179ad 100644 --- a/backend/src/api/bitcoin/esplora-api.ts +++ b/backend/src/api/bitcoin/esplora-api.ts @@ -35,6 +35,11 @@ class ElectrsApi implements AbstractBitcoinApi { .then((response) => response.data); } + $getBlockHeader(hash: string): Promise { + return axios.get(config.ESPLORA.REST_API_URL + '/block/' + hash + '/header', this.axiosConfig) + .then((response) => response.data); + } + $getBlock(hash: string): Promise { return axios.get(config.ESPLORA.REST_API_URL + '/block/' + hash, this.axiosConfig) .then((response) => response.data); diff --git a/backend/src/index.ts b/backend/src/index.ts index 0685b5e61..2d1ed5456 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -238,6 +238,7 @@ class Server { .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/status', routes.getTransactionStatus) .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/outspends', routes.getTransactionOutspends) .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash', routes.getBlock) + .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/header', routes.getBlockHeader) .get(config.MEMPOOL.API_URL_PREFIX + 'blocks', routes.getBlocks) .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/:height', routes.getBlocks) .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/tip/height', routes.getBlockTipHeight) diff --git a/backend/src/routes.ts b/backend/src/routes.ts index a40a23895..718f492f9 100644 --- a/backend/src/routes.ts +++ b/backend/src/routes.ts @@ -506,6 +506,15 @@ class Routes { } } + public async getBlockHeader(req: Request, res: Response) { + try { + const blockHeader = await bitcoinApi.$getBlockHeader(req.params.hash); + res.send(blockHeader); + } catch (e) { + res.status(500).send(e.message || e); + } + } + public async getBlocks(req: Request, res: Response) { try { loadingIndicators.setProgress('blocks', 0); diff --git a/frontend/src/app/components/api-docs/api-docs.component.html b/frontend/src/app/components/api-docs/api-docs.component.html index 9c7fe0e65..fe5708997 100644 --- a/frontend/src/app/components/api-docs/api-docs.component.html +++ b/frontend/src/app/components/api-docs/api-docs.component.html @@ -190,6 +190,26 @@ + + + GET Block Header + + + +
    +
    Endpoint
    + GET {{ network.val === '' ? '' : '/' + network.val }}/api/block/:hash/header +
    + +
    +
    Description
    +
    Returns the hex-encoded block header.
    +
    + + +     +     + GET Block Height diff --git a/frontend/src/app/components/api-docs/api-docs.component.ts b/frontend/src/app/components/api-docs/api-docs.component.ts index 2d0948084..27f4b0fdf 100644 --- a/frontend/src/app/components/api-docs/api-docs.component.ts +++ b/frontend/src/app/components/api-docs/api-docs.component.ts @@ -175,7 +175,15 @@ export class ApiDocsComponent implements OnInit { bits: 404111758, difficulty: 49402014931 }`, - }, + }, + blockHeader: { + codeSample: { + esModule: `//to be added`, + commonJS: `//to be added`, + curl: `curl -X GET "https://mempool.space/api/block/:hash/header"`, + }, + responseSample: `040000202c04d4c450187d1da9b1bc23ba47d67fe028d22486fd0c00000000000000000059a3a33d4642c799af9f54a4dd351fff9130e6a89d4e251130c60064878616e906b5ea60ce9813173a25caf3`, + }, blockHeight: { codeSample: { esModule: `const { %{1}: { blocks } } = mempoolJS(); diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index b26922bef..999c4fcff 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -114,6 +114,11 @@
    + + + + +
    Nonce {{ block.nonce | decimal2hex }}
    Block Header Hexview
    From cb90b09a0ec53c0ce4f9dfa672cf51831be525f5 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 19 Jul 2021 02:34:01 +0300 Subject: [PATCH 41/42] Changing block header link to icon. Setting api response header to match electrs. --- backend/src/routes.ts | 1 + frontend/src/app/app.module.ts | 3 ++- frontend/src/app/components/block/block.component.html | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/routes.ts b/backend/src/routes.ts index 718f492f9..3e7e487bb 100644 --- a/backend/src/routes.ts +++ b/backend/src/routes.ts @@ -509,6 +509,7 @@ class Routes { public async getBlockHeader(req: Request, res: Response) { try { const blockHeader = await bitcoinApi.$getBlockHeader(req.params.hash); + res.setHeader('content-type', 'text/plain'); res.send(blockHeader); } catch (e) { res.status(500).send(e.message || e); diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 09ea8c047..a6d29402b 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -45,7 +45,7 @@ import { FeesBoxComponent } from './components/fees-box/fees-box.component'; import { DashboardComponent } from './dashboard/dashboard.component'; import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome'; import { faAngleDown, faAngleUp, faBolt, faChartArea, faCogs, faCubes, faDatabase, faExchangeAlt, faInfoCircle, - faLink, faList, faSearch, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faAngleDoubleUp, faChevronDown, faFileAlt, faRedoAlt, faArrowAltCircleRight } from '@fortawesome/free-solid-svg-icons'; + faLink, faList, faSearch, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faAngleDoubleUp, faChevronDown, faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt } from '@fortawesome/free-solid-svg-icons'; import { ApiDocsComponent } from './components/api-docs/api-docs.component'; import { CodeTemplateComponent } from './components/api-docs/code-template.component'; import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component'; @@ -137,5 +137,6 @@ export class AppModule { library.addIcons(faFileAlt); library.addIcons(faRedoAlt); library.addIcons(faArrowAltCircleRight); + library.addIcons(faExternalLinkAlt); } } diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index 999c4fcff..51740e636 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -116,8 +116,7 @@
    Block Header Hexview
    From 95436d398dd55ad2b4576f92d87ae019ae8da089 Mon Sep 17 00:00:00 2001 From: Miguel Medeiros Date: Mon, 19 Jul 2021 17:13:34 -0300 Subject: [PATCH 42/42] Fix undefined asset and colored coinbase tx. (#645) --- .../transactions-list/transactions-list.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index f445e1b20..9768952d0 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -21,7 +21,7 @@ - +
    @@ -122,7 +122,7 @@ - +
    {{ vout.scriptpubkey_address | shortenString : 16 }}