hush
/
hush3
9
0
Fork 11
Code Issues 143 Pull Requests 2 Projects Releases 16 Wiki Activity
Browse Source

qt: small English language updates from translators 

More friendly language, use placeholders where possible
pull/145/head
Wladimir J. van der Laan 10 years ago
parent
c313d6ecb9
commit
9acbb4180a
No known key found for this signature in database GPG Key ID: 74810B012346C9A6
5 changed files with 35 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/init.cpp
  2. 2
      src/qt/bitcoingui.cpp
  3. 4
      src/qt/bitcoinstrings.cpp
  4. 4
      src/qt/intro.cpp
  5. 49
      src/qt/locale/bitcoin_en.ts

2
src/init.cpp
View File

@ -276,7 +276,7 @@ std::string HelpMessage(HelpMessageMode mode)
#endif
#endif
strUsage += " -whitebind=<addr> " + _("Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6") + "\n";
strUsage += " -whitelist=<netmask> " + _("Whitelist peers connecting from the given netmask or ip. Can be specified multiple times.") + "\n";
strUsage += " -whitelist=<netmask> " + _("Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.") + "\n";
strUsage += " " + _("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") + "\n";
#ifdef ENABLE_WALLET

2
src/qt/bitcoingui.cpp
View File

@ -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)

4
src/qt/bitcoinstrings.cpp
View File

@ -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"),

4
src/qt/intro.cpp
View File

@ -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("");

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

@ -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 &quot;Bitcoin Alert&quot; 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 &quot;Bitcoin Alert&quot; 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>

Write Preview
Loading…
Cancel
Save