diff options
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 2 | ||||
| -rw-r--r-- | src/qt/guiutil.cpp | 4 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 78 |
3 files changed, 42 insertions, 42 deletions
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index baca95a0bc..acd81a6b2a 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -191,7 +191,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "included in share/rpcuser. This option can be specified multiple times"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Wallet will not create transactions that violate mempool chain limits " -"(default: %u"), +"(default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Warning: Unknown block versions being mined! It's possible unknown rules are " "in effect"), diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 8132e4fe0d..94b1b8abed 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -961,11 +961,11 @@ QString formateNiceTimeOffset(qint64 secs) const int YEAR_IN_SECONDS = 31556952; // Average length of year in Gregorian calendar if(secs < 60) { - timeBehindText = QObject::tr("%n seconds(s)","",secs); + timeBehindText = QObject::tr("%n second(s)","",secs); } else if(secs < 2*HOUR_IN_SECONDS) { - timeBehindText = QObject::tr("%n minutes(s)","",secs/60); + timeBehindText = QObject::tr("%n minute(s)","",secs/60); } else if(secs < 2*DAY_IN_SECONDS) { diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 2d0cccb894..83dbeffd4d 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1085,17 +1085,17 @@ <message numerus="yes"> <location line="+9"/> <source>%n GB of free space available</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>%n GB of free space available</numerusform> + <numerusform>%n GB of free space available</numerusform> </translation> </message> <message numerus="yes"> <location line="+3"/> <source>(of %n GB needed)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>(of %n GB needed)</numerusform> + <numerusform>(of %n GB needed)</numerusform> </translation> </message> </context> @@ -1792,18 +1792,18 @@ </message> <message numerus="yes"> <location line="+18"/> - <source>%n seconds(s)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <source>%n second(s)</source> + <translation> + <numerusform>%n second</numerusform> + <numerusform>%n seconds</numerusform> </translation> </message> <message numerus="yes"> <location line="+4"/> - <source>%n minutes(s)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <source>%n minute(s)</source> + <translation> + <numerusform>%n minute</numerusform> + <numerusform>%n minutes</numerusform> </translation> </message> <message numerus="yes"> @@ -2807,9 +2807,9 @@ <message numerus="yes"> <location line="+67"/> <source>%n block(s)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>%n block</numerusform> + <numerusform>%n blocks</numerusform> </translation> </message> <message> @@ -2820,9 +2820,9 @@ <message numerus="yes"> <location line="+25"/> <source>Estimated to begin confirmation within %n block(s).</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>Estimated to begin confirmation within %n block.</numerusform> + <numerusform>Estimated to begin confirmation within %n blocks.</numerusform> </translation> </message> <message> @@ -3175,9 +3175,9 @@ <message numerus="yes"> <location filename="../transactiondesc.cpp" line="+30"/> <source>Open for %n more block(s)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>Open for %n more block</numerusform> + <numerusform>Open for %n more blocks</numerusform> </translation> </message> <message> @@ -3238,9 +3238,9 @@ <message numerus="yes"> <location line="+2"/> <source>, broadcast through %n node(s)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>, broadcast through %n node</numerusform> + <numerusform>, broadcast through %n nodes</numerusform> </translation> </message> <message> @@ -3305,9 +3305,9 @@ <message numerus="yes"> <location line="-144"/> <source>matures in %n more block(s)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>matures in %n more block</numerusform> + <numerusform>matures in %n more blocks</numerusform> </translation> </message> <message> @@ -3444,9 +3444,9 @@ <message numerus="yes"> <location line="+58"/> <source>Open for %n more block(s)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform>Open for %n more block</numerusform> + <numerusform>Open for %n more blocks</numerusform> </translation> </message> <message> @@ -4014,7 +4014,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+31"/> + <location line="+12"/> + <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> <translation type="unfinished"></translation> </message> @@ -4719,12 +4724,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation type="unfinished"></translation> </message> |