From da50db837436f9b3273df17366bc994f78fdf723 Mon Sep 17 00:00:00 2001 From: neiros Date: Wed, 28 Mar 2018 20:16:12 +0700 Subject: [PATCH] text changes --- src/clientversion.h | 4 ++-- src/compat.h | 2 +- src/json/json_spirit_writer_template.h | 2 +- src/qt/askpassphrasedialog.cpp | 4 ++-- src/qt/bitcoin.cpp | 2 +- src/qt/bitcoinstrings.cpp | 14 +++++++------- src/qt/forms/addressbookpage.ui | 6 +++--- src/qt/forms/optionsdialog.ui | 18 +++++++++--------- src/qt/forms/overviewpage.ui | 6 +++--- src/qt/forms/rpcconsole.ui | 4 ++-- src/qt/forms/sendcoinsentry.ui | 14 +++++++------- src/qt/forms/signverifymessagedialog.ui | 10 +++++----- src/qt/signverifymessagedialog.cpp | 4 ++-- 13 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/clientversion.h b/src/clientversion.h index 03e4c0b..eb750d2 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -9,14 +9,14 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 8 #define CLIENT_VERSION_REVISION 217 // 99 -#define CLIENT_VERSION_BUILD 4 +#define CLIENT_VERSION_BUILD 5 // Set to true for release, false for prerelease or test build Установите true для релиза, false для предварительной или тестовой сборки #define CLIENT_VERSION_IS_RELEASE true // false // Copyright year (2009-this) // Todo: update this when changing our copyright comments in the source обновите это при изменении наших авторских комментариев в исходниках -#define COPYRIGHT_YEAR 2017 // 2013 +#define COPYRIGHT_YEAR 2018 // 2013 // Converts the parameter X to a string after macro replacement on X has been performed.Преобразует значение параметра X в строку после макро замены на X которая была выполнена // Don't merge these into one macro! Не объединяйте их в один макрос! diff --git a/src/compat.h b/src/compat.h index 7062216..6d05f4c 100644 --- a/src/compat.h +++ b/src/compat.h @@ -26,7 +26,7 @@ #include #endif -typedef u_int SOCKET; +//typedef u_int SOCKET; #ifdef WIN32 #define MSG_NOSIGNAL 0 #define MSG_DONTWAIT 0 diff --git a/src/json/json_spirit_writer_template.h b/src/json/json_spirit_writer_template.h index 28c49dd..f139dc4 100644 --- a/src/json/json_spirit_writer_template.h +++ b/src/json/json_spirit_writer_template.h @@ -28,7 +28,7 @@ namespace json_spirit template< class String_type > String_type non_printable_to_string( unsigned int c ) { - typedef typename String_type::value_type Char_type; +// typedef typename String_type::value_type Char_type; String_type result( 6, '\\' ); diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 4d68c7b..6085645 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -98,7 +98,7 @@ void AskPassphraseDialog::accept() break; } QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm wallet encryption"), - tr("Warning: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS!") + "

" + tr("Are you sure you wish to encrypt your wallet?"), + tr("Warning: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR TTCOINS!") + "

" + tr("Are you sure you wish to encrypt your wallet?"), QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Cancel); if(retval == QMessageBox::Yes) @@ -111,7 +111,7 @@ void AskPassphraseDialog::accept() "" + tr("TTC will close now to finish the encryption process. " "Remember that encrypting your wallet cannot fully protect " - "your bitcoins from being stolen by malware infecting your computer.") + + "your TTC from being stolen by malware infecting your computer.") + "

" + tr("IMPORTANT: Any previous backups you have made of your wallet file " "should be replaced with the newly generated, encrypted wallet file. " diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 482c4a8..06d4cdc 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -197,7 +197,7 @@ int main(int argc, char *argv[]) // Install global event filter that makes sure that long tooltips can be word-wrapped app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app)); - // ... then bitcoin.conf: + // ... then TTC.conf: if (!boost::filesystem::is_directory(GetDataDir(false))) { QMessageBox::critical(0, QObject::tr("TTC"), diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 69d0c09..7e5b1ac 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -17,7 +17,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "If the file does not exist, create it with owner-readable-only file " "permissions.\n" "It is also recommended to set alertnotify so you are notified of problems;\n" -"for example: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com\n"), +"for example: alertnotify=echo %%s | mail -s \"TTC Alert\" admin@foo.com\n"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:" "@STRENGTH)"), @@ -30,7 +30,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Bind to given address and always listen on it. Use [host]:port notation for " "IPv6"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Cannot obtain a lock on data directory %s. Bitcoin is probably already " +"Cannot obtain a lock on data directory %s. TTC is probably already " "running."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Enter regression test mode, which uses a special chain in which blocks can " @@ -67,7 +67,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "This is a pre-release test build - use at your own risk - do not use for " "mining or merchant applications"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Unable to bind to %s on this computer. Bitcoin is probably already running."), +"Unable to bind to %s on this computer. TTC is probably already running."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Warning: -paytxfee is set very high! This is the transaction fee you will " "pay if you send a transaction."), @@ -95,7 +95,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"), QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"), QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"), -QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"), +QT_TRANSLATE_NOOP("bitcoin-core", "TTC version"), QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), @@ -113,7 +113,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environmen QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of TTC"), QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"), @@ -183,7 +183,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)" QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: 4)"), QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: TTC.conf)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), @@ -208,7 +208,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"), QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), +QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart TTC to complete"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"), diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui index a2a7da3..04d6d06 100644 --- a/src/qt/forms/addressbookpage.ui +++ b/src/qt/forms/addressbookpage.ui @@ -6,7 +6,7 @@ 0 0 - 760 + 867 380 @@ -96,7 +96,7 @@ - Sign a message to prove you own a Bitcoin address + Sign a message to prove you own a TTC address Sign &Message @@ -110,7 +110,7 @@ - Verify a message to ensure it was signed with a specified Bitcoin address + Verify a message to ensure it was signed with a specified TTC address &Verify Message diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index f7f7e33..1ed1cf6 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -97,7 +97,7 @@ - Automatically start Bitcoin after logging in to the system. + Automatically start TTC after logging in to the system. &Start TTC on system login @@ -167,7 +167,7 @@ - Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor). + Connect to the TTC network through a SOCKS proxy (e.g. when connecting through Tor). &Connect through SOCKS proxy: @@ -341,7 +341,7 @@ - The user interface language can be set here. This setting will take effect after restarting Bitcoin. + The user interface language can be set here. This setting will take effect after restarting TTC. @@ -374,7 +374,7 @@ - Whether to show Bitcoin addresses in the transaction list or not. + Whether to show TTC addresses in the transaction list or not. &Display addresses in transaction list @@ -477,6 +477,11 @@ + + QValidatedLineEdit + QLineEdit +
qvalidatedlineedit.h
+ BitcoinAmountField QSpinBox @@ -487,11 +492,6 @@ QComboBox
qvaluecombobox.h
 - - QValidatedLineEdit - QLineEdit -
qvalidatedlineedit.h
- diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 405ba57..fa7a9ed 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -7,7 +7,7 @@ 0 0 748 - 488 + 508 @@ -61,7 +61,7 @@ - The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin 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 TTC network after a connection is established, but this process has not completed yet. QLabel { color: red; } @@ -292,7 +292,7 @@ - The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin 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 TTC network after a connection is established, but this process has not completed yet. QLabel { color: red; } diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui index 739beea..fe5d7cb 100644 --- a/src/qt/forms/rpcconsole.ui +++ b/src/qt/forms/rpcconsole.ui @@ -322,7 +322,7 @@ - Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files. + Open the TTC debug log file from the current data directory. This can take a few seconds for large log files. &Open @@ -348,7 +348,7 @@ - Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options. + Show the TTC-Qt help message to get a list with possible TTC command-line options. &Show diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 28553c5..dea79c1 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -73,7 +73,7 @@ - The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) + The address to send the payment to (e.g. TYw4sTfrcA5Bk8nh5Rx2bwTTSqDPgKZUqK) 34 @@ -140,17 +140,17 @@ - - BitcoinAmountField - QLineEdit -
bitcoinamountfield.h
- 1 - QValidatedLineEdit QLineEdit
qvalidatedlineedit.h
 + + BitcoinAmountField + QSpinBox +
bitcoinamountfield.h
+ 1 + diff --git a/src/qt/forms/signverifymessagedialog.ui b/src/qt/forms/signverifymessagedialog.ui index 8cb4c6b..8b3ef92 100644 --- a/src/qt/forms/signverifymessagedialog.ui +++ b/src/qt/forms/signverifymessagedialog.ui @@ -20,7 +20,7 @@ - 1 + 0 @@ -48,7 +48,7 @@ - The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) + The address to sign the message with (e.g. TYw4sTfrcA5Bk8nh5Rx2bwTTSqDPgKZUqK) 34 @@ -155,7 +155,7 @@ - Sign the message to prove you own this Bitcoin address + Sign the message to prove you own this TTC address Sign &Message @@ -261,7 +261,7 @@ - The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) + The address the message was signed with (e.g. TYw4sTfrcA5Bk8nh5Rx2bwTTSqDPgKZUqK) 34 @@ -301,7 +301,7 @@ - Verify the message to ensure it was signed with the specified Bitcoin address + Verify the message to ensure it was signed with the specified TTC address Verify &Message diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index 7c36953..619db8e 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -24,10 +24,10 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(QWidget *parent) : #if (QT_VERSION >= 0x040700) /* Do not move this to the XML file, Qt before 4.7 will choke on it */ - ui->addressIn_SM->setPlaceholderText(tr("Enter a TTC address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)")); + ui->addressIn_SM->setPlaceholderText(tr("Enter a TTC address (e.g. TYw4sTfrcA5Bk8nh5Rx2bwTTSqDPgKZUqK)")); ui->signatureOut_SM->setPlaceholderText(tr("Click \"Sign Message\" to generate signature")); - ui->addressIn_VM->setPlaceholderText(tr("Enter a TTC address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)")); + ui->addressIn_VM->setPlaceholderText(tr("Enter a TTC address (e.g. TYw4sTfrcA5Bk8nh5Rx2bwTTSqDPgKZUqK)")); ui->signatureIn_VM->setPlaceholderText(tr("Enter TTC signature")); #endif