From 4627e6bee2aa0a72b0aa7dc8f456242df56320dc Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Thu, 10 Jul 2014 21:40:23 +0400 Subject: [PATCH] Translation fixes --- src/init.cpp | 5 +++-- src/qt/locale/bitcoin_en.ts | 33 ++++++++++++++++++++++----------- src/qt/locale/bitcoin_ru.ts | 33 ++++++++++++++++++++++----------- src/rpcblockchain.cpp | 4 ++-- src/rpcwallet.cpp | 4 ++-- 5 files changed, 51 insertions(+), 28 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 36c4a3a..6243f40 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -11,6 +11,7 @@ #include "ui_interface.h" #include "checkpoints.h" #include "zerocoin/ZeroTest.h" +#include #include #include #include @@ -234,7 +235,7 @@ std::string HelpMessage() " -conf= " + _("Specify configuration file (default: novacoin.conf)") + "\n" + " -pid= " + _("Specify pid file (default: novacoind.pid)") + "\n" + " -datadir= " + _("Specify data directory") + "\n" + - " -wallet= " + _("Specify wallet file (within data directory)") + "\n" + + " -wallet= " + _("Specify wallet file (within data directory)") + "\n" + " -dbcache= " + _("Set database cache size in megabytes (default: 25)") + "\n" + " -dblogsize= " + _("Set database disk log size in megabytes (default: 100)") + "\n" + " -timeout= " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n" + @@ -268,7 +269,7 @@ std::string HelpMessage() #endif " -detachdb " + _("Detach block and address databases. Increases shutdown time (default: 0)") + "\n" + " -paytxfee= " + _("Fee per KB to add to transactions you send") + "\n" + - " -mininput= " + _("When creating transactions, ignore inputs with value less than this (default: 0.01)") + "\n" + + " -mininput= " + str(boost::format(_("When creating transactions, ignore inputs with value less than this (default: %s)")) % FormatMoney(MIN_TXOUT_AMOUNT)) + "\n" + #ifdef QT_GUI " -server " + _("Accept command line and JSON-RPC commands") + "\n" + #endif diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 620dd19..e7f562d 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -2589,7 +2589,7 @@ This label turns red, if the priority is smaller than "medium". Specify wallet file (within data directory) - Specify wallet file (within data directory) + Specify wallet file (within data directory) @@ -2688,8 +2688,12 @@ This label turns red, if the priority is smaller than "medium". - Find peers using DNS lookup (default: 0) - Find peers using DNS lookup (default: 1) {0)?} + Find peers using DNS lookup (default: 1) + Find peers using DNS lookup (default: 1) + + + Sync checkpoints policy (default: strict) + Sync checkpoints policy (default: strict) @@ -2781,14 +2785,6 @@ This label turns red, if the priority is smaller than "medium". Failed to listen on any port. Use -listen=0 if you want this. - Find peers using DNS lookup (default: 1) - Find peers using DNS lookup (default: 1) - - - Sync checkpoints policy (default: strict) - Sync checkpoints policy (default: strict) - - Invalid -tor address: '%s' Invalid -tor address: '%s' @@ -2949,6 +2945,16 @@ This label turns red, if the priority is smaller than "medium". Upgrade wallet to latest format + + Require a confirmations for change (default: 0) + Require a confirmations for change (default: 0) + + + + Enforce transaction scripts to use canonical PUSH operators (default: 1) + Enforce transaction scripts to use canonical PUSH operators (default: 1) + + Set key pool size to <n> (default: 100) Set key pool size to <n> (default: 100) @@ -3133,6 +3139,11 @@ This label turns red, if the priority is smaller than "medium". Fee per KB to add to transactions you send + + When creating transactions, ignore inputs with value less than this (default: %s) + When creating transactions, ignore inputs with value less than this (default: %s) + + Loading wallet... Loading wallet... diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 0049f98..8cb011a 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -2601,7 +2601,7 @@ This label turns red, if the priority is smaller than "medium". Specify wallet file (within data directory) - Указать файл кошелька (в пределах DATA директории) + Указать файл кошелька (в пределах DATA директории) @@ -2705,8 +2705,12 @@ This label turns red, if the priority is smaller than "medium". - Find peers using DNS lookup (default: 0) - Искать узлы с помощью DNS (по умолчанию: 1) {0)?} + Find peers using DNS lookup (default: 1) + Искать узлы с помощью DNS (по умолчанию: 1) + + + Sync checkpoints policy (default: strict) + Политика синхронизированных меток (по умолчанию: strict) @@ -2793,14 +2797,6 @@ This label turns red, if the priority is smaller than "medium". Не удалось начать прослушивание на порту. Используйте -listen=0 если вас это устраивает. - Find peers using DNS lookup (default: 1) - Искать узлы с помощью DNS (по умолчанию: 1) - - - Sync checkpoints policy (default: strict) - Политика синхронизированных меток (по умолчанию: strict) - - Invalid -tor address: '%s' Неверный адрес -tor: '%s' @@ -2962,6 +2958,16 @@ This label turns red, if the priority is smaller than "medium". Обновить бумажник до последнего формата + + Require a confirmations for change (default: 0) + Требовать подтверждения для сдачи (по умолчанию: 0) + + + + Enforce transaction scripts to use canonical PUSH operators (default: 1) + Требовать от скриптов использования стандартных PUSH операторов (по умолчанию: 1) + + Set key pool size to <n> (default: 100) Установить размер запаса ключей в <n> (по умолчанию: 100) @@ -3146,6 +3152,11 @@ This label turns red, if the priority is smaller than "medium". Комиссия на килобайт, добавляемая к вашим транзакциям + + When creating transactions, ignore inputs with value less than this (default: %s) + При создании транзакций игнорировать входы с суммой ниже указанной (по умолчанию: %s) + + Loading wallet... Загрузка бумажника... diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 3d2aacd..d8860d5 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -185,10 +185,10 @@ Value settxfee(const Array& params, bool fHelp) if (fHelp || params.size() < 1 || params.size() > 1 || AmountFromValue(params[0]) < MIN_TX_FEE) throw runtime_error( "settxfee \n" - " is a real and is rounded to the nearest 0.01"); + " is a real and is rounded to the nearest " + FormatMoney(MIN_TX_FEE)); nTransactionFee = AmountFromValue(params[0]); - nTransactionFee = (nTransactionFee / CENT) * CENT; // round to cent + nTransactionFee = (nTransactionFee / MIN_TX_FEE) * MIN_TX_FEE; // round to minimum fee return true; } diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index f6cd0fe..78066f2 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -288,7 +288,7 @@ Value sendtoaddress(const Array& params, bool fHelp) if (fHelp || params.size() < 2 || params.size() > 4) throw runtime_error( "sendtoaddress [comment] [comment-to]\n" - " is a real and is rounded to the nearest 0.000001" + " is a real and is rounded to the nearest " + FormatMoney(MIN_TXOUT_AMOUNT) + HelpRequiringPassphrase()); CBitcoinAddress address(params[0].get_str()); @@ -654,7 +654,7 @@ Value sendfrom(const Array& params, bool fHelp) if (fHelp || params.size() < 3 || params.size() > 6) throw runtime_error( "sendfrom [minconf=1] [comment] [comment-to]\n" - " is a real and is rounded to the nearest 0.000001" + " is a real and is rounded to the nearest " + FormatMoney(MIN_TXOUT_AMOUNT) + HelpRequiringPassphrase()); string strAccount = AccountFromValue(params[0]); -- 1.7.1