Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/groovy_gluon_7.3RC' into…
Browse files Browse the repository at this point in the history
… mainnet
  • Loading branch information
anatolse committed Apr 14, 2023
2 parents 5514910 + acdeaa1 commit c126713
Show file tree
Hide file tree
Showing 26 changed files with 515 additions and 439 deletions.
2 changes: 1 addition & 1 deletion beam
60 changes: 32 additions & 28 deletions ui/i18n/be_BY.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,10 @@ please review your settings and try again.</translation>
<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>
<translation>Каб транзакцыя была завершана, атрымальнік павінен выйсці ў Інтэрнэт на працягу наступных 12 гадзін, а вы павінны ўвайсці ў Інтэрнэт на працягу 2 гадзін пасля гэтага.</translation>
</message>
<message id="trezor-message">
<source>Please, look at your Trezor device to complete actions...</source>
<translation>Калі ласка, паглядзіце на ваш Trezor, каб выканаць дзеянні...</translation>
</message>
<message id="start-init-wallet-with-trezor">
<source>Init wallet with Trezor</source>
<translation>Стварыць кашалёк з Trezor</translation>
Expand Down Expand Up @@ -1271,7 +1275,7 @@ Please check the swap token and try again.</source>
<message id="settings-swap-confirm-show-seed-title">
<source>Show seed phrase</source>
<extracomment>electrum settings, ask password to show seed phrase, dialog title</extracomment>
<translation>Паказаць кантрольную фразу</translation>
<translation type="unfinished">Show seed phrase</translation>
</message>
<message id="settings-swap-confirm-show-seed-message">
<source>Enter your wallet password to see the phrase</source>
Expand Down Expand Up @@ -1326,6 +1330,14 @@ Please check the swap token and try again.</source>
<source> Once the offer is accepted by the other side, the %1 transaction fee will be charged even if the offer is cancelled.</source>
<translation>Пасля прыняцця прапановы іншым бокам, збор за транзакцыю %1 будзе спаганяцца, нават калі прапанова будзе адменена.</translation>
</message>
<message id="app-close-title">
<source>Beam wallet close</source>
<translation>Зачынiць кашалёк Beam</translation>
</message>
<message id="app-close-text">
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
<translation>Зараз ёсць %1 актыўных транзакцый, якія могуць пацярпець няўдачу, калі кашалёк выйдзе з сеткі. Вы сапраўды хочаце зачыніць кашалёк?</translation>
</message>
<message id="wallet-export-tx-history">
<source>Export transactions history</source>
<extracomment>transactions history screen, export button tooltip and open file dialog</extracomment>
Expand Down Expand Up @@ -1667,7 +1679,7 @@ Your version is: %2. Please, check for updates.</source>
<message id="settings-remote-node-address">
<source>Node address</source>
<extracomment>settings tab, node section, address label</extracomment>
<translation>Адрас вузла</translation>
<translation type="unfinished">Node address</translation>
</message>
<message id="settings-peers-title">
<source>Peers</source>
Expand Down Expand Up @@ -1861,8 +1873,10 @@ Your version is: %2. Please, check for updates.</source>
<translation>Тып адраса</translation>
</message>
<message id="address-info-sbbs-address">
<source>Online (SBBS) Address</source>
<translation>Анлайн (SBBS) адрас </translation>
<source>SBBS Address
(use for CEX withdrawals)</source>
<translation type="unfinished">SBBS Address
(use for CEX withdrawals)</translation>
</message>
<message id="address-info-address">
<source>Address</source>
Expand Down Expand Up @@ -2476,7 +2490,7 @@ Update your settings and try again.</source>
</message>
<message id="tx-offline">
<source>Offline</source>
<translation>Афлайн</translation>
<translation type="unfinished">Offline</translation>
</message>
<message id="send-no-funds">
<source>Insufficient funds to complete the transaction. Maximum amount is %1 %2.</source>
Expand Down Expand Up @@ -2575,16 +2589,16 @@ Update your settings and try again.</source>
<translation>Адрас адпраўніка</translation>
</message>
<message id="tx-details-sender-identity">
<source>Sender Endpoint</source>
<translation>Адпраўшчык</translation>
<source>Sender signature</source>
<translation type="unfinished">Sender signature</translation>
</message>
<message id="tx-details-receiving-addr-label">
<source>Receiving address</source>
<translation>Адрас атрымальніка</translation>
</message>
<message id="tx-details-receiver-identity">
<source>Receiver Endpoint</source>
<translation>Атрымальнік</translation>
<source>Receiver signature</source>
<translation type="unfinished">Receiver signature</translation>
</message>
<message id="tx-details-amount-label">
<source>Amount</source>
Expand Down Expand Up @@ -2773,7 +2787,7 @@ Update your settings and try again.</source>
</message>
<message id="notifications-title">
<source>Notifications</source>
<translation>Апавяшчэнні</translation>
<translation type="unfinished">Notifications</translation>
</message>
<message id="notifications-clear-all">
<source>clear all</source>
Expand Down Expand Up @@ -2844,8 +2858,8 @@ Allow to proceed? You can always update your choice in Settings later.</source>
<translation>Агульная інфармацыя</translation>
</message>
<message id="general-wallet-signature">
<source>Endpoint</source>
<translation type="unfinished">Endpoint</translation>
<source>Signature</source>
<translation type="unfinished">Signature</translation>
</message>
<message id="settings-utilities-show-utxo">
<source>Show UTXO</source>
Expand Down Expand Up @@ -2877,7 +2891,7 @@ Allow to proceed? You can always update your choice in Settings later.</source>
</message>
<message id="tx-online">
<source>Online</source>
<translation>Анлайн</translation>
<translation type="unfinished">Online</translation>
</message>
<message id="send-receiver-online-tip">
<source>Ask receiver to come online to support more offline transactions.</source>
Expand Down Expand Up @@ -3863,28 +3877,18 @@ Please, restart the wallet and try again.</source>
<message id="receive-view-hw-wallet-disconnected">
<source>QR code is wrong.
A hardware wallet is not connected. Please, connect the wallet</source>
<translation type="unfinished"></translation>
<translation>QR-код няправільны.
Апаратны кашалёк не падключаны. Калі ласка, падключыце кашалёк</translation>
</message>
<message id="approve-on-hw-wallet-title">
<source>Transaction</source>
<translation type="unfinished"></translation>
<translation>Транзакцыя</translation>
</message>
<message id="approve-on-hw-wallet-text">
<source>Transaction is in process.
Connect your Hardware Wallet to finalize the transaction.</source>
<translation type="unfinished"></translation>
</message>
<message id="app-close-title">
<source>Beam wallet close</source>
<translation type="unfinished"></translation>
</message>
<message id="app-close-text">
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
<translation type="unfinished"></translation>
</message>
<message id="trezor-message">
<source>Please, look at your Trezor device to complete actions...</source>
<translation type="unfinished"></translation>
<translation>Транзакцыя ў працэсе.
Падключыце апаратны кашалёк, каб завяршыць транзакцыю.</translation>
</message>
</context>
</TS>
50 changes: 27 additions & 23 deletions ui/i18n/cs_CZ.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,10 @@ prosím zkontrolujte nastavení a zkuste to znovu.</translation>
<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>
<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>
</message>
<message id="trezor-message">
<source>Please, look at your Trezor device to complete actions...</source>
<translation>Prosíme, sledujte obrazovku Vašeho Trezoru pro dokončení akcí...</translation>
</message>
<message id="start-init-wallet-with-trezor">
<source>Init wallet with Trezor</source>
<translation>Spustit peněženku pomocí Trezoru</translation>
Expand Down Expand Up @@ -1327,6 +1331,14 @@ Prosím zkontrolujte token výměny a zkuste to znovu.</translation>
<source> Once the offer is accepted by the other side, the %1 transaction fee will be charged even if the offer is cancelled.</source>
<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>
</message>
<message id="app-close-title">
<source>Beam wallet close</source>
<translation>Zavřít peněženku</translation>
</message>
<message id="app-close-text">
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
<translation>Existuje %1 aktivních transakcí, které nemusí proběhnout, pokud bude peněženka odpojena. Opravdu nyní chcete zavřít peněženku?</translation>
</message>
<message id="wallet-export-tx-history">
<source>Export transactions history</source>
<extracomment>transactions history screen, export button tooltip and open file dialog</extracomment>
Expand Down Expand Up @@ -1862,8 +1874,10 @@ Vaše verze je: %2. Zkontrolujte prosím aktualizace.</translation>
<translation>Typ adresy</translation>
</message>
<message id="address-info-sbbs-address">
<source>Online (SBBS) Address</source>
<translation>Online (SBBS) adresa</translation>
<source>SBBS Address
(use for CEX withdrawals)</source>
<translation type="unfinished">SBBS Address
(use for CEX withdrawals)</translation>
</message>
<message id="address-info-address">
<source>Address</source>
Expand Down Expand Up @@ -2574,16 +2588,16 @@ Aktualizujte nastavení a zkuste to znovu.</translation>
<translation>Odesílací adresa</translation>
</message>
<message id="tx-details-sender-identity">
<source>Sender Endpoint</source>
<translation type="unfinished">Sender Endpoint</translation>
<source>Sender signature</source>
<translation type="unfinished">Sender signature</translation>
</message>
<message id="tx-details-receiving-addr-label">
<source>Receiving address</source>
<translation>Přijímací adresa</translation>
</message>
<message id="tx-details-receiver-identity">
<source>Receiver Endpoint</source>
<translation type="unfinished">Receiver Endpoint</translation>
<source>Receiver signature</source>
<translation type="unfinished">Receiver signature</translation>
</message>
<message id="tx-details-amount-label">
<source>Amount</source>
Expand Down Expand Up @@ -2843,8 +2857,8 @@ Allow to proceed? You can always update your choice in Settings later.</translat
<translation type="unfinished">General info</translation>
</message>
<message id="general-wallet-signature">
<source>Endpoint</source>
<translation type="unfinished">Endpoint</translation>
<source>Signature</source>
<translation type="unfinished">Signature</translation>
</message>
<message id="settings-utilities-show-utxo">
<source>Show UTXO</source>
Expand Down Expand Up @@ -3863,28 +3877,18 @@ Please, restart the wallet and try again.</translation>
<message id="receive-view-hw-wallet-disconnected">
<source>QR code is wrong.
A hardware wallet is not connected. Please, connect the wallet</source>
<translation type="unfinished"></translation>
<translation type="unfinished">QR code is wrong.
A hardware wallet is not connected. Please, connect the wallet</translation>
</message>
<message id="approve-on-hw-wallet-title">
<source>Transaction</source>
<translation type="unfinished"></translation>
<translation>Transakce</translation>
</message>
<message id="approve-on-hw-wallet-text">
<source>Transaction is in process.
Connect your Hardware Wallet to finalize the transaction.</source>
<translation type="unfinished"></translation>
</message>
<message id="app-close-title">
<source>Beam wallet close</source>
<translation type="unfinished"></translation>
</message>
<message id="app-close-text">
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
<translation type="unfinished"></translation>
</message>
<message id="trezor-message">
<source>Please, look at your Trezor device to complete actions...</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Transaction is in process.
Connect your Hardware Wallet to finalize the transaction.</translation>
</message>
</context>
</TS>
50 changes: 27 additions & 23 deletions ui/i18n/de_DE.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1011,6 +1011,10 @@ bitte überprüfen Sie Ihre Einstellungen und versuchen Sie es erneut.</translat
<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>
<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>
</message>
<message id="trezor-message">
<source>Please, look at your Trezor device to complete actions...</source>
<translation>Bitte schauen Sie sich Ihr Trezor an, um Aktionen abzuschließen...</translation>
</message>
<message id="start-init-wallet-with-trezor">
<source>Init wallet with Trezor</source>
<translation>Wallet mit Trezor initialisieren</translation>
Expand Down Expand Up @@ -1324,6 +1328,14 @@ Bitte überprüfen Sie das Swap-Token und versuchen Sie es erneut.</translation>
<source> Once the offer is accepted by the other side, the %1 transaction fee will be charged even if the offer is cancelled.</source>
<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>
</message>
<message id="app-close-title">
<source>Beam wallet close</source>
<translation type="unfinished">Beam wallet close</translation>
</message>
<message id="app-close-text">
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
<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>
</message>
<message id="wallet-export-tx-history">
<source>Export transactions history</source>
<extracomment>transactions history screen, export button tooltip and open file dialog</extracomment>
Expand Down Expand Up @@ -1859,8 +1871,10 @@ Your version is: %2. Please, check for updates.</translation>
<translation type="unfinished">Address type</translation>
</message>
<message id="address-info-sbbs-address">
<source>Online (SBBS) Address</source>
<translation type="unfinished">Online (SBBS) Address</translation>
<source>SBBS Address
(use for CEX withdrawals)</source>
<translation type="unfinished">SBBS Address
(use for CEX withdrawals)</translation>
</message>
<message id="address-info-address">
<source>Address</source>
Expand Down Expand Up @@ -2568,16 +2582,16 @@ Aktualisieren Sie Ihre Einstellungen und versuchen Sie es erneut.</translation>
<translation>Sender Adresse</translation>
</message>
<message id="tx-details-sender-identity">
<source>Sender Endpoint</source>
<translation type="unfinished">Sender Endpoint</translation>
<source>Sender signature</source>
<translation type="unfinished">Sender signature</translation>
</message>
<message id="tx-details-receiving-addr-label">
<source>Receiving address</source>
<translation>Empfänger Adresse</translation>
</message>
<message id="tx-details-receiver-identity">
<source>Receiver Endpoint</source>
<translation type="unfinished">Receiver Endpoint</translation>
<source>Receiver signature</source>
<translation type="unfinished">Receiver signature</translation>
</message>
<message id="tx-details-amount-label">
<source>Amount</source>
Expand Down Expand Up @@ -2837,8 +2851,8 @@ Allow to proceed? You can always update your choice in Settings later.</translat
<translation type="unfinished">General info</translation>
</message>
<message id="general-wallet-signature">
<source>Endpoint</source>
<translation type="unfinished">Endpoint</translation>
<source>Signature</source>
<translation type="unfinished">Signature</translation>
</message>
<message id="settings-utilities-show-utxo">
<source>Show UTXO</source>
Expand Down Expand Up @@ -3854,28 +3868,18 @@ Please, restart the wallet and try again.</translation>
<message id="receive-view-hw-wallet-disconnected">
<source>QR code is wrong.
A hardware wallet is not connected. Please, connect the wallet</source>
<translation type="unfinished"></translation>
<translation type="unfinished">QR code is wrong.
A hardware wallet is not connected. Please, connect the wallet</translation>
</message>
<message id="approve-on-hw-wallet-title">
<source>Transaction</source>
<translation type="unfinished"></translation>
<translation>Transaktion</translation>
</message>
<message id="approve-on-hw-wallet-text">
<source>Transaction is in process.
Connect your Hardware Wallet to finalize the transaction.</source>
<translation type="unfinished"></translation>
</message>
<message id="app-close-title">
<source>Beam wallet close</source>
<translation type="unfinished"></translation>
</message>
<message id="app-close-text">
<source>There are %1 active transactions that might fail if the wallet will go offline. Are you sure to close the wallet now?</source>
<translation type="unfinished"></translation>
</message>
<message id="trezor-message">
<source>Please, look at your Trezor device to complete actions...</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Transaction is in process.
Connect your Hardware Wallet to finalize the transaction.</translation>
</message>
</context>
</TS>
Loading

0 comments on commit c126713

Please sign in to comment.