diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/README | 4 | ||||
-rw-r--r-- | doc/README_windows.txt | 4 | ||||
-rw-r--r-- | doc/assets-attribution.txt | 6 | ||||
-rw-r--r-- | doc/build-msw.txt | 8 | ||||
-rw-r--r-- | doc/build-osx.txt | 9 | ||||
-rw-r--r-- | doc/build-unix.txt | 3 | ||||
-rw-r--r-- | doc/readme-qt.rst | 57 | ||||
-rw-r--r-- | doc/release-process.txt | 21 | ||||
-rw-r--r-- | doc/translation_process.md | 33 |
9 files changed, 71 insertions, 74 deletions
diff --git a/doc/README b/doc/README index d8453a4d6d..a196a461e5 100644 --- a/doc/README +++ b/doc/README @@ -1,6 +1,6 @@ -Bitcoin 0.5.99 BETA +Bitcoin 0.6.1 BETA -Copyright (c) 2009-2011 Bitcoin Developers +Copyright (c) 2009-2012 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in diff --git a/doc/README_windows.txt b/doc/README_windows.txt index f3e9811aaf..ec0225fd92 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,6 +1,6 @@ -Bitcoin 0.5.99 BETA
+Bitcoin 0.6.1 BETA
-Copyright (c) 2009-2011 Bitcoin Developers
+Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file license.txt or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index 5cf0a734bf..0b0e377065 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -1,3 +1,7 @@ +Code: src/strlcpy.h +Author: Todd C. Miller <Todd.Miller@courtesan.com> +License: ISC + Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png, src/qt/res/src/*.svg Designer: Wladimir van der Laan @@ -7,7 +11,7 @@ Icon: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png, src/qt/res/icons/history.png, src/qt/res/icons/key.png, src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png, src/qt/res/icons/receive.png, src/qt/res/icons/send.png, - src/qt/res/icons/synced.png + src/qt/res/icons/synced.png, src/qt/res/icons/filesave.png Icon Pack: NUVOLA ICON THEME for KDE 3.x Designer: David Vignoni (david@icon-king.com) ICON KING - www.icon-king.com diff --git a/doc/build-msw.txt b/doc/build-msw.txt index 346be75f56..b1805154e1 100644 --- a/doc/build-msw.txt +++ b/doc/build-msw.txt @@ -1,4 +1,4 @@ -Copyright (c) 2009-2011 Bitcoin Developers +Copyright (c) 2009-2012 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in @@ -24,7 +24,7 @@ Dependencies Libraries you need to download separately and build: default path download -OpenSSL \openssl-1.0.0d-mgw http://www.openssl.org/source/ +OpenSSL \openssl-1.0.1b-mgw http://www.openssl.org/source/ Berkeley DB \db-4.8.30.NC-mgw http://www.oracle.com/technology/software/products/berkeley-db/index.html Boost \boost-1.47.0-mgw http://www.boost.org/users/download/ miniupnpc \miniupnpc-1.6-mgw http://miniupnp.tuxfamily.org/files/ @@ -36,7 +36,7 @@ Boost MIT-like license miniupnpc New (3-clause) BSD license Versions used in this release: -OpenSSL 1.0.0e +OpenSSL 1.0.1b Berkeley DB 4.8.30.NC Boost 1.47.0 miniupnpc 1.6 @@ -48,7 +48,7 @@ MSYS shell: un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377) change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe' -cd /c/openssl-1.0.0e-mgw +cd /c/openssl-1.0.1b-mgw ./config make diff --git a/doc/build-osx.txt b/doc/build-osx.txt index d47febe94b..2ae77067fc 100644 --- a/doc/build-osx.txt +++ b/doc/build-osx.txt @@ -1,4 +1,4 @@ -Copyright (c) 2011 Bitcoin Developers +Copyright (c) 2009-2012 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in the @@ -36,12 +36,7 @@ git clone git@github.com:bitcoin/bitcoin.git bitcoin 3. Install dependencies from MacPorts -sudo port install boost db48 openssl - -Install the right version of miniupnpc: -pushd bitcoin/contrib/minipupnpc; sudo port install; popd -(this will be unnecessary soon, you will just port install miniupnpc -along with the rest of the dependencies). +sudo port install boost db48 openssl miniupnpc Optionally install qrencode (and set USE_QRCODE=1): sudo port install qrencode diff --git a/doc/build-unix.txt b/doc/build-unix.txt index e1a1805aa3..c5b4205084 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -1,5 +1,4 @@ -Copyright (c) 2009-2010 Satoshi Nakamoto -Copyright (c) 2011 Bitcoin Developers +Copyright (c) 2009-2012 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst index 090177321e..294f31ac24 100644 --- a/doc/readme-qt.rst +++ b/doc/readme-qt.rst @@ -1,39 +1,6 @@ Bitcoin-qt: Qt4 GUI for Bitcoin =============================== -Features -======== - -- All functionality of the Wx GUI, including wallet encryption - -- Compatibility with Linux (both GNOME and KDE), MacOSX and Windows - -- Notification on incoming / outgoing transactions (compatible with FreeDesktop and other desktop notification schemes) - -- General interface improvements: Splash screen, tabbed interface - -- Overview page with current balance, unconfirmed balance, and such - -- Better transaction list with status icons, real-time filtering and a context menu - -- Asks for confirmation before sending coins, for your own safety - -- CSV export of transactions and address book (for Excel bookkeeping) - -- Shows alternative icon when connected to testnet, so you never accidentally send real coins during testing - -- Shows a progress bar on initial block download, so that you don't have to wonder how many blocks it needs to download to be up to date - -- Sendmany support, send to multiple recipients at the same time - -- Multiple unit support, can show subdivided bitcoins (uBTC, mBTC) for users that like large numbers - -- Support for English, German, Russian and Dutch languages - -- Address books and transaction table can be sorted by any column - -- Accepts "bitcoin:" URLs from browsers and other sources through drag and drop - Build instructions =================== @@ -92,7 +59,7 @@ Mac OS X :: sudo port selfupdate - sudo port install boost db48 + sudo port install boost db48 miniupnpc - Open the .pro file in Qt Creator and build as normal (cmd-B) @@ -127,14 +94,6 @@ Set USE_UPNP to a different value to control this: | USE_UPNP=1 | build with UPnP support turned on by default at runtime. | +------------+--------------------------------------------------------------------------+ -Mac OS X users: miniupnpc is currently outdated on MacPorts. An updated Portfile is provided in contrib/miniupnpc within this project. -You can execute the following commands in a terminal to install it: - -:: - - cd <location of bitcoin-qt>/contrib/miniupnpc - sudo port install - Notification support for recent (k)ubuntu versions --------------------------------------------------- @@ -145,6 +104,20 @@ FreeDesktop notification interface through DBUS using the following qmake option qmake "USE_DBUS=1" +Generation of QR codes +----------------------- + +libqrencode may be used to generate QRCode images for payment requests. +It can be downloaded from http://fukuchi.org/works/qrencode/index.html.en, or installed via your package manager. Pass the USE_QRCODE +flag to qmake to control this: + ++--------------+--------------------------------------------------------------------------+ +| USE_QRCODE=0 | (the default) No QRCode support - libarcode not required | ++--------------+--------------------------------------------------------------------------+ +| USE_QRCODE=1 | QRCode support enabled | ++--------------+--------------------------------------------------------------------------+ + + Berkely DB version warning ========================== diff --git a/doc/release-process.txt b/doc/release-process.txt index 3f1a6a5fb7..00fafa4818 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -2,7 +2,7 @@ * update (commit) version in sources bitcoin-qt.pro - src/main.h (CLIENT_VERSION : PROTOCOL_VERSION in serialize.h is updated only on protocol changes) + src/version.h share/setup.nsi doc/README* @@ -24,8 +24,11 @@ * Fetch and build inputs: mkdir -p inputs; cd inputs/ wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz - wget 'http://www.openssl.org/source/openssl-1.0.0e.tar.gz' + wget 'http://www.openssl.org/source/openssl-1.0.1b.tar.gz' wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' + wget 'http://zlib.net/zlib-1.2.6.tar.gz' + wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz' + wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2' wget 'http://downloads.sourceforge.net/project/boost/boost/1.47.0/boost_1_47_0.tar.bz2' wget 'http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz' cd .. @@ -33,6 +36,8 @@ cp build/out/boost-win32-1.47.0-gitian.zip inputs/ ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml cp build/out/qt-win32-4.7.4-gitian.zip inputs/ + ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml + cp build/out/bitcoin-deps-0.0.3.zip inputs/ * Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32: ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml @@ -67,14 +72,18 @@ rm -rf bitcoin-${VERSION}-win32 * perform Mac build - See this blog post for how Gavin set up his build environment and - patched macdeployqt to build the OSX release: + See this blog post for how Gavin set up his build environment to build the OSX + release; note that a patched version of macdeployqt is not needed anymore, as + the required functionality and fixes are implemented directly in macdeployqtplus: http://gavintech.blogspot.com/2011/11/deploying-bitcoin-qt-on-osx.html - qmake USE_SSL=1 USE_UPNP=1 bitcoin-qt.pro + Gavin also had trouble with the macports py27-appscript package; he + ended up installing a version that worked with: /usr/bin/easy_install-2.7 appscript + + qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 bitcoin-qt.pro make export QTDIR=/opt/local/share/qt4 # needed to find translations/qt_*.qm files T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale) - contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist + python2.7 contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist Build output expected: Bitcoin-Qt.dmg diff --git a/doc/translation_process.md b/doc/translation_process.md index cf1000573f..3ddfc0cbf4 100644 --- a/doc/translation_process.md +++ b/doc/translation_process.md @@ -1,7 +1,7 @@ Translations ============ -The QT GUI can be easily be translated into other languages. Here's how we +The Qt GUI can be easily translated into other languages. Here's how we handle those translations. Files and Folders @@ -30,10 +30,14 @@ This directory contains all translations. Filenames must adhere to this format: #### Source file -`src/qt/locale/bitcoin_en.ts` is a treated in a special way. It is used as the -source for all other translations. Whenever a string in the code is change +`src/qt/locale/bitcoin_en.ts` is treated in a special way. It is used as the +source for all other translations. Whenever a string in the code is changed this file must be updated to reflect those changes. Usually, this can be -accomplished by running `lupdate` +accomplished by running `lupdate` (included in the Qt SDK). + +An updated source file should be merged to github and transifex will pick it +up from there. Afterwards the new strings show up as "Remaining" in transifex +and can be translated. Syncing with transifex ---------------------- @@ -42,9 +46,9 @@ We are using http://transifex.net as a frontend for translating the client. https://www.transifex.net/projects/p/bitcoin/resource/tx/ -The "transifex client":http://help.transifex.net/features/client/index.html -will help with fetching new translations from transifex. - +The "transifex client" (see: http://help.transifex.net/features/client/) +will help with fetching new translations from transifex. Use the following +config to be able to connect with the client. ### .tx/config @@ -55,9 +59,22 @@ will help with fetching new translations from transifex. file_filter = src/qt/locale/bitcoin_<lang>.ts source_file = src/qt/locale/bitcoin_en.ts source_lang = en + +### .tx/config (for Windows) + + [main] + host = https://www.transifex.net + + [bitcoin.tx] + file_filter = src\qt\locale\bitcoin_<lang>.ts + source_file = src\qt\locale\bitcoin_en.ts + source_lang = en + +It is also possible to directly download new translations one by one from transifex. ### Fetching new translations 1. `tx pull -a` -2. update `src/qt/bitcoin.qrc` +2. update `src/qt/bitcoin.qrc` manually or via + `ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(bitcoin_\(.*\)\).ts/<file alias="\2">locale/\1.qm<\/file>/'` 3. `git add` new translations from `src/qt/locale/` |