diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-11 01:18:43 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-11 01:32:18 +0000 |
| commit | be2e2845ec0844d42008287842bb053aabe58b0b (patch) | |
| tree | 0a535adaaeea7765acb781cd056ee25118ffd2f3 /src/qt/locale/bitcoin_fr_CA.ts | |
| parent | 6d7b6681b6cf5d63a8686c99a431ec401c14379f (diff) | |
| parent | ea3e34dc3d710747f625e4f93eaed2686c9db045 (diff) | |
| download | bitcoin-be2e2845ec0844d42008287842bb053aabe58b0b.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_zh_CN.ts
Diffstat (limited to 'src/qt/locale/bitcoin_fr_CA.ts')
| -rw-r--r-- | src/qt/locale/bitcoin_fr_CA.ts | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts index b9365a3035..3f8cea04db 100644 --- a/src/qt/locale/bitcoin_fr_CA.ts +++ b/src/qt/locale/bitcoin_fr_CA.ts @@ -23,7 +23,13 @@ This is experimental software. 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 OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source> - <translation type="unfinished"></translation> + <translation>Copyright © 2009-2012 Développeurs de Bitcoin + +This is experimental software. + +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 OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation> </message> </context> <context> @@ -1639,7 +1645,7 @@ Address: %4 <message> <location filename="../bitcoinstrings.cpp" line="8"/> <source>Bitcoin version</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Bitcoin version</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> |