Skip to content

Commit

Permalink
Translations201710 - en, de, fi, fr, ru, vi (#1659)
Browse files Browse the repository at this point in the history
* fix "InstantSend: Yes/No" in receiving request dlg

* [qt] Add more sources to translate

backport fae26e8

* fix .pro

* fix typo: memonic -> mnemonic

* fix "s(s)"

* `make translate` + qt linguist

* update ru

* update fi

* update de

* update fr

* update vi

* fix ru

* fix de
  • Loading branch information
UdjinM6 authored Oct 9, 2017
1 parent 0b6955a commit 11afd7c
Show file tree
Hide file tree
Showing 12 changed files with 3,491 additions and 2,397 deletions.
1 change: 1 addition & 0 deletions contrib/dash-qt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ FORMS += \
../src/qt/forms/editaddressdialog.ui \
../src/qt/forms/helpmessagedialog.ui \
../src/qt/forms/intro.ui \
../src/qt/forms/masternodelist.ui \
../src/qt/forms/openuridialog.ui \
../src/qt/forms/optionsdialog.ui \
../src/qt/forms/overviewpage.ui \
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -567,11 +567,11 @@ QT_QM=$(QT_TS:.ts=.qm)

SECONDARY: $(QT_QM)

qt/dashstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES)
qt/dashstrings.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) ../share/qt/extract_strings_qt.py $^

translate: qt/dashstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
translate: qt/dashstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) qt/dash.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 qt/locale/dash_en.ts

Expand Down
2 changes: 1 addition & 1 deletion src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ std::string HelpMessage(HelpMessageMode mode)
CURRENCY_UNIT, FormatMoney(DEFAULT_TRANSACTION_MAXFEE)));
strUsage += HelpMessageOpt("-usehd", _("Use hierarchical deterministic key generation (HD) after bip39/bip44. Only has effect during wallet creation/first start") + " " + strprintf(_("(default: %u)"), DEFAULT_USE_HD_WALLET));
strUsage += HelpMessageOpt("-mnemonic", _("User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)"));
strUsage += HelpMessageOpt("-mnemonicpassphrase", _("User defined memonic passphrase for HD wallet (bip39). Only has effect during wallet creation/first start (default: empty string)"));
strUsage += HelpMessageOpt("-mnemonicpassphrase", _("User defined mnemonic passphrase for HD wallet (bip39). Only has effect during wallet creation/first start (default: empty string)"));
strUsage += HelpMessageOpt("-hdseed", _("User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)"));
strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format on startup"));
strUsage += HelpMessageOpt("-wallet=<file>", _("Specify wallet file (within data directory)") + " " + strprintf(_("(default: %s)"), "wallet.dat"));
Expand Down
56 changes: 42 additions & 14 deletions src/qt/dashstrings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ QT_TRANSLATE_NOOP("dash-core", ""
"Enable use of automated PrivateSend for funds stored in this wallet (0-1, "
"default: %u)"),
QT_TRANSLATE_NOOP("dash-core", ""
"Error loading %s: You can't enable HD on a already existing non-HD wallet"),
QT_TRANSLATE_NOOP("dash-core", ""
"Error reading wallet.dat! All keys read correctly, but transaction data or "
"address book entries might be missing or incorrect."),
QT_TRANSLATE_NOOP("dash-core", ""
Expand Down Expand Up @@ -112,6 +114,10 @@ QT_TRANSLATE_NOOP("dash-core", ""
"If paytxfee is not set, include enough fee so transactions begin "
"confirmation on average within n blocks (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", ""
"If this block is in the chain assume that it and its ancestors are valid and "
"potentially skip their script verification (0 to verify all, default: %s, "
"testnet: %s)"),
QT_TRANSLATE_NOOP("dash-core", ""
"InstantSend doesn't support sending values that high yet. Transactions are "
"currently limited to %1 DASH."),
QT_TRANSLATE_NOOP("dash-core", ""
Expand All @@ -136,6 +142,9 @@ QT_TRANSLATE_NOOP("dash-core", ""
"Maintain at most <n> connections to peers (temporary service connections "
"excluded) (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", ""
"Make sure to encrypt your wallet and delete all non-encrypted backups after "
"you verified that wallet works!"),
QT_TRANSLATE_NOOP("dash-core", ""
"Maximum size of data in data carrier transactions we relay and mine "
"(default: %u)"),
QT_TRANSLATE_NOOP("dash-core", ""
Expand Down Expand Up @@ -233,21 +242,27 @@ QT_TRANSLATE_NOOP("dash-core", ""
QT_TRANSLATE_NOOP("dash-core", ""
"Use UPnP to map the listening port (default: 1 when listening and no -proxy)"),
QT_TRANSLATE_NOOP("dash-core", ""
"Use hierarchical deterministic key generation (HD) after bip39/bip44. Only "
"has effect during wallet creation/first start"),
QT_TRANSLATE_NOOP("dash-core", ""
"Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: "
"%s)"),
QT_TRANSLATE_NOOP("dash-core", ""
"User defined mnemonic for HD wallet (bip39). Only has effect during wallet "
"creation/first start (default: randomly generated)"),
QT_TRANSLATE_NOOP("dash-core", ""
"User defined mnemonic passphrase for HD wallet (bip39). Only has effect "
"during wallet creation/first start (default: empty string)"),
QT_TRANSLATE_NOOP("dash-core", ""
"User defined seed for HD wallet (should be in hex). Only has effect during "
"wallet creation/first start (default: randomly generated)"),
QT_TRANSLATE_NOOP("dash-core", ""
"Username and hashed password for JSON-RPC connections. The field <userpw> "
"comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is "
"included in share/rpcuser. This option can be specified multiple times"),
QT_TRANSLATE_NOOP("dash-core", ""
"WARNING! Failed to replenish keypool, please unlock your wallet to do so."),
QT_TRANSLATE_NOOP("dash-core", ""
"WARNING: abnormally high number of blocks generated, %d blocks received in "
"the last %d hours (%d expected)"),
QT_TRANSLATE_NOOP("dash-core", ""
"WARNING: check your network connection, %d blocks received in the last %d "
"hours (%d expected)"),
QT_TRANSLATE_NOOP("dash-core", ""
"Wallet is locked, can't replenish keypool! Automatic backups and mixing are "
"disabled, please unlock your wallet to replenish keypool."),
QT_TRANSLATE_NOOP("dash-core", ""
Expand All @@ -260,6 +275,9 @@ QT_TRANSLATE_NOOP("dash-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("dash-core", ""
"Warning: incorrect parameter -walletbackupsdir, path must exist! Using "
"default path."),
QT_TRANSLATE_NOOP("dash-core", ""
"Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as "
"wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect "
"you should restore from a backup."),
Expand All @@ -276,6 +294,8 @@ QT_TRANSLATE_NOOP("dash-core", ""
"You need to rebuild the database using -reindex to go back to unpruned "
"mode. This will redownload the entire blockchain"),
QT_TRANSLATE_NOOP("dash-core", ""
"You need to rebuild the database using -reindex-chainstate to change -txindex"),
QT_TRANSLATE_NOOP("dash-core", ""
"masternodeaddr option is deprecated. Please use masternode.conf to manage "
"your remote masternodes."),
QT_TRANSLATE_NOOP("dash-core", "%s - %d confirmations"),
Expand All @@ -288,7 +308,6 @@ QT_TRANSLATE_NOOP("dash-core", "<category> can be:"),
QT_TRANSLATE_NOOP("dash-core", "Accept command line and JSON-RPC commands"),
QT_TRANSLATE_NOOP("dash-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"),
QT_TRANSLATE_NOOP("dash-core", "Accept public REST requests (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Activating best chain..."),
QT_TRANSLATE_NOOP("dash-core", "Add a node to connect to and attempt to keep the connection open"),
QT_TRANSLATE_NOOP("dash-core", "Allow DNS lookups for -addnode, -seednode and -connect"),
QT_TRANSLATE_NOOP("dash-core", "Already have that input."),
Expand All @@ -298,14 +317,15 @@ QT_TRANSLATE_NOOP("dash-core", "Attempt to recover private keys from a corrupt w
QT_TRANSLATE_NOOP("dash-core", "Automatic backups disabled"),
QT_TRANSLATE_NOOP("dash-core", "Automatically create Tor hidden service (default: %d)"),
QT_TRANSLATE_NOOP("dash-core", "Block creation options:"),
QT_TRANSLATE_NOOP("dash-core", "Can't denominate: no compatible inputs left."),
QT_TRANSLATE_NOOP("dash-core", "Can't find random Masternode."),
QT_TRANSLATE_NOOP("dash-core", "Can't mix while sync in progress."),
QT_TRANSLATE_NOOP("dash-core", "Can't mix: no compatible inputs found!"),
QT_TRANSLATE_NOOP("dash-core", "Cannot downgrade wallet"),
QT_TRANSLATE_NOOP("dash-core", "Cannot resolve -bind address: '%s'"),
QT_TRANSLATE_NOOP("dash-core", "Cannot resolve -externalip address: '%s'"),
QT_TRANSLATE_NOOP("dash-core", "Cannot resolve -whitebind address: '%s'"),
QT_TRANSLATE_NOOP("dash-core", "Cannot write default address"),
QT_TRANSLATE_NOOP("dash-core", "Chain selection options:"),
QT_TRANSLATE_NOOP("dash-core", "Collateral not valid."),
QT_TRANSLATE_NOOP("dash-core", "Connect only to the specified node(s)"),
QT_TRANSLATE_NOOP("dash-core", "Connect through SOCKS5 proxy"),
Expand All @@ -330,9 +350,11 @@ QT_TRANSLATE_NOOP("dash-core", "Enable publish raw transaction in <address>"),
QT_TRANSLATE_NOOP("dash-core", "Enable the client to act as a masternode (0-1, default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Enable transaction replacement in the memory pool (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Entries are full."),
QT_TRANSLATE_NOOP("dash-core", "Entry exceeds maximum size."),
QT_TRANSLATE_NOOP("dash-core", "Error connecting to Masternode."),
QT_TRANSLATE_NOOP("dash-core", "Error initializing block database"),
QT_TRANSLATE_NOOP("dash-core", "Error initializing wallet database environment %s!"),
QT_TRANSLATE_NOOP("dash-core", "Error loading %s: You can't disable HD on a already existing HD wallet"),
QT_TRANSLATE_NOOP("dash-core", "Error loading block database"),
QT_TRANSLATE_NOOP("dash-core", "Error loading wallet.dat"),
QT_TRANSLATE_NOOP("dash-core", "Error loading wallet.dat: Wallet corrupted"),
Expand All @@ -346,6 +368,10 @@ QT_TRANSLATE_NOOP("dash-core", "Failed to create backup %s!"),
QT_TRANSLATE_NOOP("dash-core", "Failed to create backup, error: %s"),
QT_TRANSLATE_NOOP("dash-core", "Failed to delete backup, error: %s"),
QT_TRANSLATE_NOOP("dash-core", "Failed to listen on any port. Use -listen=0 if you want this."),
QT_TRANSLATE_NOOP("dash-core", "Failed to load fulfilled requests cache from"),
QT_TRANSLATE_NOOP("dash-core", "Failed to load governance cache from"),
QT_TRANSLATE_NOOP("dash-core", "Failed to load masternode cache from"),
QT_TRANSLATE_NOOP("dash-core", "Failed to load masternode payments cache from"),
QT_TRANSLATE_NOOP("dash-core", "Failed to parse host:port string"),
QT_TRANSLATE_NOOP("dash-core", "Fee (in %s/kB) to add to transactions you send (default: %s)"),
QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing ( waiting %s )"),
Expand Down Expand Up @@ -380,14 +406,16 @@ QT_TRANSLATE_NOOP("dash-core", "KeePassHttp key for AES encrypted communication
QT_TRANSLATE_NOOP("dash-core", "Keep N DASH anonymized (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Keep at most <n> unconnectable transactions in memory (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Keep the transaction memory pool below <n> megabytes (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Keypool ran out, please call keypoolrefill first"),
QT_TRANSLATE_NOOP("dash-core", "Last PrivateSend was too recent."),
QT_TRANSLATE_NOOP("dash-core", "Last successful PrivateSend action was too recent."),
QT_TRANSLATE_NOOP("dash-core", "Line: %d"),
QT_TRANSLATE_NOOP("dash-core", "Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Listen for connections on <port> (default: %u or testnet: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Loading addresses..."),
QT_TRANSLATE_NOOP("dash-core", "Loading banlist..."),
QT_TRANSLATE_NOOP("dash-core", "Loading block index..."),
QT_TRANSLATE_NOOP("dash-core", "Loading fullfiled requests cache..."),
QT_TRANSLATE_NOOP("dash-core", "Loading fulfilled requests cache..."),
QT_TRANSLATE_NOOP("dash-core", "Loading governance cache..."),
QT_TRANSLATE_NOOP("dash-core", "Loading masternode cache..."),
QT_TRANSLATE_NOOP("dash-core", "Loading masternode payment cache..."),
Expand All @@ -406,11 +434,11 @@ QT_TRANSLATE_NOOP("dash-core", "Maximum per-connection send buffer, <n>*1000 byt
QT_TRANSLATE_NOOP("dash-core", "Minimum bytes per sigop in transactions we relay and mine (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Missing input transaction information."),
QT_TRANSLATE_NOOP("dash-core", "Mixing in progress..."),
QT_TRANSLATE_NOOP("dash-core", "Mnemonic passphrase is too long, must be at most 256 characters"),
QT_TRANSLATE_NOOP("dash-core", "Need to specify a port with -whitebind: '%s'"),
QT_TRANSLATE_NOOP("dash-core", "No Masternodes detected."),
QT_TRANSLATE_NOOP("dash-core", "No compatible Masternode found."),
QT_TRANSLATE_NOOP("dash-core", "No errors detected."),
QT_TRANSLATE_NOOP("dash-core", "No funds detected in need of denominating."),
QT_TRANSLATE_NOOP("dash-core", "No matching denominations found for mixing."),
QT_TRANSLATE_NOOP("dash-core", "Node relay options:"),
QT_TRANSLATE_NOOP("dash-core", "Non-standard public key detected."),
Expand All @@ -433,7 +461,8 @@ QT_TRANSLATE_NOOP("dash-core", "Prune cannot be configured with a negative value
QT_TRANSLATE_NOOP("dash-core", "Prune mode is incompatible with -txindex."),
QT_TRANSLATE_NOOP("dash-core", "Pruning blockstore..."),
QT_TRANSLATE_NOOP("dash-core", "RPC server options:"),
QT_TRANSLATE_NOOP("dash-core", "Rebuild block chain index from current blk000??.dat files on startup"),
QT_TRANSLATE_NOOP("dash-core", "Rebuild chain state and block index from the blk*.dat files on disk"),
QT_TRANSLATE_NOOP("dash-core", "Rebuild chain state from the currently indexed blocks"),
QT_TRANSLATE_NOOP("dash-core", "Receive and display P2P network alerts (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Reducing -maxconnections from %d to %d, because of system limitations."),
QT_TRANSLATE_NOOP("dash-core", "Relay and mine data carrier transactions (default: %u)"),
Expand Down Expand Up @@ -466,13 +495,13 @@ QT_TRANSLATE_NOOP("dash-core", "Spend unconfirmed change when sending transactio
QT_TRANSLATE_NOOP("dash-core", "Submitted following entries to masternode: %u / %d"),
QT_TRANSLATE_NOOP("dash-core", "Submitted to masternode, waiting for more entries ( %u / %d ) %s"),
QT_TRANSLATE_NOOP("dash-core", "Submitted to masternode, waiting in queue %s"),
QT_TRANSLATE_NOOP("dash-core", "Synchroning blockchain..."),
QT_TRANSLATE_NOOP("dash-core", "Synchronization failed"),
QT_TRANSLATE_NOOP("dash-core", "Synchronization finished"),
QT_TRANSLATE_NOOP("dash-core", "Synchronization pending..."),
QT_TRANSLATE_NOOP("dash-core", "Synchronizing governance objects..."),
QT_TRANSLATE_NOOP("dash-core", "Synchronizing masternode payments..."),
QT_TRANSLATE_NOOP("dash-core", "Synchronizing masternodes..."),
QT_TRANSLATE_NOOP("dash-core", "Synchronizing sporks..."),
QT_TRANSLATE_NOOP("dash-core", "The transaction amount is too small to pay the fee"),
QT_TRANSLATE_NOOP("dash-core", "This help message"),
QT_TRANSLATE_NOOP("dash-core", "This is experimental software."),
Expand Down Expand Up @@ -500,9 +529,9 @@ QT_TRANSLATE_NOOP("dash-core", "Unsupported argument -tor found, use -onion."),
QT_TRANSLATE_NOOP("dash-core", "Upgrade wallet to latest format on startup"),
QT_TRANSLATE_NOOP("dash-core", "Use KeePass 2 integration using KeePassHttp plugin (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Use UPnP to map the listening port (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Use the test chain"),
QT_TRANSLATE_NOOP("dash-core", "User Agent comment (%s) contains unsafe characters."),
QT_TRANSLATE_NOOP("dash-core", "Username for JSON-RPC connections"),
QT_TRANSLATE_NOOP("dash-core", "Value more than PrivateSend pool maximum allows."),
QT_TRANSLATE_NOOP("dash-core", "Verifying blocks..."),
QT_TRANSLATE_NOOP("dash-core", "Verifying wallet..."),
QT_TRANSLATE_NOOP("dash-core", "Very low number of keys left: %d"),
Expand All @@ -516,7 +545,6 @@ QT_TRANSLATE_NOOP("dash-core", "Warning: unknown new rules activated (versionbit
QT_TRANSLATE_NOOP("dash-core", "Wasn't able to create wallet backup folder %s!"),
QT_TRANSLATE_NOOP("dash-core", "Whether to operate in a blocks only mode (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Will retry..."),
QT_TRANSLATE_NOOP("dash-core", "You need to rebuild the database using -reindex to change -txindex"),
QT_TRANSLATE_NOOP("dash-core", "Your entries added successfully."),
QT_TRANSLATE_NOOP("dash-core", "Your transaction was accepted into the pool!"),
QT_TRANSLATE_NOOP("dash-core", "Zapping all transactions from wallet..."),
Expand Down
4 changes: 2 additions & 2 deletions src/qt/guiutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1035,11 +1035,11 @@ QString formatNiceTimeOffset(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)
{
Expand Down
Loading

0 comments on commit 11afd7c

Please sign in to comment.