Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Vincent Geneste committed Apr 17, 2021
2 parents 028fa71 + 2e4602d commit d14f38d
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 17 deletions.
3 changes: 2 additions & 1 deletion src/locales/cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "输入到Metamask",
"crossChain": "异链传送",
"sameChain": "同链传送",
"sendOn": "发送到"
"sendOn": "发送到",
"cosmicSwap": "You do not have enough KCAL to perform this transaction. Use some SOUL to perform a cosmic swap?"
},
"nfts": {
"selected": "已选择",
Expand Down
3 changes: 2 additions & 1 deletion src/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "Und importieren Sie diesen in Metamask",
"crossChain": "CROSS CHAIN ÜBERWEISUNGEN",
"sameChain": "ÜBERWEISUNGEN AUF GLEICHER CHAIN",
"sendOn": "Versand auf"
"sendOn": "Versand auf",
"cosmicSwap": "You do not have enough KCAL to perform this transaction. Use some SOUL to perform a cosmic swap?"
},
"nfts": {
"selected": "ausgewählt",
Expand Down
3 changes: 2 additions & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "and import in Metamask",
"crossChain": "CROSS CHAIN TRANSFERS",
"sameChain": "SAME CHAIN TRANSFERS",
"sendOn": "Send on"
"sendOn": "Send on",
"cosmicSwap": "You do not have enough KCAL to perform this transaction. Use some SOUL to perform a cosmic swap?"
},
"nfts": {
"selected": "selected",
Expand Down
3 changes: 2 additions & 1 deletion src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "e importala en Metamask",
"crossChain": "TRANSFERENCIA ENTRE CHAINS",
"sameChain": "TRANSFERENCIA NORMAL",
"sendOn": "Enviar en"
"sendOn": "Enviar en",
"cosmicSwap": "You do not have enough KCAL to perform this transaction. Use some SOUL to perform a cosmic swap?"
},
"nfts": {
"selected": "seleccionado",
Expand Down
3 changes: 2 additions & 1 deletion src/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "et importer dans Metamask",
"crossChain": "TRANSFERTS INTER CHAINES",
"sameChain": "TRANSFERTS INTRA CHAINES",
"sendOn": "Envoi vers"
"sendOn": "Envoi vers",
"cosmicSwap": "Vous n'avez pas assez de KCAL pour effectuer cette transaction. Désirez-vous utiliser des SOUL pour effectuer un cosmic swap?"
},
"nfts": {
"selected": "sélectionné",
Expand Down
3 changes: 2 additions & 1 deletion src/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "e importa in Metamask",
"crossChain": "TRASFERIMENTI CROSS-CHAIN",
"sameChain": "TRASFERIMENTI SU CHAIN SINGOLA",
"sendOn": "Manda su"
"sendOn": "Manda su",
"cosmicSwap": "You do not have enough KCAL to perform this transaction. Use some SOUL to perform a cosmic swap?"
},
"nfts": {
"selected": "selezionato",
Expand Down
3 changes: 2 additions & 1 deletion src/locales/nb.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "og importer i Metamask",
"crossChain": "OVERFØRING MELLOM ULIKE BLOKKKJEDER",
"sameChain": "SEND PÅ SAMME BLOKKJEDE",
"sendOn": "Send på"
"sendOn": "Send på",
"cosmicSwap": "You do not have enough KCAL to perform this transaction. Use some SOUL to perform a cosmic swap?"
},
"nfts": {
"selected": "valgte",
Expand Down
3 changes: 2 additions & 1 deletion src/locales/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "en importeer in Metamask",
"crossChain": "OVERDRACHTEN TUSSEN CHAINS",
"sameChain": "OVERDRACHTEN OP DEZELFDE CHAIN",
"sendOn": "Verstuur op"
"sendOn": "Verstuur op",
"cosmicSwap": "You do not have enough KCAL to perform this transaction. Use some SOUL to perform a cosmic swap?"
},
"nfts": {
"selected": "gekozen",
Expand Down
3 changes: 2 additions & 1 deletion src/locales/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "e importa no Metamask",
"crossChain": "TRANSFERÊNCIAS ENTRE CHAINS",
"sameChain": "TRANSFERÊNCIAS NA MESMA CHAIN",
"sendOn": "Envia em"
"sendOn": "Envia em",
"cosmicSwap": "You do not have enough KCAL to perform this transaction. Use some SOUL to perform a cosmic swap?"
},
"nfts": {
"selected": "selecionado",
Expand Down
3 changes: 2 additions & 1 deletion src/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "и импортировать в Metamask",
"crossChain": "КРОСС-ЧЕЙН ПЕРЕСЫЛКИ",
"sameChain": "ПЕРЕСЫЛКИ В РАМКАХ ОДНОГО БЛОКЧЕЙНА",
"sendOn": "Отправить в"
"sendOn": "Отправить в",
"cosmicSwap": "You do not have enough KCAL to perform this transaction. Use some SOUL to perform a cosmic swap?"
},
"nfts": {
"selected": "выбрано",
Expand Down
7 changes: 4 additions & 3 deletions src/locales/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@
"swapAmount": "Transfer Edilecek Miktar",
"needGasToSwap": "Transfer harçları için Phantasma tarafında {0} GAS gerekir.",
"needEthToSwap": "Transfer harçları için Phantasma tarafında:<br>ETH için yaklaşık {0} ETH harç,<br>ERC20 için yaklaşık {1} ETH harç gerekir.",
"swapInProgressTitle": "Değişim işleniyor",
"swapBeingProcessed": "Değişiminiz işleme alınacak.",
"swapInProgressTitle": "Transfer işleniyor",
"swapBeingProcessed": "Transferiniz işleme alınacak.",
"needsConfirmations": "Görebilmeniz için 12 doğrulama gerekli.",
"checkTransaction": "İşleminizi kontrol edebilirsiniz",
"here": "buradan",
Expand All @@ -183,7 +183,8 @@
"andImportInMetamask": "ve Metamask'a aktarın.",
"crossChain": "ZİNCİR DEĞİŞİM İŞLEMLERİ",
"sameChain": "DİĞER ZİNCİRLERDE TRANSFERLER",
"sendOn": "Burada Gönder-Al,"
"sendOn": "Burada Gönder-Al,",
"cosmicSwap": "Hesabınızda yeterli KCAL bulunmamaktadır. Biraz SOUL kullanarak kozmik değişim yapılsın mı?"
},
"nfts": {
"selected": "Seçildi",
Expand Down
3 changes: 2 additions & 1 deletion src/locales/vn.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"andImportInMetamask": "và nhập trong Metamask",
"crossChain": "CHUYỂN ĐỔI CHUỖI CHÉO",
"sameChain": "CÙNG CHUYỂN ĐỔI CHUỖI",
"sendOn": "Gửi tiếp"
"sendOn": "Gửi tiếp",
"cosmicSwap": "You do not have enough KCAL to perform this transaction. Use some SOUL to perform a cosmic swap?"
},
"nfts": {
"selected": "đã chọn",
Expand Down
3 changes: 1 addition & 2 deletions src/views/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1241,8 +1241,7 @@
</v-card-text>

<v-card-text v-if="isMissingKCAL">
You do not have enough KCAL to perform this transaction. Use some SOUL
to perform a cosmic swap?
{{ $t("home.cosmicSwap") }}
</v-card-text>

<v-card-actions v-if="isMissingKCAL">
Expand Down
6 changes: 5 additions & 1 deletion src/views/Sign.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@
>
</v-row>

<div style="padding-right: 30px">
<div
class="mt-3"
style="padding-right: 30px"
>
{{ $t("sign.description") }}
<strong>{{ currentAccountDescription }}</strong
>?
Expand All @@ -51,6 +54,7 @@
@keyup.native.enter="signtx"
@submit.prevent
style="margin: 0px 28px 10px 15px"
class="mt-6"
>
<v-text-field
tabindex="1"
Expand Down

0 comments on commit d14f38d

Please sign in to comment.