From f1e262c8e1b317b6c23d1a113ec4fce115f7a6f8 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 4 Oct 2012 08:13:37 +0200 Subject: [PATCH] Translation update for 0.7.1 Also clarify translation process that the package `gettext` is needed to run string extractor. --- doc/translation_process.md | 4 +- src/qt/bitcoinstrings.cpp | 12 +- src/qt/locale/bitcoin_en.ts | 283 ++++++++++++++++++++---------------- 3 files changed, 171 insertions(+), 128 deletions(-) diff --git a/doc/translation_process.md b/doc/translation_process.md index 7ef22d83..1724e953 100644 --- a/doc/translation_process.md +++ b/doc/translation_process.md @@ -34,7 +34,9 @@ This directory contains all translations. Filenames must adhere to this format: source for all other translations. Whenever a string in the code is changed this file must be updated to reflect those changes. This can be accomplished by running `lupdate` (included in the Qt SDK). Also, a custom script is used -to extract strings from the non-Qt parts: +to extract strings from the non-Qt parts. This script makes use of `gettext`, +so make sure that utility is installed (ie, `apt-get install gettext` on +Ubuntu/Debian): python share/qt/extract_strings_qt.py lupdate bitcoin-qt.pro -no-obsolete -locations relative -ts src/qt/locale/bitcoin_en.ts diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 20d18304..53e72972 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -19,6 +19,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:" "@STRENGTH)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"An error occurred while setting up the RPC port %i for listening on IPv6, " +"falling back to IPv4: %s"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"An error occurred while setting up the RPC port %u for listening on IPv4: %s"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Cannot obtain a lock on data directory %s. Bitcoin is probably already " "running."), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -34,6 +39,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Execute command when the best block changes (%s in cmd is replaced by block " "hash)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Listen for JSON-RPC connections on (default: 8332 or testnet: 18332)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: " "86400)"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -60,7 +67,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 i QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"), QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"), QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"), -QT_TRANSLATE_NOOP("bitcoin-core", "An error occurred while setting up the RPC port %i for listening: %s"), QT_TRANSLATE_NOOP("bitcoin-core", "Bind to given address. Use [host]:port notation for IPv6"), QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"), QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin"), @@ -92,7 +98,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins"), QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 2500, 0 = all)"), QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-6, default: 1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Importing blocks..."), +QT_TRANSLATE_NOOP("bitcoin-core", "Importing blockchain data file."), +QT_TRANSLATE_NOOP("bitcoin-core", "Importing bootstrap blockchain data file."), QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000?.dat file"), QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"), @@ -100,7 +107,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -tor address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"), QT_TRANSLATE_NOOP("bitcoin-core", "List commands"), -QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on (default: 8332)"), QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on (default: 8333 or testnet: 18333)"), QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index f8876325..715b046a 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1,4 +1,6 @@ - + + + UTF-8 AboutDialog @@ -82,11 +84,16 @@ This product includes software developed by the OpenSSL Project for use in the O - &Sign Message - &Sign Message + Sign &Message + - + + Delete the currently selected address from the list + + + + Verify a message to ensure it was signed with a specified Bitcoin address Verify a message to ensure it was signed with a specified Bitcoin address @@ -96,12 +103,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Verify Message - - Delete the currently selected address from the list. Only sending addresses can be deleted. - Delete the currently selected address from the list. Only sending addresses can be deleted. - - - + &Delete &Delete @@ -232,24 +234,29 @@ This product includes software developed by the OpenSSL Project for use in the O Are you sure you wish to encrypt your wallet? - + + IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet. + + + + Warning: The Caps Lock key is on! Warning: The Caps Lock key is on! - - + + Wallet encrypted Wallet encrypted - + Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer. Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer. - + @@ -293,17 +300,17 @@ This product includes software developed by the OpenSSL Project for use in the O BitcoinGUI - + Sign &message... Sign &message... - + Synchronizing with network... Synchronizing with network... - + &Overview &Overview @@ -313,7 +320,7 @@ This product includes software developed by the OpenSSL Project for use in the O Show general overview of wallet - + &Transactions &Transactions @@ -333,7 +340,7 @@ This product includes software developed by the OpenSSL Project for use in the O Edit the list of stored addresses and labels - + &Receive coins &Receive coins @@ -343,12 +350,12 @@ This product includes software developed by the OpenSSL Project for use in the O Show the list of addresses for receiving payments - + &Send coins &Send coins - + E&xit E&xit @@ -378,7 +385,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Options... - + &Encrypt Wallet... &Encrypt Wallet... @@ -395,7 +402,10 @@ This product includes software developed by the OpenSSL Project for use in the O ~%n block(s) remaining - ~%n block remaining~%n blocks remaining + + ~%n block remaining + ~%n blocks remaining + @@ -403,42 +413,27 @@ This product includes software developed by the OpenSSL Project for use in the O Downloaded %1 of %2 blocks of transaction history (%3% done). - + &Export... &Export... - + Send coins to a Bitcoin address Send coins to a Bitcoin address - - Sign a message to prove you own a Bitcoin address - Sign a message to prove you own a Bitcoin address - - - - Verify a message to ensure it was signed with a specified Bitcoin address - Verify a message to ensure it was signed with a specified Bitcoin address - - - - S&ignatures - S&ignatures - - - + Modify configuration options for Bitcoin Modify configuration options for Bitcoin - + Export the data in the current tab to a file Export the data in the current tab to a file - + Encrypt or decrypt wallet Encrypt or decrypt wallet @@ -453,7 +448,7 @@ This product includes software developed by the OpenSSL Project for use in the O Change the passphrase used for wallet encryption - + &Debug window &Debug window @@ -463,12 +458,12 @@ This product includes software developed by the OpenSSL Project for use in the O Open debugging and diagnostic console - + &Verify message... &Verify message... - + Bitcoin Bitcoin @@ -478,7 +473,7 @@ This product includes software developed by the OpenSSL Project for use in the O Wallet - + &About Bitcoin &About Bitcoin @@ -488,12 +483,12 @@ This product includes software developed by the OpenSSL Project for use in the O &Show / Hide - + &File &File - + &Settings &Settings @@ -508,7 +503,7 @@ This product includes software developed by the OpenSSL Project for use in the O Tabs toolbar - + Actions toolbar Actions toolbar @@ -525,9 +520,12 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin client - + %n active connection(s) to Bitcoin network - %n active connection to Bitcoin network%n active connections to Bitcoin network + + %n active connection to Bitcoin network + %n active connections to Bitcoin network + @@ -537,22 +535,34 @@ This product includes software developed by the OpenSSL Project for use in the O %n second(s) ago - %n second ago%n seconds ago + + %n second ago + %n seconds ago + %n minute(s) ago - %n minute ago%n minutes ago + + %n minute ago + %n minutes ago + %n hour(s) ago - %n hour ago%n hours ago + + %n hour ago + %n hours ago + %n day(s) ago - %n day ago%n days ago + + %n day ago + %n days ago + @@ -603,7 +613,7 @@ Address: %4 - + URI handling URI handling @@ -1110,7 +1120,7 @@ Address: %4 - + N/A N/A @@ -1261,8 +1271,8 @@ Address: %4 - &Add Recipient - &Add Recipient + Add &Recipient + @@ -1291,8 +1301,8 @@ Address: %4 - &Send - &Send + S&end + @@ -1604,7 +1614,10 @@ Address: %4 Open for %n block(s) - Open for %n blockOpen for %n blocks + + Open for %n block + Open for %n blocks + @@ -1629,7 +1642,10 @@ Address: %4 , broadcast through %n node(s) - , broadcast through %n node, broadcast through %n nodes + + , broadcast through %n node + , broadcast through %n nodes + @@ -1647,7 +1663,7 @@ Address: %4 Generated - + From From @@ -1682,7 +1698,10 @@ Address: %4 matures in %n more block(s) - matures in %n more blockmatures in %n more blocks + + matures in %n more block + matures in %n more blocks + @@ -1758,12 +1777,12 @@ Address: %4 false - + , has not been successfully broadcast yet , has not been successfully broadcast yet - + unknown unknown @@ -1806,7 +1825,10 @@ Address: %4 Open for %n block(s) - Open for %n blockOpen for %n blocks + + Open for %n block + Open for %n blocks + @@ -1831,7 +1853,10 @@ Address: %4 Mined balance will be available when it matures in %n more block(s) - Mined balance will be available when it matures in %n more blockMined balance will be available when it matures in %n more blocks + + Mined balance will be available when it matures in %n more block + Mined balance will be available when it matures in %n more blocks + @@ -2074,7 +2099,7 @@ Address: %4 bitcoin-core - + Bitcoin version Bitcoin version @@ -2089,12 +2114,12 @@ Address: %4 Send command to -server or bitcoind - + List commands List commands - + Get help for a command Get help for a command @@ -2169,22 +2194,47 @@ Address: %4 Threshold for disconnecting misbehaving peers (default: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + + An error occurred while setting up the RPC port %i for listening on IPv6, falling back to IPv4: %s + + + + + An error occurred while setting up the RPC port %u for listening on IPv4: %s + + + + Detach block and address databases. Increases shutdown time (default: 0) Detach block and address databases. Increases shutdown time (default: 0) - + + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) + + + + Accept command line and JSON-RPC commands Accept command line and JSON-RPC commands - + + Importing blockchain data file. + + + + + Importing bootstrap blockchain data file. + + + + Run in the background as a daemon and accept commands Run in the background as a daemon and accept commands @@ -2194,7 +2244,7 @@ Address: %4 Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) Accept connections from outside (default: 1 if no -proxy or -connect) @@ -2219,12 +2269,7 @@ Address: %4 Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly. - - An error occurred while setting up the RPC port %i for listening: %s - An error occurred while setting up the RPC port %i for listening: %s - - - + Block creation options: Block creation options: @@ -2249,17 +2294,12 @@ Address: %4 Find peers using DNS lookup (default: 1 unless -connect) - - Importing blocks... - Importing blocks... - - - + Invalid -tor address: '%s' Invalid -tor address: '%s' - + Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000) Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000) @@ -2364,27 +2404,22 @@ Address: %4 Password for JSON-RPC connections - - Listen for JSON-RPC connections on <port> (default: 8332) - Listen for JSON-RPC connections on <port> (default: 8332) - - - + Allow JSON-RPC connections from specified IP address Allow JSON-RPC connections from specified IP address - + Send commands to node running on <ip> (default: 127.0.0.1) Send commands to node running on <ip> (default: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format Upgrade wallet to latest format @@ -2409,12 +2444,12 @@ Address: %4 How thorough the block verification is (0-6, default: 1) - + Imports blocks from external blk000?.dat file Imports blocks from external blk000?.dat file - + Use OpenSSL (https) for JSON-RPC connections Use OpenSSL (https) for JSON-RPC connections @@ -2429,22 +2464,22 @@ Address: %4 Server private key (default: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message This help message - + Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - + Bitcoin Bitcoin @@ -2459,12 +2494,12 @@ Address: %4 Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... Loading addresses... @@ -2494,12 +2529,12 @@ Address: %4 Error loading wallet.dat - + Invalid -proxy address: '%s' Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' Unknown network specified in -onlynet: '%s' @@ -2519,12 +2554,12 @@ Address: %4 Cannot resolve -externalip address: '%s' - + Invalid amount for -paytxfee=<amount>: '%s' Invalid amount for -paytxfee=<amount>: '%s' - + Error: could not start node Error: could not start node @@ -2534,12 +2569,12 @@ Address: %4 Error: Wallet locked, unable to create transaction - + Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds - + Error: Transaction creation failed Error: Transaction creation failed @@ -2549,12 +2584,12 @@ Address: %4 Sending... - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. - + Invalid amount Invalid amount @@ -2564,12 +2599,12 @@ Address: %4 Insufficient funds - + Loading block index... Loading block index... - + Add a node to connect to and attempt to keep the connection open Add a node to connect to and attempt to keep the connection open @@ -2579,7 +2614,7 @@ Address: %4 Unable to bind to %s on this computer. Bitcoin is probably already running. - + Find peers using internet relay chat (default: 0) Find peers using internet relay chat (default: 0) @@ -2624,7 +2659,7 @@ Address: %4 To use the %s option - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2643,12 +2678,12 @@ If the file does not exist, create it with owner-readable-only file permissions. - + Error Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. @@ -2657,4 +2692,4 @@ If the file does not exist, create it with owner-readable-only file permissions. If the file does not exist, create it with owner-readable-only file permissions. - \ No newline at end of file +