diff --git a/src/gui/TransactionsModel.cpp b/src/gui/TransactionsModel.cpp index 62f6fa74e..99885fdb4 100644 --- a/src/gui/TransactionsModel.cpp +++ b/src/gui/TransactionsModel.cpp @@ -331,8 +331,10 @@ QVariant TransactionsModel::getEditRole(const QModelIndex& _index) const { QVariant TransactionsModel::getToolTipRole(const QModelIndex& _index) const { quint64 numberOfConfirmations = _index.data(ROLE_NUMBER_OF_CONFIRMATIONS).value(); TransactionType transactionType = static_cast(_index.data(ROLE_TYPE).value()); - - if(numberOfConfirmations == 0) { + TransactionState transactionState = static_cast(_index.data(ROLE_STATE).value()); + if (transactionState != TransactionState::ACTIVE && transactionState != TransactionState::SENDING) { + return QString(tr("Canceled or failed transaction")); + } else if (numberOfConfirmations == 0) { if (transactionType == TransactionType::INPUT) return QString(tr("Incoming transaction, unconfirmed")); @@ -369,7 +371,11 @@ QVariant TransactionsModel::getToolTipRole(const QModelIndex& _index) const { QVariant TransactionsModel::getDecorationRole(const QModelIndex& _index) const { if(_index.column() == COLUMN_STATE) { quint64 numberOfConfirmations = _index.data(ROLE_NUMBER_OF_CONFIRMATIONS).value(); - if(numberOfConfirmations == 0) { + TransactionState transactionState = static_cast(_index.data(ROLE_STATE).value()); + + if (transactionState != TransactionState::ACTIVE && transactionState != TransactionState::SENDING) { + return QPixmap(":icons/cancel"); + } else if (numberOfConfirmations == 0) { return QPixmap(":icons/unconfirmed"); } else if(numberOfConfirmations < 2) { return QPixmap(":icons/clock1"); @@ -398,6 +404,9 @@ QVariant TransactionsModel::getAlignmentRole(const QModelIndex& _index) const { QVariant TransactionsModel::getUserRole(const QModelIndex& _index, int _role, CryptoNote::TransactionId _transactionId, CryptoNote::WalletLegacyTransaction& _transaction, CryptoNote::TransferId _transferId, CryptoNote::WalletLegacyTransfer& _transfer) const { switch(_role) { + case ROLE_STATE: + return static_cast(_transaction.state); + case ROLE_DATE: return (_transaction.timestamp > 0 ? QDateTime::fromTime_t(_transaction.timestamp) : QDateTime()); diff --git a/src/gui/TransactionsModel.h b/src/gui/TransactionsModel.h index aa6ed3d56..0e222e76c 100644 --- a/src/gui/TransactionsModel.h +++ b/src/gui/TransactionsModel.h @@ -14,6 +14,8 @@ namespace WalletGui { enum class TransactionType : quint8 {MINED, INPUT, OUTPUT, INOUT, FUSION}; +enum class TransactionState : quint8 {ACTIVE, DELETED, SENDING, CANCELLED, FAILED}; + typedef QPair TransactionTransferId; class TransactionsModel : public QAbstractItemModel { @@ -22,14 +24,14 @@ class TransactionsModel : public QAbstractItemModel { Q_ENUMS(Roles) public: - enum Columns{ + enum Columns { COLUMN_STATE = 0, COLUMN_DATE, COLUMN_AMOUNT, COLUMN_FEE, COLUMN_ADDRESS, COLUMN_PAYMENT_ID, COLUMN_HASH, COLUMN_HEIGHT, COLUMN_TYPE, COLUMN_SECRET_KEY }; - enum Roles{ + enum Roles { ROLE_DATE = Qt::UserRole, ROLE_TYPE, ROLE_HASH, ROLE_ADDRESS, ROLE_AMOUNT, ROLE_PAYMENT_ID, ROLE_ICON, - ROLE_TRANSACTION_ID, ROLE_HEIGHT, ROLE_FEE, ROLE_NUMBER_OF_CONFIRMATIONS, ROLE_SECRET_KEY, ROLE_COLUMN, ROLE_ROW + ROLE_TRANSACTION_ID, ROLE_HEIGHT, ROLE_FEE, ROLE_NUMBER_OF_CONFIRMATIONS, ROLE_SECRET_KEY, ROLE_COLUMN, ROLE_ROW, ROLE_STATE }; static TransactionsModel& instance(); diff --git a/src/languages/ar.ts b/src/languages/ar.ts index 84f045e63..70b2f3671 100644 --- a/src/languages/ar.ts +++ b/src/languages/ar.ts @@ -652,7 +652,7 @@ Please wait... - + Recent wallets المحافظ الأخيرة @@ -663,158 +663,158 @@ Please wait... - + Help مساعدة - + Wallet محفظة - + toolBar شريط الأدوات - + Account toolbar شريط أدوات الحساب - + Overview لمحة عامة - + Send إرسال - + Receive استلام - + Transactions المعاملات - + Exit خروج - + Ctrl+Q كونترول + Q - + Contacts جهات الاتصال - + Create wallet إنشاء محفظة - + Open wallet فتح محفظة - + Encrypt wallet تشفير المحفظة - - + + Change password تغيير كلمة المرور - + About حول - + About Qt حول Qt - + Backup wallet نسخ المحفظة - + Start on system login البدء بتسجيل الدخول إلى النظام - + Minimize to tray تصغير إلى شريط الأدوات - + Close to tray بالقرب من شريط الأدوات - + Import private key استيراد المفتاح الخاص - + Sign message العنوان - + Verify signed message - + Optimization الاقوي - + Get proof of balance تأكيد التوازن - + Import keys استيراد المفاتيح - + Don't show wallet optimization transactions لا تُظهر معاملات تحسين المحفظة - + Lock wallet قفل المحفظة - + Ctrl+L - + Hide everything when wallet is locked إخفاء كل شيء عندما يتم تأمين المحفظة @@ -823,8 +823,8 @@ Please wait... تعدين - - + + Reset wallet إعادة تعيين المحفظة @@ -838,62 +838,63 @@ Please wait... تغيير اللغة - + Export private key تصدير المفتاح الخاص - + F1 F1 - + Connection اتصال - + Open payment request فتح طلب الدفع - + Export tracking key تصدير مفتاح التتبع - + Import tracking key استيراد مفتاح التتبع - + Close wallet إغلاق المحفظة - + + Information معلومات - + Open log file فتح ملف السجل - + Show mnemonic seed عرض كلمة استرجاع المحفظة - + Restore from mnemonic seed استعاد ة من كلمة استرجاع المحفظة - + Create nondeterministic wallet إنشاء نظام عدم اشتقاق مفاتيح @@ -902,7 +903,7 @@ Please wait... بدء التعدين الجماعي تلقائياً - + Sweep unmixable زر الدفعات القديمة @@ -1338,28 +1339,28 @@ Please wait... QObject - + Help مساعدة - + Error خطأ - + Fail فشل - + %1 wallet already running or cannot create lock file %2. Check your permissions. 1% من المحفظة نشط من قبل أو لا يمكن إنشاء ملف قفل 2%. تحقق من الأذونات المتاحة. - + Loading blockchain... جار تحميل البلوكتشين... @@ -2963,32 +2964,37 @@ when the wallet is synchronized (غير متطابق) - + + Canceled or failed transaction + المعاملة الملغاة أو الفاشلة + + + Incoming transaction, unconfirmed معاملة واردة ، غير مؤكدة - + Mined, confirmations معدن، التأكيدات - + Wallet optimization transaction, unconfirmed معاملة تحسين المحفظة ، غير مؤكدة - + Sent to yourself, unconfirmed مرسل إلى نفسي، غير مؤكد - + Outgoing transaction, unconfirmed المعاملة الصادرة ، غير مؤكدة - + Incoming transaction, %n confirmation(s) المعاملة الواردة ،:%n تأكيد @@ -3000,7 +3006,7 @@ when the wallet is synchronized - + Mined, %n confirmation(s) معدن،٪ n تأكيد @@ -3012,7 +3018,7 @@ when the wallet is synchronized - + Wallet optimization transaction, %n confirmation(s) ل،%n تأكيد معاملات تحسين المحفظة @@ -3024,7 +3030,7 @@ when the wallet is synchronized - + Sent to yourself, %n confirmation(s) مرسل إلى نفسك ،٪ n تأكيد @@ -3036,7 +3042,7 @@ when the wallet is synchronized - + Outgoing transaction, %n confirmation(s) المعاملة الصادرة ،٪ n التأكيد diff --git a/src/languages/be.ts b/src/languages/be.ts index 8acc4cf7a..552fee127 100644 --- a/src/languages/be.ts +++ b/src/languages/be.ts @@ -2645,6 +2645,10 @@ when the wallet is synchronized Аптымізацыя гаманца,%n пацвярджэнняў + + Canceled or failed transaction + Адмененая або няўдалая транзакцыя + WalletGui::WalletAdapter diff --git a/src/languages/de.ts b/src/languages/de.ts index 3a10453a4..80705ed65 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -2639,6 +2639,10 @@ wenn die Brieftasche die Synchronisation beendet Wallet-Optimierungstransaktion,%n bestätigungen + + Canceled or failed transaction + Abgebrochene oder fehlgeschlagene Transaktion + WalletGui::WalletAdapter diff --git a/src/languages/es.ts b/src/languages/es.ts index 9ff6da725..7f8e6039d 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -2636,6 +2636,10 @@ cuando la cartera termine de sincronizar Transacción de optimización de billetera, , %n confirmaciones + + Canceled or failed transaction + Transacción cancelada o fallida + WalletGui::WalletAdapter diff --git a/src/languages/fa.ts b/src/languages/fa.ts index 1989be493..3d2862e63 100644 --- a/src/languages/fa.ts +++ b/src/languages/fa.ts @@ -2616,6 +2616,10 @@ when the wallet is synchronized معاملات بهینه سازی کیف پول ،,%n تاییدیه + + Canceled or failed transaction + معامله لغو یا شکست خورده است + WalletGui::WalletAdapter diff --git a/src/languages/fr.ts b/src/languages/fr.ts index c7a3ecc96..299f87d4e 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -2643,6 +2643,10 @@ quand le portefeuille aura terminé la synchronisation Transaction d'optimisation de portefeuille, %n confirmations + + Canceled or failed transaction + Transaction annulée ou échouée + WalletGui::WalletAdapter diff --git a/src/languages/hi.ts b/src/languages/hi.ts index 8bdb7e5a7..43dfc63c5 100644 --- a/src/languages/hi.ts +++ b/src/languages/hi.ts @@ -637,7 +637,7 @@ Please wait... - + Recent wallets हाल के वॉलेट @@ -648,158 +648,158 @@ Please wait... - + Help सहायता - + Wallet वॉलेट - + toolBar टूलबार - + Account toolbar अकाउंट टूलबार - + Overview अवलोकन - + Send भेजें - + Receive प्राप्त करें - + Transactions लेनदेन - + Exit बाहर जाएँ - + Ctrl+Q Ctrl + Q - + Contacts संपर्क - + Create wallet वॉलेट बनाएँ - + Open wallet वॉलेट खोलें - + Encrypt wallet वॉलेट एन्क्रिप्ट करें - - + + Change password पासवर्ड बदलें - + About बारे में - + About Qt QT के बारे में - + Backup wallet बैकअप वॉलेट - + Start on system login सिस्टम लॉगिन पर शुरू करें - + Minimize to tray ट्रे में छोटा करें - + Close to tray ट्रे में बंद करें - + Import private key प्राइवेट की इम्पोर्ट करें - + Sign message - + Verify signed message - + Optimization अनुकूलन - + Get proof of balance - + Import keys की इम्पोर्ट हो रही हैं - + Don't show wallet optimization transactions वॉलेट अनुकूलन लेनदेन न दिखाएं - + Lock wallet बटुआ बंद करो - + Ctrl+L - + Hide everything when wallet is locked वॉलेट लॉक होने पर सब कुछ छिपाएं @@ -808,8 +808,8 @@ Please wait... माइनिंग - - + + Reset wallet वॉलेट रीसेट करें @@ -823,62 +823,63 @@ Please wait... भाषा बदलें - + Export private key प्राइवेट की एक्सपोर्ट करें - + F1 F1 - + Connection कनेक्शन - + Open payment request भुगतान रिक्वेस्ट खोलें - + Export tracking key ट्रैकिंग की एक्सपोर्ट करें - + Import tracking key ट्रैकिंग की इम्पोर्ट करें - + Close wallet वॉलेट बंद करें - + + Information जानकारी - + Open log file लॉग फ़ाइल खोलें - + Show mnemonic seed म्नेमोनिक सीड दिखाएँ - + Restore from mnemonic seed म्नेमोनिक सीड से रिस्टोर करें - + Create nondeterministic wallet नोनडिटर्मिनिस्टिक वॉलेट बनायें @@ -887,7 +888,7 @@ Please wait... पूल माइनिंग स्वतः शुरू करें - + Sweep unmixable मिक्स नहीं होने वालों को स्वीप करें @@ -1319,27 +1320,27 @@ Please wait... QObject - + Help - + Error - + Fail - + %1 wallet already running or cannot create lock file %2. Check your permissions. %1 वॉलेट पहले से चालू है या लॉक फाइल %2 नहीं बना सकता। आपके लिए स्वीकृत अनुमति जाँचें। - + Loading blockchain... ब्लॉकचैन लोड रही है... @@ -2960,32 +2961,37 @@ when the wallet is synchronized (n/a) - + + Canceled or failed transaction + रद्द या विफल लेनदेन + + + Incoming transaction, unconfirmed इनकमिंग लेनदेन, पुष्टि नहीं हुए - + Mined, confirmations माइन किये हुए, पुष्टि - + Wallet optimization transaction, unconfirmed बटुआ अनुकूलन लेनदेन, अपुष्ट - + Sent to yourself, unconfirmed खुद को भेजा हुआ, पुष्टि नहीं हुए - + Outgoing transaction, unconfirmed आउटगोइंग लेनदेन, पुष्टि नहीं हुए - + Incoming transaction, %n confirmation(s) इनकमिंग लेनदेन, %n पुष्टि @@ -2993,7 +2999,7 @@ when the wallet is synchronized - + Mined, %n confirmation(s) माइन हुई, %n पुष्टि @@ -3001,7 +3007,7 @@ when the wallet is synchronized - + Wallet optimization transaction, %n confirmation(s) बटुआ अनुकूलन लेनदेन, %n पुष्टि @@ -3009,7 +3015,7 @@ when the wallet is synchronized - + Sent to yourself, %n confirmation(s) खुद को भेजा हुआ, %n पुष्टि @@ -3017,7 +3023,7 @@ when the wallet is synchronized - + Outgoing transaction, %n confirmation(s) आउटगोइंग लेनदेन, %n पुष्टि diff --git a/src/languages/it.ts b/src/languages/it.ts index fbff50938..dd783862b 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -615,7 +615,7 @@ Attendere prego… - + Recent wallets Portafogli recenti @@ -626,164 +626,164 @@ Attendere prego… - + Help Aiuto - + Wallet Portafoglio - + toolBar - + Account toolbar Barra degli strumenti dell'account - + Overview Riepilogo - + Send Invia - + Receive Ricevi - + Transactions Transazioni - + Exit Esci - + Ctrl+Q - + Contacts Contatti - + Create wallet Crea un portafoglio - + Open wallet Apri il portafoglio - + Encrypt wallet Cripta il portafoglio - - + + Change password Cambia password - + About Informazioni - + About Qt Info su Qt - + Backup wallet Portafoglio di backup - + Start on system login Avvia il login di sistema - + Minimize to tray Riduci a icona nel vassoio - + Close to tray Chiudi nel vassoio - + Import private key Importa la chiave privata - + Sign message Firmare un messaggio - + Verify signed message Verifica messaggio firmato - + Optimization Ottimizzazione - + Get proof of balance Conferma dell'equilibrio - + Import keys Importa chiavi - + Don't show wallet optimization transactions Non mostrare le transazioni di ottimizzazione del portafoglio - + Lock wallet Blocca il portafoglio - + Ctrl+L - + Hide everything when wallet is locked Nascondi tutto quando il portafoglio è bloccato - - + + Reset wallet Resetta il portafoglio @@ -793,62 +793,63 @@ Attendere prego… Lingua - + Export private key Esporta la chiave privata - + F1 - + Connection Connessione - + Open payment request Apri una richiesta di pagamento - + Export tracking key Esporta la chiave di tracking - + Import tracking key Importa la chiave di tracking - + Close wallet Chiudi il portafoglio - + + Information Informazioni - + Open log file Apri il file di registro - + Show mnemonic seed Mostra il seed mnemonico - + Restore from mnemonic seed Ripristina dal seed mnemonico - + Create nondeterministic wallet Crea un portafoglio nondeterministico @@ -857,7 +858,7 @@ Attendere prego… Inizia il mining pool automaticamente - + Sweep unmixable Sweep unmixable @@ -1301,27 +1302,27 @@ Attendere prego… QObject - + Help Aiuto - + Error Errore - + Fail Fallito - + %1 wallet already running or cannot create lock file %2. Check your permissions. %1 il portafoglio è già in esecuzione o non può creare un file lock %2. Controlla le tue licenze. - + Loading blockchain... Caricamento del blockchain… @@ -2924,32 +2925,37 @@ when the wallet is synchronized Nessun dato - + + Canceled or failed transaction + Transazione annullata o non riuscita + + + Incoming transaction, unconfirmed Transazione in entrata, non confermata - + Mined, confirmations Minato, conferme - + Wallet optimization transaction, unconfirmed Transazione di ottimizzazione del portafoglio, non confermata - + Sent to yourself, unconfirmed Mandato a te stesso, non confermato - + Outgoing transaction, unconfirmed Transazione in uscita, non confermata - + Incoming transaction, %n confirmation(s) Transazione in entrata, %n conferma @@ -2957,7 +2963,7 @@ when the wallet is synchronized - + Mined, %n confirmation(s) Minato, %n conferma @@ -2965,7 +2971,7 @@ when the wallet is synchronized - + Wallet optimization transaction, %n confirmation(s) Transazione di ottimizzazione del portafoglio, %n conferma @@ -2973,7 +2979,7 @@ when the wallet is synchronized - + Sent to yourself, %n confirmation(s) Mandato a te stesso, %n conferma/e @@ -2981,7 +2987,7 @@ when the wallet is synchronized - + Outgoing transaction, %n confirmation(s) Transazione in uscita, %n conferma diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 9bd12b6ff..fa822d4fc 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -610,7 +610,7 @@ Please wait... - + Recent wallets 最近のウォレット @@ -621,158 +621,158 @@ Please wait... - + Help ヘルプ - + Wallet ウォレット - + toolBar - + Account toolbar アカウント ツールバー - + Overview 概要 - + Send 送信 - + Receive 受信 - + Transactions 史籍 - + Exit 退出 - + Ctrl+Q - + Contacts 連絡先 - + Create wallet ウォレットを作る - + Open wallet ウォレットを開く - + Encrypt wallet ウォレットの暗号化 - - + + Change password パスワードの変更 - + About アバウト - + About Qt Qtについて - + Backup wallet ウォレットをバックアップ - + Start on system login システム ログインを始める - + Minimize to tray トレイに最小化 - + Close to tray トレイに閉じる - + Import private key プライベートキーのインポート - + Sign message サインメッセージ - + Verify signed message 署名されたメッセージを確認する - + Optimization 最適化 - + Get proof of balance 残高確認 - + Import keys キーをインポートする - + Don't show wallet optimization transactions ウォレット最適化トランザクションを表示しません - + Lock wallet ロックウォレット - + Ctrl+L - + Hide everything when wallet is locked ウォレットがロックされているときにすべてを隠す @@ -781,8 +781,8 @@ Please wait... マイニング - - + + Reset wallet ウォレットをリセット @@ -792,62 +792,63 @@ Please wait... 言語 - + Export private key プライベートキーをエクスポート - + F1 - + Connection 接続 - + Open payment request ペイメント リクエストを開く - + Export tracking key トラッキングキーをエクスポート - + Import tracking key トラッキングキーをインポート - + Close wallet ウォレットを閉じる - + + Information インフォメーション - + Open log file ログファイルを開く - + Show mnemonic seed ニーモニックシードを表示 - + Restore from mnemonic seed ニーモニックシードから復元 - + Create nondeterministic wallet 非決定的ウォレットを作成 @@ -856,7 +857,7 @@ Please wait... 自動プールマイニング開始 - + Sweep unmixable スイープ混合不可 @@ -1284,27 +1285,27 @@ Please wait... QObject - + Help ヘルプ - + Error エラー - + Fail 失敗 - + %1 wallet already running or cannot create lock file %2. Check your permissions. %1 ウォレットは既に実行されているか、ロックファイルの作成ができません。%2. あなたの権限を確認してください。 - + Loading blockchain... ブロックチェーン ローディング中... @@ -2888,60 +2889,65 @@ when the wallet is synchronized データなし - + + Canceled or failed transaction + キャンセルまたは失敗したトランザクション + + + Incoming transaction, unconfirmed インカミングトランザクション、未承認 - + Mined, confirmations マイニング済み、承認 - + Wallet optimization transaction, unconfirmed ウォレット最適化トランザクション、未確認 - + Sent to yourself, unconfirmed 自分に送信、未承認 - + Outgoing transaction, unconfirmed アウトゴーイングトランザクション、未承認 - + Incoming transaction, %n confirmation(s) インカミングトランザクション, %n 確認 - + Mined, %n confirmation(s) マイニング済み、%n 確認 - + Wallet optimization transaction, %n confirmation(s) ウォレット最適化トランザクション、 %n 確認 - + Sent to yourself, %n confirmation(s) 自分に送信, %n 確認 - + Outgoing transaction, %n confirmation(s) アウトゴーイングトランザクション, %n 確認 diff --git a/src/languages/ko.ts b/src/languages/ko.ts index 6c4fb4a3b..714094d67 100644 --- a/src/languages/ko.ts +++ b/src/languages/ko.ts @@ -637,7 +637,7 @@ Please wait... - + Recent wallets 최근 지갑 @@ -648,158 +648,158 @@ Please wait... - + Help 도움말 - + Wallet 지갑 - + toolBar 툴바 - + Account toolbar 계정 툴바 - + Overview 개요 - + Send 전송 - + Receive 수신 - + Transactions 트랜잭션 - + Exit 나가기 - + Ctrl+Q Ctrl+Q - + Contacts 연락처 - + Create wallet 지갑 생성 - + Open wallet 지갑 열기 - + Encrypt wallet 지갑 암호화 - - + + Change password 암호 변경 - + About 소개 - + About Qt Qt 소개 - + Backup wallet 백업 지갑 - + Start on system login 시스템 로그인 시작 - + Minimize to tray 트레이에 최소화하기 - + Close to tray 트레이에 닫기 - + Import private key 개인 키 불러오기 - + Sign message 메시지에 서명 - + Verify signed message 서명 된 메시지 확인 - + Optimization 최적화 - + Get proof of balance 잔액 확인 - + Import keys 키 불러오는 중 - + Don't show wallet optimization transactions 지갑 최적화 거래를 표시하지 않습니다 - + Lock wallet 지갑 잠금 - + Ctrl+L - + Hide everything when wallet is locked 지갑이 잠겨있을 때 모든 것을 숨기기 @@ -808,8 +808,8 @@ Please wait... 마이닝 - - + + Reset wallet 지갑 재설정 @@ -823,62 +823,63 @@ Please wait... 언어 변경 - + Export private key 개인 키 내보내기 - + F1 F1 - + Connection 연결 - + Open payment request 지갑 요청 열기 - + Export tracking key 추적 키 내보내기 - + Import tracking key 추적 키 불러오기 - + Close wallet 지갑 닫기 - + + Information 정보 - + Open log file 로그 파일 열기 - + Show mnemonic seed 연상기호 시드 표시 - + Restore from mnemonic seed 연상기호 시드에서 복구 - + Create nondeterministic wallet 연상기호 지갑 생성 @@ -887,7 +888,7 @@ Please wait... 자동 풀 마이닝 시작 - + Sweep unmixable 혼합불가 제거 @@ -1323,27 +1324,27 @@ Please wait... QObject - + Help 도움말 - + Error 오류 - + Fail 실패 - + %1 wallet already running or cannot create lock file %2. Check your permissions. %1 지갑이 이미 작동 중이거나 잠금 파일 %2(을)를 만들 수 없습니다. 권한 허가를 확인하세요. - + Loading blockchain... 블록체인 로딩 중... @@ -2958,60 +2959,65 @@ when the wallet is synchronized 해당사항 없음 - + + Canceled or failed transaction + 취소되었거나 실패한 거래 + + + Incoming transaction, unconfirmed 수신한 트랜잭션, 확인되지 않음 - + Mined, confirmations 마이닝됨, 확인 - + Wallet optimization transaction, unconfirmed 월렛 최적화 거래 미확인 - + Sent to yourself, unconfirmed 나에게 전송됨, 확인되지 않음 - + Outgoing transaction, unconfirmed 지출한 트랜잭션, 확인되지 않음 - + Incoming transaction, %n confirmation(s) 수신한 트랜잭션, %n개 확인됨 - + Mined, %n confirmation(s) 마이닝됨, %n개 확인됨 - + Wallet optimization transaction, %n confirmation(s) 월렛 최적화 거래, %n개 확인됨 - + Sent to yourself, %n confirmation(s) 나에게 전송됨, %n개 확인됨 - + Outgoing transaction, %n confirmation(s) 지출한 트랜잭션, %n개 확인됨 diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 540db3544..8ebe3b70b 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -2641,6 +2641,10 @@ kiedy portfel skończy synchronizowanie Transakcja optymalizacji portfela, %n potwiedzeń + + Canceled or failed transaction + Anulowana lub nieudana transakcja + WalletGui::WalletAdapter diff --git a/src/languages/pt.ts b/src/languages/pt.ts index 63f4fd918..07ce5f38d 100644 --- a/src/languages/pt.ts +++ b/src/languages/pt.ts @@ -404,7 +404,7 @@ Por favor aguarde... Start synchronization from this height (leave empty if unsure): - Inicie a sincronização a partir desta altura (deixe em branco se não tiver certeza): + Inicie a sincronização a partir desta altura (deixe em branco se não tiver a certeza): @@ -443,7 +443,7 @@ Por favor aguarde... Start synchronization from this height (leave empty if unsure): - Inicie a sincronização a partir desta altura (deixe em branco se não tiver certeza): + Inicie a sincronização a partir desta altura (deixe em branco se não tiver a certeza): @@ -486,7 +486,7 @@ Por favor aguarde... Start synchronization from this height (leave empty if unsure): - Inicie a sincronização a partir desta altura (deixe em branco se não tiver certeza): + Inicie a sincronização a partir desta altura (deixe em branco se não tiver a certeza): @@ -1291,7 +1291,7 @@ Você quer ir à página de dowload? Start synchronization from this height (leave empty if unsure): - Inicie a sincronização a partir desta altura (deixe em branco se não tiver certeza): + Inicie a sincronização a partir desta altura (deixe em branco se não tiver a certeza): @@ -2644,6 +2644,10 @@ quando a carteira vai terminar de sincronizar Transação de otimização de carteira, %n confirmações + + Canceled or failed transaction + Transação cancelada ou com falha + WalletGui::WalletAdapter diff --git a/src/languages/ru.ts b/src/languages/ru.ts index 32bea2324..e1ed883bd 100644 --- a/src/languages/ru.ts +++ b/src/languages/ru.ts @@ -2634,6 +2634,10 @@ when the wallet is synchronized Оптимизация кошелька, %n подтверждений + + Canceled or failed transaction + Отмененная или неудачная транзакция + WalletGui::WalletAdapter diff --git a/src/languages/uk.ts b/src/languages/uk.ts index ef6f78d2e..dd23fd7de 100644 --- a/src/languages/uk.ts +++ b/src/languages/uk.ts @@ -2630,6 +2630,10 @@ when the wallet is synchronized Оптимізація гаманця, %n підтверджень + + Canceled or failed transaction + Скасована або невдала транзакція + WalletGui::WalletAdapter diff --git a/src/languages/zh.ts b/src/languages/zh.ts index 303db3c0c..5e0ab7867 100644 --- a/src/languages/zh.ts +++ b/src/languages/zh.ts @@ -641,7 +641,7 @@ Please wait... - + Recent wallets 最近的钱包 @@ -652,158 +652,158 @@ Please wait... - + Help 帮助 - + Wallet 钱包 - + toolBar 工具栏 - + Account toolbar 账户工具栏 - + Overview 概览 - + Send 发送 - + Receive 接收 - + Transactions 交易 - + Exit 退出 - + Ctrl+Q 按键 Ctrl+Q - + Contacts 联系人 - + Create wallet 创建钱包 - + Open wallet 打开钱包 - + Encrypt wallet 加密钱包 - - + + Change password 更改密码 - + About 相关信息 - + About Qt 关于QT - + Backup wallet 备用钱包 - + Start on system login 开始登陆系统 - + Minimize to tray 最小化到托盘 - + Close to tray 关闭至托盘 - + Import private key 导入私钥 - + Sign message 签名消息 - + Verify signed message 验证已签名的邮件 - + Optimization 优化 - + Get proof of balance 余额确认 - + Import keys 正在导入密钥 - + Don't show wallet optimization transactions 不显示钱包优化交易 - + Lock wallet 锁钱包 - + Ctrl+L - + Hide everything when wallet is locked 钱包被锁定时隐藏所有内容 @@ -812,8 +812,8 @@ Please wait... 挖矿 - - + + Reset wallet 重置钱包 @@ -827,62 +827,63 @@ Please wait... 更换语言 - + Export private key 导出私钥 - + F1 F1 - + Connection 连接 - + Open payment request 打开付款请求 - + Export tracking key 导出跟踪密钥 - + Import tracking key 导入跟踪密钥 - + Close wallet 关闭钱包 - + + Information 信息 - + Open log file 打开日志文件 - + Show mnemonic seed 显示助记种子 - + Restore from mnemonic seed 从助记种子恢复 - + Create nondeterministic wallet 创建非确定性钱包 @@ -891,7 +892,7 @@ Please wait... 自动开始从矿池挖矿 - + Sweep unmixable 扫除不可混合的金额 @@ -1327,27 +1328,27 @@ Please wait... QObject - + Help 帮助 - + Error 错误 - + Fail 失败 - + %1 wallet already running or cannot create lock file %2. Check your permissions. ％1钱包已在运行中或无法创建锁文件％2，请查看您的权限。 - + Loading blockchain... 加载区块链… @@ -2946,60 +2947,65 @@ when the wallet is synchronized 没有资料 - + + Canceled or failed transaction + 交易取消或失败 + + + Incoming transaction, unconfirmed 传入交易，未确认 - + Mined, confirmations 已挖矿，已确认 - + Wallet optimization transaction, unconfirmed 钱包优化交易，未确认 - + Sent to yourself, unconfirmed 发送给自己，未确认 - + Outgoing transaction, unconfirmed 传出交易，未确认 - + Incoming transaction, %n confirmation(s) 传入交易，%n确认 - + Mined, %n confirmation(s) 已挖矿，%n确认 - + Wallet optimization transaction, %n confirmation(s) 钱包优化交易，%n确认 - + Sent to yourself, %n confirmation(s) 发送给自己，%n确认 - + Outgoing transaction, %n confirmation(s) 传出交易，%n确认