From 7648cd46a477a30bd089651bb4fa8d413ba6f48f Mon Sep 17 00:00:00 2001 From: xanatos Date: Fri, 7 Sep 2012 16:04:39 +0300 Subject: [PATCH 1/5] Wrong address added to collection in test The wrong address is added to the collection. As was written a second copy of address1 was added (and so address2 was useless). --- src/test/rpc_tests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index 45424163f85..5b8086ffef6 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -22,7 +22,7 @@ createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL) result.push_back(nRequired); Array addresses; if (address1) addresses.push_back(address1); - if (address2) addresses.push_back(address1); + if (address2) addresses.push_back(address2); result.push_back(addresses); return result; } From 4c1bc220134aef99047294dc6673b59ec6d235cb Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Mon, 10 Sep 2012 23:52:27 +0000 Subject: [PATCH 2/5] Bugfix: Correct doubled-up & in translations and remove extra spaces after ampersand in translations (this fixes hotkeys) Partial of upstream 4ee706243c670bf308123792d026d7dab6b5ae69. --- src/qt/locale/bitcoin_pt_BR.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index 34c70c2c58d..568de45ca07 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -51,7 +51,7 @@ This product includes software developed by the OpenSSL Project for use in the O &New Address... - & Novo endereço ... + &Novo endereço ... @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Copy to Clipboard - & Copie para a área de transferência do sistema + &Copie para a área de transferência do sistema From 2ff8456c11f389f5e7ce29ee0ba3183a6576a167 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Mon, 10 Sep 2012 23:52:27 +0000 Subject: [PATCH 3/5] Bugfix: Correct doubled-up & in translations and remove extra spaces after ampersand in translations (this fixes hotkeys) Partial of upstream 4ee706243c670bf308123792d026d7dab6b5ae69. --- src/qt/locale/bitcoin_es_CL.ts | 2 +- src/qt/locale/bitcoin_fa.ts | 12 ++++++------ src/qt/locale/bitcoin_lt.ts | 2 +- src/qt/locale/bitcoin_pt_BR.ts | 6 +++--- src/qt/locale/bitcoin_sv.ts | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index be702c5e667..20f6369d794 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -881,7 +881,7 @@ Dirección: %4 &Sign Message - & Firmar Mensaje + &Firmar Mensaje diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 9adc50686ee..f6253df9f56 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -380,7 +380,7 @@ Are you sure you wish to encrypt your wallet? &Transactions - &معاملات + &معاملات @@ -477,7 +477,7 @@ Are you sure you wish to encrypt your wallet? Open &Bitcoin - باز کردن &بیتکویین + باز کردن &بیتکویین @@ -789,7 +789,7 @@ Address: %4 Pay transaction &fee - دستمزد&پر داخت معامله + دستمزد&پر داخت معامله @@ -1136,12 +1136,12 @@ Address: %4 A&mount: - A&مبلغ : + A&مبلغ : Pay &To: - به&پر داخت : + به&پر داخت : @@ -1152,7 +1152,7 @@ Address: %4 &Label: - & بر چسب + &بر چسب diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 8afe58e9013..1ceedd4f935 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -749,7 +749,7 @@ Adresas: %4 Map port using &UPnP - Prievado struktūra naudojant & UPnP + Prievado struktūra naudojant &UPnP diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index 6f30fc2580f..542819990e8 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -56,7 +56,7 @@ This product includes software developed by the OpenSSL Project for use in the O &New Address... - & Novo endereço ... + &Novo endereço ... @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Copy to Clipboard - & Copie para a área de transferência do sistema + &Copie para a área de transferência do sistema @@ -819,7 +819,7 @@ Endereço: %4 &Copy to Clipboard - & Copie para a área de transferência do sistema + &Copie para a área de transferência do sistema diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index 71d001d479b..efa59e2a195 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -346,7 +346,7 @@ Are you sure you wish to encrypt your wallet? Open &Bitcoin - Öppna &Bitcoin + Öppna &Bitcoin @@ -584,7 +584,7 @@ Adress: %4 &Encrypt Wallet - &Kryptera plånbok + &Kryptera plånbok @@ -604,7 +604,7 @@ Adress: %4 &Change Passphrase - &Byt lösenfras + &Byt lösenfras @@ -866,7 +866,7 @@ Adress: %4 &Copy to Clipboard - & Kopiera till Urklipp + &Kopiera till Urklipp @@ -1145,7 +1145,7 @@ Adress: %4 Pay &To: - Betala & Till: + Betala &Till: From 82bcb7bf8008be758df6ec0be82067c47917f471 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 18 Jul 2012 22:11:56 +0800 Subject: [PATCH 4/5] Docs Tidy up Partial of f00a0dcfed248186811ae596dbe42f83c8550b31. --- contrib/debian/control | 4 ++-- contrib/debian/copyright | 6 +++--- doc/README | 2 +- doc/assets-attribution.txt | 4 ++-- doc/readme-qt.rst | 13 ++++++------- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/contrib/debian/control b/contrib/debian/control index 9152339c4ee..9d8764d6cbf 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -42,7 +42,7 @@ Description: peer-to-peer network based digital currency - daemon Package: bitcoin-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: peer-to-peer network based digital currency - QT GUI +Description: peer-to-peer network based digital currency - Qt GUI Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and @@ -54,4 +54,4 @@ Description: peer-to-peer network based digital currency - QT GUI Full transaction history is stored locally at each client. This requires 2+ GB of space, slowly growing. . - This package provides bitcoin-qt, a GUI for Bitcoin based on QT. + This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt. diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 5db418df3aa..749682813e6 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -6,7 +6,7 @@ Source: http://sourceforge.net/projects/bitcoin/files/ https://github.com/bitcoin/bitcoin Files: * -Copyright: 2009-2011, Bitcoin Developers +Copyright: 2009-2012, Bitcoin Developers License: Expat Comment: The Bitcoin Developers encompasses the current developers listed on bitcoin.org, as well as the numerous contributors to the project. @@ -57,7 +57,7 @@ Files: src/qt/res/icons/transaction*.png Copyright: md2k7 License: You are free to do with these icons as you wish, including selling, copying, modifying etc. -Comment: Site: https://forum.bitcoin.org/index.php?topic=15276.0 +Comment: Site: https://bitcointalk.org/index.php?topic=15276.0 Files: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png, src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png, @@ -70,7 +70,7 @@ Comment: Icon Pack: Crystal SVG Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan) License: PUB-DOM -Comment: Site: http://forum.bitcoin.org/?topic=1756.0 +Comment: Site: https://bitcointalk.org/?topic=1756.0 Files: scripts/img/reload.xcf, src/qt/res/movies/update_spinner.mng Copyright: Everaldo (Everaldo Coelho) diff --git a/doc/README b/doc/README index 07e480e7a8f..6d2c77c6387 100644 --- a/doc/README +++ b/doc/README @@ -18,7 +18,7 @@ with each other, with the help of a P2P network to check for double-spending. Setup ----- -You need the Qt4 run-time libraries to run bitcoin-qt. On Debian or Ubuntu: +You need the Qt4 run-time libraries to run Bitcoin-Qt. On Debian or Ubuntu: sudo apt-get install libqtgui4 Unpack the files into a directory and run: diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index 2ed25bbe9ea..afbe3df67d8 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -26,7 +26,7 @@ Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0 Icon: src/qt/res/icons/transaction*.png Designer: md2k7 -Site: https://forum.bitcoin.org/index.php?topic=15276.0 +Site: https://bitcointalk.org/index.php?topic=15276.0 License: You are free to do with these icons as you wish, including selling, copying, modifying etc. @@ -41,7 +41,7 @@ License: LGPL Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan) License: Public Domain -Site: http://forum.bitcoin.org/?topic=1756.0 +Site: https://bitcointalk.org/?topic=1756.0 Icon: scripts/img/reload.xcf (modified),src/qt/res/movies/update_spinner.mng Icon Pack: Kids diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst index 090177321eb..07d59f96853 100644 --- a/doc/readme-qt.rst +++ b/doc/readme-qt.rst @@ -1,4 +1,4 @@ -Bitcoin-qt: Qt4 GUI for Bitcoin +Bitcoin-Qt: Qt4 GUI for Bitcoin =============================== Features @@ -60,21 +60,20 @@ Alternatively, install Qt Creator and open the `bitcoin-qt.pro` file. An executable named `bitcoin-qt` will be built. - Windows -------- Windows build instructions: -- Download the `QT Windows SDK`_ and install it. You don't need the Symbian stuff, just the desktop Qt. +- Download the `Qt Windows SDK`_ and install it. You don't need the Symbian stuff, just the desktop Qt. - Download and extract the `dependencies archive`_ [#]_, or compile openssl, boost and dbcxx yourself. - Copy the contents of the folder "deps" to "X:\\QtSDK\\mingw", replace X:\\ with the location where you installed the Qt SDK. Make sure that the contents of "deps\\include" end up in the current "include" directory. -- Open the .pro file in QT creator and build as normal (ctrl-B) +- Open the bitcoin-qt.pro file in Qt Creator and build as normal (ctrl-B) -.. _`QT Windows SDK`: http://qt.nokia.com/downloads/sdk-windows-cpp +.. _`Qt Windows SDK`: http://qt.nokia.com/downloads/sdk-windows-cpp .. _`dependencies archive`: https://download.visucore.com/bitcoin/qtgui_deps_1.zip .. [#] PGP signature: https://download.visucore.com/bitcoin/qtgui_deps_1.zip.sig (signed with RSA key ID `610945D0`_) .. _`610945D0`: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x610945D0 @@ -94,7 +93,7 @@ Mac OS X sudo port selfupdate sudo port install boost db48 -- Open the .pro file in Qt Creator and build as normal (cmd-B) +- Open the bitcoin-qt.pro file in Qt Creator and build as normal (cmd-B) .. _`Qt Mac OS X SDK`: http://qt.nokia.com/downloads/sdk-mac-os-cpp .. _`MacPorts`: http://www.macports.org/install.php @@ -103,7 +102,7 @@ Mac OS X Build configuration options ============================ -UPNnP port forwarding +UPnP port forwarding --------------------- To use UPnP for port forwarding behind a NAT router (recommended, as more connections overall allow for a faster and more stable bitcoin experience), pass the following argument to qmake: From cae8742130b31fc1b23b2108a90db28254807e85 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Sat, 8 Sep 2012 21:51:52 +0000 Subject: [PATCH 5/5] Apply MIT license to md2k7 art [21:48:14] feel free to make it MIT if you like --- contrib/debian/copyright | 3 +-- doc/assets-attribution.txt | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 749682813e6..fde33d3730d 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -55,8 +55,7 @@ Comment: Icon Pack: Human-O2 Files: src/qt/res/icons/transaction*.png Copyright: md2k7 -License: You are free to do with these icons as you wish, including selling, - copying, modifying etc. +License: Expat Comment: Site: https://bitcointalk.org/index.php?topic=15276.0 Files: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png, diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index afbe3df67d8..479e0e7960e 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -29,6 +29,7 @@ Designer: md2k7 Site: https://bitcointalk.org/index.php?topic=15276.0 License: You are free to do with these icons as you wish, including selling, copying, modifying etc. +License: MIT Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png, src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,