Skip to content

Commit e0dc3d7

Browse files
laanwjlaanwj
committed
Merge #9460: Fix a few typos in translated strings
d45b21e qt: Fill in English numerusforms (Wladimir J. van der Laan) a9d6151 qt,wallet: Fix a few typos in messages (Wladimir J. van der Laan)
2 parents 03e1d6c + d45b21e commit e0dc3d7

File tree

4 files changed

+43
-43
lines changed

4 files changed

+43
-43
lines changed

‎src/qt/bitcoinstrings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
191191
"included in share/rpcuser. This option can be specified multiple times"),
192192
QT_TRANSLATE_NOOP("bitcoin-core", ""
193193
"Wallet will not create transactions that violate mempool chain limits "
194-
"(default: %u"),
194+
"(default: %u)"),
195195
QT_TRANSLATE_NOOP("bitcoin-core", ""
196196
"Warning: Unknown block versions being mined! It's possible unknown rules are "
197197
"in effect"),

‎src/qt/guiutil.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,11 +961,11 @@ QString formateNiceTimeOffset(qint64 secs)
961961
const int YEAR_IN_SECONDS = 31556952; // Average length of year in Gregorian calendar
962962
if(secs < 60)
963963
{
964-
timeBehindText = QObject::tr("%n seconds(s)","",secs);
964+
timeBehindText = QObject::tr("%n second(s)","",secs);
965965
}
966966
else if(secs < 2*HOUR_IN_SECONDS)
967967
{
968-
timeBehindText = QObject::tr("%n minutes(s)","",secs/60);
968+
timeBehindText = QObject::tr("%n minute(s)","",secs/60);
969969
}
970970
else if(secs < 2*DAY_IN_SECONDS)
971971
{

‎src/qt/locale/bitcoin_en.ts

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,17 +1085,17 @@
10851085
<message numerus="yes">
10861086
<location line="+9"/>
10871087
<source>%n GB of free space available</source>
1088-
<translation type="unfinished">
1089-
<numerusform></numerusform>
1090-
<numerusform></numerusform>
1088+
<translation>
1089+
<numerusform>%n GB of free space available</numerusform>
1090+
<numerusform>%n GB of free space available</numerusform>
10911091
</translation>
10921092
</message>
10931093
<message numerus="yes">
10941094
<location line="+3"/>
10951095
<source>(of %n GB needed)</source>
1096-
<translation type="unfinished">
1097-
<numerusform></numerusform>
1098-
<numerusform></numerusform>
1096+
<translation>
1097+
<numerusform>(of %n GB needed)</numerusform>
1098+
<numerusform>(of %n GB needed)</numerusform>
10991099
</translation>
11001100
</message>
11011101
</context>
@@ -1792,18 +1792,18 @@
17921792
</message>
17931793
<message numerus="yes">
17941794
<location line="+18"/>
1795-
<source>%n seconds(s)</source>
1796-
<translation type="unfinished">
1797-
<numerusform></numerusform>
1798-
<numerusform></numerusform>
1795+
<source>%n second(s)</source>
1796+
<translation>
1797+
<numerusform>%n second</numerusform>
1798+
<numerusform>%n seconds</numerusform>
17991799
</translation>
18001800
</message>
18011801
<message numerus="yes">
18021802
<location line="+4"/>
1803-
<source>%n minutes(s)</source>
1804-
<translation type="unfinished">
1805-
<numerusform></numerusform>
1806-
<numerusform></numerusform>
1803+
<source>%n minute(s)</source>
1804+
<translation>
1805+
<numerusform>%n minute</numerusform>
1806+
<numerusform>%n minutes</numerusform>
18071807
</translation>
18081808
</message>
18091809
<message numerus="yes">
@@ -2807,9 +2807,9 @@
28072807
<message numerus="yes">
28082808
<location line="+67"/>
28092809
<source>%n block(s)</source>
2810-
<translation type="unfinished">
2811-
<numerusform></numerusform>
2812-
<numerusform></numerusform>
2810+
<translation>
2811+
<numerusform>%n block</numerusform>
2812+
<numerusform>%n blocks</numerusform>
28132813
</translation>
28142814
</message>
28152815
<message>
@@ -2820,9 +2820,9 @@
28202820
<message numerus="yes">
28212821
<location line="+25"/>
28222822
<source>Estimated to begin confirmation within %n block(s).</source>
2823-
<translation type="unfinished">
2824-
<numerusform></numerusform>
2825-
<numerusform></numerusform>
2823+
<translation>
2824+
<numerusform>Estimated to begin confirmation within %n block.</numerusform>
2825+
<numerusform>Estimated to begin confirmation within %n blocks.</numerusform>
28262826
</translation>
28272827
</message>
28282828
<message>
@@ -3175,9 +3175,9 @@
31753175
<message numerus="yes">
31763176
<location filename="../transactiondesc.cpp" line="+30"/>
31773177
<source>Open for %n more block(s)</source>
3178-
<translation type="unfinished">
3179-
<numerusform></numerusform>
3180-
<numerusform></numerusform>
3178+
<translation>
3179+
<numerusform>Open for %n more block</numerusform>
3180+
<numerusform>Open for %n more blocks</numerusform>
31813181
</translation>
31823182
</message>
31833183
<message>
@@ -3238,9 +3238,9 @@
32383238
<message numerus="yes">
32393239
<location line="+2"/>
32403240
<source>, broadcast through %n node(s)</source>
3241-
<translation type="unfinished">
3242-
<numerusform></numerusform>
3243-
<numerusform></numerusform>
3241+
<translation>
3242+
<numerusform>, broadcast through %n node</numerusform>
3243+
<numerusform>, broadcast through %n nodes</numerusform>
32443244
</translation>
32453245
</message>
32463246
<message>
@@ -3305,9 +3305,9 @@
33053305
<message numerus="yes">
33063306
<location line="-144"/>
33073307
<source>matures in %n more block(s)</source>
3308-
<translation type="unfinished">
3309-
<numerusform></numerusform>
3310-
<numerusform></numerusform>
3308+
<translation>
3309+
<numerusform>matures in %n more block</numerusform>
3310+
<numerusform>matures in %n more blocks</numerusform>
33113311
</translation>
33123312
</message>
33133313
<message>
@@ -3444,9 +3444,9 @@
34443444
<message numerus="yes">
34453445
<location line="+58"/>
34463446
<source>Open for %n more block(s)</source>
3447-
<translation type="unfinished">
3448-
<numerusform></numerusform>
3449-
<numerusform></numerusform>
3447+
<translation>
3448+
<numerusform>Open for %n more block</numerusform>
3449+
<numerusform>Open for %n more blocks</numerusform>
34503450
</translation>
34513451
</message>
34523452
<message>
@@ -4014,7 +4014,12 @@
40144014
<translation type="unfinished"></translation>
40154015
</message>
40164016
<message>
4017-
<location line="+31"/>
4017+
<location line="+12"/>
4018+
<source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
4019+
<translation type="unfinished"></translation>
4020+
</message>
4021+
<message>
4022+
<location line="+19"/>
40184023
<source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
40194024
<translation type="unfinished"></translation>
40204025
</message>
@@ -4719,12 +4724,7 @@
47194724
<translation type="unfinished"></translation>
47204725
</message>
47214726
<message>
4722-
<location line="+4"/>
4723-
<source>Wallet will not create transactions that violate mempool chain limits (default: %u</source>
4724-
<translation type="unfinished"></translation>
4725-
</message>
4726-
<message>
4727-
<location line="+3"/>
4727+
<location line="+7"/>
47284728
<source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
47294729
<translation type="unfinished"></translation>
47304730
</message>

‎src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3399,7 +3399,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
33993399
strUsage += HelpMessageOpt("-dblogsize=<n>", strprintf("Flush wallet database activity from memory to disk log every <n> megabytes (default: %u)", DEFAULT_WALLET_DBLOGSIZE));
34003400
strUsage += HelpMessageOpt("-flushwallet", strprintf("Run a thread to flush wallet periodically (default: %u)", DEFAULT_FLUSHWALLET));
34013401
strUsage += HelpMessageOpt("-privdb", strprintf("Sets the DB_PRIVATE flag in the wallet db environment (default: %u)", DEFAULT_WALLET_PRIVDB));
3402-
strUsage += HelpMessageOpt("-walletrejectlongchains", strprintf(_("Wallet will not create transactions that violate mempool chain limits (default: %u"), DEFAULT_WALLET_REJECT_LONG_CHAINS));
3402+
strUsage += HelpMessageOpt("-walletrejectlongchains", strprintf(_("Wallet will not create transactions that violate mempool chain limits (default: %u)"), DEFAULT_WALLET_REJECT_LONG_CHAINS));
34033403
}
34043404

34053405
return strUsage;

0 commit comments

Comments
 (0)