Skip to content

Commit

Permalink
Merge #20256: qt: Pre-splitoff translations update
Browse files Browse the repository at this point in the history
a193f96 qt: Pre-splitoff translations update (Wladimir J. van der Laan)

Pull request description:

  Do a pre-splitoff translations update. Pulls the translations from Transifex, and apparently, there are also some new English messages in the source code since the transtlations freeze, but not many.

ACKs for top commit:
  fanquake:
    ACK a193f96 - I got the same changes (branch: [translation_check_0210](https://github.com/fanquake/bitcoin/tree/translation_check_0210)), except for a diff in `src/qt/locale/bitcoin_es_MX.ts`. Although from a look on Transifex it seems that transalation may have been updated in the last hour or so.

Tree-SHA512: 315c1f4327142caae01179a8398b0a8adb9108e1fc8122585274b7ed74ae878554399a06fd12a8103a4933ecf0ad6e211d6efc63edc6827c0168317f2b83528f
  • Loading branch information
MarcoFalke committed Oct 28, 2020
2 parents 55b1ffc + a193f96 commit 488b77f
Show file tree
Hide file tree
Showing 89 changed files with 7,949 additions and 5,453 deletions.
1 change: 1 addition & 0 deletions src/Makefile.qt_locale.include
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ QT_TS = \
qt/locale/bitcoin_ta.ts \
qt/locale/bitcoin_te.ts \
qt/locale/bitcoin_th.ts \
qt/locale/bitcoin_tr.ts \
qt/locale/bitcoin_uk.ts \
qt/locale/bitcoin_ur.ts \
qt/locale/bitcoin_uz@Cyrl.ts \
Expand Down
1 change: 1 addition & 0 deletions src/qt/bitcoin_locale.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<file alias="ta">locale/bitcoin_ta.qm</file>
<file alias="te">locale/bitcoin_te.qm</file>
<file alias="th">locale/bitcoin_th.qm</file>
<file alias="tr">locale/bitcoin_tr.qm</file>
<file alias="uk">locale/bitcoin_uk.qm</file>
<file alias="ur">locale/bitcoin_ur.qm</file>
<file alias="uz@Cyrl">locale/bitcoin_uz@Cyrl.qm</file>
Expand Down
19 changes: 19 additions & 0 deletions src/qt/bitcoinstrings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay "
"fee of %s to prevent stuck transactions)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"More than one onion bind address is provided. Using %s for the automatically "
"created Tor onion service."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Please check that your computer's date and time are correct! If your clock "
"is wrong, %s will not work properly."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
Expand All @@ -50,6 +53,15 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Prune: last wallet synchronisation goes beyond pruned data. You need to -"
"reindex (download the whole blockchain again in case of pruned node)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"SQLiteDatabase: Failed to prepare the statement to fetch sqlite wallet "
"schema version: %s"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"SQLiteDatabase: Failed to prepare the statement to fetch the application id: "
"%s"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is "
"supported"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"The block database contains a block which appears to be from the future. "
"This may be due to your computer's date and time being set incorrectly. Only "
"rebuild the block database if you are sure that your computer's date and "
Expand Down Expand Up @@ -125,6 +137,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low for %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Keypool ran out, please call keypoolrefill first"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to rescan the wallet during initialization"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to verify database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Fee rate (%s) is lower than the minimum fee rate setting (%s)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Importing..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Incorrect or no genesis block found. Wrong datadir for network?"),
Expand Down Expand Up @@ -153,6 +166,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Reducing -maxconnections from %d to %d, becau
QT_TRANSLATE_NOOP("bitcoin-core", "Replaying blocks..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Rewinding blocks..."),
QT_TRANSLATE_NOOP("bitcoin-core", "SQLiteDatabase: Failed to execute statement to verify database: %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "SQLiteDatabase: Failed to fetch sqlite wallet schema version: %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "SQLiteDatabase: Failed to fetch the application id: %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "SQLiteDatabase: Failed to prepare statement to verify database: %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "SQLiteDatabase: Failed to read database verification error: %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "SQLiteDatabase: Unexpected application id. Expected %u, got %u"),
QT_TRANSLATE_NOOP("bitcoin-core", "Section [%s] is not recognized."),
QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" does not exist"),
Expand Down
147 changes: 35 additions & 112 deletions src/qt/locale/bitcoin_af.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@
<source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
<translation>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</translation>
</message>
<message>
<source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.</source>
<translation>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.</translation>
</message>
<message>
<source>&amp;Copy Address</source>
<translation>&amp;Copy Address</translation>
Expand Down Expand Up @@ -629,11 +625,7 @@
<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>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</translation>
</message>
</context>
</context>
<context>
<name>CoinControlDialog</name>
<message>
Expand Down Expand Up @@ -1138,10 +1130,6 @@
<source>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
<translation>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</translation>
</message>
<message>
<source>Use separate SOCKS&amp;5 proxy to reach peers via Tor hidden services:</source>
<translation>Use separate SOCKS&amp;5 proxy to reach peers via Tor hidden services:</translation>
</message>
<message>
<source>Hide the icon from the system tray.</source>
<translation>Hide the icon from the system tray.</translation>
Expand Down Expand Up @@ -1274,10 +1262,6 @@
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
<source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
<translation>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</translation>
</message>
<message>
<source>&amp;Window</source>
<translation>&amp;Window</translation>
Expand Down Expand Up @@ -1453,7 +1437,18 @@
<source>Current total balance in watch-only addresses</source>
<translation>Current total balance in watch-only addresses</translation>
</message>
</context>
</context>
<context>
<name>PSBTOperationsDialog</name>
<message>
<source>Total Amount</source>
<translation>Total Amount</translation>
</message>
<message>
<source>or</source>
<translation>or</translation>
</message>
</context>
<context>
<name>PaymentServer</name>
<message>
Expand Down Expand Up @@ -1716,10 +1711,6 @@
<source>Block chain</source>
<translation>Block chain</translation>
</message>
<message>
<source>Current number of blocks</source>
<translation>Current number of blocks</translation>
</message>
<message>
<source>Memory Pool</source>
<translation>Memory Pool</translation>
Expand Down Expand Up @@ -1764,10 +1755,6 @@
<source>Select a peer to view detailed information.</source>
<translation>Select a peer to view detailed information.</translation>
</message>
<message>
<source>Whitelisted</source>
<translation>Whitelisted</translation>
</message>
<message>
<source>Direction</source>
<translation>Direction</translation>
Expand Down Expand Up @@ -1820,10 +1807,6 @@
<source>Services</source>
<translation>Services</translation>
</message>
<message>
<source>Ban Score</source>
<translation>Ban Score</translation>
</message>
<message>
<source>Connection Time</source>
<translation>Connection Time</translation>
Expand Down Expand Up @@ -1972,14 +1955,6 @@
<source>Outbound</source>
<translation>Outbound</translation>
</message>
<message>
<source>Yes</source>
<translation>Yes</translation>
</message>
<message>
<source>No</source>
<translation>No</translation>
</message>
<message>
<source>Unknown</source>
<translation>Unknown</translation>
Expand Down Expand Up @@ -2079,12 +2054,24 @@
<source>Copy amount</source>
<translation>Copy amount</translation>
</message>
</context>
<message>
<source>Could not unlock wallet.</source>
<translation>Could not unlock wallet.</translation>
</message>
</context>
<context>
<name>ReceiveRequestDialog</name>
<message>
<source>QR Code</source>
<translation>QR Code</translation>
<source>Amount:</source>
<translation>Amount:</translation>
</message>
<message>
<source>Message:</source>
<translation>Message:</translation>
</message>
<message>
<source>Wallet:</source>
<translation>Wallet:</translation>
</message>
<message>
<source>Copy &amp;URI</source>
Expand All @@ -2106,30 +2093,6 @@
<source>Payment information</source>
<translation>Payment information</translation>
</message>
<message>
<source>URI</source>
<translation>URI</translation>
</message>
<message>
<source>Address</source>
<translation>Address</translation>
</message>
<message>
<source>Amount</source>
<translation>Amount</translation>
</message>
<message>
<source>Label</source>
<translation>Label</translation>
</message>
<message>
<source>Message</source>
<translation>Message</translation>
</message>
<message>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
</context>
<context>
<name>RecentRequestsTableModel</name>
Expand Down Expand Up @@ -2376,10 +2339,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<source>Are you sure you want to send?</source>
<translation>Are you sure you want to send?</translation>
</message>
<message>
<source>Please, review your transaction proposal. This will produce a Partially Signed Bitcoin Transaction (PSBT) which you can copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
<translation>Please, review your transaction proposal. This will produce a Partially Signed Bitcoin Transaction (PSBT) which you can copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</translation>
</message>
<message>
<source>or</source>
<translation>or</translation>
Expand Down Expand Up @@ -2416,18 +2375,10 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<source>Confirm transaction proposal</source>
<translation>Confirm transaction proposal</translation>
</message>
<message>
<source>Copy PSBT to clipboard</source>
<translation>Copy PSBT to clipboard</translation>
</message>
<message>
<source>Send</source>
<translation>Send</translation>
</message>
<message>
<source>PSBT copied</source>
<translation>PSBT copied</translation>
</message>
<message>
<source>Watch-only balance:</source>
<translation>Watch-only balance:</translation>
Expand Down Expand Up @@ -3210,12 +3161,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
<translation>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</translation>
</message>
</context>
</context>
<context>
<name>WalletFrame</name>
<message>
<source>No wallet has been loaded.</source>
<translation>No wallet has been loaded.</translation>
<source>Create a new wallet</source>
<translation>Create a new wallet</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -3287,6 +3238,10 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<source>Export the data in the current tab to a file</source>
<translation>Export the data in the current tab to a file</translation>
</message>
<message>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<source>Backup Wallet</source>
<translation>Backup Wallet</translation>
Expand Down Expand Up @@ -3330,10 +3285,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
<translation>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</translation>
</message>
<message>
<source>Error: A fatal internal error occurred, see debug.log for details</source>
<translation>Error: A fatal internal error occurred, see debug.log for details</translation>
</message>
<message>
<source>Pruning blockstore...</source>
<translation>Pruning blockstore...</translation>
Expand All @@ -3346,10 +3297,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<source>The %s developers</source>
<translation>The %s developers</translation>
</message>
<message>
<source>Can't generate a change-address key. No keys in the internal keypool and can't generate any keys.</source>
<translation>Can't generate a change-address key. No keys in the internal keypool and can't generate any keys.</translation>
</message>
<message>
<source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
<translation>Cannot obtain a lock on data directory %s. %s is probably already running.</translation>
Expand Down Expand Up @@ -3398,14 +3345,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<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>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation>
</message>
<message>
<source>%d of last 100 blocks have unexpected version</source>
<translation>%d of last 100 blocks have unexpected version</translation>
</message>
<message>
<source>%s corrupt, salvage failed</source>
<translation>%s corrupt, salvage failed</translation>
</message>
<message>
<source>-maxmempool must be at least %d MB</source>
<translation>-maxmempool must be at least %d MB</translation>
Expand Down Expand Up @@ -3530,10 +3469,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<source>Loading P2P addresses...</source>
<translation>Loading P2P addresses...</translation>
</message>
<message>
<source>Error: Disk space is too low!</source>
<translation>Error: Disk space is too low!</translation>
</message>
<message>
<source>Loading banlist...</source>
<translation>Loading banlist...</translation>
Expand Down Expand Up @@ -3716,10 +3651,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<source>Warning: unknown new rules activated (versionbit %i)</source>
<translation>Warning: unknown new rules activated (versionbit %i)</translation>
</message>
<message>
<source>Zapping all transactions from wallet...</source>
<translation>Zapping all transactions from wallet...</translation>
</message>
<message>
<source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
<translation>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</translation>
Expand All @@ -3732,10 +3663,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
<translation>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</translation>
</message>
<message>
<source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
<translation>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</translation>
</message>
<message>
<source>%s is set very high!</source>
<translation>%s is set very high!</translation>
Expand Down Expand Up @@ -3780,10 +3707,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<source>Insufficient funds</source>
<translation>Insufficient funds</translation>
</message>
<message>
<source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source>
<translation>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</translation>
</message>
<message>
<source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
<translation>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</translation>
Expand Down
11 changes: 3 additions & 8 deletions src/qt/locale/bitcoin_am.ts
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,9 @@
<context>
<name>OverviewPage</name>
</context>
<context>
<name>PSBTOperationsDialog</name>
</context>
<context>
<name>PaymentServer</name>
</context>
Expand All @@ -330,14 +333,6 @@
</context>
<context>
<name>ReceiveRequestDialog</name>
<message>
<source>Address</source>
<translation>አድራሻ</translation>
</message>
<message>
<source>Label</source>
<translation>መለያ ስም</translation>
</message>
</context>
<context>
<name>RecentRequestsTableModel</name>
Expand Down
Loading

0 comments on commit 488b77f

Please sign in to comment.