diff --git a/app/assets/asset-symbols/grc.png b/app/assets/asset-symbols/grc.png index 3d590d5aae..abdd55676e 100644 Binary files a/app/assets/asset-symbols/grc.png and b/app/assets/asset-symbols/grc.png differ diff --git a/app/assets/locales/locale-cn.json b/app/assets/locales/locale-cn.json index c0e53bb339..7f916cf7c5 100644 --- a/app/assets/locales/locale-cn.json +++ b/app/assets/locales/locale-cn.json @@ -1176,7 +1176,7 @@ "open": "

资产 %(asset)s 由真实资产 %(backed)s 1:1 储备背书。可以通过 Openledger 提供的网关服务进行充值提现。", "trade": "

资产 %(asset)s 由真实资产 %(backed)s 1:1 储备背书。可以通过 Blocktrades 提供的网关服务进行充值提现。", "bit": "
bit %(asset)s 锚定 %(backed)s 的金融衍生品. 它是100%去中心化，无需信任第三方中心机构，并由锁定在区块链上智能合用中的抵押品进行价值背书。", - "bitcny": "

bitCNY 可以通过 Transwiser 提供的网关服务进行充值提现。更多信息请访问 https://www.transwiser.com/" + "bitcny": "

bitCNY 可以通过 Magic Wallet 提供的网关服务进行充值提现。更多信息请访问 https://www.magicw.net/" }, "your_account": "你的账户", "bridge": "桥接", diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json index 405052d3f9..e0c8da30fb 100644 --- a/app/assets/locales/locale-de.json +++ b/app/assets/locales/locale-de.json @@ -939,7 +939,7 @@ "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.", "trade": "

The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Blocktrades.", "bit": "
bit%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", - "bitcny": "

bitCNY can be deposited or withdrawn 1:1 to real Yuan using the gateway service provided by Transwiser. For more info, see https://www.transwiser.com/" + "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/" }, "your_account": "Your account", "bridge": "Bridge", diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json index ad0614b9a2..5ed2356300 100644 --- a/app/assets/locales/locale-en.json +++ b/app/assets/locales/locale-en.json @@ -1205,7 +1205,7 @@ "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.", "trade": "

The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Blocktrades.", "bit": "
bit%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", - "bitcny": "

bitCNY can be deposited or withdrawn 1:1 to real Yuan using the gateway service provided by Transwiser. For more info, see https://www.transwiser.com/" + "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/" }, "your_account": "Your account", "bitkapital_text": "Choose an asset to deposit or withdraw:", diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json index 7a3fc8c6c3..b29e31095d 100644 --- a/app/assets/locales/locale-es.json +++ b/app/assets/locales/locale-es.json @@ -767,7 +767,7 @@ "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.", "trade": "

The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Blocktrades.", "bit": "
bit%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", - "bitcny": "

bitCNY can be deposited or withdrawn 1:1 to real Yuan using the gateway service provided by Transwiser. For more info, see https://www.transwiser.com/" + "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/" }, "your_account": "Your account", "bridge": "Bridge", diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json index e116f7eb43..4b434287da 100644 --- a/app/assets/locales/locale-fr.json +++ b/app/assets/locales/locale-fr.json @@ -528,7 +528,7 @@ "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.", "trade": "

The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Blocktrades.", "bit": "
bit%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", - "bitcny": "

bitCNY can be deposited or withdrawn 1:1 to real Yuan using the gateway service provided by Transwiser. For more info, see https://www.transwiser.com/" + "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/" }, "your_account": "Your account", "bridge": "Bridge", diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json index 72681c5bfb..e8f87416e9 100644 --- a/app/assets/locales/locale-ko.json +++ b/app/assets/locales/locale-ko.json @@ -767,7 +767,7 @@ "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.", "trade": "

The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Blocktrades.", "bit": "
bit%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", - "bitcny": "

bitCNY can be deposited or withdrawn 1:1 to real Yuan using the gateway service provided by Transwiser. For more info, see https://www.transwiser.com/" + "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/" }, "your_account": "Your account", "bridge": "Bridge", diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json index 3029e3fe8a..06444a6443 100644 --- a/app/assets/locales/locale-ru.json +++ b/app/assets/locales/locale-ru.json @@ -1205,7 +1205,7 @@ "open":"

Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от Openledger.", "trade":"

Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от Blocktrades.", "bit":"
Bit%(asset)s - это производное, которое отслеживает реальную стоимость %(backed)s. Он на 100%% децентрализован, не требует доверия и обеспечен залогом, удерживаемым блокчейном в виде смарт-контракта.", - "bitcny":"

bitCNY может быть депонирован или выведен в соотношении 1:1 к реальному Юаню с помощью сервиса шлюза от Transwiser. Подробную информацию можно найти здесь https://www.transwiser.com/" + "bitcny":"

bitCNY может быть депонирован или выведен в соотношении 1:1 к реальному Юаню с помощью сервиса шлюза от Magic Wallet. Подробную информацию можно найти здесь https://www.magicw.net/" }, "your_account":"Ваш аккаунт", "bitkapital_text":"Выберите актив для для пополнения или вывода:", @@ -1283,4 +1283,4 @@ "trx_error":{ "expire":"Срок ожидания Вашей транзакции истек без подтверждения, пожалуйста, повторите попытку позже." } -} \ No newline at end of file +} diff --git a/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json index bd23cc989b..c7004433a7 100644 --- a/app/assets/locales/locale-tr.json +++ b/app/assets/locales/locale-tr.json @@ -1141,7 +1141,7 @@ "open": "

Bu dijital varlık Bitshares üzerinde %(backed)s işlemleri yapmanız için OpenLedger tarafından %%100 %(backed)s rezervi ile desteklenmektedir. İstediğiniz zaman 1:1 oranında %(asset)s-%(backed)s dönüşümü yapabilirsiniz.", "trade": "

Bu dijital varlık Bitshares üzerinde %(backed)s işlemleri yapmanız için BlockTrades tarafından %%100 %(backed)s rezervi ile desteklenmektedir. İstediğiniz zaman 1:1 oranında %(asset)s-%(backed)s dönüşümü yapabilirsiniz.", "bit": "
bit%(asset)s, fiyat olarak %(backed)s marketini takip eden bir türev araçtır. Bu hizmet hiçbir merkezi otorite tarafından değil, merkezsiz Bitshares blokzinciri tarafından sağlanır.", - "bitcny": "

bitCNY, Çin Yuanı'nın Bitshares borsasındaki temsilidir. 1:1 Çin Yuanı ile değiştirilebilen bu dijital varlık Transwiser tarafından yürütülmektedir. Daha fazla bilgi için: https://www.transwiser.com/" + "bitcny": "

bitCNY, Çin Yuanı'nın Bitshares borsasındaki temsilidir. 1:1 Çin Yuanı ile değiştirilebilen bu dijital varlık Magic Wallet tarafından yürütülmektedir. Daha fazla bilgi için: https://www.magicw.net/" }, "your_account": "Kullanıcı adınız", "bitkapital_receive": "Vermiş olduğunuz banka hesabınıza yatacak miktar", diff --git a/package.json b/package.json index 3007037bdf..2527667f3d 100644 --- a/package.json +++ b/package.json @@ -182,7 +182,7 @@ "copyfiles": "^1.2.0", "cross-env": "^5.0.5", "css-loader": "^0.22.0", - "electron": "^1.7.6", + "electron": "^1.7.8", "electron-builder": "^19.27.7", "es6-promise": "^3.0.2", "eslint": "^2.11.1",