diff --git a/src/init.cpp b/src/init.cpp index b0b3360..7bf5350 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -344,7 +344,7 @@ std::string HelpMessage() " -connect= " + _("Connect only to the specified node(s)") + "\n" + " -seednode= " + _("Connect to a node to retrieve peer addresses, and disconnect") + "\n" + " -externalip= " + _("Specify your own public address") + "\n" + - " -onlynet= " + _("Only connect to nodes in network (IPv4, IPv6 or I2P") + "\n" + + " -onlynet= " + _("Only connect to nodes in network (IPv4, IPv6 or I2P)") + "\n" + " -discover " + _("Discover own IP address (default: 1 when listening and no -externalip)") + "\n" + " -checkpoints " + _("Only accept block chain matching built-in checkpoints (default: 1)") + "\n" + " -listen " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n" + @@ -406,13 +406,13 @@ std::string HelpMessage() " -rpcsslciphers= " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)") + "\n"+ "\n"+ _("I2P Options:") + "\n" + - " -generatei2pdestination " + _("Generate an I2P destination, print it and exit.")+ "\n" + - " -i2p=1 " + _("Enable I2P.") + "\n" + - " -onlynet=i2p " + _("Enable I2P only mode.") + "\n" + - " -i2psessionname= " + _("Name of an I2P session. If it is not specified, value will be \"Gostcoin-client\"") + "\n" + - " -samhost= " + _("Address of the SAM bridge host. If it is not specified, value will be \"127.0.0.1\".") + "\n" + - " -samport= " + _("Port number of the SAM bridge host. If it is not specified, value will be \"7656\".") + "\n" + - " -mydestination= " + _("Your full destination (public+private keys). If it is not specified, the client will geneterate a random destination for you. See below (Starting wallet with a permanent i2p-address) more details about this option.") + + " -generatei2pdestination " + _("Generate an I2P destination, print it and exit")+ "\n" + + " -i2p " + _("Enable I2P (default: 1)") + "\n" + + " -onlynet=i2p " + _("Enable I2P-only mode") + "\n" + + " -i2psessionname= " + _("Set I2P session name to (default: Gostcoin-client)") + "\n" + + " -samhost= " + _("Set host where SAM bridge is listening (default: 127.0.0.1)") + "\n" + + " -samport= " + _("Set port number where SAM bridge is listening (default: 7656)") + "\n" + + " -mydestination= " + _("Your full destination (public+private keys) (if it is not specified, the client will geneterate a random destination for you)") + "\n"; return strUsage; diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 52d8d5f..f29fd8d 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -76,8 +76,8 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) : restoreWindowGeometry(); setWindowTitle(tr("Gostcoin") + " - " + tr("Wallet")); #ifndef Q_OS_MAC - QApplication::setWindowIcon(QIcon(":icons/bitcoin")); - setWindowIcon(QIcon(":icons/bitcoin")); + QApplication::setWindowIcon(QIcon(":icons/gostcoin")); + setWindowIcon(QIcon(":icons/gostcoin")); #else setUnifiedTitleAndToolBarOnMac(true); QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); @@ -221,16 +221,16 @@ void BitcoinGUI::createActions() quitAction->setStatusTip(tr("Quit application")); quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); quitAction->setMenuRole(QAction::QuitRole); - aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Gostcoin"), this); + aboutAction = new QAction(QIcon(":/icons/gostcoin"), tr("&About Gostcoin"), this); aboutAction->setStatusTip(tr("Show information about Gostcoin")); aboutAction->setMenuRole(QAction::AboutRole); - aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this); + aboutQtAction = new QAction(QIcon(":/icons/qtlogo"), tr("About &Qt"), this); aboutQtAction->setStatusTip(tr("Show information about Qt")); aboutQtAction->setMenuRole(QAction::AboutQtRole); optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); optionsAction->setStatusTip(tr("Modify configuration options for Gostcoin")); optionsAction->setMenuRole(QAction::PreferencesRole); - toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Show / Hide"), this); + toggleHideAction = new QAction(QIcon(":/icons/gostcoin"), tr("&Show / Hide"), this); toggleHideAction->setStatusTip(tr("Show or hide the main Window")); encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this); diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index ffb64e4..dc9e9cd 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -49,7 +49,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Execute command when the best block changes (%s in cmd is replaced by block " "hash)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Listen for JSON-RPC connections on (default: 9377 or testnet: 19377)"), +"Listen for JSON-RPC connections on (default: 9376 or testnet: 19376)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: " "86400)"), @@ -90,6 +90,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 i QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"), 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", "Allow peers to set bloom filters (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), @@ -104,6 +105,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Creating SAM session..."), QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"), QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"), QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), +QT_TRANSLATE_NOOP("bitcoin-core", "Enable I2P (default: 1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Enable I2P-only mode"), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"), @@ -128,11 +131,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write transaction index"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write undo data"), QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send"), QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using DNS lookup (default: 1 unless -connect)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Generate an I2P destination, print it and exit"), QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), QT_TRANSLATE_NOOP("bitcoin-core", "Gostcoin version"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 288, 0 = all)"), QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-4, default: 3)"), +QT_TRANSLATE_NOOP("bitcoin-core", "I2P Options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file"), QT_TRANSLATE_NOOP("bitcoin-core", "Information"), QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), @@ -147,17 +152,18 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."), QT_TRANSLATE_NOOP("bitcoin-core", "Maintain a full transaction index (default: 0)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most connections to peers (default: 125)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most connections to peers (default: 200)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, *1000 bytes (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, *1000 bytes (default: 1000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Name of an I2P session (default: Gostcoin-client)"), QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."), QT_TRANSLATE_NOOP("bitcoin-core", "Only accept block chain matching built-in checkpoints (default: 1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network (IPv4, IPv6 or Tor)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network (IPv4, IPv6 or I2P)"), QT_TRANSLATE_NOOP("bitcoin-core", "Options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Output extra debugging information. Implies all other -debug* options"), QT_TRANSLATE_NOOP("bitcoin-core", "Output extra network debugging information"), QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"), -QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp"), +QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), @@ -173,9 +179,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to debugger"), QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)"), QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (default: 25)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set host where SAM bridge is listening (default: 127.0.0.1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set I2P session name to (default: Gostcoin-client)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to (default: 100)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: 250000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set port number where SAM bridge is listening (default: 7656)"), 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"), @@ -208,5 +217,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Gostco QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), +QT_TRANSLATE_NOOP("bitcoin-core", "When creating transactions, ignore inputs with value less than this (default: 0.0001)"), QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"), +QT_TRANSLATE_NOOP("bitcoin-core", "Your full destination (public+private keys) (if it is not specified, the client will geneterate a random destination for you)"), }; diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index cb7ba57..72b52eb 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -63,7 +63,7 @@ IBeamCursor - 0.3.666-beta + v0.8.5.10 Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -108,15 +108,16 @@ -This is experimental software. - -Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. - -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com). +<p>This is experimental software.</p> +<p>Distributed under the MIT/X11 software license, see the accompanying file COPYING or <a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a>.</p> +<p>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (<a href="http://www.openssl.org/">http://www.openssl.org/</a>) and cryptographic software written by Eric Young (eay@cryptsoft.com).</p> true + + Qt::RichText + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/src/qt/gostcoin.qrc b/src/qt/gostcoin.qrc index 2b5262a..2ff48aa 100644 --- a/src/qt/gostcoin.qrc +++ b/src/qt/gostcoin.qrc @@ -1,6 +1,7 @@ - res/icons/gostcoin.png + res/icons/gostcoin.png + res/icons/qtlogo.png res/icons/address-book.png res/icons/quit.png res/icons/send.png diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index af8c38c..077773d 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -16,17 +16,13 @@ -This is experimental software. - -Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. - -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard. +<p>This is experimental software.</p> +<p>Distributed under the MIT/X11 software license, see the accompanying file COPYING or <a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a>.</p> +<p>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (<a href="http://www.openssl.org/">http://www.openssl.org/</a>) and cryptographic software written by Eric Young (eay@cryptsoft.com).</p> -Это экспериментальная программа. - -Распространяется на правах лицензии MIT/X11, см. файл COPYING или http://www.opensource.org/licenses/mit-license.php. - -Этот продукт включает ПО, разработанное OpenSSL Project для использования в OpenSSL Toolkit (http://www.openssl.org/) и криптографическое ПО, написанное Eric Young (eay@cryptsoft.com) и ПО для работы с UPnP, написанное Thomas Bernard. +<p>Это экспериментальная программа.</p> +<p>Распространяется на правах лицензии MIT/X11, см. файл COPYING или <a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a>.</p> +<p>Этот продукт включает ПО, разработанное OpenSSL Project для использования в OpenSSL Toolkit (<a href="http://www.openssl.org/">http://www.openssl.org/</a>) и криптографическое ПО, написанное Eric Young (eay@cryptsoft.com).</p> @@ -1445,6 +1441,57 @@ Address: %4 + + + ShowI2PAddresses + + + Dialog + Диалог + + + + If you want to use a permanent I2P-address you have to set a 'mydestination' option in the configuration file: + Если вы хотите использовать постоянный I2P адрес, добавьте параметр 'mydestination' в конфигурационный файл: + + + + Ready to save parameter (If you want to use this address save this text in the configuration file and keep it secret): + Сохраните этот параметр (если вы хотите использовать данный адрес, сохраните этот текст в конфигурационный файл и держите его в сектрете): + + + + Address (you can publish it): + Адрес (вы можете публиковать его): + + + + Short base32-address: + Короткий base32 адрес: + + + + Copy "mydestination" parameter +to the clipboard + Скопировать параметр "mydestination" +в буфер обмена + + + + Copy public address +to the clipboard + Скопировать публичный адрес +в буфер обмена + + + + Copy b32-address +to the clipboard + Скопировать b32 адрес +в буфер обмена + + + OverviewPage @@ -2856,8 +2903,8 @@ rpcpassword=%s - Listen for JSON-RPC connections on <port> (default: 9332 or testnet: 19332) - Прослушивать подключения JSON-RPC на <порту> (по умолчанию: 9332 или для testnet: 19332) + Listen for JSON-RPC connections on <port> (default: 9376 or testnet: 19376) + Прослушивать подключения JSON-RPC на <порту> (по умолчанию: 9376 или для testnet: 19376) @@ -2943,6 +2990,11 @@ If the file does not exist, create it with owner-readable-only file permissions. Allow JSON-RPC connections from specified IP address Разрешить подключения JSON-RPC с указанного IP + + + Allow peers to set bloom filters (default: 1) + Разрешить пирам устанавливать bloom-фильтры (по умолчанию: 1) + Attempt to recover private keys from a corrupt wallet.dat @@ -3013,6 +3065,16 @@ If the file does not exist, create it with owner-readable-only file permissions. Done loading Загрузка завершена + + + Enable I2P (default: 1) + Включить работу в I2P (по умолчанию: 1) + + + + Enable I2P-only mode + Включить режим работы "только в I2P" + Error initializing block database @@ -3133,6 +3195,11 @@ If the file does not exist, create it with owner-readable-only file permissions. Find peers using DNS lookup (default: 1 unless -connect) Искать узлы с помощью DNS (по умолчанию: 1, если не указан -connect) + + + Generate an I2P destination, print it and exit + Сгенерировать I2P адрес, напечатать его и выйти + Generate coins (default: 0) @@ -3158,6 +3225,11 @@ If the file does not exist, create it with owner-readable-only file permissions. How thorough the block verification is (0-4, default: 3) Насколько тщательно проверять блок (0-4, по умолчанию: 3) + + + I2P Options: + Настройки I2P: + Imports blocks from external blk000??.dat file @@ -3205,8 +3277,8 @@ If the file does not exist, create it with owner-readable-only file permissions. - Listen for connections on <port> (default: 9333 or testnet: 19333) - Принимать входящие подключения на <port> (по умолчанию: 9333 или 19333 в тестовой сети) + Listen for connections on <port> (default: 9377 or testnet: 19377) + Принимать входящие подключения на <port> (по умолчанию: 9377 или 19377 в тестовой сети) @@ -3230,8 +3302,8 @@ If the file does not exist, create it with owner-readable-only file permissions. - Maintain at most <n> connections to peers (default: 125) - Поддерживать не более <n> подключений к узлам (по умолчанию: 125) + Maintain at most <n> connections to peers (default: 200) + Поддерживать не более <n> подключений к узлам (по умолчанию: 200) @@ -3243,6 +3315,11 @@ If the file does not exist, create it with owner-readable-only file permissions. Maximum per-connection send buffer, <n>*1000 bytes (default: 1000) Максимальный размер буфера отправки на соединение, <n>*1000 байт (по умолчанию: 1000) + + + Name of an I2P session (default: Gostcoin-client) + Имя I2P сессии (по умолчанию: Gostcoin-client) + Not enough file descriptors available. @@ -3255,8 +3332,8 @@ If the file does not exist, create it with owner-readable-only file permissions. - Only connect to nodes in network <net> (IPv4, IPv6 or Tor) - Подключаться только к узлам из сети <net> (IPv4, IPv6 или Tor) + Only connect to nodes in network <net> (IPv4, IPv6 or I2P) + Подключаться только к узлам из сети <net> (IPv4, IPv6 или I2P) @@ -3280,8 +3357,8 @@ If the file does not exist, create it with owner-readable-only file permissions. - Prepend debug output with timestamp - Дописывать отметки времени к отладочному выводу + Prepend debug output with timestamp (default: 1) + Дописывать отметки времени к отладочному выводу (по умолчанию: 1) @@ -3358,6 +3435,16 @@ If the file does not exist, create it with owner-readable-only file permissions. Set database cache size in megabytes (default: 25) Установить размер кэша базы данных в мегабайтах (по умолчанию: 25) + + + Set host where SAM bridge is listening (default: 127.0.0.1) + Указать адрес, на котором слушает SAM мост (по умолчанию: 127.0.0.1) + + + + Set I2P session name to <name> (default: Gostcoin-client) + Установить имя I2P сессии на <name> (по умолчанию: Gostcoin-client) + Set key pool size to <n> (default: 100) @@ -3373,6 +3460,11 @@ If the file does not exist, create it with owner-readable-only file permissions. Set minimum block size in bytes (default: 0) Минимальный размер блока в байтах (по умолчанию: 0) + + + Set port number where SAM bridge is listening (default: 7656) + Указать порт, на котором слушает SAM мост (по умолчанию: 7656) + Set the number of threads to service RPC calls (default: 4) @@ -3533,10 +3625,20 @@ If the file does not exist, create it with owner-readable-only file permissions. Warning: This version is obsolete, upgrade required! Внимание: эта версия устарела, требуется обновление! + + + When creating transactions, ignore inputs with value less than this (default: 0.0001) + Когда создается транзакция, игнорировать ввод с значением ниже указанного (по умолчанию: 0.0001) + You need to rebuild the databases using -reindex to change -txindex Вам необходимо пересобрать базы данных с помощью -reindex, чтобы изменить -txindex + + + Your full destination (public+private keys) (if it is not specified, the client will geneterate a random destination for you) + Ваш полный ключ I2P назначения (публичный+приватный ключи) (если данный параметр не указан, то будут сгенерированы случайные ключи) + diff --git a/src/qt/res/icons/qtlogo.png b/src/qt/res/icons/qtlogo.png new file mode 100644 index 0000000..4cb69e6 Binary files /dev/null and b/src/qt/res/icons/qtlogo.png differ