Browse Source

Merge #9457: [qt] Select more files for translation

facf3e7 [qt] `make translate` (MarcoFalke)
fae26e8 [qt] Add more sources to translate (MarcoFalke)
0.14
Wladimir J. van der Laan 8 years ago
parent
commit
123ea73624
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 4
      src/Makefile.qt.include
  2. 11
      src/qt/bitcoinstrings.cpp
  3. 103
      src/qt/locale/bitcoin_en.ts

4
src/Makefile.qt.include

@ -414,11 +414,11 @@ QT_QM=$(QT_TS:.ts=.qm) @@ -414,11 +414,11 @@ QT_QM=$(QT_TS:.ts=.qm)
SECONDARY: $(QT_QM)
$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES)
$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) $(libbitcoin_util_a_SOURCES)
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/bitcoin.cpp $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/bitcoin_en.ts

11
src/qt/bitcoinstrings.cpp

@ -157,6 +157,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -157,6 +157,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
QT_TRANSLATE_NOOP("bitcoin-core", ""
"The transaction amount is too small to send after the fee has been deducted"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"This is a pre-release test build - use at your own risk - do not use for "
"mining or merchant applications"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"This is the transaction fee you may pay when fee estimates are not available."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"This product includes software developed by the OpenSSL Project for use in "
@ -193,6 +196,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -193,6 +196,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Wallet will not create transactions that violate mempool chain limits "
"(default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: The network does not appear to fully agree! Some miners appear to "
"be experiencing issues."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: Unknown block versions being mined! It's possible unknown rules are "
"in effect"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
@ -200,6 +206,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -200,6 +206,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"if your balance or transactions are incorrect you should restore from a "
"backup."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: We do not appear to fully agree with our peers! You may need to "
"upgrade, or other nodes may need to upgrade."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR "
"notated network (e.g. 1.2.3.0/24). Can be specified multiple times."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
@ -228,6 +237,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), @@ -228,6 +237,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"),
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"),
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"),
QT_TRANSLATE_NOOP("bitcoin-core", "Chain selection options:"),
QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
@ -350,6 +360,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -debugnet ignored, use - @@ -350,6 +360,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -debugnet ignored, use -
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -tor found, use -onion."),
QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format on startup"),
QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Use the test chain"),
QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."),
QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"),
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."),

103
src/qt/locale/bitcoin_en.ts

@ -684,6 +684,11 @@ @@ -684,6 +684,11 @@
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
</message>
<message>
<location filename="../bitcoin.cpp" line="+516"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CoinControlDialog</name>
@ -1839,6 +1844,29 @@ @@ -1839,6 +1844,29 @@
<numerusform>%n years</numerusform>
</translation>
</message>
<message>
<location filename="../bitcoin.cpp" line="+172"/>
<source>%1 didn&apos;t yet exit safely...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject::QObject</name>
<message>
<location line="-81"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<source>Error: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QRImageWidget</name>
@ -3824,7 +3852,7 @@ @@ -3824,7 +3852,7 @@
<context>
<name>bitcoin-core</name>
<message>
<location filename="../bitcoinstrings.cpp" line="+292"/>
<location filename="../bitcoinstrings.cpp" line="+302"/>
<source>Options:</source>
<translation>Options:</translation>
</message>
@ -3844,12 +3872,12 @@ @@ -3844,12 +3872,12 @@
<translation>Specify your own public address</translation>
</message>
<message>
<location line="-107"/>
<location line="-108"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Accept command line and JSON-RPC commands</translation>
</message>
<message>
<location line="-196"/>
<location line="-205"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
<translation type="unfinished"></translation>
</message>
@ -3889,7 +3917,7 @@ @@ -3889,7 +3917,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+117"/>
<location line="+127"/>
<source>Error: A fatal internal error occurred, see debug.log for details</source>
<translation type="unfinished"></translation>
</message>
@ -3914,7 +3942,7 @@ @@ -3914,7 +3942,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="-334"/>
<location line="-344"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
</message>
@ -3994,7 +4022,12 @@ @@ -3994,7 +4022,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<location line="+7"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+15"/>
<source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source>
<translation type="unfinished"></translation>
</message>
@ -4009,7 +4042,17 @@ @@ -4009,7 +4042,17 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<location line="+3"/>
<source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+10"/>
<source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
<source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
<translation type="unfinished"></translation>
</message>
@ -4050,6 +4093,11 @@ @@ -4050,6 +4093,11 @@
</message>
<message>
<location line="+2"/>
<source>Chain selection options:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Change index out of range</source>
<translation type="unfinished"></translation>
</message>
@ -4293,6 +4341,11 @@ @@ -4293,6 +4341,11 @@
<source>Use UPnP to map the listening port (default: %u)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Use the test chain</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>User Agent comment (%s) contains unsafe characters.</source>
@ -4329,7 +4382,7 @@ @@ -4329,7 +4382,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="-331"/>
<location line="-342"/>
<source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
<translation type="unfinished"></translation>
</message>
@ -4399,12 +4452,12 @@ @@ -4399,12 +4452,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+25"/>
<location line="+28"/>
<source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+23"/>
<location line="+29"/>
<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>
@ -4429,7 +4482,7 @@ @@ -4429,7 +4482,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<location line="+7"/>
<source>Connect through SOCKS5 proxy</source>
<translation type="unfinished"></translation>
</message>
@ -4559,7 +4612,7 @@ @@ -4559,7 +4612,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<location line="+4"/>
<source>Username for JSON-RPC connections</source>
<translation>Username for JSON-RPC connections</translation>
</message>
@ -4589,27 +4642,27 @@ @@ -4589,27 +4642,27 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="-72"/>
<location line="-73"/>
<source>Password for JSON-RPC connections</source>
<translation>Password for JSON-RPC connections</translation>
</message>
<message>
<location line="-216"/>
<location line="-226"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
</message>
<message>
<location line="+145"/>
<location line="+154"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
</message>
<message>
<location line="+57"/>
<location line="+58"/>
<source>Loading addresses...</source>
<translation>Loading addresses...</translation>
</message>
<message>
<location line="-265"/>
<location line="-275"/>
<source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
<translation type="unfinished"></translation>
</message>
@ -4674,7 +4727,7 @@ @@ -4674,7 +4727,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+12"/>
<source>This is the transaction fee you may pay when fee estimates are not available.</source>
<translation type="unfinished"></translation>
</message>
@ -4714,7 +4767,7 @@ @@ -4714,7 +4767,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<location line="+10"/>
<source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
<translation type="unfinished"></translation>
</message>
@ -4724,7 +4777,7 @@ @@ -4724,7 +4777,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+7"/>
<source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
<translation type="unfinished"></translation>
</message>
@ -4744,7 +4797,7 @@ @@ -4744,7 +4797,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+37"/>
<location line="+38"/>
<source>How many blocks to check at startup (default: %u, 0 = all)</source>
<translation type="unfinished"></translation>
</message>
@ -4904,17 +4957,17 @@ @@ -4904,17 +4957,17 @@
<translation>Loading block index...</translation>
</message>
<message>
<location line="-60"/>
<location line="-61"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Add a node to connect to and attempt to keep the connection open</translation>
</message>
<message>
<location line="+61"/>
<location line="+62"/>
<source>Loading wallet...</source>
<translation>Loading wallet...</translation>
</message>
<message>
<location line="-54"/>
<location line="-55"/>
<source>Cannot downgrade wallet</source>
<translation>Cannot downgrade wallet</translation>
</message>
@ -4924,7 +4977,7 @@ @@ -4924,7 +4977,7 @@
<translation>Cannot write default address</translation>
</message>
<message>
<location line="+77"/>
<location line="+78"/>
<source>Rescanning...</source>
<translation>Rescanning...</translation>
</message>

Loading…
Cancel
Save