diff options
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 2 | ||||
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 4 | ||||
| -rw-r--r-- | src/qt/intro.cpp | 4 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 49 |
4 files changed, 34 insertions, 25 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 9d6d07a56b..f0471c32f9 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -665,7 +665,7 @@ void BitcoinGUI::setNumBlocks(int count) QDateTime currentDate = QDateTime::currentDateTime(); int secs = lastBlockDate.secsTo(currentDate); - tooltip = tr("Processed %1 blocks of transaction history.").arg(count); + tooltip = tr("Processed %n blocks of transaction history.", "", count); // Set icon state: spinning if catching up, tick otherwise if(secs < 90*60) diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index e397857faa..1073b6a472 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -150,8 +150,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect " "you should restore from a backup."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Whitelist peers connecting from the given netmask or ip. Can be specified " -"multiple times."), +"Whitelist peers connecting from the given netmask or IP address. Can be " +"specified multiple times."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Whitelisted peers cannot be DoS banned and their transactions are always " "relayed, even if they are already in the mempool, useful e.g. for a gateway"), diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index d469c9a0bd..7618bff69d 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -215,10 +215,10 @@ void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable { ui->freeSpace->setText(""); } else { - QString freeString = QString::number(bytesAvailable/GB_BYTES) + tr("GB of free space available"); + QString freeString = tr("%n GB of free space available", "", bytesAvailable/GB_BYTES); if(bytesAvailable < BLOCK_CHAIN_SIZE) { - freeString += " " + tr("(of %1GB needed)").arg(BLOCK_CHAIN_SIZE/GB_BYTES); + freeString += " " + tr("(of %n GB needed)", "", BLOCK_CHAIN_SIZE/GB_BYTES); ui->freeSpace->setStyleSheet("QLabel { color: #800000 }"); } else { ui->freeSpace->setStyleSheet(""); diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index f16af5f201..df285441e1 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -549,13 +549,8 @@ <source>No block source available...</source> <translation>No block source available...</translation> </message> - <message> - <location line="+10"/> - <source>Processed %1 blocks of transaction history.</source> - <translation>Processed %1 blocks of transaction history.</translation> - </message> <message numerus="yes"> - <location line="+26"/> + <location line="+36"/> <source>%n hour(s)</source> <translation> <numerusform>%n hour</numerusform> @@ -627,8 +622,16 @@ <source>Up to date</source> <translation>Up to date</translation> </message> + <message numerus="yes"> + <location line="-5"/> + <source>Processed %n blocks of transaction history.</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> <message> - <location line="+44"/> + <location line="+49"/> <source>Catching up...</source> <translation>Catching up...</translation> </message> @@ -1163,15 +1166,21 @@ Address: %4 <source>Error</source> <translation>Error</translation> </message> - <message> + <message numerus="yes"> <location line="+9"/> - <source>GB of free space available</source> - <translation>GB of free space available</translation> + <source>%n GB of free space available</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> - <message> + <message numerus="yes"> <location line="+3"/> - <source>(of %1GB needed)</source> - <translation>(of %1GB needed)</translation> + <source>(of %n GB needed)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> </context> <context> @@ -3600,7 +3609,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</translation> </message> <message> - <location line="+11"/> + <location line="+4"/> + <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> <source>(default: 1)</source> <translation type="unfinished"></translation> </message> @@ -3870,12 +3884,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+16"/> - <source>Whitelist peers connecting from the given netmask or ip. Can be specified multiple times.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="+19"/> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation type="unfinished"></translation> </message> |