diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 64a8530def..18e48d7236 100755 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -67,7 +67,6 @@ QT_TS = \ qt/locale/bitcoin_uk.ts \ qt/locale/bitcoin_ur_PK.ts \ qt/locale/bitcoin_vi.ts \ - qt/locale/bitcoin_vi_VN.ts \ qt/locale/bitcoin_zh_CN.ts \ qt/locale/bitcoin_zh_TW.ts diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc index 081c9cbfb2..1f7da55bda 100644 --- a/src/qt/bitcoin_locale.qrc +++ b/src/qt/bitcoin_locale.qrc @@ -60,7 +60,6 @@ locale/bitcoin_uk.qm locale/bitcoin_ur_PK.qm locale/bitcoin_vi.qm - locale/bitcoin_vi_VN.qm locale/bitcoin_zh_CN.qm locale/bitcoin_zh_TW.qm diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index bb6d967c42..f74913354c 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -279,7 +279,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "CPID count polls are not supported."), QT_TRANSLATE_NOOP("bitcoin-core", "CPID"), QT_TRANSLATE_NOOP("bitcoin-core", "Cancel snapshot operation?"), QT_TRANSLATE_NOOP("bitcoin-core", "Cancel"), -QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -externalip address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 9356603c7f..c775918fc9 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -952,6 +952,12 @@ Scraper(s) not publishing: %5. CPID: %1 +Time left to activate: %2%3 + + + + + CPID: %1 Beacon age: %2 Current beacon expired! %3 @@ -966,7 +972,7 @@ Expires: %3 - + New Poll @@ -1864,7 +1870,12 @@ Expires: %3 MRCModel - + + You must have a mature balance of at least 1 GRC to submit an MRC. + + + + Too soon since your last research rewards payment. @@ -2044,6 +2055,11 @@ Expires: %3 A block update must have occurred after wallet start or sync to submit MRCs. + + + You must have a mature balance of at least 1 GRC to submit an MRC. + + NoResult @@ -2398,12 +2414,12 @@ Expires: %3 - + The displayed information may be out of date. Your wallet automatically synchronizes with the Gridcoin network after a connection is established, but this process has not completed yet. The displayed information may be out of date. Your wallet automatically synchronizes with the Gridcoin network after a connection is established, but this process has not completed yet. - + Total of transactions that have yet to be confirmed, and do not yet count toward the current balance Total of transactions that have yet to be confirmed, and do not yet count toward the current balance @@ -2418,12 +2434,12 @@ Expires: %3 - + Pending Reward: - + Open the researcher/beacon configuration wizard. @@ -2514,17 +2530,22 @@ Expires: %3 - + Magnitude: - + Status: - + + You are approaching the accrual limit of 16384 GRC. If you have a relatively low balance, you should request payment via MRC so that you do not lose earned rewards. + + + + Recent Transactions @@ -2534,13 +2555,13 @@ Expires: %3 - + Out of Sync - + Pool @@ -2591,7 +2612,7 @@ Expires: %3 Form - + Votes: @@ -2601,32 +2622,47 @@ Expires: %3 - + Top Answer: - + Total Weight: - + Poll Type - + % of AVW: - + AVW: - + + Your Last Vote: + + + + + Your Vote Weight: + + + + + Your % of AVW: + + + + Balance @@ -2647,7 +2683,7 @@ Expires: %3 - + Voting finished. @@ -3694,7 +3730,7 @@ Expires: %3 ResearcherModel - + Beacon is active. @@ -3755,20 +3791,25 @@ Expires: %3 - + Waiting for sync... - + Not whitelisted - + Not attached + + + Uses external adapter + + ResearcherWizard @@ -3808,7 +3849,7 @@ Expires: %3 - 3. Change your username to the following verification code: + 3. Change your "name" (real name or nickname) to the following verification code: @@ -4221,7 +4262,7 @@ Expires: %3 - + Everything looks good. @@ -5576,7 +5617,7 @@ Expires: %3 VotingModel - + Please unlock the wallet. @@ -5682,7 +5723,7 @@ Expires: %3 - + Usage: Usage: @@ -5692,7 +5733,7 @@ Expires: %3 List commands - + A poll with a yes/no/abstain response type cannot include any additional custom choices. @@ -5942,7 +5983,7 @@ Expires: %3 - + Cannot write to data directory '%s'; check permissions. @@ -6492,7 +6533,7 @@ Expires: %3 - + Balance @@ -6547,7 +6588,7 @@ Expires: %3 - + Client Version @@ -6657,7 +6698,7 @@ Expires: %3 - + Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -6672,17 +6713,17 @@ Expires: %3 Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect. - + Error: Transaction creation failed - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. - + Failed to listen on any port. Use -listen=0 if you want this. Failed to listen on any port. Use -listen=0 if you want this. @@ -6707,7 +6748,7 @@ Expires: %3 To use the %s option - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -6765,7 +6806,7 @@ If the file does not exist, create it with owner-readable-only file permissions. If the file does not exist, create it with owner-readable-only file permissions. - + Gridcoin version Gridcoin version @@ -6855,12 +6896,12 @@ If the file does not exist, create it with owner-readable-only file permissions. - + None - + No current polls @@ -6890,12 +6931,12 @@ If the file does not exist, create it with owner-readable-only file permissions. - + Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - + wallet.dat corrupt, salvage failed @@ -6980,12 +7021,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Error: could not start node - + Unable to bind to %s on this computer. Gridcoin is probably already running. Unable to bind to %s on this computer. Gridcoin is probably already running. - + Unable to bind to %s on this computer (bind returned error %d, %s) Unable to bind to %s on this computer (bind returned error %d, %s) @@ -7000,12 +7041,12 @@ If the file does not exist, create it with owner-readable-only file permissions. - + Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds - + Sending... Sending... @@ -7015,12 +7056,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Invalid amount - + Warning: Please check that your computer's date and time are correct! If your clock is wrong Gridcoin will not work properly. Warning: Please check that your computer's date and time are correct! If your clock is wrong Gridcoin will not work properly. - + Vote signature failed. See debug.log. @@ -7050,12 +7091,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Loading wallet... - - Cannot downgrade wallet - Cannot downgrade wallet - - - + Cannot write default address Cannot write default address diff --git a/src/qt/locale/bitcoin_vi_VN.ts b/src/qt/locale/bitcoin_vi_VN.ts deleted file mode 100644 index 62e29133da..0000000000 --- a/src/qt/locale/bitcoin_vi_VN.ts +++ /dev/null @@ -1,500 +0,0 @@ - - - AddressBookPage - - Create a new address - Tạo một địa chỉ mới - - - &New - &Mới - - - Copy the currently selected address to the system clipboard - Copy địa chỉ được chọn vào clipboard - - - Delete the currently selected address from the list - Xóa địa chỉ hiện tại từ danh sách - - - &Delete - &Xó&a - - - - AskPassphraseDialog - - Passphrase Dialog - Hội thoại Passphrase - - - Enter passphrase - Điền passphrase - - - New passphrase - Passphrase mới - - - Repeat new passphrase - Điền lại passphrase - - - - BitcoinGUI - - Wallet - Ví - - - &Overview - &Tổng quan - - - Show general overview of wallet - Hiện thỉ thông tin sơ lược chung về Ví - - - &Send - &Gửi - - - &Receive - &Nhận - - - Browse transaction history - Duyệt tìm lịch sử giao dịch - - - E&xit - T&hoát - - - Quit application - Thoát chương trình - - - &Options... - &Tùy chọn... - - - &Show / Hide - Ẩn / H&iện - - - &Encrypt Wallet... - &Mã hóa ví tiền - - - &Change Passphrase... - &Thay đổi mật khẩu... - - - Change the passphrase used for wallet encryption - Thay đổi cụm mật mã dùng cho mã hoá Ví - - - Sign &message... - Chứ ký & Tin nhắn... - - - &Verify message... - &Tin nhắn xác thực - - - &Debug window - &Cửa sổ xử lý lỗi (debug) - - - &Settings - &Thiết lập - - - &Help - Trợ &giúp - - - %n active connection(s) to the Gridcoin network - - - - - - Processed %n block(s) of transaction history. - - - - - - %n second(s) ago - - - - - - %n minute(s) ago - - - - - - %n hour(s) ago - - - - - - %n day(s) ago - - - - - - Up to date - Đã cập nhật - - - Catching up... - Bắt kịp... - - - Sent transaction - Giao dịch đã gửi - - - Incoming transaction - Giao dịch đang tới - - - Wallet is <b>encrypted</b> and currently <b>locked</b> - Ví tiền <b> đã được mã hóa</b>và hiện <b>đang khóa</b> - - - - CoinControlDialog - - Quantity: - Lượng: - - - Amount: - Lượng: - - - Fee: - Phí: - - - After Fee: - Sau thuế, phí: - - - Change: - Thay đổi: - - - Amount - Lượng - - - Date - Ngày tháng - - - Confirmations - Lần xác nhận - - - Confirmed - Đã xác nhận - - - - EditAddressDialog - - Edit Address - Thay đổi địa chỉ - - - &Label - Nhãn - - - &Address - Địa chỉ - - - - Intro - - %n GB of free space available - - - - - - (of %n GB needed) - - - - - - (%n GB needed for full chain) - - - - - - - OptionsDialog - - Options - Lựa chọn - - - &Main - &Chính - - - &Port: - &Cổng: - - - Port of the proxy (e.g. 9050) - Cổng proxy (e.g. 9050) - - - &Display - &Hiển thị - - - User Interface &language: - Giao diện người dùng & ngôn ngữ - - - &Cancel - &Từ chối - - - default - mặc định - - - - OverviewPage - - Available: - Khả dụng - - - Total: - Tổng: - - - - QObject - - %n second(s) - - - - - - %n minute(s) - - - - - - %n hour(s) - - - - - - %n day(s) - - - - - - %n week(s) - - - - - - %n year(s) - - - - - - - RPCConsole - - &Information - Thông tin - - - Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen. - Sử dụng phím lên và xuống để di chuyển lịch sử, và <b>Ctrl-L</b> để xóa màn hình - - - Type <b>help</b> for an overview of available commands. - Gõ <b>help</b> để xem nhưng câu lệnh có sẵn - - - - SendCoinsDialog - - Send Coins - Gửi Coins - - - Inputs... - Nhập... - - - automatically selected - Tự động chọn - - - Insufficient funds! - Không đủ tiền - - - Quantity: - Lượng: - - - Amount: - Lượng: - - - Fee: - Phí: - - - After Fee: - Sau thuế, phí: - - - Send to multiple recipients at once - Gửi đến nhiều người nhận trong một lần - - - Add &Recipient - Thêm &Người nhận - - - Clear &All - Xóa &Tất cả - - - Confirm the send action - Xác nhận sự gửi - - - Confirm send coins - Xác nhận gửi coins - - - - SendCoinsEntry - - A&mount: - Lượng: - - - &Label: - &Nhãn - - - - SignVerifyMessageDialog - - Clear &All - Xóa &Tất cả - - - - TransactionDesc - - Open for %n more block(s) - - - - - - , broadcast through %n node(s) - - - - - - matures in %n more block(s) - - - - - - Message - Tin nhắn - - - Amount - Lượng - - - - TransactionTableModel - - Open for %n more block(s) - - - - - - - bitcoin-core - - Loading addresses... - Đang đọc các địa chỉ... - - - Insufficient funds - Không đủ tiền - - - Loading block index... - Đang đọc block index... - - - Loading wallet... - Đang đọc ví... - - - Cannot downgrade wallet - Không downgrade được ví - - - Cannot write default address - Không ghi được địa chỉ mặc định - - - Rescanning... - Đang quét lại... - - - Done loading - Đã nạp xong - - - Error - Lỗi - - - \ No newline at end of file