Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_zh_CN.ts
This commit is contained in:
Luke Dashjr
2012-09-11 01:18:43 +00:00
19 changed files with 62 additions and 56 deletions

View File

@@ -530,7 +530,7 @@ Are you sure you wish to encrypt your wallet?</source>
<message>
<location filename="../bitcoingui.cpp" line="292"/>
<source>&amp;Settings</source>
<translation type="unfinished"></translation>
<translation type="unfinished">&amp;Opcions</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="305"/>
@@ -1335,7 +1335,7 @@ Address: %4
<message>
<location filename="../forms/transactiondescdialog.ui" line="14"/>
<source>Transaction details</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Transacció details</translation>
</message>
<message>
<location filename="../forms/transactiondescdialog.ui" line="20"/>
@@ -1387,7 +1387,7 @@ Address: %4
<message>
<location filename="../transactiontablemodel.cpp" line="286"/>
<source>Unconfirmed (%1 of %2 confirmations)</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Sense confirmar (%1 of %2 confirmations)</translation>
</message>
<message>
<location filename="../transactiontablemodel.cpp" line="289"/>

View File

@@ -198,7 +198,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<message>
<location filename="../askpassphrasedialog.cpp" line="112"/>
<source>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.</source>
<translation type="unfinished">Bitcoin will close now to finish the encryption process. Husk, at kryptere din tegnebog vil ikke fuldt ud beskytte dine bitcoins mod at blive stjålet af malware din computer.</translation>
<translation>Bitcoin will close now to finish the encryption process. Husk, at kryptere din tegnebog vil ikke fuldt ud beskytte dine bitcoins mod at blive stjålet af malware din computer.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="137"/>
@@ -473,7 +473,7 @@ Adresse: %4
<message>
<location filename="../bitcoingui.cpp" line="253"/>
<source>Export the data in the current tab to a file</source>
<translation type="unfinished">Eksportér den aktuelle visning til en fil</translation>
<translation>Eksportér den aktuelle visning til en fil</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="783"/>
@@ -610,7 +610,7 @@ Adresse: %4
<message>
<location filename="../bitcoingui.cpp" line="806"/>
<source>Backup Wallet</source>
<translation type="unfinished">Backup tegnebog</translation>
<translation>Backup tegnebog</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="244"/>
@@ -945,7 +945,7 @@ Adresse: %4
<message>
<location filename="../forms/overviewpage.ui" line="88"/>
<source>Wallet</source>
<translation type="unfinished">tegnebog</translation>
<translation>tegnebog</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="124"/>
@@ -1849,7 +1849,7 @@ Adresse: %4
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished">Tilføj en node til at forbinde til and attempt to keep the connection open</translation>
<translation>Tilføj en node til at forbinde til and attempt to keep the connection open</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
@@ -1993,7 +1993,7 @@ SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translati
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished">Lyt til forbindelser &lt;port&gt; (standard: 8333 or testnet: 18333)</translation>
<translation>Lyt til forbindelser &lt;port&gt; (standard: 8333 or testnet: 18333)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>

View File

@@ -650,7 +650,7 @@ Dirección: %4</translation>
<message>
<location filename="../optionsdialog.cpp" line="281"/>
<source>Whether to show Bitcoin addresses in the transaction list</source>
<translation type="unfinished">Mostrar o no las direcciones Bitcoin en la lista de transacciones</translation>
<translation type="unfinished">Mostrar las direcciones Bitcoin en la lista de transacciones</translation>
</message>
</context>
<context>

View File

@@ -1869,7 +1869,7 @@ Dirección: %4</translation>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished">Agrega un nodo para conectarse and attempt to keep the connection open</translation>
<translation>Agrega un nodo para conectarse and attempt to keep the connection open</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
@@ -1890,7 +1890,7 @@ Dirección: %4</translation>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
<source>Accept connections from outside (default: 1)</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Aceptar conexiones desde el exterior (predeterminado: 1)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>

View File

@@ -799,7 +799,7 @@ Address: %4
<message>
<location filename="../forms/messagepage.ui" line="14"/>
<source>Message</source>
<translation type="unfinished">پیام</translation>
<translation>پیام</translation>
</message>
<message>
<location filename="../forms/messagepage.ui" line="20"/>

View File

@@ -23,13 +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>Copyright © 2009-2012 Bitcoin Developers
<translation>Copyright © 2009-2012 Bitcoin kehittäjät
This is experimental software.
Tämä on kokeellinen ohjelmisto.
Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php.
Levitetään MIT/X11 ohjelmistolisenssin alaisuudessa. Tarkemmat tiedot löytyvät tiedostosta license.txt tai osoitteesta 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>
Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.openssl.org/), Eric Youngin (eay@cryptsoft.com) kehittämän salausohjelmiston sekä Thomas Bernardin UPnP ohjelmiston.</translation>
</message>
</context>
<context>
@@ -624,7 +624,7 @@ Osoite: %4</translation>
<message>
<location filename="../bitcoin.cpp" line="144"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"></translation>
<translation>Peruuttamaton virhe on tapahtunut. Bitcoin ei voi enää jatkaa turvallisesti ja sammutetaan.</translation>
</message>
</context>
<context>
@@ -647,7 +647,7 @@ Osoite: %4</translation>
<message>
<location filename="../optionsdialog.cpp" line="281"/>
<source>Whether to show Bitcoin addresses in the transaction list</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Näytetäänkö Bitcoin-osoitteet rahansiirrot listassa vai ei.</translation>
</message>
</context>
<context>
@@ -1895,7 +1895,7 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
<source>Find peers using DNS lookup (default: 1)</source>
<translation type="unfinished"></translation>
<translation>Hae naapureita DNS hauilla (vakioasetus: 1)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>

View File

@@ -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"/>

View File

@@ -267,7 +267,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../askpassphrasedialog.cpp" line="161"/>
<source>Wallet passphrase was successfully changed.</source>
<translation type="unfinished">סיסמת הארנק שונתה בהצלחה.</translation>
<translation>סיסמת הארנק שונתה בהצלחה.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="208"/>
@@ -624,7 +624,7 @@ Address: %4
<message>
<location filename="../bitcoin.cpp" line="144"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"></translation>
<translation>שגיאה סופנית אירעה. ביטקוין אינו יכול להמשיך לפעול בבטחה ולכן ייסגר.</translation>
</message>
</context>
<context>
@@ -1097,7 +1097,7 @@ Address: %4
<message>
<location filename="../sendcoinsdialog.cpp" line="124"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished">כתובת המקבל אינה תקינה, אנא בדוק שנית.</translation>
<translation>כתובת המקבל אינה תקינה, אנא בדוק שנית.</translation>
</message>
<message>
<location filename="../sendcoinsdialog.cpp" line="129"/>
@@ -1889,7 +1889,7 @@ Address: %4
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
<source>Find peers using DNS lookup (default: 1)</source>
<translation type="unfinished"></translation>
<translation type="unfinished">מצא עמיתים ע&quot;י חיפוש DNS (ברירת מחדל: 1)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>

View File

@@ -101,7 +101,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../addressbookpage.cpp" line="63"/>
<source>Edit</source>
<translation type="unfinished"></translation>
<translation>Izmjeniti</translation>
</message>
<message>
<location filename="../addressbookpage.cpp" line="64"/>
@@ -2002,7 +2002,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished">Unesite nod s kojim se želite spojiti and attempt to keep the connection open</translation>
<translation>Unesite nod s kojim se želite spojiti and attempt to keep the connection open</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>

View File

@@ -271,7 +271,7 @@ Biztosan kódolni akarod a tárcát?</translation>
<message>
<location filename="../askpassphrasedialog.cpp" line="112"/>
<source>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.</source>
<translation type="unfinished">Bitcoin will close now to finish the encryption process. Ne feledd, hogy a tárca titkosítása sem nyújt teljes védelmet az adathalász programok fertőzésével szemben.</translation>
<translation>Bitcoin will close now to finish the encryption process. Ne feledd, hogy a tárca titkosítása sem nyújt teljes védelmet az adathalász programok fertőzésével szemben.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="161"/>
@@ -501,7 +501,7 @@ Cím: %4
<message>
<location filename="../bitcoingui.cpp" line="253"/>
<source>Export the data in the current tab to a file</source>
<translation type="unfinished">Jelenlegi nézet exportálása fájlba</translation>
<translation>Jelenlegi nézet exportálása fájlba</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="257"/>
@@ -883,7 +883,7 @@ Cím: %4
<message>
<location filename="../forms/messagepage.ui" line="14"/>
<source>Message</source>
<translation type="unfinished">Üzenet</translation>
<translation>Üzenet</translation>
</message>
</context>
<context>
@@ -929,7 +929,7 @@ Cím: %4
<message>
<location filename="../forms/overviewpage.ui" line="88"/>
<source>Wallet</source>
<translation type="unfinished">Tárca</translation>
<translation>Tárca</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="68"/>
@@ -1463,7 +1463,7 @@ Cím: %4
<message>
<location filename="../transactiontablemodel.cpp" line="351"/>
<source>Received from</source>
<translation type="unfinished">Erről az</translation>
<translation>Erről az</translation>
</message>
</context>
<context>
@@ -1985,7 +1985,7 @@ Cím: %4
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished">Csatlakozásokhoz figyelendő &lt;port&gt; (alapértelmezett: 8333 or testnet: 18333)</translation>
<translation>Csatlakozásokhoz figyelendő &lt;port&gt; (alapértelmezett: 8333 or testnet: 18333)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
@@ -2036,7 +2036,7 @@ SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit)
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished">Elérendő csomópont megadása and attempt to keep the connection open</translation>
<translation>Elérendő csomópont megadása and attempt to keep the connection open</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="41"/>

View File

@@ -1994,7 +1994,7 @@ Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL)
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished">Elérendő csomópont megadása and attempt to keep the connection open</translation>
<translation>Elérendő csomópont megadása and attempt to keep the connection open</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>

View File

@@ -544,12 +544,12 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation>
<message>
<location filename="../bitcoingui.cpp" line="806"/>
<source>Backup Wallet</source>
<translation type="unfinished">Backup piniginę</translation>
<translation>Backup piniginę</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="806"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
<translation>Piniginės duomenys (*.dat)</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="809"/>
@@ -1023,7 +1023,7 @@ Adresas: %4</translation>
<message>
<location filename="../qrcodedialog.cpp" line="113"/>
<source>PNG Images (*.png)</source>
<translation type="unfinished"></translation>
<translation>PNG paveikslėliai (*.png)</translation>
</message>
</context>
<context>
@@ -1877,7 +1877,7 @@ Adresas: %4</translation>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished">Pridėti mazgą prie sujungti su and attempt to keep the connection open</translation>
<translation>Pridėti mazgą prie sujungti su and attempt to keep the connection open</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
@@ -1892,7 +1892,7 @@ Adresas: %4</translation>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
<source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
<translation type="unfinished"></translation>
<translation>Nustatyti kalbą, pavyzdžiui &quot;lt_LT&quot; (numatyta: sistemos kalba)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>

View File

@@ -1975,7 +1975,7 @@ opcje SSL: (sprawdź Bitcoin Wiki dla instrukcje konfiguracji SSL)</translation>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished">Dodaj węzeł do łączenia się and attempt to keep the connection open</translation>
<translation>Dodaj węzeł do łączenia się and attempt to keep the connection open</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>

View File

@@ -481,7 +481,7 @@ Address: %4
<message>
<location filename="../bitcoingui.cpp" line="806"/>
<source>Backup Wallet</source>
<translation type="unfinished">Backup portofelul electronic</translation>
<translation>Backup portofelul electronic</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="806"/>
@@ -935,7 +935,7 @@ Address: %4
<message>
<location filename="../forms/overviewpage.ui" line="88"/>
<source>Wallet</source>
<translation type="unfinished">Portofelul</translation>
<translation>Portofelul</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="124"/>
@@ -1586,7 +1586,7 @@ Address: %4
<message>
<location filename="../transactionview.cpp" line="126"/>
<source>Copy amount</source>
<translation type="unfinished">Copiază sumă</translation>
<translation>Copiază sumă</translation>
</message>
<message>
<location filename="../transactionview.cpp" line="124"/>

View File

@@ -1436,7 +1436,7 @@ Adresa: %4</translation>
<message>
<location filename="../transactiontablemodel.cpp" line="283"/>
<source>Offline (%1 confirmations)</source>
<translation type="unfinished">Offline (%1 potvrdení)</translation>
<translation>Offline (%1 potvrdení)</translation>
</message>
<message numerus="yes">
<location filename="../transactiontablemodel.cpp" line="277"/>
@@ -1865,7 +1865,7 @@ Adresa: %4</translation>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished">Pridať nódu a pripojiť sa and attempt to keep the connection open</translation>
<translation>Pridať nódu a pripojiť sa and attempt to keep the connection open</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>

View File

@@ -477,7 +477,7 @@ Are you sure you wish to encrypt your wallet?</source>
<message>
<location filename="../bitcoingui.cpp" line="806"/>
<source>Backup Wallet</source>
<translation type="unfinished">Backup новчаника</translation>
<translation>Backup новчаника</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="806"/>
@@ -561,7 +561,7 @@ Address: %4
<message>
<location filename="../bitcoingui.cpp" line="245"/>
<source>Show information about Qt</source>
<translation type="unfinished">Прегледајте информације о Qt-у</translation>
<translation>Прегледајте информације о Qt-у</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="247"/>
@@ -950,7 +950,7 @@ Address: %4
<message>
<location filename="../forms/overviewpage.ui" line="88"/>
<source>Wallet</source>
<translation type="unfinished">новчаник</translation>
<translation>новчаник</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="124"/>
@@ -1028,7 +1028,7 @@ Address: %4
<location filename="../sendcoinsdialog.cpp" line="149"/>
<location filename="../sendcoinsdialog.cpp" line="154"/>
<source>Send Coins</source>
<translation type="unfinished">Слање новца</translation>
<translation>Слање новца</translation>
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="64"/>
@@ -1152,7 +1152,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsentry.ui" line="75"/>
<source>&amp;Label:</source>
<translation type="unfinished">&amp;Етикета</translation>
<translation>&amp;Етикета</translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>

View File

@@ -67,7 +67,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<message>
<location filename="../forms/addressbookpage.ui" line="74"/>
<source>&amp;Copy to Clipboard</source>
<translation type="unfinished">&amp;Kopiera till Urklipp</translation>
<translation>&amp;Kopiera till Urklipp</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="96"/>

View File

@@ -1929,7 +1929,7 @@ Address: %4
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished">Додати вузол для підключення and attempt to keep the connection open</translation>
<translation>Додати вузол для підключення and attempt to keep the connection open</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>

View File

@@ -620,7 +620,7 @@ Address: %4
<message>
<location filename="../bitcoin.cpp" line="144"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
@@ -1865,7 +1865,7 @@ Address: %4
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
<source>Find peers using DNS lookup (default: 1)</source>
<translation type="unfinished"></translation>
<translation>DNS查找节点(1)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>