diff options
| -rw-r--r-- | bitcoin-qt.pro | 15 | ||||
| -rw-r--r-- | src/qt/bitcoingui.cpp | 5 | ||||
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 1 | ||||
| -rw-r--r-- | src/qt/forms/aboutdialog.ui | 19 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 142 |
5 files changed, 96 insertions, 86 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index c8f46538b2..bf0c87e7e3 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -75,12 +75,12 @@ contains(FIRST_CLASS_MESSAGING, 1) { # or: qmake "USE_IPV6=0" (disabled by default) # or: qmake "USE_IPV6=-" (not supported) contains(USE_IPV6, -) { - message(Building without IPv6 support) + message(Building without IPv6 support) } else { - count(USE_IPV6, 0) { - USE_IPV6=1 - } - DEFINES += USE_IPV6=$$USE_IPV6 + count(USE_IPV6, 0) { + USE_IPV6=1 + } + DEFINES += USE_IPV6=$$USE_IPV6 } contains(BITCOIN_NEED_QT_PLUGINS, 1) { @@ -92,7 +92,7 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { # for extra security against potential buffer overflows QMAKE_CXXFLAGS += -fstack-protector QMAKE_LFLAGS += -fstack-protector - # do not enable this on windows, as it will result in a non-working executable! + # do not enable this on windows cross compile with mingw 4.2.x, as it will result in a non-working executable! } # regenerate src/build.h @@ -202,9 +202,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/addrman.cpp \ src/db.cpp \ src/walletdb.cpp \ - src/json/json_spirit_writer.cpp \ - src/json/json_spirit_value.cpp \ - src/json/json_spirit_reader.cpp \ src/qt/clientmodel.cpp \ src/qt/guiutil.cpp \ src/qt/transactionrecord.cpp \ diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 1bdc313da8..27b974b5c6 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -273,8 +273,7 @@ void BitcoinGUI::createActions() optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); optionsAction->setToolTip(tr("Modify configuration options for Bitcoin")); optionsAction->setMenuRole(QAction::PreferencesRole); - toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("Show/Hide &Bitcoin"), this); - toggleHideAction->setToolTip(tr("Show or hide the Bitcoin window")); + toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Show / Hide"), this); exportAction = new QAction(QIcon(":/icons/export"), tr("&Export..."), this); exportAction->setToolTip(tr("Export the data in the current tab to a file")); encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this); @@ -463,7 +462,7 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) { if(reason == QSystemTrayIcon::Trigger) { - // Click on system tray icon triggers "show/hide Bitcoin" + // Click on system tray icon triggers show/hide of the main window toggleHideAction->trigger(); } } diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 5fe9e5218a..92b3352866 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -92,6 +92,7 @@ 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", "Imports blocks from external blk000?.dat file"), QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"), diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index 6632e311d0..b59c2445de 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -65,9 +65,6 @@ <property name="text"> <string notr="true">0.3.666-beta</string> </property> - <property name="textFormat"> - <enum>Qt::RichText</enum> - </property> <property name="textInteractionFlags"> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> </property> @@ -89,13 +86,25 @@ </layout> </item> <item> + <widget class="QLabel" name="copyrightLabel"> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> + </property> + <property name="text"> + <string>Copyright © 2009-2012 The Bitcoin developers</string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item> <widget class="QLabel" name="label_2"> <property name="cursor"> <cursorShape>IBeamCursor</cursorShape> </property> <property name="text"> - <string>Copyright © 2009-2012 Bitcoin Developers - + <string> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 849ff47a52..2ac97a532b 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -15,9 +15,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -286,22 +290,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation type="unfinished"></translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation type="unfinished"></translation> </message> @@ -376,7 +375,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation type="unfinished"></translation> </message> @@ -409,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"></translation> </message> @@ -434,12 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"></translation> </message> @@ -469,12 +463,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"></translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation type="unfinished"></translation> </message> @@ -484,12 +478,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation type="unfinished"></translation> </message> @@ -657,7 +656,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -741,7 +740,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"></translation> @@ -960,7 +959,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"></translation> @@ -1256,7 +1255,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -2106,7 +2105,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> @@ -2121,12 +2120,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation type="unfinished"></translation> </message> @@ -2141,7 +2140,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation type="unfinished"></translation> </message> @@ -2151,7 +2150,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation type="unfinished"></translation> </message> @@ -2181,27 +2180,27 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"></translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"></translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> @@ -2216,7 +2215,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"></translation> </message> @@ -2226,7 +2225,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"></translation> </message> @@ -2281,7 +2280,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"></translation> </message> @@ -2391,22 +2395,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"></translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> @@ -2421,7 +2425,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> @@ -2431,7 +2435,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"></translation> </message> @@ -2451,17 +2455,17 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> @@ -2471,12 +2475,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation type="unfinished"></translation> </message> @@ -2486,12 +2490,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation type="unfinished"></translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"></translation> </message> @@ -2506,17 +2510,17 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"></translation> </message> @@ -2531,7 +2535,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"></translation> </message> @@ -2541,12 +2545,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"></translation> </message> @@ -2566,17 +2570,17 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation type="unfinished"></translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <source>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.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation type="unfinished"></translation> </message> @@ -2591,7 +2595,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"></translation> </message> @@ -2611,12 +2615,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"></translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> @@ -2631,22 +2635,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation type="unfinished"></translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation type="unfinished"></translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: |