Skip to content

Commit 3fddc8e

Browse files
laanwjlaanwj
committed
Update translations for bitcoin core
- Move scripts/qt to share/qt, to clean up toplevel directories - Update english ts file which is used to source messages for Transifex - In extract_strings_qt.py use a glob *.h *.cpp, this is safe now that the Wx UI files are removed
1 parent c3c203c commit 3fddc8e

File tree

7 files changed

+452
-261
lines changed

7 files changed

+452
-261
lines changed

‎scripts/qt/extract_strings_qt.py renamed to ‎share/qt/extract_strings_qt.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
they can be picked up by Qt linguist.
55
'''
66
from subprocess import Popen, PIPE
7+
import glob
78

89
OUT_CPP="src/qt/bitcoinstrings.cpp"
910
EMPTY=['""']
@@ -44,7 +45,7 @@ def parse_po(text):
4445

4546
return messages
4647

47-
files = ['src/base58.h', 'src/bignum.h', 'src/db.cpp', 'src/db.h', 'src/headers.h', 'src/init.cpp', 'src/init.h', 'src/irc.cpp', 'src/irc.h', 'src/key.h', 'src/main.cpp', 'src/main.h', 'src/net.cpp', 'src/net.h', 'src/noui.h', 'src/script.cpp', 'src/script.h', 'src/serialize.h', 'src/strlcpy.h', 'src/uint256.h', 'src/util.cpp', 'src/util.h']
48+
files = glob.glob('src/*.cpp') + glob.glob('src/*.h')
4849

4950
# xgettext -n --keyword=_ $FILES
5051
child = Popen(['xgettext','--output=-','-n','--keyword=_'] + files, stdout=PIPE)

‎scripts/qt/img/reload.xcf renamed to ‎share/qt/img/reload.xcf

File renamed without changes.

‎scripts/qt/make_spinner.py renamed to ‎share/qt/make_spinner.py

File renamed without changes.

‎scripts/qt/make_windows_icon.py renamed to ‎share/qt/make_windows_icon.py

File renamed without changes.

‎src/qt/bitcoingui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ void BitcoinGUI::createActions()
241241
optionsAction->setToolTip(tr("Modify configuration options for bitcoin"));
242242
optionsAction->setMenuRole(QAction::PreferencesRole);
243243
toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("Show/Hide &Bitcoin"), this);
244-
toggleHideAction->setToolTip(tr("Show or Hide the Bitcoin window"));
244+
toggleHideAction->setToolTip(tr("Show or hide the Bitcoin window"));
245245
exportAction = new QAction(QIcon(":/icons/export"), tr("&Export..."), this);
246246
exportAction->setToolTip(tr("Export the data in the current tab to a file"));
247247
encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet"), this);

‎src/qt/bitcoinstrings.cpp

Lines changed: 56 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#include <QtGlobal>
22
// Automatically generated by extract_strings.py
3-
static const char *bitcoin_strings[] = {QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"),
3+
static const char *bitcoin_strings[] = {QT_TRANSLATE_NOOP("bitcoin-core", ""
4+
"Unable to bind to port %d on this computer. Bitcoin is probably already "
5+
"running."),
6+
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low "),
7+
QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"),
48
QT_TRANSLATE_NOOP("bitcoin-core", "Usage:"),
59
QT_TRANSLATE_NOOP("bitcoin-core", "Send command to -server or bitcoind"),
610
QT_TRANSLATE_NOOP("bitcoin-core", "List commands"),
@@ -11,25 +15,30 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"),
1115
QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins"),
1216
QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins"),
1317
QT_TRANSLATE_NOOP("bitcoin-core", "Start minimized"),
18+
QT_TRANSLATE_NOOP("bitcoin-core", "Show splash screen on startup (default: 1)"),
1419
QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"),
20+
QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (default: 25)"),
21+
QT_TRANSLATE_NOOP("bitcoin-core", "Set database disk log size in megabytes (default: 100)"),
1522
QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout (in milliseconds)"),
1623
QT_TRANSLATE_NOOP("bitcoin-core", "Connect through socks4 proxy"),
1724
QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for addnode and connect"),
1825
QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 8333 or testnet: 18333)"),
1926
QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most <n> connections to peers (default: 125)"),
20-
QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to"),
27+
QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"),
2128
QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node"),
22-
QT_TRANSLATE_NOOP("bitcoin-core", "Don't accept connections from outside"),
23-
QT_TRANSLATE_NOOP("bitcoin-core", "Don't bootstrap list of peers using DNS"),
29+
QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using internet relay chat (default: 0)"),
30+
QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1)"),
31+
QT_TRANSLATE_NOOP("bitcoin-core", "Set language, for example \"de_DE\" (default: system locale)"),
32+
QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using DNS lookup (default: 1)"),
2433
QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)"),
2534
QT_TRANSLATE_NOOP("bitcoin-core", ""
2635
"Number of seconds to keep misbehaving peers from reconnecting (default: "
2736
"86400)"),
2837
QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)"),
2938
QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)"),
30-
QT_TRANSLATE_NOOP("bitcoin-core", "Don't attempt to use UPnP to map the listening port"),
31-
QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to use UPnP to map the listening port"),
32-
QT_TRANSLATE_NOOP("bitcoin-core", "Fee per kB to add to transactions you send"),
39+
QT_TRANSLATE_NOOP("bitcoin-core", "Use Universal Plug and Play to map the listening port (default: 1)"),
40+
QT_TRANSLATE_NOOP("bitcoin-core", "Use Universal Plug and Play to map the listening port (default: 0)"),
41+
QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send"),
3342
QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"),
3443
QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"),
3544
QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"),
@@ -42,8 +51,14 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"),
4251
QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: 8332)"),
4352
QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"),
4453
QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)"),
54+
QT_TRANSLATE_NOOP("bitcoin-core", ""
55+
"Execute command when the best block changes (%s in cmd is replaced by block "
56+
"hash)"),
57+
QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format"),
4558
QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: 100)"),
4659
QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"),
60+
QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 2500, 0 = all)"),
61+
QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-6, default: 1)"),
4762
QT_TRANSLATE_NOOP("bitcoin-core", ""
4863
"\n"
4964
"SSL options: (see the Bitcoin Wiki for SSL setup instructions)"),
@@ -54,9 +69,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
5469
"Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:"
5570
"@STRENGTH)"),
5671
QT_TRANSLATE_NOOP("bitcoin-core", "This help message"),
72+
QT_TRANSLATE_NOOP("bitcoin-core", "Usage"),
5773
QT_TRANSLATE_NOOP("bitcoin-core", ""
5874
"Cannot obtain a lock on data directory %s. Bitcoin is probably already "
5975
"running."),
76+
QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin"),
6077
QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."),
6178
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading addr.dat"),
6279
QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."),
@@ -66,6 +83,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"),
6683
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin"),
6784
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"),
6885
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"),
86+
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"),
87+
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot initialize keypool"),
88+
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"),
6989
QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."),
7090
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
7191
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address"),
@@ -74,12 +94,36 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
7494
"Warning: -paytxfee is set very high. This is the transaction fee you will "
7595
"pay if you send a transaction."),
7696
QT_TRANSLATE_NOOP("bitcoin-core", "Error: CreateThread(StartNode) failed"),
77-
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low "),
97+
QT_TRANSLATE_NOOP("bitcoin-core", "To use the %s option"),
7898
QT_TRANSLATE_NOOP("bitcoin-core", ""
79-
"Unable to bind to port %d on this computer. Bitcoin is probably already "
80-
"running."),
99+
"%s, you must set a rpcpassword in the configuration file:\n"
100+
" %s\n"
101+
"It is recommended you use the following random password:\n"
102+
"rpcuser=bitcoinrpc\n"
103+
"rpcpassword=%s\n"
104+
"(you do not need to remember this password)\n"
105+
"If the file does not exist, create it with owner-readable-only file "
106+
"permissions.\n"),
107+
QT_TRANSLATE_NOOP("bitcoin-core", "Error"),
108+
QT_TRANSLATE_NOOP("bitcoin-core", "An error occured while setting up the RPC port %i for listening: %s"),
109+
QT_TRANSLATE_NOOP("bitcoin-core", ""
110+
"You must set rpcpassword=<password> in the configuration file:\n"
111+
"%s\n"
112+
"If the file does not exist, create it with owner-readable-only file "
113+
"permissions."),
81114
QT_TRANSLATE_NOOP("bitcoin-core", ""
82115
"Warning: Please check that your computer's date and time are correct. If "
83116
"your clock is wrong Bitcoin will not work properly."),
84-
QT_TRANSLATE_NOOP("bitcoin-core", "beta"),
85-
};
117+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet locked, unable to create transaction "),
118+
QT_TRANSLATE_NOOP("bitcoin-core", ""
119+
"Error: This transaction requires a transaction fee of at least %s because of "
120+
"its amount, complexity, or use of recently received funds "),
121+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Transaction creation failed "),
122+
QT_TRANSLATE_NOOP("bitcoin-core", "Sending..."),
123+
QT_TRANSLATE_NOOP("bitcoin-core", ""
124+
"Error: The transaction was rejected. This might happen if some of the coins "
125+
"in your wallet were already spent, such as if you used a copy of wallet.dat "
126+
"and coins were spent in the copy but not marked as spent here."),
127+
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"),
128+
QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"),
129+
};

0 commit comments

Comments
 (0)