Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
sschiessl-bcp committed Sep 17, 2023
2 parents 363e727 + da77971 commit 9d32453
Show file tree
Hide file tree
Showing 17 changed files with 3,474 additions and 112 deletions.
18 changes: 9 additions & 9 deletions app/api/apiConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export const settingsAPIs = {
contact: "telegram:bhuzor"
},
{
url: "wss://bts.open.icowallet.net/ws",
url: "wss://btsapi.magicw.net/ws",
region: "Eastern Asia",
country: "China",
location: "Hangzhou",
Expand Down Expand Up @@ -345,21 +345,21 @@ export const settingsAPIs = {
operator: "Witness: liuye",
contact: "email:work@akawa.ink"
},
{
url: "wss://api.iamredbar.com/bts-testnet",
region: "Northern America",
country: "USA",
location: "Atlanta",
operator: "Witness: iamredbar",
contact: "email:iamredbar@protonmail.com"
},
{
url: "wss://btstestnet.cybertron.ninja/ws",
region: "Northern America",
country: "USA",
location: "Utah",
operator: "Witness: cn-faucet-test",
contact: "email:codinheim@protonmail.com"
},
{
url: "wss://bitsharestestnet.loclx.io",
region: "Northern America",
country: "USA",
location: "Chicago",
operator: "bitshares.info",
contact: "telegram:brekyrself"
}
],
ES_WRAPPER_LIST: [
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-de.json
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
"bitcny": "bitCNY kann 1:1 zum echten Yuan ein- oder ausbezahlt werden, indem die Gateway des Magic Wallet Dienstes benutzt wird. Mehr Informationen auf https://www.magicw.net/",
"bridge": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch CryptoBridge bereitgestellt",
"gdex": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch Gdex bereitgestellt",
"ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch OpenLedger bereitgestellt",
"pirate": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch PirateDEX bereitgestellt",
"rudex": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch Rudex bereitgestellt",
Expand Down Expand Up @@ -1338,7 +1338,7 @@
"info": "Info",
"intermediate": "Zwischenglied Konto",
"inventory": "Inventar",
"ioxbank": {
"iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
Expand Down Expand Up @@ -1953,6 +1953,7 @@
},
"transfer": "{from} hat {amount} an {to} überwiesen.",
"transfer_account": "Konto {account} wurde an {to} übertragen.",
"unknown_operation": "Unbekannte Operation",
"unlisted_by": "{lister} hat {listee} von der Liste gestrichen.",
"update_account": "{account} hat seine Kontodetails aktualisiert.",
"vesting_balance_withdraw": "{account} hat Sperrfristguthaben {amount} beansprucht.",
Expand Down
7 changes: 4 additions & 3 deletions app/assets/locales/locale-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@
"tooltip_resolution_date": "The resolution date is an informal statement when the asset owner intends to resolve this betting market."
},
"price_feed": {
"external_feed_price": "Feed price (derived from price feeds and other parameters)",
"external_feed_price": "Settlement price (derived from price feeds and other parameters)",
"feed_lifetime": "Feed lifetime (hours)",
"feed_price": "Feed price",
"global_settlement_price": "Global settlement price will be",
Expand Down Expand Up @@ -1268,7 +1268,7 @@
"bitcny": "bitCNY can be deposited or withdrawn 1:1 to real Yuan using a gateway service such as Magic Wallet. For more info, see https://www.magicw.net/",
"bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.",
"gdex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by GDEX.",
"ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by OpenLedger.",
"pirate": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by PirateDEX.",
"rudex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Rudex.",
Expand Down Expand Up @@ -1338,7 +1338,7 @@
"info": "Info",
"intermediate": "Intermediate account",
"inventory": "Inventory",
"ioxbank": {
"iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
Expand Down Expand Up @@ -1953,6 +1953,7 @@
},
"transfer": "{from} sent {amount} to {to}",
"transfer_account": "{account} ownership transferred to {to}",
"unknown_operation": "Unknown operation",
"unlisted_by": "{lister} unlisted the account {listee}",
"update_account": "{account} updated their account data {change}",
"vesting_balance_withdraw": "{account} withdrew vesting balance of {amount}",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
"bitcny": "bitCNY se puede depositar o retirar 1:1 a Yuan real mediante un servicio de puerta de enlace como Magic Wallet. Para más información, consulte https://www.magicw.net/",
"bridge": "El activo %(asset)s es respaldado 1:1 por real %(backed)s y puede ser depositado or retiado usando el servico de porton proporcionado por CryptoBridge.",
"gdex": "El %(asset)s activo es respaldado 1:1 por real %(backed)s y puede ser depositado or retirado usando el servico de porton proporcionado por GDex.",
"ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "El %(asset)s activo es respaldado 1:1 por real %(backed)s y puede ser depositado or retirado usando el servico de porton proporcionado por OpenLedger.",
"pirate": "El activo %(asset) està respaldado 1:1 da real %(backed)s y puede ser depositado o retirado utilizando el servicio de puerta de enlace proporcionado por PirateDEX.",
"rudex": "El %(asset)s activo es respaldado 1:1 por real %(backed)s y puede ser depositado or retirado usando el servico de porton proporcionado por Rudex.",
Expand Down Expand Up @@ -1338,7 +1338,7 @@
"info": "Información",
"intermediate": "Cuenta intermedia",
"inventory": "Inventario",
"ioxbank": {
"iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
Expand Down Expand Up @@ -1953,6 +1953,7 @@
},
"transfer": "{from} enviado {amount} a {to}",
"transfer_account": "{account} propiedad transferida a {to}",
"unknown_operation": "Operación desconocida",
"unlisted_by": "{lister} delistada la cuenta {listee}",
"update_account": "{account} actualizado sus datos de cuenta",
"vesting_balance_withdraw": "{account} retiro del saldo de adquisición de {amount}",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@
"bitcny": "bitCNY can be deposited or withdrawn 1:1 to real Yuan using a gateway service such as Magic Wallet. For more info, see https://www.magicw.net/",
"bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.",
"gdex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by GDex.",
"ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Openledger.",
"pirate": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by PirateDEX.",
"rudex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Rudex.",
Expand Down Expand Up @@ -1332,7 +1332,7 @@
"info": "Info",
"intermediate": "Intermediate account",
"inventory": "Inventory",
"ioxbank": {
"iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
Expand Down Expand Up @@ -1947,6 +1947,7 @@
},
"transfer": "{from} a envoyé {amount} à {to}",
"transfer_account": "{account} ownership transferred to {to}",
"unknown_operation": "Opération inconnue",
"unlisted_by": "{lister} a délisté le compte {listee}",
"update_account": "{account} a mis à jour les donnéees de son compte",
"vesting_balance_withdraw": "{account} a retiré {amount} d'un solde bloqué",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-it.json
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@
"bitcny": "bitCNY v 1:1 verso veri Yuan usando un servizio di gateway come Magic Wallet. For more info, vedi https://www.magicw.net/",
"bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.",
"gdex": "L'asset %(asset)s è garantito 1:1 da %(backed)s reali e può essere depositato o ritirato usando il servizio di gateway fornito da GDex.",
"ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "L'asset %(asset)s è garantito 1:1 da %(backed)s reali e può essere depositato o ritirato usando il servizio di gateway fornito da OpenLedger.",
"pirate": "L'asset %(asset)s è garantito 1:1 da %(backed)s reali e può essere depositato o ritirato usando il servizio di gateway fornito da PirateDEX.",
"rudex": "L'asset %(asset)s è garantito 1:1 da %(backed)s reali e può essere depositato o ritirato usando il servizio di gateway fornito da Rudex.",
Expand Down Expand Up @@ -1332,7 +1332,7 @@
"info": "Info",
"intermediate": "Account intermedio",
"inventory": "Inventario",
"ioxbank": {
"iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
Expand Down Expand Up @@ -1947,6 +1947,7 @@
},
"transfer": "{from} ha inviato {amount} a {to}",
"transfer_account": "L'ownership di {account} è stata transferita a {to}",
"unknown_operation": "Operazione sconosciuta",
"unlisted_by": "{lister} ha delistato l'account {listee}",
"update_account": "{account} ha aggiornato i dati del suo account",
"vesting_balance_withdraw": "{account} ha ritirato un saldo vesting di {amount}",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@
"bitcny": "bitCNY はMagic Walletが提供するゲートウェイサービスによって実際の元と1:1で入出金できます。詳細はこちらを見てください https://www.magicw.net/",
"bridge": "%(asset)sアセットは実際の%(backed)sと1:1に対応し、CryptoBridgeによって提供されるゲートウェイサービスによって入出金が可能です。",
"gdex": "%(asset)sアセットは実際の%(backed)sと1:1に対応し、Gdexによって提供されるゲートウェイサービスによって入出金が可能です。",
"ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "%(asset)sアセットは実際の%(backed)sと1:1に対応し、OpenLedgerによって提供されるゲートウェイサービスによって入出金が可能です。",
"pirate": "%(asset)sアセットは実際の%(backed)sと1:1に対応し、PirateDEXによって提供されるゲートウェイサービスによって入出金が可能です。",
"rudex": "%(asset)sアセットは実際の%(backed)sと1:1に対応し、Rudexによって提供されるゲートウェイサービスによって入出金が可能です。",
Expand Down Expand Up @@ -1332,7 +1332,7 @@
"info": "情報",
"intermediate": "中間アカウント",
"inventory": "一覧表",
"ioxbank": {
"iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
Expand Down Expand Up @@ -1947,6 +1947,7 @@
},
"transfer": "{from}は{amount}を{to}に送りました",
"transfer_account": "{account}の所有権を{to}に移転しました",
"unknown_operation": "不明な操作",
"unlisted_by": "{lister}は{listee}をリストから外しました",
"update_account": "{account}はアカウント情報を更新しました",
"vesting_balance_withdraw": "{account}は{amount}の権利確定残高を引き出しました",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@
"bitcny": "bitCNY can be deposited or withdrawn 1:1 to real Yuan using a gateway service such as Magic Wallet. For more info, see https://www.magicw.net/",
"bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.",
"gdex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by GDex.",
"ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Openledger.",
"pirate": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by PirateDEX.",
"rudex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Rudex.",
Expand Down Expand Up @@ -1332,7 +1332,7 @@
"info": "Info",
"intermediate": "Intermediate account",
"inventory": "Inventory",
"ioxbank": {
"iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
Expand Down Expand Up @@ -1947,6 +1947,7 @@
},
"transfer": "{from} sent {amount} to {to}",
"transfer_account": "{account} ownership transferred to {to}",
"unknown_operation": "Unknown operation",
"unlisted_by": "{lister} unlisted the account {listee}",
"update_account": "{account} updated their account data",
"vesting_balance_withdraw": "{account} withdrew vesting balance of {amount}",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
"bitcny": "bitCNY может быть депонирован или выведен в соотношении 1:1 к реальному юаню с помощью сервиса шлюза от Magic Wallet. Подробную информацию можно найти здесь https://www.magicw.net/",
"bridge": " Актив %(asset)s обеспечен в соотношении 1:1 реальными %(backed)s и может быть размещен в депозите или выведен через шлюз, предоставляемый CryptoBridge.",
"gdex": " Актив %(asset)s обеспечен в соотношении 1:1 реальными %(backed)s и может быть размещен в депозите или выведен через шлюз, предоставляемый GDex.",
"ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от OpenLedger.",
"pirate": "Актив %(asset)s обеспечен реальными %(backed)s в соотношении 1:1 и может быть введён/выведен с помощью сервиса шлюза от PirateDEX.",
"rudex": "Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от Rudex.",
Expand Down Expand Up @@ -1338,7 +1338,7 @@
"info": "Информация",
"intermediate": "Промежуточный аккаунт",
"inventory": "Инвентарь",
"ioxbank": {
"iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
Expand Down Expand Up @@ -1953,6 +1953,7 @@
},
"transfer": "{from} отправил {amount} на {to}",
"transfer_account": "Владение {account} передано {to}",
"unknown_operation": "Неизвестная операция",
"unlisted_by": "{lister} удалил аккаунт {listee} из списка",
"update_account": "{account} обновил данные своего аккаунта {change}",
"vesting_balance_withdraw": "{account} вывел с вестингового баланса {amount}",
Expand Down
Loading

0 comments on commit 9d32453

Please sign in to comment.