Skip to content

Commit c126713

Browse files
committed
Merge remote-tracking branch 'remotes/origin/groovy_gluon_7.3RC' into mainnet
2 parents 5514910 + acdeaa1 commit c126713

26 files changed

+515
-439
lines changed

beam

ui/i18n/be_BY.ts

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,10 @@ please review your settings and try again.</translation>
10141014
<source>For the transaction to complete, the recipient must get online within the next 12 hours and you should get online within 2 hours afterwards.</source>
10151015
<translation>Каб транзакцыя была завершана, атрымальнік павінен выйсці ў Інтэрнэт на працягу наступных 12 гадзін, а вы павінны ўвайсці ў Інтэрнэт на працягу 2 гадзін пасля гэтага.</translation>
10161016
</message>
1017+
<message id="trezor-message">
1018+
<source>Please, look at your Trezor device to complete actions...</source>
1019+
<translation>Калі ласка, паглядзіце на ваш Trezor, каб выканаць дзеянні...</translation>
1020+
</message>
10171021
<message id="start-init-wallet-with-trezor">
10181022
<source>Init wallet with Trezor</source>
10191023
<translation>Стварыць кашалёк з Trezor</translation>
@@ -1271,7 +1275,7 @@ Please check the swap token and try again.</source>
12711275
<message id="settings-swap-confirm-show-seed-title">
12721276
<source>Show seed phrase</source>
12731277
<extracomment>electrum settings, ask password to show seed phrase, dialog title</extracomment>
1274-
<translation>Паказаць кантрольную фразу</translation>
1278+
<translation type="unfinished">Show seed phrase</translation>
12751279
</message>
12761280
<message id="settings-swap-confirm-show-seed-message">
12771281
<source>Enter your wallet password to see the phrase</source>
@@ -1326,6 +1330,14 @@ Please check the swap token and try again.</source>
13261330
<source> Once the offer is accepted by the other side, the %1 transaction fee will be charged even if the offer is cancelled.</source>
13271331
<translation>Пасля прыняцця прапановы іншым бокам, збор за транзакцыю %1 будзе спаганяцца, нават калі прапанова будзе адменена.</translation>
13281332
</message>
1333+
<message id="app-close-title">
1334+
<source>Beam wallet close</source>
1335+
<translation>Зачынiць кашалёк Beam</translation>
1336+
</message>
1337+
<message id="app-close-text">
1338+
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
1339+
<translation>Зараз ёсць %1 актыўных транзакцый, якія могуць пацярпець няўдачу, калі кашалёк выйдзе з сеткі. Вы сапраўды хочаце зачыніць кашалёк?</translation>
1340+
</message>
13291341
<message id="wallet-export-tx-history">
13301342
<source>Export transactions history</source>
13311343
<extracomment>transactions history screen, export button tooltip and open file dialog</extracomment>
@@ -1667,7 +1679,7 @@ Your version is: %2. Please, check for updates.</source>
16671679
<message id="settings-remote-node-address">
16681680
<source>Node address</source>
16691681
<extracomment>settings tab, node section, address label</extracomment>
1670-
<translation>Адрас вузла</translation>
1682+
<translation type="unfinished">Node address</translation>
16711683
</message>
16721684
<message id="settings-peers-title">
16731685
<source>Peers</source>
@@ -1861,8 +1873,10 @@ Your version is: %2. Please, check for updates.</source>
18611873
<translation>Тып адраса</translation>
18621874
</message>
18631875
<message id="address-info-sbbs-address">
1864-
<source>Online (SBBS) Address</source>
1865-
<translation>Анлайн (SBBS) адрас </translation>
1876+
<source>SBBS Address
1877+
(use for CEX withdrawals)</source>
1878+
<translation type="unfinished">SBBS Address
1879+
(use for CEX withdrawals)</translation>
18661880
</message>
18671881
<message id="address-info-address">
18681882
<source>Address</source>
@@ -2476,7 +2490,7 @@ Update your settings and try again.</source>
24762490
</message>
24772491
<message id="tx-offline">
24782492
<source>Offline</source>
2479-
<translation>Афлайн</translation>
2493+
<translation type="unfinished">Offline</translation>
24802494
</message>
24812495
<message id="send-no-funds">
24822496
<source>Insufficient funds to complete the transaction. Maximum amount is %1 %2.</source>
@@ -2575,16 +2589,16 @@ Update your settings and try again.</source>
25752589
<translation>Адрас адпраўніка</translation>
25762590
</message>
25772591
<message id="tx-details-sender-identity">
2578-
<source>Sender Endpoint</source>
2579-
<translation>Адпраўшчык</translation>
2592+
<source>Sender signature</source>
2593+
<translation type="unfinished">Sender signature</translation>
25802594
</message>
25812595
<message id="tx-details-receiving-addr-label">
25822596
<source>Receiving address</source>
25832597
<translation>Адрас атрымальніка</translation>
25842598
</message>
25852599
<message id="tx-details-receiver-identity">
2586-
<source>Receiver Endpoint</source>
2587-
<translation>Атрымальнік</translation>
2600+
<source>Receiver signature</source>
2601+
<translation type="unfinished">Receiver signature</translation>
25882602
</message>
25892603
<message id="tx-details-amount-label">
25902604
<source>Amount</source>
@@ -2773,7 +2787,7 @@ Update your settings and try again.</source>
27732787
</message>
27742788
<message id="notifications-title">
27752789
<source>Notifications</source>
2776-
<translation>Апавяшчэнні</translation>
2790+
<translation type="unfinished">Notifications</translation>
27772791
</message>
27782792
<message id="notifications-clear-all">
27792793
<source>clear all</source>
@@ -2844,8 +2858,8 @@ Allow to proceed? You can always update your choice in Settings later.</source>
28442858
<translation>Агульная інфармацыя</translation>
28452859
</message>
28462860
<message id="general-wallet-signature">
2847-
<source>Endpoint</source>
2848-
<translation type="unfinished">Endpoint</translation>
2861+
<source>Signature</source>
2862+
<translation type="unfinished">Signature</translation>
28492863
</message>
28502864
<message id="settings-utilities-show-utxo">
28512865
<source>Show UTXO</source>
@@ -2877,7 +2891,7 @@ Allow to proceed? You can always update your choice in Settings later.</source>
28772891
</message>
28782892
<message id="tx-online">
28792893
<source>Online</source>
2880-
<translation>Анлайн</translation>
2894+
<translation type="unfinished">Online</translation>
28812895
</message>
28822896
<message id="send-receiver-online-tip">
28832897
<source>Ask receiver to come online to support more offline transactions.</source>
@@ -3863,28 +3877,18 @@ Please, restart the wallet and try again.</source>
38633877
<message id="receive-view-hw-wallet-disconnected">
38643878
<source>QR code is wrong.
38653879
A hardware wallet is not connected. Please, connect the wallet</source>
3866-
<translation type="unfinished"></translation>
3880+
<translation>QR-код няправільны.
3881+
Апаратны кашалёк не падключаны. Калі ласка, падключыце кашалёк</translation>
38673882
</message>
38683883
<message id="approve-on-hw-wallet-title">
38693884
<source>Transaction</source>
3870-
<translation type="unfinished"></translation>
3885+
<translation>Транзакцыя</translation>
38713886
</message>
38723887
<message id="approve-on-hw-wallet-text">
38733888
<source>Transaction is in process.
38743889
Connect your Hardware Wallet to finalize the transaction.</source>
3875-
<translation type="unfinished"></translation>
3876-
</message>
3877-
<message id="app-close-title">
3878-
<source>Beam wallet close</source>
3879-
<translation type="unfinished"></translation>
3880-
</message>
3881-
<message id="app-close-text">
3882-
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
3883-
<translation type="unfinished"></translation>
3884-
</message>
3885-
<message id="trezor-message">
3886-
<source>Please, look at your Trezor device to complete actions...</source>
3887-
<translation type="unfinished"></translation>
3890+
<translation>Транзакцыя ў працэсе.
3891+
Падключыце апаратны кашалёк, каб завяршыць транзакцыю.</translation>
38883892
</message>
38893893
</context>
38903894
</TS>

ui/i18n/cs_CZ.ts

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,10 @@ prosím zkontrolujte nastavení a zkuste to znovu.</translation>
10141014
<source>For the transaction to complete, the recipient must get online within the next 12 hours and you should get online within 2 hours afterwards.</source>
10151015
<translation>Pro dokončení transakce musí být příjemce online během následujících 12 hodin a měli byste být online do 2 hodin poté.</translation>
10161016
</message>
1017+
<message id="trezor-message">
1018+
<source>Please, look at your Trezor device to complete actions...</source>
1019+
<translation>Prosíme, sledujte obrazovku Vašeho Trezoru pro dokončení akcí...</translation>
1020+
</message>
10171021
<message id="start-init-wallet-with-trezor">
10181022
<source>Init wallet with Trezor</source>
10191023
<translation>Spustit peněženku pomocí Trezoru</translation>
@@ -1327,6 +1331,14 @@ Prosím zkontrolujte token výměny a zkuste to znovu.</translation>
13271331
<source> Once the offer is accepted by the other side, the %1 transaction fee will be charged even if the offer is cancelled.</source>
13281332
<translation> Jakmile bude nabídka přijata druhou stranou, bude poplatek za transakci %1 účtován i v případě, že bude nabídka zrušena.</translation>
13291333
</message>
1334+
<message id="app-close-title">
1335+
<source>Beam wallet close</source>
1336+
<translation>Zavřít peněženku</translation>
1337+
</message>
1338+
<message id="app-close-text">
1339+
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
1340+
<translation>Existuje %1 aktivních transakcí, které nemusí proběhnout, pokud bude peněženka odpojena. Opravdu nyní chcete zavřít peněženku?</translation>
1341+
</message>
13301342
<message id="wallet-export-tx-history">
13311343
<source>Export transactions history</source>
13321344
<extracomment>transactions history screen, export button tooltip and open file dialog</extracomment>
@@ -1862,8 +1874,10 @@ Vaše verze je: %2. Zkontrolujte prosím aktualizace.</translation>
18621874
<translation>Typ adresy</translation>
18631875
</message>
18641876
<message id="address-info-sbbs-address">
1865-
<source>Online (SBBS) Address</source>
1866-
<translation>Online (SBBS) adresa</translation>
1877+
<source>SBBS Address
1878+
(use for CEX withdrawals)</source>
1879+
<translation type="unfinished">SBBS Address
1880+
(use for CEX withdrawals)</translation>
18671881
</message>
18681882
<message id="address-info-address">
18691883
<source>Address</source>
@@ -2574,16 +2588,16 @@ Aktualizujte nastavení a zkuste to znovu.</translation>
25742588
<translation>Odesílací adresa</translation>
25752589
</message>
25762590
<message id="tx-details-sender-identity">
2577-
<source>Sender Endpoint</source>
2578-
<translation type="unfinished">Sender Endpoint</translation>
2591+
<source>Sender signature</source>
2592+
<translation type="unfinished">Sender signature</translation>
25792593
</message>
25802594
<message id="tx-details-receiving-addr-label">
25812595
<source>Receiving address</source>
25822596
<translation>Přijímací adresa</translation>
25832597
</message>
25842598
<message id="tx-details-receiver-identity">
2585-
<source>Receiver Endpoint</source>
2586-
<translation type="unfinished">Receiver Endpoint</translation>
2599+
<source>Receiver signature</source>
2600+
<translation type="unfinished">Receiver signature</translation>
25872601
</message>
25882602
<message id="tx-details-amount-label">
25892603
<source>Amount</source>
@@ -2843,8 +2857,8 @@ Allow to proceed? You can always update your choice in Settings later.</translat
28432857
<translation type="unfinished">General info</translation>
28442858
</message>
28452859
<message id="general-wallet-signature">
2846-
<source>Endpoint</source>
2847-
<translation type="unfinished">Endpoint</translation>
2860+
<source>Signature</source>
2861+
<translation type="unfinished">Signature</translation>
28482862
</message>
28492863
<message id="settings-utilities-show-utxo">
28502864
<source>Show UTXO</source>
@@ -3863,28 +3877,18 @@ Please, restart the wallet and try again.</translation>
38633877
<message id="receive-view-hw-wallet-disconnected">
38643878
<source>QR code is wrong.
38653879
A hardware wallet is not connected. Please, connect the wallet</source>
3866-
<translation type="unfinished"></translation>
3880+
<translation type="unfinished">QR code is wrong.
3881+
A hardware wallet is not connected. Please, connect the wallet</translation>
38673882
</message>
38683883
<message id="approve-on-hw-wallet-title">
38693884
<source>Transaction</source>
3870-
<translation type="unfinished"></translation>
3885+
<translation>Transakce</translation>
38713886
</message>
38723887
<message id="approve-on-hw-wallet-text">
38733888
<source>Transaction is in process.
38743889
Connect your Hardware Wallet to finalize the transaction.</source>
3875-
<translation type="unfinished"></translation>
3876-
</message>
3877-
<message id="app-close-title">
3878-
<source>Beam wallet close</source>
3879-
<translation type="unfinished"></translation>
3880-
</message>
3881-
<message id="app-close-text">
3882-
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
3883-
<translation type="unfinished"></translation>
3884-
</message>
3885-
<message id="trezor-message">
3886-
<source>Please, look at your Trezor device to complete actions...</source>
3887-
<translation type="unfinished"></translation>
3890+
<translation type="unfinished">Transaction is in process.
3891+
Connect your Hardware Wallet to finalize the transaction.</translation>
38883892
</message>
38893893
</context>
38903894
</TS>

ui/i18n/de_DE.ts

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,10 @@ bitte überprüfen Sie Ihre Einstellungen und versuchen Sie es erneut.</translat
10111011
<source>For the transaction to complete, the recipient must get online within the next 12 hours and you should get online within 2 hours afterwards.</source>
10121012
<translation>Damit die Transaktion abgeschlossen werden kann, muss der Empfänger innerhalb der nächsten 12 Stunden online sein und Sie sollten innerhalb von 2 Stunden online sein.</translation>
10131013
</message>
1014+
<message id="trezor-message">
1015+
<source>Please, look at your Trezor device to complete actions...</source>
1016+
<translation>Bitte schauen Sie sich Ihr Trezor an, um Aktionen abzuschließen...</translation>
1017+
</message>
10141018
<message id="start-init-wallet-with-trezor">
10151019
<source>Init wallet with Trezor</source>
10161020
<translation>Wallet mit Trezor initialisieren</translation>
@@ -1324,6 +1328,14 @@ Bitte überprüfen Sie das Swap-Token und versuchen Sie es erneut.</translation>
13241328
<source> Once the offer is accepted by the other side, the %1 transaction fee will be charged even if the offer is cancelled.</source>
13251329
<translation type="unfinished"> Once the offer is accepted by the other side, the %1 transaction fee will be charged even if the offer is cancelled.</translation>
13261330
</message>
1331+
<message id="app-close-title">
1332+
<source>Beam wallet close</source>
1333+
<translation type="unfinished">Beam wallet close</translation>
1334+
</message>
1335+
<message id="app-close-text">
1336+
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
1337+
<translation type="unfinished">There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</translation>
1338+
</message>
13271339
<message id="wallet-export-tx-history">
13281340
<source>Export transactions history</source>
13291341
<extracomment>transactions history screen, export button tooltip and open file dialog</extracomment>
@@ -1859,8 +1871,10 @@ Your version is: %2. Please, check for updates.</translation>
18591871
<translation type="unfinished">Address type</translation>
18601872
</message>
18611873
<message id="address-info-sbbs-address">
1862-
<source>Online (SBBS) Address</source>
1863-
<translation type="unfinished">Online (SBBS) Address</translation>
1874+
<source>SBBS Address
1875+
(use for CEX withdrawals)</source>
1876+
<translation type="unfinished">SBBS Address
1877+
(use for CEX withdrawals)</translation>
18641878
</message>
18651879
<message id="address-info-address">
18661880
<source>Address</source>
@@ -2568,16 +2582,16 @@ Aktualisieren Sie Ihre Einstellungen und versuchen Sie es erneut.</translation>
25682582
<translation>Sender Adresse</translation>
25692583
</message>
25702584
<message id="tx-details-sender-identity">
2571-
<source>Sender Endpoint</source>
2572-
<translation type="unfinished">Sender Endpoint</translation>
2585+
<source>Sender signature</source>
2586+
<translation type="unfinished">Sender signature</translation>
25732587
</message>
25742588
<message id="tx-details-receiving-addr-label">
25752589
<source>Receiving address</source>
25762590
<translation>Empfänger Adresse</translation>
25772591
</message>
25782592
<message id="tx-details-receiver-identity">
2579-
<source>Receiver Endpoint</source>
2580-
<translation type="unfinished">Receiver Endpoint</translation>
2593+
<source>Receiver signature</source>
2594+
<translation type="unfinished">Receiver signature</translation>
25812595
</message>
25822596
<message id="tx-details-amount-label">
25832597
<source>Amount</source>
@@ -2837,8 +2851,8 @@ Allow to proceed? You can always update your choice in Settings later.</translat
28372851
<translation type="unfinished">General info</translation>
28382852
</message>
28392853
<message id="general-wallet-signature">
2840-
<source>Endpoint</source>
2841-
<translation type="unfinished">Endpoint</translation>
2854+
<source>Signature</source>
2855+
<translation type="unfinished">Signature</translation>
28422856
</message>
28432857
<message id="settings-utilities-show-utxo">
28442858
<source>Show UTXO</source>
@@ -3854,28 +3868,18 @@ Please, restart the wallet and try again.</translation>
38543868
<message id="receive-view-hw-wallet-disconnected">
38553869
<source>QR code is wrong.
38563870
A hardware wallet is not connected. Please, connect the wallet</source>
3857-
<translation type="unfinished"></translation>
3871+
<translation type="unfinished">QR code is wrong.
3872+
A hardware wallet is not connected. Please, connect the wallet</translation>
38583873
</message>
38593874
<message id="approve-on-hw-wallet-title">
38603875
<source>Transaction</source>
3861-
<translation type="unfinished"></translation>
3876+
<translation>Transaktion</translation>
38623877
</message>
38633878
<message id="approve-on-hw-wallet-text">
38643879
<source>Transaction is in process.
38653880
Connect your Hardware Wallet to finalize the transaction.</source>
3866-
<translation type="unfinished"></translation>
3867-
</message>
3868-
<message id="app-close-title">
3869-
<source>Beam wallet close</source>
3870-
<translation type="unfinished"></translation>
3871-
</message>
3872-
<message id="app-close-text">
3873-
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
3874-
<translation type="unfinished"></translation>
3875-
</message>
3876-
<message id="trezor-message">
3877-
<source>Please, look at your Trezor device to complete actions...</source>
3878-
<translation type="unfinished"></translation>
3881+
<translation type="unfinished">Transaction is in process.
3882+
Connect your Hardware Wallet to finalize the transaction.</translation>
38793883
</message>
38803884
</context>
38813885
</TS>

0 commit comments

Comments
 (0)