Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #114 from MXCzkEVM/conflict-rc
Browse files Browse the repository at this point in the history
Ver:1.7.0
  • Loading branch information
sheenhx authored Nov 2, 2023
2 parents 33cc625 + 8cb0e91 commit cf3c77d
Show file tree
Hide file tree
Showing 64 changed files with 1,077 additions and 434 deletions.
11 changes: 9 additions & 2 deletions assets/flutter_i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"wallet": "Wallet",
"active": "Aktiv",
"date": "Datum",
"tx": "Tx = Transaktion",
"tx": "Transaktion",
"manage_portfolio": "Token senden/Portfolio verwalten",
"fiat_options": "FIAT Optionen",
"show/hide_balance": "Balance anzeigen/verbergen",
Expand Down Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "Sind Sie sicher, dass Sie dieses Konto entfernen möchten?",
"remove": "Entfernen",
"duplicate_account_import_notice": "Das Konto, das Sie versuchen zu importieren, ist ein Duplikat.",
"unable_to_launch_email_app": "Nicht in der Lage, E-Mail-App zu starten"
"unable_to_launch_email_app": "Nicht in der Lage, E-Mail-App zu starten",
"max_fee": "Maximale Gebühr",
"deposit_from_exchanges_notice": "Kaufen Sie von {0}, {1} Börsen und hinterlegen Sie zkEVM MXC direkt in die AXS Wallet.",
"deposit_with_l3_bridge_notice": "Kaufen Sie von anderen Börsen und verwenden Sie {0}, um ERC20 MXC in die AXS Wallet einzuzahlen.",
"buy_some_x_for_fee_notice": "Kaufen Sie etwas {0}, um die Gasgebühr für die Transaktion zu bezahlen, normalerweise weniger als 2 USD, wenn das Netzwerk nicht ausgelastet ist.",
"insufficient_funds_notice": "Unzureichendes Guthaben für diese Transaktion. Bitte fügen Sie Geldmittel hinzu.",
"contractCall": "Vertragsaufruf",
"contract_call_transactions": "Vertragsaufruf-Transaktionen"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"send": "Send",
"received": "Received",
"sent": "Sent",
"contractCall": "Contract call",
"email_secured_body": "For the security and privacy of your AXS wallet it's essential that you keep all information contained in this email strictly confidential. \nPlease follow these next steps carefully: \n1. Ensure you're the sole recipient of this email by replacing the recipient's address with your own. \n2. After confirming the correct email address, proceed to click the 'Send' button to forward this vital information to yourself securely. By adhering to these measures, you'll ensure the utmost safety for your AXS wallet. Thank you for your diligence in this matter.",
"email_secured_subject": "Secure Your AXS Wallet Key - Important Instructions",
"face_id": "Face ID",
Expand Down Expand Up @@ -141,6 +142,7 @@
"from": "From",
"to": "To",
"estimated_fee": "Estimated Fee",
"max_fee": "Max Fee",
"sending": "Sending",
"confirm_transaction": "Confirm transaction",
"add_nft": "Add NFT",
Expand Down Expand Up @@ -171,6 +173,7 @@
"all_transactions": "All transactions",
"send_transactions": "Send transactions",
"receive_transactions": "Receive transactions",
"contract_call_transactions": "Contract call transactions",
"sort": "Sort",
"new_to_old": "New to Old",
"old_to_new": "Old to New",
Expand Down Expand Up @@ -300,5 +303,9 @@
"removing_account_warning": "Are you sure you want to remove this account?",
"remove": "Remove",
"duplicate_account_import_notice": "The account you are trying to import is a duplicate",
"unable_to_launch_email_app": "Unable to launch email app"
"unable_to_launch_email_app": "Unable to launch email app",
"deposit_from_exchanges_notice": "Buy from {0}, {1} exchanges and deposit zkEVM MXC directly to AXS wallet",
"deposit_with_l3_bridge_notice": "Buy from other exchanges and use {0} to deposit ERC20 MXC to AXS wallet",
"buy_some_x_for_fee_notice": "Buy some {0} to pay for gas fee for the transaction, normally less than 2 USD when the network is not busy",
"insufficient_funds_notice": "Insufficient balance for this transaction.\n Please add funds."
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "¿Estás seguro de que quieres eliminar esta cuenta?",
"remove": "Eliminar",
"duplicate_account_import_notice": "La cuenta que intentas importar es un duplicado.",
"unable_to_launch_email_app": "Incapaz de iniciar la aplicación de correo electrónico"
"unable_to_launch_email_app": "Incapaz de iniciar la aplicación de correo electrónico",
"max_fee": "Tarifa Máxima",
"deposit_from_exchanges_notice": "Compra desde {0}, {1} intercambios y deposita zkEVM MXC directamente en la cartera AXS",
"deposit_with_l3_bridge_notice": "Compra en otros intercambios y usa {0} para depositar ERC20 MXC en la billetera AXS.",
"buy_some_x_for_fee_notice": "Compra algo de {0} para pagar la tarifa de gas para la transacción, normalmente menos de 2 USD cuando la red no está ocupada.",
"insufficient_funds_notice": "Saldo insuficiente para esta transacción. Por favor, añade fondos.",
"contractCall": "Llamada de contrato",
"contract_call_transactions": "Transacciones de llamada de contrato"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "Êtes-vous sûr de vouloir supprimer ce compte?",
"remove": "Supprimer",
"duplicate_account_import_notice": "Le compte que vous essayez d'importer est un doublon.",
"unable_to_launch_email_app": "Impossible de lancer l'application email"
"unable_to_launch_email_app": "Impossible de lancer l'application email",
"max_fee": "Frais Maximal",
"deposit_from_exchanges_notice": "Achetez auprès de {0}, {1} échanges et déposez directement zkEVM MXC dans le portefeuille AXS",
"deposit_with_l3_bridge_notice": "Achetez sur d'autres échanges et utilisez {0} pour déposer ERC20 MXC dans le portefeuille AXS",
"buy_some_x_for_fee_notice": "Achetez un peu de {0} pour payer les frais de gaz pour la transaction, normalement moins de 2 USD lorsque le réseau n'est pas occupé",
"insufficient_funds_notice": "Solde insuffisant pour cette transaction. Veuillez ajouter des fonds.",
"contractCall": "Appel de contrat",
"contract_call_transactions": "Transactions d'appel de contrat"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "Apakah Anda yakin ingin menghapus akun ini?",
"remove": "Hapus",
"duplicate_account_import_notice": "Akun yang Anda coba impor adalah duplikat.",
"unable_to_launch_email_app": "Tidak dapat meluncurkan aplikasi email"
"unable_to_launch_email_app": "Tidak dapat meluncurkan aplikasi email",
"max_fee": "Biaya Maksimal",
"deposit_from_exchanges_notice": "Beli dari {0}, {1} bursa dan setor langsung zkEVM MXC ke dompet AXS",
"deposit_with_l3_bridge_notice": "Beli dari bursa lain dan gunakan {0} untuk menyetor MXC ERC20 ke dompet AXS",
"buy_some_x_for_fee_notice": "Beli beberapa {0} untuk membayar biaya gas untuk transaksi, biasanya kurang dari 2 USD saat jaringan tidak sibuk",
"insufficient_funds_notice": "Saldo tidak cukup untuk transaksi ini. \nSilakan tambahkan dana.",
"contractCall": "Panggilan kontrak",
"contract_call_transactions": "Transaksi panggilan kontrak"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "Sei sicuro di voler rimuovere questo account?",
"remove": "Rimuovi",
"duplicate_account_import_notice": "L'account che stai cercando di importare è un duplicato.",
"unable_to_launch_email_app": "Impossibile avviare l'app di posta elettronica"
"unable_to_launch_email_app": "Impossibile avviare l'app di posta elettronica",
"max_fee": "Commissione Massima",
"deposit_from_exchanges_notice": "Acquista da {0}, {1} scambi e deposita direttamente zkEVM MXC nel portafoglio AXS",
"deposit_with_l3_bridge_notice": "Acquista da altri exchange e usa {0} per depositare MXC ERC20 nel portafoglio AXS",
"buy_some_x_for_fee_notice": "Acquista un po' di {0} per pagare la commissione di gas per la transazione, normalmente meno di 2 USD quando la rete non è occupata.",
"insufficient_funds_notice": "Saldo insufficiente per questa transazione. Per favore, aggiungi fondi.",
"contractCall": "Chiamata del contratto",
"contract_call_transactions": "Transazioni di chiamata del contratto"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "このアカウントを削除してもよろしいですか?",
"remove": "削除する",
"duplicate_account_import_notice": "あなたがインポートしようとしているアカウントは重複しています。",
"unable_to_launch_email_app": "メールアプリを起動できません"
"unable_to_launch_email_app": "メールアプリを起動できません",
"max_fee": "最大手数料",
"deposit_from_exchanges_notice": "{0}から購入し、{1}の取引所でzkEVM MXCを直接AXSウォレットに預けてください。",
"deposit_with_l3_bridge_notice": "他の取引所から購入し、{0}を使用してERC20 MXCをAXSウォレットに預ける",
"buy_some_x_for_fee_notice": "取引のガス料を支払うために{0}をいくつか購入してください。通常、ネットワークが混雑していないときは2ドル未満です。",
"insufficient_funds_notice": "このトランザクションには残高が不足しています。資金を追加してください。",
"contractCall": "契約の呼び出し",
"contract_call_transactions": "契約呼び出しトランザクション"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "이 계정을 삭제하시겠습니까?",
"remove": "제거하다",
"duplicate_account_import_notice": "당신이 가져오려고 하는 계정은 중복된 계정입니다.",
"unable_to_launch_email_app": "이메일 앱을 실행할 수 없습니다."
"unable_to_launch_email_app": "이메일 앱을 실행할 수 없습니다.",
"max_fee": "최대 수수료",
"deposit_from_exchanges_notice": "{0}에서 구매하고, {1} 거래소에서 zkEVM MXC를 직접 AXS 지갑에 입금하세요.",
"deposit_with_l3_bridge_notice": "다른 거래소에서 구매하고 {0}을 사용하여 ERC20 MXC를 AXS 지갑에 입금하십시오.",
"buy_some_x_for_fee_notice": "거래 수수료를 위해 {0}을 구매하세요, 네트워크가 바쁘지 않을 때는 일반적으로 2 달러 미만입니다.",
"insufficient_funds_notice": "이 거래를 위한 잔액이 부족합니다. 자금을 추가해 주세요.",
"contractCall": "계약 호출",
"contract_call_transactions": "계약 호출 트랜잭션"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "Weet je zeker dat je dit account wilt verwijderen?",
"remove": "Verwijderen",
"duplicate_account_import_notice": "Het account dat u probeert te importeren is een duplicaat.",
"unable_to_launch_email_app": "Kan e-mail app niet starten"
"unable_to_launch_email_app": "Kan e-mail app niet starten",
"max_fee": "Maximale Vergoeding",
"deposit_from_exchanges_notice": "Koop van {0}, {1} beurzen en stort zkEVM MXC direct in de AXS portemonnee",
"deposit_with_l3_bridge_notice": "Koop van andere beurzen en gebruik {0} om ERC20 MXC te storten in de AXS portemonnee",
"buy_some_x_for_fee_notice": "Koop wat {0} om de gasprijs voor de transactie te betalen, normaal gesproken minder dan 2 USD wanneer het netwerk niet druk is.",
"insufficient_funds_notice": "Onvoldoende saldo voor deze transactie. Voeg alsjeblieft fondsen toe.",
"contractCall": "Contractoproep",
"contract_call_transactions": "Contractoproep transacties"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "Tem certeza de que deseja remover esta conta?",
"remove": "Remover",
"duplicate_account_import_notice": "A conta que você está tentando importar é uma duplicata.",
"unable_to_launch_email_app": "Incapaz de iniciar o aplicativo de email"
"unable_to_launch_email_app": "Incapaz de iniciar o aplicativo de email",
"max_fee": "Taxa Máxima",
"deposit_from_exchanges_notice": "Compre de {0}, {1} bolsas e deposite zkEVM MXC diretamente na carteira AXS",
"deposit_with_l3_bridge_notice": "Compre de outras bolsas e use {0} para depositar ERC20 MXC na carteira AXS",
"buy_some_x_for_fee_notice": "Compre algum {0} para pagar a taxa de gás para a transação, normalmente menos de 2 USD quando a rede não está ocupada.",
"insufficient_funds_notice": "Saldo insuficiente para esta transação. Por favor, adicione fundos.",
"contractCall": "Chamada de contrato",
"contract_call_transactions": "Transações de chamada de contrato"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/ro.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "Ești sigur că vrei să ștergi acest cont?",
"remove": "Eliminați",
"duplicate_account_import_notice": "Contul pe care încercați să-l importați este un duplicat.",
"unable_to_launch_email_app": "Imposibil de lansat aplicația de email"
"unable_to_launch_email_app": "Imposibil de lansat aplicația de email",
"max_fee": "Taxă Maximă",
"deposit_from_exchanges_notice": "Cumpărați de la {0}, {1} burse și depuneți direct zkEVM MXC în portofelul AXS",
"deposit_with_l3_bridge_notice": "Cumpărați de la alte burse și utilizați {0} pentru a depune MXC ERC20 în portofelul AXS.",
"buy_some_x_for_fee_notice": "Cumpărați ceva {0} pentru a plăti taxa de gaz pentru tranzacție, de obicei mai puțin de 2 USD când rețeaua nu este ocupată.",
"insufficient_funds_notice": "Sold insuficient pentru această tranzacție. Vă rugăm să adăugați fonduri.",
"contractCall": "Apel de contract",
"contract_call_transactions": "Tranzacții de apel contractuale"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "Вы уверены, что хотите удалить этот аккаунт?",
"remove": "Удалить",
"duplicate_account_import_notice": "Учетная запись, которую вы пытаетесь импортировать, является дубликатом.",
"unable_to_launch_email_app": "Не удается запустить приложение для электронной почты"
"unable_to_launch_email_app": "Не удается запустить приложение для электронной почты",
"max_fee": "Максимальная комиссия",
"deposit_from_exchanges_notice": "Купите от {0}, {1} бирж и напрямую внесите zkEVM MXC в кошелек AXS",
"deposit_with_l3_bridge_notice": "Покупайте на других биржах и используйте {0} для депозита ERC20 MXC в кошелек AXS",
"buy_some_x_for_fee_notice": "Купите немного {0} для оплаты комиссии за транзакцию, обычно меньше 2 долларов США, когда сеть не загружена.",
"insufficient_funds_notice": "Недостаточный баланс для этой транзакции. Пожалуйста, пополните счет.",
"contractCall": "Вызов контракта",
"contract_call_transactions": "Транзакции вызова контракта"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "Bu hesabı kaldırmak istediğinize emin misiniz?",
"remove": "Kaldır",
"duplicate_account_import_notice": "İçe aktarmaya çalıştığınız hesap bir kopyadır.",
"unable_to_launch_email_app": "E-posta uygulaması başlatılamıyor"
"unable_to_launch_email_app": "E-posta uygulaması başlatılamıyor",
"max_fee": "Maksimum Ücret",
"deposit_from_exchanges_notice": "{0}, {1} borsalarından satın alın ve zkEVM MXC'yi doğrudan AXS cüzdanına yatırın.",
"deposit_with_l3_bridge_notice": "Diğer borsalardan satın alın ve ERC20 MXC'yi AXS cüzdanına yatırmak için {0} kullanın.",
"buy_some_x_for_fee_notice": "İşlem için gaz ücretini ödemek üzere biraz {0} satın alın, ağ meşgul olmadığında genellikle 2 USD'den azdır.",
"insufficient_funds_notice": "Bu işlem için yetersiz bakiye. Lütfen fon ekleyin.",
"contractCall": "Sözleşme çağrısı",
"contract_call_transactions": "Sözleşme çağrı işlemleri"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "Bạn có chắc chắn muốn xóa tài khoản này không?",
"remove": "Xóa bỏ",
"duplicate_account_import_notice": "Tài khoản bạn đang cố gắng nhập vào là một bản sao.",
"unable_to_launch_email_app": "Không thể khởi chạy ứng dụng email"
"unable_to_launch_email_app": "Không thể khởi chạy ứng dụng email",
"max_fee": "Phí Tối Đa",
"deposit_from_exchanges_notice": "Mua từ {0}, {1} sàn giao dịch và nạp zkEVM MXC trực tiếp vào ví AXS",
"deposit_with_l3_bridge_notice": "Mua từ các sàn giao dịch khác và sử dụng {0} để nạp MXC ERC20 vào ví AXS",
"buy_some_x_for_fee_notice": "Mua một số {0} để trả phí gas cho giao dịch, thường ít hơn 2 USD khi mạng không bận rộn",
"insufficient_funds_notice": "Số dư không đủ cho giao dịch này. Vui lòng nạp thêm tiền.",
"contractCall": "Gọi hợp đồng",
"contract_call_transactions": "Giao dịch gọi hợp đồng"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "您确定要删除这个账户吗?",
"remove": "删除",
"duplicate_account_import_notice": "您试图导入的账户是重复的。",
"unable_to_launch_email_app": "无法启动电子邮件应用程序"
"unable_to_launch_email_app": "无法启动电子邮件应用程序",
"max_fee": "最大费用",
"deposit_from_exchanges_notice": "从{0},{1}交易所购买并直接将zkEVM MXC存入AXS钱包",
"deposit_with_l3_bridge_notice": "从其他交易所购买并使用{0}将ERC20 MXC存入AXS钱包",
"buy_some_x_for_fee_notice": "购买一些{0}来支付交易的燃气费,通常在网络不忙的时候少于2美元。",
"insufficient_funds_notice": "此交易余额不足。请添加资金。",
"contractCall": "合约调用",
"contract_call_transactions": "合约调用交易"
}
9 changes: 8 additions & 1 deletion assets/flutter_i18n/zh_TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,12 @@
"removing_account_warning": "您確定要刪除此帳戶嗎?",
"remove": "移除",
"duplicate_account_import_notice": "您試圖導入的帳戶是重複的。",
"unable_to_launch_email_app": "無法啟動電子郵件應用程式"
"unable_to_launch_email_app": "無法啟動電子郵件應用程式",
"max_fee": "最高費用",
"deposit_from_exchanges_notice": "從{0},{1}交易所購買並直接將zkEVM MXC存入AXS錢包",
"deposit_with_l3_bridge_notice": "從其他交易所購買,並使用 {0} 存款 ERC20 MXC 到 AXS 錢包",
"buy_some_x_for_fee_notice": "購買一些{0}來支付交易的燃氣費,通常在網路不忙碌時少於2美元。",
"insufficient_funds_notice": "此交易餘額不足。請增加資金。",
"contractCall": "合約呼叫",
"contract_call_transactions": "合約呼叫交易"
}
Loading

0 comments on commit cf3c77d

Please sign in to comment.