GOSTSec/gostcoin
1
0
Fork 0
mirror of https://github.com/GOSTSec/gostcoin synced 2025-03-12 13:21:21 +00:00
Code Issues Releases Wiki Activity

update russian translation, some ui fixes

Browse Source
This commit is contained in:
R4SAS 2017-10-30 13:32:04 +03:00
parent 1b6dbf1302
commit 9b6a26e738
19 changed files with 1456 additions and 855 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/i2p.cpp
View File

@ -95,7 +95,7 @@ bool StreamSessionAdapter::StartSession (
const std::string& minVer /*= SAM_DEFAULT_MIN_VER*/,
const std::string& maxVer /*= SAM_DEFAULT_MAX_VER*/)
{
std::cout << "Creating SAM session ..." << std::endl;
std::cout << "Creating SAM session..." << std::endl;
auto s = std::make_shared<SAM::StreamSession>(nickname, SAMHost, SAMPort, myDestination, i2pOptions, minVer, maxVer);
sessionHolder_ = std::make_shared<SessionHolder>(s);
bool isReady = s->isReady ();
@ -108,7 +108,7 @@ bool StreamSessionAdapter::StartSession (
void StreamSessionAdapter::StopSession ()
{
std::cout << "Terminating SAM session ..." << std::endl;
std::cout << "Terminating SAM session..." << std::endl;
sessionHolder_ = nullptr;
std::cout << "SAM session terminated" << std::endl;
}

2
src/init.cpp
View File

@ -551,7 +551,7 @@ bool AppInit2(boost::thread_group& threadGroup)
#endif
#endif
// if (GetBoolArg("-i2p", false))
// if (GetBoolArg("-i2p", true))
// {
uiInterface.InitMessage(_("Creating SAM session..."));
if (!I2PSession::Instance ().Start () && IsI2POnly())

34
src/qt/aboutdialog.cpp
View File

@ -4,36 +4,36 @@
#include "clientmodel.h"
#include "clientversion.h"
// Copyright year (2009-this)
// Todo: update this when changing our copyright comments in the source
const int ABOUTDIALOG_COPYRIGHT_YEAR = 2017;
AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::AboutDialog)
QDialog(parent),
ui(new Ui::AboutDialog)
{
ui->setupUi(this);
ui->setupUi(this);
// Set current copyright year
ui->copyrightLabel->setText(tr("Copyright") + QString(" &copy; 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin developers") + QString("<br>") + tr("Copyright") + QString(" &copy; ") + tr("2011-%1 The Litecoin developers").arg(ABOUTDIALOG_COPYRIGHT_YEAR) + QString("<br>") + tr("Copyright") + QString(" &copy; ") + tr("2013-%1 The Anoncoin developers").arg(ABOUTDIALOG_COPYRIGHT_YEAR) +
QString("<br>") + tr("Copyright") + QString(" &copy; ") + tr("2015-%1 The i2pd developers").arg(ABOUTDIALOG_COPYRIGHT_YEAR) +
QString("<br>") + tr("Copyright") + QString(" &copy; ") + tr("%1 The Gostcoin developers").arg(ABOUTDIALOG_COPYRIGHT_YEAR));
// Set current copyright year
ui->copyrightLabel->setText(
tr("Copyright") + QString(" &copy; 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin developers") + QString("<br>") +
tr("Copyright") + QString(" &copy; 2011-%1 ").arg(COPYRIGHT_YEAR) + tr("The Litecoin developers") + QString("<br>") +
tr("Copyright") + QString(" &copy; 2013-%1 ").arg(COPYRIGHT_YEAR) + tr("The Anoncoin developers") + QString("<br>") +
tr("Copyright") + QString(" &copy; 2015-%1 ").arg(COPYRIGHT_YEAR) + tr("The i2pd developers") + QString("<br>") +
tr("Copyright") + QString(" &copy; %1 ").arg(COPYRIGHT_YEAR) + tr("The Gostcoin developers")
);
}
void AboutDialog::setModel(ClientModel *model)
{
if(model)
{
ui->versionLabel->setText(model->formatFullVersion());
}
if(model)
{
ui->versionLabel->setText(model->formatFullVersion());
}
}
AboutDialog::~AboutDialog()
{
delete ui;
delete ui;
}
void AboutDialog::on_buttonBox_accepted()
{
close();
close();
}

10
src/qt/bitcoingui.cpp
View File

@ -560,11 +560,11 @@ void BitcoinGUI::setNumI2PConnections(int count)
QString i2pIcon;
switch(count)
{
case 0: i2pIcon = ":/icons/bwi2pconnect_0"; break;
case 1: case 2: /*case 3:*/ i2pIcon = ":/icons/bwi2pconnect_1"; break;
/*case 2:*/ case 4: case 5: i2pIcon = ":/icons/bwi2pconnect_2"; break;
case 7: i2pIcon = ":/icons/bwi2pconnect_3"; break;
default: i2pIcon = ":/icons/bwi2pconnect_4"; break;
case 0: i2pIcon = ":/icons/connect_0"; break;
case 1: case 2: i2pIcon = ":/icons/connect_1"; break;
case 3: case 4: i2pIcon = ":/icons/connect_2"; break;
case 5: case 6: i2pIcon = ":/icons/connect_3"; break;
default: i2pIcon = ":/icons/connect_4"; break;
}
labelI2PConnections->setPixmap(QPixmap(i2pIcon));
labelI2PConnections->setToolTip(tr("%n active connection(s) to I2P-Gostcoin network", "", count));

14
src/qt/bitcoinstrings.cpp
View File

@ -91,7 +91,6 @@ 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", "Gostcoin 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'"),
@ -101,6 +100,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect through socks proxy"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"),
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"),
@ -113,8 +113,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires new
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!"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet locked, unable to create transaction!"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: system error: "),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet locked, unable to create transaction!"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to read block info"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to read block"),
@ -130,13 +130,13 @@ 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 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", "Imports blocks from external blk000??.dat file"),
QT_TRANSLATE_NOOP("bitcoin-core", "Information"),
QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"),
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -tor address: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -minrelaytxfee=<amount>: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -mintxfee=<amount>: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'"),
@ -162,7 +162,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000
QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"),
QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"),
QT_TRANSLATE_NOOP("bitcoin-core", "SSL options: (see the Gostcoin Wiki for SSL setup instructions)"),
QT_TRANSLATE_NOOP("bitcoin-core", "SAM session created"),
QT_TRANSLATE_NOOP("bitcoin-core", "SAM session failed"),
QT_TRANSLATE_NOOP("bitcoin-core", "SAM session terminated"),
QT_TRANSLATE_NOOP("bitcoin-core", "Select the version of socks proxy to use (4-5, default: 5)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Send command to -server or gostcoind"),
QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)"),
@ -182,7 +184,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (d
QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: gostcoind.pid)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"),
QT_TRANSLATE_NOOP("bitcoin-core", "SSL options: (see the Gostcoin Wiki for SSL setup instructions)"),
QT_TRANSLATE_NOOP("bitcoin-core", "System error: "),
QT_TRANSLATE_NOOP("bitcoin-core", "Terminating SAM session..."),
QT_TRANSLATE_NOOP("bitcoin-core", "This help message"),
QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)"),
QT_TRANSLATE_NOOP("bitcoin-core", "To use the %s option"),
@ -201,8 +205,8 @@ 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 Gostcoin to complete"),
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", "You need to rebuild the database using -reindex to change -txindex"),
QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"),
};

17
src/qt/coincontroldialog.cpp
View File

@ -395,13 +395,14 @@ QString CoinControlDialog::getPriorityLabel(double dPriority)
if (CTransaction::AllowFree(dPriority / 10000)) return tr("highest");
else if (CTransaction::AllowFree(dPriority / 1000)) return tr("high");
else if (CTransaction::AllowFree(dPriority / 100)) return tr("medium-high");
else return tr("medium");
else return tr("medium");
}
else
{
if (CTransaction::AllowFree(dPriority * 100)) return tr("low-medium");
else if (CTransaction::AllowFree(dPriority * 10000)) return tr("low");
else return tr("lowest");
else if (CTransaction::AllowFree(dPriority * 1000)) return tr("low");
else if (CTransaction::AllowFree(dPriority * 10000)) return tr("lower");
else return tr("lowest");
}
}
@ -413,7 +414,7 @@ void CoinControlDialog::updateLabelLocked()
if (vOutpts.size() > 0)
{
ui->labelLocked->setText(tr("(%1 locked)").arg(vOutpts.size()));
ui->labelLocked->setVisible(true);
ui->labelLocked->setVisible(true);
}
else ui->labelLocked->setVisible(false);
}
@ -600,10 +601,10 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
l8->setStyleSheet((nChange > 0 && nChange < CENT) ? "color:red;" : ""); // Change < 0.01BTC
// tool tips
l5->setToolTip(tr("This label turns red, if the transaction size is bigger than 10000 bytes.\n\n This means a fee of at least %1 per kb is required.\n\n Can vary +/- 1 Byte per input.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
l6->setToolTip(tr("Transactions with higher priority get more likely into a block.\n\nThis label turns red, if the priority is smaller than \"medium\".\n\n This means a fee of at least %1 per kb is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
l7->setToolTip(tr("This label turns red, if any recipient receives an amount smaller than %1.\n\n This means a fee of at least %2 is required. \n\n Amounts below 0.546 times the minimum relay fee are shown as DUST.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CENT)).arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
l8->setToolTip(tr("This label turns red, if the change is smaller than %1.\n\n This means a fee of at least %2 is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CENT)).arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
l5->setToolTip(tr("This label turns red, if the transaction size is bigger than 10000 bytes.\n\nThis means a fee of at least %1 per kb is required.\n\nCan vary +/- 1 Byte per input.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
l6->setToolTip(tr("Transactions with higher priority get more likely into a block.\n\nThis label turns red, if the priority is smaller than \"medium\".\n\nThis means a fee of at least %1 per kb is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
l7->setToolTip(tr("This label turns red, if any recipient receives an amount smaller than %1.\n\nThis means a fee of at least %2 is required. \n\nAmounts below 0.546 times the minimum relay fee are shown as DUST.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CENT)).arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
l8->setToolTip(tr("This label turns red, if the change is smaller than %1.\n\nThis means a fee of at least %2 is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CENT)).arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
dialog->findChild<QLabel *>("labelCoinControlBytesText") ->setToolTip(l5->toolTip());
dialog->findChild<QLabel *>("labelCoinControlPriorityText") ->setToolTip(l6->toolTip());
dialog->findChild<QLabel *>("labelCoinControlLowOutputText")->setToolTip(l7->toolTip());

12
src/qt/forms/coincontroldialog.ui
View File

@ -141,7 +141,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -221,7 +221,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -307,7 +307,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -345,7 +345,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -428,7 +428,7 @@
<item>
<widget class="QLabel" name="labelLocked">
<property name="text">
<string>(1 locked)</string>
<string>(%1 locked)</string>
</property>
</widget>
</item>
@ -478,7 +478,7 @@
</column>
<column>
<property name="text">
<string notr="true">Label</string>
<string>Label</string>
</property>
</column>
<column>

10
src/qt/forms/optionsdialog.ui
View File

@ -281,7 +281,7 @@
<item>
<widget class="QCheckBox" name="silentMode">
<property name="toolTip">
<string>Suppress notifications and tray animations</string>
<string>Suppress notifications and tray animations.</string>
</property>
<property name="text">
<string>Silent mode</string>
@ -442,7 +442,7 @@
</sizepolicy>
</property>
<property name="text">
<string>127.0.0.1</string>
<string notr="true">127.0.0.1</string>
</property>
</widget>
</item>
@ -488,7 +488,7 @@
</size>
</property>
<property name="text">
<string>Gostcoin-client</string>
<string notr="true">Gostcoin-client</string>
</property>
</widget>
</item>
@ -509,7 +509,7 @@
<item>
<widget class="QLabel" name="labelInboundQuantity">
<property name="text">
<string>quantity </string>
<string>quantity</string>
</property>
</widget>
</item>
@ -533,7 +533,7 @@
<item>
<widget class="QLabel" name="labelInboundLength">
<property name="text">
<string>length </string>
<string>length</string>
</property>
</widget>
</item>

6
src/qt/forms/overviewpage.ui
View File

@ -122,7 +122,7 @@
<string>Your current balance</string>
</property>
<property name="text">
<string notr="true">0 LTC</string>
<string notr="true">0 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -151,7 +151,7 @@
<string>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</string>
</property>
<property name="text">
<string notr="true">0 LTC</string>
<string notr="true">0 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -177,7 +177,7 @@
<string>Mined balance that has not yet matured</string>
</property>
<property name="text">
<string notr="true">0 LTC</string>
<string notr="true">0 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>

15
src/qt/forms/sendcoinsdialog.ui
View File

@ -321,7 +321,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -407,7 +407,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -493,7 +493,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -525,7 +525,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -555,8 +555,11 @@
</property>
<item>
<widget class="QCheckBox" name="checkBoxCoinControlChange">
<property name="toolTip">
<string>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</string>
</property>
<property name="text">
<string>custom change address</string>
<string>Custom change address</string>
</property>
</widget>
</item>
@ -720,7 +723,7 @@
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string>123.456 LTC</string>
<string notr="true">123.456 GST</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>

6
src/qt/forms/sendcoinsentry.ui
View File

@ -73,7 +73,7 @@
<item>
<widget class="QValidatedLineEdit" name="payTo">
<property name="toolTip">
<string>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
<string>The address to send the payment to (e.g. GbD2JSQHBHCKLa9WTHmigJRpyFgmBj4woG)</string>
</property>
<property name="maxLength">
<number>34</number>
@ -93,7 +93,7 @@
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property>
<property name="shortcut">
<string>Alt+A</string>
<string notr="true">Alt+A</string>
</property>
</widget>
</item>
@ -110,7 +110,7 @@
<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
</property>
<property name="shortcut">
<string>Alt+P</string>
<string notr="true">Alt+P</string>
</property>
</widget>
</item>

6
src/qt/forms/signverifymessagedialog.ui
View File

@ -68,7 +68,7 @@
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property>
<property name="shortcut">
<string>Alt+A</string>
<string notr="true">Alt+A</string>
</property>
<property name="autoDefault">
<bool>false</bool>
@ -88,7 +88,7 @@
<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
</property>
<property name="shortcut">
<string>Alt+P</string>
<string notr="true">Alt+P</string>
</property>
<property name="autoDefault">
<bool>false</bool>
@ -281,7 +281,7 @@
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property>
<property name="shortcut">
<string>Alt+A</string>
<string notr="true">Alt+A</string>
</property>
<property name="autoDefault">
<bool>false</bool>

4
src/qt/locale/bitcoin_en.ts
View File

@ -932,8 +932,8 @@ Address: %4
</message>
<message>
<location line="+7"/>
<source>Suppress notifications and tray animations</source>
<translation>Suppress notifications and tray animations</translation>
<source>Suppress notifications and tray animations.</source>
<translation>Suppress notifications and tray animations.</translation>
</message>
<message>
<location line="+3"/>

2143
src/qt/locale/bitcoin_ru.ts
View File

File diff suppressed because it is too large Load Diff

4
src/qt/optionsdialog.cpp
View File

@ -300,7 +300,7 @@ void OptionsDialog::ShowCurrentI2PAddress()
const QString b32 = this->model->getB32Address(pub);
const QString configFile = QString::fromStdString(GetConfigFile().string());
ShowI2PAddresses i2pCurrDialog("Your current I2P-address", pub, priv, b32, configFile, this);
ShowI2PAddresses i2pCurrDialog(tr("Your current I2P-address"), pub, priv, b32, configFile, this);
i2pCurrDialog.exec();
}
}
@ -314,7 +314,7 @@ void OptionsDialog::GenerateNewI2PAddress()
const QString b32 = this->model->getB32Address(pub);
const QString configFile = QString::fromStdString(GetConfigFile().string());
ShowI2PAddresses i2pCurrDialog("Generated I2P address", pub, priv, b32, configFile, this);
ShowI2PAddresses i2pCurrDialog(tr("Generated I2P address"), pub, priv, b32, configFile, this);
i2pCurrDialog.exec();
}
}

2
src/qt/paymentserver.cpp
View File

@ -95,7 +95,7 @@ bool PaymentServer::ipcSendCommandLine()
PaymentServer::PaymentServer(QApplication* parent) : QObject(parent), saveURIs(true)
{
// Install global event filter to catch QFileOpenEvents on the mac (sent when you click bitcoin: links)
// Install global event filter to catch QFileOpenEvents on the mac (sent when you click gostcoin: links)
parent->installEventFilter(this);
QString name = ipcServerName();

2
src/qt/sendcoinsdialog.cpp
View File

@ -490,7 +490,7 @@ void SendCoinsDialog::coinControlChangeEdited(const QString & text)
{
CPubKey pubkey;
CKeyID keyid;
CBitcoinAddress(text.toStdString()).GetKeyID(keyid);
CBitcoinAddress(text.toStdString()).GetKeyID(keyid);
if (model->getPubKey(keyid, pubkey))
ui->labelCoinControlChangeLabel->setText(tr("(no label)"));
else

16
src/qt/splashscreen.cpp
View File

@ -16,19 +16,19 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) :
int line2 = 13;
int line3 = 26;
int line4 = 39;
int line5 = 52;
int line6 = 65;
int line5 = 52;
int line6 = 65;
float fontFactor = 1.0;
// define text to place
QString titleText = QString(QApplication::applicationName()).replace(QString("-testnet"), QString(""), Qt::CaseSensitive); // cut of testnet, place it as single object further down
QString versionText = QString("Version %1 ").arg(QString::fromStdString(FormatFullVersion()));
QString versionText = QString(tr("Version %1")).arg(QString::fromStdString(FormatFullVersion()));
QString copyrightText1 = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin developers"));
QString copyrightText2 = QChar(0xA9)+QString(" 2011-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Litecoin developers"));
QString copyrightText3 = QChar(0xA9)+QString(" 2013-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Anoncoin developers"));
QString copyrightText4 = QChar(0xA9)+QString(" 2015-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The i2pd developers"));
QString copyrightText5 = QChar(0xA9)+QString(" %1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Gostcoin developers"));
QString copyrightText4 = QChar(0xA9)+QString(" 2015-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The i2pd developers"));
QString copyrightText5 = QChar(0xA9)+QString(" %1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Gostcoin developers"));
QString font = "Arial";
@ -42,13 +42,13 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) :
}
QPainter pixPaint(&newPixmap);
pixPaint.setPen(QColor(70,70,70));
pixPaint.setPen(QColor(32,33,79));
pixPaint.setFont(QFont(font, 9*fontFactor));
pixPaint.setFont(QFont(font, 10*fontFactor));
pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line6,versionText);
// draw copyright stuff
pixPaint.setFont(QFont(font, 9*fontFactor));
pixPaint.setFont(QFont(font, 10*fontFactor));
pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line1,copyrightText1);
pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line2,copyrightText2);
pixPaint.drawText(paddingLeftCol2,paddingTopCol2+line3,copyrightText3);

4
src/qt/transactiontablemodel.cpp
View File

@ -285,13 +285,13 @@ QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) cons
status = tr("Open until %1").arg(GUIUtil::dateTimeStr(wtx->status.open_for));
break;
case TransactionStatus::Offline:
status = tr("Offline (%1 confirmations)").arg(wtx->status.depth);
status = tr("Offline (%n confirmations)","",wtx->status.depth);
break;
case TransactionStatus::Unconfirmed:
status = tr("Unconfirmed (%1 of %2 confirmations)").arg(wtx->status.depth).arg(TransactionRecord::NumConfirmations);
break;
case TransactionStatus::HaveConfirmations:
status = tr("Confirmed (%1 confirmations)").arg(wtx->status.depth);
status = tr("Confirmed (%n confirmations)","",wtx->status.depth);
break;
}
if(wtx->type == TransactionRecord::Generated)