aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/qt/locale/bitcoin_ca_ES.ts87
-rw-r--r--src/qt/locale/bitcoin_cs.ts97
-rw-r--r--src/qt/locale/bitcoin_da.ts89
-rw-r--r--src/qt/locale/bitcoin_de.ts105
-rw-r--r--src/qt/locale/bitcoin_en.ts87
-rw-r--r--src/qt/locale/bitcoin_es.ts119
-rw-r--r--src/qt/locale/bitcoin_es_CL.ts97
-rw-r--r--src/qt/locale/bitcoin_et.ts87
-rw-r--r--src/qt/locale/bitcoin_eu_ES.ts87
-rw-r--r--src/qt/locale/bitcoin_fa.ts89
-rw-r--r--src/qt/locale/bitcoin_fa_IR.ts89
-rw-r--r--src/qt/locale/bitcoin_fi.ts89
-rw-r--r--src/qt/locale/bitcoin_fr_CA.ts87
-rw-r--r--src/qt/locale/bitcoin_fr_FR.ts91
-rw-r--r--src/qt/locale/bitcoin_he.ts89
-rw-r--r--src/qt/locale/bitcoin_hr.ts91
-rw-r--r--src/qt/locale/bitcoin_hu.ts89
-rw-r--r--src/qt/locale/bitcoin_it.ts97
-rw-r--r--src/qt/locale/bitcoin_lt.ts105
-rw-r--r--src/qt/locale/bitcoin_nb.ts93
-rw-r--r--src/qt/locale/bitcoin_nl.ts97
-rw-r--r--src/qt/locale/bitcoin_pl.ts113
-rw-r--r--src/qt/locale/bitcoin_pt_BR.ts101
-rw-r--r--src/qt/locale/bitcoin_ro_RO.ts95
-rw-r--r--src/qt/locale/bitcoin_ru.ts99
-rw-r--r--src/qt/locale/bitcoin_sk.ts99
-rw-r--r--src/qt/locale/bitcoin_sr.ts87
-rw-r--r--src/qt/locale/bitcoin_sv.ts89
-rw-r--r--src/qt/locale/bitcoin_tr.ts89
-rw-r--r--src/qt/locale/bitcoin_uk.ts95
-rw-r--r--src/qt/locale/bitcoin_zh_CN.ts95
-rw-r--r--src/qt/locale/bitcoin_zh_TW.ts103
32 files changed, 1593 insertions, 1433 deletions
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index 7b187cefad..8c4febee9a 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -75,7 +75,7 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -202,59 +202,64 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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"></translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -1094,7 +1099,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1270,85 +1275,85 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index 6c2f5bf081..1757f48f64 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -81,7 +81,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation>Po&amp;depiš zprávu</translation>
</message>
<message>
@@ -228,8 +228,13 @@ Are you sure you wish to encrypt your wallet?</source>
Jsi si jistý, že chceš peněženku zašifrovat?</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Upozornění: Caps Lock je zapnutý.</translation>
</message>
@@ -240,53 +245,53 @@ Jsi si jistý, že chceš peněženku zašifrovat?</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Peněženka je zašifrována</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin se teď ukončí, aby dokončil zašifrování. Pamatuj však, že pouhé zašifrování peněženky úplně nezabraňuje krádeži tvých bitcoinů malwarem, kterým se může počítač nakazit.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Zašifrování peněženky selhalo</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Zašifrování peněženky selhalo kvůli vnitřní chybě. Tvá peněženka tedy nebyla zašifrována.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Zadaná hesla nejsou shodná.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Odemčení peněženky selhalo</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Nezadal jsi správné heslo pro dešifrování peněženky.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Dešifrování peněženky selhalo</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Heslo k peněžence bylo v pořádku změněno.</translation>
</message>
@@ -1084,6 +1089,11 @@ Adresa: %4
<translation>123.456 BTC</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsdialog.ui" line="147"/>
+ <source>S&amp;end</source>
+ <translation>&amp;Pošli</translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsdialog.ui" line="84"/>
<source>Remove all transaction fields</source>
<translation>Smaž všechny transakční formuláře</translation>
@@ -1094,11 +1104,6 @@ Adresa: %4
<translation>Potvrď odeslání</translation>
</message>
<message>
- <location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>&amp;Pošli</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsdialog.ui" line="106"/>
<source>Balance:</source>
<translation>Stav účtu:</translation>
@@ -1231,7 +1236,7 @@ Adresa: %4
<translation>%1/nepotvrzeno</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>neznámo</translation>
</message>
@@ -1256,30 +1261,30 @@ Adresa: %4
<translation>&lt;b&gt;Zdroj:&lt;/b&gt; Vygenerováno&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Od:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Pro:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>ID transakce:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Vygenerované mince musí čekat 120 bloků, než mohou být utraceny. Když jsi vygeneroval tenhle blok, tak byl rozposlán do sítě, aby byl přidán do řetězce bloků. Pokud se mu nepodaří dostat se do řetězce, změní se na &quot;neakceptovaný&quot; a nepůjde utratit. Občas se to může stát, když jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (tvoje, označení: </translation>
</message>
@@ -1314,52 +1319,52 @@ Adresa: %4
<translation>&lt;b&gt;Datum:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (tvoje)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(neakceptováno)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Zpráva:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Komentář:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Příjem:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 dozraje po %2 blocích)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Výdaj:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Transakční poplatek:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Čistá částka:&lt;/b&gt; </translation>
</message>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index 43e12764e3..aacd9ce5ea 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -96,7 +96,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -186,10 +186,10 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Dialog</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Tegnebogskryptering mislykkedes</translation>
</message>
@@ -224,13 +224,18 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Bekræft tegnebogskryptering</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Tegnebogskryptering mislykkedes på grund af en intern fejl. Din tegnebog blev ikke krypteret.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -240,18 +245,18 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Krypter tegnebog</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>De angivne kodeord stemmer ikke overens.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Tegnebogsdekryptering mislykkedes</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Tegnebogsoplåsning mislykkedes</translation>
</message>
@@ -261,9 +266,9 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Indtast den gamle og nye adgangskode til tegnebogen.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Det angivne kodeord for tegnebogsdekrypteringen er forkert.</translation>
</message>
@@ -276,17 +281,17 @@ Er du sikker på at du ønsker at kryptere din tegnebog?</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Tegnebog krypteret</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>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 på din computer.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Tegnebogskodeord blev ændret.</translation>
</message>
@@ -1114,7 +1119,7 @@ Adresse: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Afsend</translation>
</message>
<message>
@@ -1240,18 +1245,18 @@ Adresse: %4
<translation>, transmitteret via %1 noder</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Fra:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (din, etiket:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (din)</translation>
</message>
@@ -1266,20 +1271,20 @@ Adresse: %4
<translation>%1/ubekræftet</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>ukendt</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 modnes i %2 blokke mere)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Kredit:&lt;/b&gt; </translation>
</message>
@@ -1309,51 +1314,51 @@ Adresse: %4
<translation>&lt;b&gt;Kilde:&lt;/b&gt; Genereret&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Til:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(ikke accepteret)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Debet:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Transaktionsgebyr:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Nettobeløb:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Besked:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Kommentar:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Genererede coins skal vente 120 blokke, før de kan blive brugt. Da du genererede denne blok blev det transmitteret til netværket, for at blive føjet til blokkæden. Hvis det mislykkes at komme ind i kæden, vil den skifte til &quot;ikke godkendt&quot;, og ikke blive kunne bruges. Dette kan lejlighedsvis ske, hvis en anden node genererer en blok inden for få sekunder af din.</translation>
</message>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 120d002e8e..d1fc56e022 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -75,11 +75,6 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open
<translation>&amp;QR-Code anzeigen</translation>
</message>
<message>
- <location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>Nachricht &amp;signieren</translation>
- </message>
- <message>
<location filename="../forms/addressbookpage.ui" line="113"/>
<source>&amp;Delete</source>
<translation>&amp;Löschen</translation>
@@ -90,6 +85,11 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open
<translation>Eine Nachricht signieren, um den Besitz einer Adresse zu beweisen</translation>
</message>
<message>
+ <location filename="../forms/addressbookpage.ui" line="99"/>
+ <source>Sign &amp;Message</source>
+ <translation>&amp;Nachricht signieren...</translation>
+ </message>
+ <message>
<location filename="../forms/addressbookpage.ui" line="110"/>
<source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source>
<translation>Die ausgewählte Adresse aus der Liste entfernen. Sie können nur Zahlungsadressen entfernen.</translation>
@@ -171,7 +171,7 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open
<translation>Neue Passphrase wiederholen</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Die Passphrase der Brieftasche wurde erfolgreich geändert.</translation>
</message>
@@ -197,7 +197,7 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Brieftasche verschlüsselt</translation>
</message>
@@ -233,18 +233,23 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>WARNUNG: Wenn Sie Ihre Brieftasche verschlüsseln und Ihre Passphrase verlieren, werden Sie &lt;b&gt;ALLE IHRE BITCOINS VERLIEREN&lt;/b&gt;!&lt;br&gt;&lt;br&gt;Sind Sie sich sicher, dass Sie Ihre Brieftasche verschlüsseln möchten?</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin wird jetzt beendet, um den Verschlüsselungsprozess abzuschließen. Bitte beachten Sie, dass die Verschlüsselung Ihrer Brieftasche nicht vollständig vor Diebstahl Ihrer Bitcoins durch Schadsoftware schützt, die Ihren Computer befällt.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Die Verschlüsselung der Brieftasche ist aufgrund eines internen Fehlers fehlgeschlagen. Ihre Brieftasche wurde nicht verschlüsselt.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Warnung: Die Feststelltaste ist aktiviert.</translation>
</message>
@@ -254,16 +259,16 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Geben Sie die neue Passphrase für die Brieftasche ein.&lt;br&gt;Bitte benutzen Sie eine Passphrase bestehend aus &lt;b&gt;10 oder mehr zufälligen Zeichen&lt;/b&gt; oder &lt;b&gt;8 oder mehr Wörtern&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Die eingegebenen Passphrasen stimmen nicht überein.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Verschlüsselung der Brieftasche fehlgeschlagen</translation>
</message>
@@ -273,19 +278,19 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Verschlüsselung der Brieftasche bestätigen</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Entsperrung der Brieftasche fehlgeschlagen</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Die eingegebene Passphrase zum Entschlüsseln der Brieftasche war nicht korrekt.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Entschlüsselung der Brieftasche fehlgeschlagen</translation>
</message>
@@ -1099,11 +1104,6 @@ Adresse: %4</translation>
<translation>Überweisung bestätigen</translation>
</message>
<message>
- <location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>&amp;Überweisen</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsdialog.ui" line="14"/>
<location filename="../sendcoinsdialog.cpp" line="123"/>
<location filename="../sendcoinsdialog.cpp" line="128"/>
@@ -1131,6 +1131,11 @@ Adresse: %4</translation>
<translation>Kontostand:</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsdialog.ui" line="147"/>
+ <source>S&amp;end</source>
+ <translation>&amp;Überweisen</translation>
+ </message>
+ <message>
<location filename="../sendcoinsdialog.cpp" line="124"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Die Zahlungsadresse ist ungültig, bitte nochmals überprüfen.</translation>
@@ -1243,7 +1248,7 @@ Adresse: %4</translation>
<translation>, wurde noch nicht erfolgreich übertragen</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>unbekannt</translation>
</message>
@@ -1273,68 +1278,68 @@ Adresse: %4</translation>
<translation>&lt;b&gt;Quelle:&lt;/b&gt; Generiert&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Von:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;An:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (Eigene Adresse, Bezeichnung: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (Eigene Adresse)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Gutschrift:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>%1 (reift noch %2 weitere Blöcke)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(nicht angenommen)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Transaktionsgebühr:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Nachricht:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Kommentar:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>Transaktions-ID:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Generierte Bitcoins müssen 120 Blöcke lang warten, bevor sie ausgegeben werden können. Als Sie diesen Block generierten, wurde er an das Netzwerk übertragen, um ihn der Blockkette hinzuzufügen. Falls dies fehlschlägt wird der Status in &quot;nicht angenommen&quot; geändert und der Betrag wird nicht verfügbar werden. Das kann gelegentlich passieren, wenn ein anderer Knoten einen Block zur selben Zeit wie Sie generierte.</translation>
</message>
@@ -1344,14 +1349,14 @@ Adresse: %4</translation>
<translation>%1/unbestätigt</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Belastung:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Nettobetrag:&lt;/b&gt; </translation>
</message>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 5046852834..4a1c9d1f6a 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -75,7 +75,7 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -227,59 +227,64 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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"></translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -1083,7 +1088,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1264,85 +1269,85 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index 4c011880ca..bb0c1412a2 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -75,12 +75,12 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<message>
<location filename="../forms/addressbookpage.ui" line="96"/>
<source>Sign a message to prove you own this address</source>
- <translation type="unfinished"></translation>
+ <translation>Firme un mensaje para demostrar que posee una dirección Bitcoin</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Firmar mensaje</translation>
+ <source>Sign &amp;Message</source>
+ <translation>Firmar &amp;mensaje...</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -199,27 +199,32 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Introduzca la contraseña anterior del monedero y la nueva. </translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>La contraseña introducida para descifrar el monedero es incorrecta.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Ha fallado el descifrado del monedero</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>La contraseña de cartera ha sido cambiada con exit.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
- <translation type="unfinished"></translation>
+ <translation>Aviso: ¡La tecla de bloqueo de mayúsculas está activada!</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="38"/>
@@ -252,12 +257,12 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Confirmar cifrado del monedero</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin cerrará al finalizar el proceso de cifrado. Recuerde que el cifrado de su monedero no puede proteger totalmente sus bitcoin de ser robados por el malware que infecte su sistema.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Ha fallado el desbloqueo del monedero</translation>
</message>
@@ -269,27 +274,27 @@ Are you sure you wish to encrypt your wallet?</source>
¿Seguro que quieres seguir encriptando la cartera?</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Ha fallado el cifrado del monedero debido a un error interno. El monedero no ha sido cifrado.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Las contraseñas no coinciden.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Ha fallado el cifrado del monedero</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Monedero cifrado</translation>
</message>
@@ -634,7 +639,7 @@ Dirección: %4</translation>
<message>
<location filename="../bitcoin.cpp" line="127"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
- <translation type="unfinished"></translation>
+ <translation>Ha ocurrido un error crítico. Bitcoin ya no puede continuar con seguridad y se cerrará.</translation>
</message>
</context>
<context>
@@ -871,12 +876,12 @@ Dirección: %4</translation>
<message>
<location filename="../forms/messagepage.ui" line="105"/>
<source>Click &quot;Sign Message&quot; to get signature</source>
- <translation type="unfinished"></translation>
+ <translation>Haga clic en &quot;Firmar mensaje&quot; para generar la firma</translation>
</message>
<message>
<location filename="../forms/messagepage.ui" line="117"/>
<source>Sign a message to prove you own this address</source>
- <translation type="unfinished"></translation>
+ <translation>Firme un mensaje para demostrar que posee una dirección Bitcoin</translation>
</message>
<message>
<location filename="../forms/messagepage.ui" line="120"/>
@@ -1048,11 +1053,6 @@ Dirección: %4</translation>
<context>
<name>SendCoinsDialog</name>
<message>
- <location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>&amp;Envía</translation>
- </message>
- <message>
<location filename="../sendcoinsdialog.cpp" line="95"/>
<source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
<translation>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</translation>
@@ -1090,6 +1090,11 @@ Dirección: %4</translation>
<translation>Saldo:</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsdialog.ui" line="147"/>
+ <source>S&amp;end</source>
+ <translation>&amp;Envía</translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsdialog.ui" line="84"/>
<source>Remove all transaction fields</source>
<translation>Eliminar todos los campos de las transacciones</translation>
@@ -1227,7 +1232,7 @@ Dirección: %4</translation>
<translation>, no ha sido emitido satisfactoriamente todavía</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>desconocido</translation>
</message>
@@ -1277,73 +1282,73 @@ Dirección: %4</translation>
<translation>&lt;b&gt;Fuente:&lt;/b&gt; Generado&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;De:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Para:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation>(tuya, etiqueta: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (tuya)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Crédito:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 madura en %2 bloques mas)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(no aceptada)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Comisión transacción:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Cantidad total:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Mensaje:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Comentario:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
- <translation type="unfinished"></translation>
+ <translation>Identificador de transacción:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Las monedas generadas deben esperar 120 bloques antes de ser gastadas. Cuando has generado este bloque se emitió a la red para ser agregado en la cadena de bloques. Si falla al incluirse en la cadena, cambiará a &quot;no aceptado&quot; y las monedas no se podrán gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque casi al mismo tiempo que el tuyo.</translation>
</message>
@@ -1353,9 +1358,9 @@ Dirección: %4</translation>
<translation>%1 confirmaciones</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Débito:&lt;/b&gt; </translation>
</message>
@@ -1742,22 +1747,22 @@ Dirección: %4</translation>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
<source>An error occurred while setting up the RPC port %i for listening: %s</source>
- <translation type="unfinished"></translation>
+ <translation>Ha ocurrido un error al configurar el puerto RPC %i para escuchar: %s</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="66"/>
<source>Find peers using DNS lookup (default: 1)</source>
- <translation type="unfinished"></translation>
+ <translation>Encontrar pares mediante búsqueda de DNS (predeterminado: 1)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="71"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 10000)</source>
- <translation type="unfinished"></translation>
+ <translation>Búfer de recepción máximo por conexión, &lt;n&gt;*1000 bytes (predeterminado: 10000)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="72"/>
<source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: 10000)</source>
- <translation type="unfinished"></translation>
+ <translation>Búfer de recepción máximo por conexión, , &lt;n&gt;*1000 bytes (predeterminado: 10000)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="81"/>
diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts
index 06a4001724..27bbd74bca 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -93,16 +93,16 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Firmar un mensaje para provar que usted es dueño de esta dirección</translation>
</message>
<message>
+ <location filename="../forms/addressbookpage.ui" line="99"/>
+ <source>Sign &amp;Message</source>
+ <translation>Firmar Mensaje</translation>
+ </message>
+ <message>
<location filename="../forms/addressbookpage.ui" line="110"/>
<source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source>
<translation>Borra la dirección seleccionada de la lista. Solo las direcciónes de envio se pueden borrar.</translation>
</message>
<message>
- <location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>Firmar Mensaje</translation>
- </message>
- <message>
<location filename="../forms/addressbookpage.ui" line="113"/>
<source>&amp;Delete</source>
<translation>&amp;Borrar</translation>
@@ -194,7 +194,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Cambiar contraseña</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Ha fallado la decodificación de la billetera</translation>
</message>
@@ -204,9 +204,9 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Confirma la codificación de cartera</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>La contraseña introducida para decodificar la billetera es incorrecta.</translation>
</message>
@@ -228,16 +228,16 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Codificar billetera</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Falló la codificación de la billetera</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Las contraseñas no coinciden.</translation>
</message>
@@ -247,13 +247,13 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Esta operación necesita la contraseña para decodificar la billetara.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin se cerrará para finalizar el proceso de encriptación. Recuerde que encriptar su billetera no protegera completatamente sus bitcoins de ser robados por malware que infecte su computador</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Billetera codificada</translation>
</message>
@@ -268,23 +268,28 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Desbloquea billetera</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>La codificación de la billetera falló debido a un error interno. Tu billetera no ha sido codificada.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Ha fallado el desbloqueo de la billetera</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>La contraseña de billetera ha sido cambiada con éxito.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Precaucion: Mayúsculas Activadas</translation>
</message>
@@ -1091,7 +1096,7 @@ Dirección: %4</translation>
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Envía</translation>
</message>
<message>
@@ -1222,12 +1227,12 @@ Dirección: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(no aceptada)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Mensaje:</translation>
</message>
@@ -1237,7 +1242,7 @@ Dirección: %4</translation>
<translation>Abierto hasta %1</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>desconocido</translation>
</message>
@@ -1287,70 +1292,70 @@ Dirección: %4</translation>
<translation>&lt;b&gt;Fuente:&lt;/b&gt; Generado&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;De:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Para:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (tuya, etiqueta: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Crédito:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 madura en %2 bloques mas)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Débito:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Comisión transacción:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Cantidad total:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Comentario:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>ID de Transacción:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Las monedas generadas deben esperar 120 bloques antes de ser gastadas. Cuando has generado este bloque se emitió a la red para ser agregado en la cadena de bloques. Si falla al incluirse en la cadena, cambiará a &quot;no aceptado&quot; y las monedas no se podrán gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque casi al mismo tiempo que el tuyo.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (tuya)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index 189ff55e96..344383c317 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -75,7 +75,7 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -227,59 +227,64 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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"></translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -1083,7 +1088,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1264,85 +1269,85 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>tundmatu</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Sõnum:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Kommentaar:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts
index 4475b1be3f..b28cdddcfc 100644
--- a/src/qt/locale/bitcoin_eu_ES.ts
+++ b/src/qt/locale/bitcoin_eu_ES.ts
@@ -75,7 +75,7 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -227,59 +227,64 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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"></translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -1083,7 +1088,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1264,85 +1269,85 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 66101eded7..244f1666ab 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -82,8 +82,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;امضای پیام</translation>
+ <source>Sign &amp;Message</source>
+ <translation>امضای &amp;پیام</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -229,53 +229,58 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>تغییر عبارت عبور</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Biticon هم اکنون بسته می‌شود تا فرایند رمزگذاری را تمام کند. به خاطر داشته باشید که رمزگذاری کیف پولتان نمی‌تواند به طور کامل بیتیکون‌های شما را در برابر دزدیده شدن توسط بدافزارهایی که رایانه شما را آلوده می‌کنند، محافظت نماید.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>عبارت عبور نو و قدیم در پنجره وارد کنید</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>تنا موفق رمز بندی پنجره ناشی از خطای داخل شد. پنجره شما مرز بندی نشده است</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>عبارت عبور عرضه تطابق نشد</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>نجره رمز گذار شد</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>اموفق رمز بندی پنجر</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>wallet passphrase با موفقیت تغییر یافت</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>ناموفق رمز بندی پنجره</translation>
</message>
@@ -286,8 +291,8 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>هشدار اگر شما روی پنجره رمز بگذارید و عبارت عبور فراموش کنید همه بیتکویینس شما گم می کنید. متماینید کن که می خواهید رمز بگذارید</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>هشدار: کلید حروف بزرگ روشن است.</translation>
</message>
@@ -1089,7 +1094,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;;ارسال</translation>
</message>
<message>
@@ -1255,44 +1260,44 @@ Address: %4
<translation>ارسال توسط گره %1</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&amp;lt;b&amp;gt;به :&amp;lt;/b&amp;gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation>مال شما) (</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&amp;lt;b&amp;gt;پر داخت معامله :&amp;lt;/b&amp;gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&amp;lt;b&amp;gt;مبلغ خالص :&amp;lt;/b&amp;gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>پیام</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>مورد نظر</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>شماره تراکنش:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation> برای ارسال واحد های تولید شده باید 120 بلوک باشند. هنگامی که بلون ایجاد می شود به شبکه ارسال می شود تا در زنجیر بلوکها اضافه شود. و گر نه بلوک به غیر قابول و غیر ارسال عوض می شود. این اتفاقی می افتد وقتی که همزمان گره دیگر در بلوک ایجاد می شود.</translation>
</message>
@@ -1312,43 +1317,43 @@ Address: %4
<translation>&amp;lt;b&amp;gt;منبع :&amp;lt;/b&amp;gt; Generated&amp;lt;br&amp;gt</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&amp;lt;b&amp;gt;از:&amp;lt;/b&amp;gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>مشخص نیست </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&amp;lt;b&amp;gt;اعتبار :&amp;lt;/b&amp;gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 )بالغ در بلوک 2% و بیشتر%2</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>قابل قبول نیست ( )</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&amp;lt;b&amp;gt;مقدار خالص:&amp;lt;/b&amp;gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation>مال شما ، بر چسب( </translation>
</message>
diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts
index e17d102747..d9553aecd6 100644
--- a/src/qt/locale/bitcoin_fa_IR.ts
+++ b/src/qt/locale/bitcoin_fa_IR.ts
@@ -75,8 +75,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>و امضای پیام </translation>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished">امضا و پیام</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -227,59 +227,64 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>تایید رمزگذاری</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin برای اتمام فرایند رمزگذاری بسته خواهد شد. به خاطر داشته باشید که رمزگذاری WALLET شما، کامپیوتر شما را از آلودگی به بدافزارها مصون نمی دارد.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>رمزگذاری تایید نشد</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>رمزگذاری به علت خطای داخلی تایید نشد. wallet شما رمزگذاری نشد</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>رمزهای/پَس فرِیزهایِ وارد شده با هم تطابق ندارند</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>قفل wallet باز نشد</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>رمزهای/پَس فرِیزهایِ وارد شده wallet برای کشف رمز اشتباه است.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>کشف رمز wallet انجام نشد</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -1087,7 +1092,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>و ارسال</translation>
</message>
<message>
@@ -1258,80 +1263,80 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>پیام:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation type="unfinished"></translation>
</message>
@@ -1346,7 +1351,7 @@ Address: %4
<translation>باز کن تا %1</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>ناشناس</translation>
</message>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index abab5d94ab..9337b57aa8 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -81,8 +81,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Allekirjoita viesti</translation>
+ <source>Sign &amp;Message</source>
+ <translation>Allekirjoita &amp;viesti</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -201,7 +201,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Avaa lompakko</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin sulkeutuu lopettaakseen salausprosessin. Muista, että salattu lompakko ei täysin suojaa sitä haittaohjelmien aiheuttamilta varkauksilta.</translation>
</message>
@@ -219,48 +219,53 @@ Tahdotko varmasti salata lompakon?</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Lompakon salaus epäonnistui</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Lompakon salaaminen epäonnistui sisäisen virheen vuoksi. Lompakkoa ei salattu.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Annetut tunnuslauseet eivät täsmää.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Lompakon avaaminen epäonnistui.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Annettu tunnuslause oli väärä.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Lompakon salauksen purku epäonnistui.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Lompakon tunnuslause on vaihdettu.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Varoitus: Caps Lock on päällä.</translation>
</message>
@@ -286,7 +291,7 @@ Tahdotko varmasti salata lompakon?</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Lompakko salattu</translation>
</message>
@@ -1093,7 +1098,7 @@ Osoite: %4</translation>
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Lähetä</translation>
</message>
<message>
@@ -1249,15 +1254,15 @@ Osoite: %4</translation>
<translation>&lt;b&gt;Lähde:&lt;/b&gt; Generoitu&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Lähettäjä:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Vast. ott.:&lt;/b&gt;</translation>
</message>
@@ -1282,67 +1287,67 @@ Osoite: %4</translation>
<translation>%1/ei linjalla?</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Krediitti:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 erääntyy %2 useammassa lohkossa)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Rahansiirtomaksu:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Nettomäärä:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Viesti:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Kommentti:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>Rahansiirron ID:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Luotujen kolikoiden on odotettava 120 lohkoa ennen kuin ne voidaan käyttää. Kun loit tämän lohkon, se lähetettiin verkkoon lisättäväksi lohkoketjuun. Jos se epäonnistuu ketjuun liittymisessä, se tila tulee muuttumaan &quot;ei hyväksytty&quot; eikä sitä voi käyttää. Tätä voi silloin tällöin esiintyä jos toinen solmu luo lohkon muutamia sekunteja omastasi.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(ei hyväksytty)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation>(sinun, tunniste: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation>(sinun)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Debit:&lt;/b&gt; </translation>
</message>
@@ -1352,7 +1357,7 @@ Osoite: %4</translation>
<translation>, ei ole vielä onnistuneesti lähetetty</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>tuntematon</translation>
</message>
diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts
index 06372e1aed..c5be6a7e14 100644
--- a/src/qt/locale/bitcoin_fr_CA.ts
+++ b/src/qt/locale/bitcoin_fr_CA.ts
@@ -81,7 +81,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -233,59 +233,64 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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"></translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -1089,7 +1094,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1270,85 +1275,85 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts
index f6e8b98865..f6d36ef633 100644
--- a/src/qt/locale/bitcoin_fr_FR.ts
+++ b/src/qt/locale/bitcoin_fr_FR.ts
@@ -81,8 +81,8 @@ Ce produit inclut des logiciels développés par OpenSSL Project pour utilisatio
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Signer un message</translation>
+ <source>Sign &amp;Message</source>
+ <translation>Signer un &amp;message</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -234,59 +234,64 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Porte-monnaie chiffré</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin va à présent se fermer pour terminer la procédure de cryptage. N&apos;oubliez pas que le chiffrement de votre porte-monnaie ne peut pas fournir une protection totale contre le vol par des logiciels malveillants qui infecteraient votre ordinateur.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Le décryptage du porte-monnaie a échoué</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>La phrase de passe du porte-monnaie a été modifiée avec succès.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Attention : la touche Verrouiller Maj est activée.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Le chiffrement du porte-monnaie a échoué</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Le chiffrement du porte-monnaie a échoué en raison d&apos;une erreur interne. Votre porte-monnaie n&apos;a pas été chiffré.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Les phrases de passe entrées ne correspondent pas.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Le déverrouillage du porte-monnaie a échoué</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>La phrase de passe entrée pour décrypter le porte-monnaie était incorrecte.</translation>
</message>
@@ -1094,7 +1099,7 @@ Adresse : %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Envoyer</translation>
</message>
<message>
@@ -1275,85 +1280,85 @@ Adresse : %4
<translation>&lt;b&gt;Source :&lt;/b&gt; Généré&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;De :&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>inconnue</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;À :&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (vôtre, étiquette : </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (vôtre)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Crédit : &lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 sera considérée comme mûre suite à %2 blocs de plus)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(pas accepté)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Débit : &lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Frais de transaction :&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Montant net :&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Message :</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Commentaire :</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>ID de la transaction :</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Les pièces générées doivent attendre 120 blocs avant de pouvoir être dépensées. Lorsque vous avez généré ce bloc, il a été diffusé sur le réseau pour être ajouté à la chaîne des blocs. S&apos;il échoue a intégrer la chaîne, il sera modifié en « pas accepté » et il ne sera pas possible de le dépenser. Cela peut arriver occasionnellement si un autre nœud génère un bloc quelques secondes avant ou après vous.</translation>
</message>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index 8f4acdb123..ca6c56859c 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -81,7 +81,7 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation>חתום על הו&amp;דעה</translation>
</message>
<message>
@@ -234,59 +234,64 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>הארנק הוצפן</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>ביטקוין ייסגר עכשיו כדי להשלים את תהליך ההצפנה. זכור שהצפנת הארנק שלך אינו יכול להגן באופן מלא על הביטקוינים שלך מתוכנות זדוניות המושתלות על המחשב.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>הצפנת הארנק נכשלה עקב שגיאה פנימית. הארנק שלך לא הוצפן.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>הסיסמות שניתנו אינן תואמות.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>פתיחת הארנק נכשלה</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>הסיסמה שהוכנסה לפענוח הארנק שגויה.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>פענוח הארנק נכשל</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>הצפנת הארנק נכשלה</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>סיסמת הארנק שונתה בהצלחה.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>אזהרה: מקש Caps Lock מופעל.</translation>
</message>
@@ -1093,7 +1098,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;שלח</translation>
</message>
<message>
@@ -1219,7 +1224,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>לא ידוע</translation>
</message>
@@ -1269,75 +1274,75 @@ Address: %4
<translation>&lt;b&gt;מקור:&lt;/b&gt; נוצר&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;מאת:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;אל:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (שלך, תוית: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation>(שלך)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;זיכוי:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&lt;חיוב:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;עמלת פעולה:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;כמות נטו:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>הודעה:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>הערה:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>מזהה פעולה:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>מטבעות שנוצרו חייבים לחכות 120 בלוקים לפני שניתן לנצל אותם. כשיצרת את הבלוק הזה, הוא שודר לרשת כדי להתווסף לשרשרת הבלוקים. אם הוא אינו מצליח להיכנס לשרשרת, הוא ישתנה ל&quot;לא התקבל&quot; ולא ניתן יהיה לנצל אותו. זה יכול לקרות מדי פעם אם צומת אחר מייצר בלוק בהפרש של מספר שניות מהבלוק שלך.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 יבגור עוד %2 בלוקים)</translation>
</message>
@@ -1347,7 +1352,7 @@ Address: %4
<translation>&lt;b&gt;מצב:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(לא התקבל)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts
index 87aa50910c..28ba9f5ce8 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -75,8 +75,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Potpišite poruku</translation>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished">&amp;Potpišite poruku</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -175,14 +175,14 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>TekstualnaOznaka</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Otključavanje novčanika nije uspjelo</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Lozinka za dešifriranje novčanika nije točna.</translation>
</message>
@@ -222,18 +222,23 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Promjena lozinke</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Dešifriranje novčanika nije uspjelo</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Lozinka novčanika je uspješno promijenjena.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -256,31 +261,31 @@ Jeste li sigurni da želite šifrirati svoj novčanik?</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Novčanik šifriran</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Šifriranje novčanika nije uspjelo</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Šifriranje novčanika nije uspjelo zbog interne pogreške. Vaš novčanik nije šifriran.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Priložene lozinke se ne podudaraju.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin će se sada zatvoriti kako bi dovršio postupak šifriranja. Zapamtite da šifriranje vašeg novčanika ne može u potpunosti zaštititi vaše bitcoine od krađe preko zloćudnog softvera koji bi bio na vašem računalu.</translation>
</message>
@@ -1072,7 +1077,7 @@ Adresa:%4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Pošalji</translation>
</message>
<message>
@@ -1235,62 +1240,62 @@ Adresa:%4
<translation>%1 potvrda</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>nepoznato</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Za:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation>(tvoje, oznaka:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation>(tvoje)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Uplaćeno:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Naknada za transakciju:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Neto iznos:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Poruka:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Komentar:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Generirani novčići moraju pričekati nastanak 120 blokova prije nego što ih je moguće potrošiti. Kad ste generirali taj blok, on je bio emitiran u mrežu kako bi bio dodan postojećim lancima blokova. Ako ne uspije biti dodan, njegov status bit će promijenjen u &quot;nije prihvaćen&quot; i on neće biti potrošiv. S vremena na vrijeme tako nešto se može desiti ako neki drugi nod generira blok u približno isto vrijeme.</translation>
</message>
@@ -1300,8 +1305,8 @@ Adresa:%4
<translation>%1 nije dostupan?</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Od:&lt;/b&gt;</translation>
</message>
@@ -1341,19 +1346,19 @@ Adresa:%4
<translation>&lt;b&gt;Izvor:&lt;/b&gt; Generirano&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 stasava za %2 dodatna bloka)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(Nije prihvaćeno)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Potrošeno:&lt;/b&gt; </translation>
</message>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index de286076da..6e308db0d6 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -70,7 +70,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -171,12 +171,12 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Tárca kódolva</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Tárca megnyitása sikertelen</translation>
</message>
@@ -213,7 +213,7 @@ Biztosan kódolni akarod a tárcát?</translation>
<translation>Tárca dekódolása</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Tárca kódolása belső hiba miatt sikertelen. A tárcád nem lett kódolva.</translation>
</message>
@@ -223,10 +223,10 @@ Biztosan kódolni akarod a tárcát?</translation>
<translation>Írd be az új jelszót a tárcához.&lt;br/&gt;Használj legalább 10&lt;br/&gt;véletlenszerű karaktert&lt;/b&gt; vagy &lt;b&gt;legalább nyolc szót&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Tárca kódolása sikertelen.</translation>
</message>
@@ -246,21 +246,26 @@ Biztosan kódolni akarod a tárcát?</translation>
<translation>Jelszó megváltoztatása</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>A megadott jelszavak nem egyeznek.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Hibás jelszó.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -270,17 +275,17 @@ Biztosan kódolni akarod a tárcát?</translation>
<translation>Biztosan kódolni akarod a tárcát?</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Jelszó megváltoztatva.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Dekódolás sikertelen.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>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>
@@ -1132,7 +1137,7 @@ Cím: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Küldés</translation>
</message>
<message>
@@ -1244,7 +1249,7 @@ Cím: %4
<translation>, %1 csomóponton keresztül elküldve.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>ismeretlen</translation>
</message>
@@ -1269,80 +1274,80 @@ Cím: %4
<translation>&lt;b&gt;Forrás:&lt;/b&gt; Generálva&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Űrlap:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Címzett:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (tiéd, címke: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Jóváírás&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1, %2 múlva készül el)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(elutasítva)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Terhelés&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Nettó összeg:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Üzenet:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Megjegyzés:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>A frissen generált érméket csak 120 blokkal később tudod elkölteni. Ez a blokk nyomban szétküldésre került a hálózatba, amint legeneráltad, hogy hozzáadhassák a blokklánchoz. Ha nem kerül be a láncba, úgy az állapota &quot;elutasítva&quot;-ra módosul, és nem költheted el az érméket. Ez akkor következhet be időnként, ha egy másik csomópont mindössze néhány másodperc különbséggel generált le egy blokkot a tiédhez képest.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (tiéd)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Tranzakciós díj:&lt;/b&gt; </translation>
</message>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index cb61c23eb7..fd3afd46a8 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -90,16 +90,16 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Mostra il codice &amp;QR</translation>
</message>
<message>
+ <location filename="../forms/addressbookpage.ui" line="99"/>
+ <source>Sign &amp;Message</source>
+ <translation>Firma il &amp;messaggio</translation>
+ </message>
+ <message>
<location filename="../forms/addressbookpage.ui" line="110"/>
<source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source>
<translation>Cancella l&apos;indirizzo attualmente selezionato dalla lista. Solo indirizzi d&apos;invio possono essere cancellati.</translation>
</message>
<message>
- <location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Firma il messaggio</translation>
- </message>
- <message>
<location filename="../forms/addressbookpage.ui" line="113"/>
<source>&amp;Delete</source>
<translation>&amp;Cancella</translation>
@@ -166,10 +166,10 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Inserisci la passphrase</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Cifratura del portamonete fallita</translation>
</message>
@@ -185,7 +185,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Portamonete cifrato</translation>
</message>
@@ -200,13 +200,13 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Etichetta</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Cifratura del portamonete fallita a causa di un errore interno. Il portamonete non è stato cifrato.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Le passphrase inserite non corrispondono.</translation>
</message>
@@ -231,9 +231,9 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Sblocca il portamonete</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>La passphrase inserita per la decifrazione del portamonete è errata.</translation>
</message>
@@ -255,17 +255,22 @@ Are you sure you wish to encrypt your wallet?</source>
Si è sicuri di voler cifrare il portamonete?</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Sblocco del portamonete fallito</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin verrà ora chiuso per finire il processo di crittazione. Ricorda che criptare il tuo portamonete non può fornire una protezione totale contro furti causati da malware che dovessero infettare il tuo computer.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Decifrazione del portamonete fallita</translation>
</message>
@@ -280,13 +285,13 @@ Si è sicuri di voler cifrare il portamonete?</translation>
<translation>Conferma la cifratura del portamonete</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Passphrase del portamonete modificata con successo.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Attenzione: tasto Blocco maiuscole attivo.</translation>
</message>
@@ -1080,7 +1085,7 @@ Indirizzo: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Spedisci</translation>
</message>
<message>
@@ -1221,7 +1226,7 @@ Indirizzo: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>sconosciuto</translation>
</message>
@@ -1271,80 +1276,80 @@ Indirizzo: %4
<translation>&lt;b&gt;Fonte:&lt;/b&gt; Generato&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Da:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Per:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (vostro, etichetta: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (vostro)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Credito:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 matura in altri %2 blocchi)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(non accettate)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Debito:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Tranzakciós díj:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Importo netto:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Messaggio:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Commento:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>ID della transazione:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Bisogna attendere 120 blocchi prima di spendere I bitcoin generati. Quando è stato generato questo blocco, è stato trasmesso alla rete per aggiungerlo alla catena di blocchi. Se non riesce a entrare nella catena, verrà modificato in &quot;non accettato&quot; e non sarà spendibile. Questo può accadere a volte, se un altro nodo genera un blocco entro pochi secondi del tuo.</translation>
</message>
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index 3a7daee36d..6b196e0d8d 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -82,8 +82,8 @@ Platinama pagal licenziją MIT/X11, papildomą informaciją rasite faile license
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;S Registruotis žinute</translation>
+ <source>Sign &amp;Message</source>
+ <translation>Registruoti praneši&amp;mą</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -235,59 +235,64 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Piniginė užšifruota</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin dabar užsidarys šifravimo proceso pabaigai. Atminkite, kad piniginės šifravimas negali pilnai apsaugoti bitcoinų vagysčių kai tinkle esančios kenkėjiškos programos patenka į jūsų kompiuterį.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Sėkmingai pakeistas piniginės slaptažodis.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>ĮSPĖJIMAS: Įjungtos didžiosios raidės</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Nepavyko užšifruoti piniginę</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Dėl vidinės klaidos nepavyko užšifruoti piniginę.Piniginė neužšifruota.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Įvestas slaptažodis nesutampa</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Nepavyko atrakinti piniginę</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation> Neteisingai įvestas slaptažodis piniginės iššifravimui</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Nepavyko iššifruoti piniginę</translation>
</message>
@@ -422,7 +427,7 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation>
<message>
<location filename="../bitcoingui.cpp" line="256"/>
<source>Backup wallet to another location</source>
- <translation type="unfinished"></translation>
+ <translation>Daryti piniginės atsarginę kopiją</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="281"/>
@@ -552,7 +557,7 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation>
<message>
<location filename="../bitcoingui.cpp" line="826"/>
<source>Backup Failed</source>
- <translation type="unfinished"></translation>
+ <translation>Nepavyko padaryti atsarginės kopijos</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="826"/>
@@ -1031,7 +1036,7 @@ Adresas: %4</translation>
<message>
<location filename="../qrcodedialog.cpp" line="46"/>
<source>Error encoding URI into QR Code.</source>
- <translation type="unfinished"></translation>
+ <translation>Klaida, koduojant URI į QR kodą.</translation>
</message>
<message>
<location filename="../qrcodedialog.cpp" line="64"/>
@@ -1072,11 +1077,6 @@ Adresas: %4</translation>
<translation>123.456 BTC</translation>
</message>
<message>
- <location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>&amp;Siųsti</translation>
- </message>
- <message>
<location filename="../sendcoinsdialog.cpp" line="100"/>
<source>Confirm send coins</source>
<translation>Patvirtinti siuntimui monetas</translation>
@@ -1114,6 +1114,11 @@ Adresas: %4</translation>
<translation>Ištrinti viską</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsdialog.ui" line="147"/>
+ <source>S&amp;end</source>
+ <translation>&amp;Siųsti</translation>
+ </message>
+ <message>
<location filename="../sendcoinsdialog.cpp" line="101"/>
<source>Are you sure you want to send %1?</source>
<translation>Ar esate įsitikinę, kad norite siųsti %1?</translation>
@@ -1271,73 +1276,73 @@ Adresas: %4</translation>
<translation>&lt;b&gt;Šaltinis:&lt;/b&gt; Sukurta&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Nuo:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Skirta:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (jūsų, žymė: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (jūsų)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Kreditas:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 apmokėtinas %2 daugiau blokais)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Sandorio mokestis:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Neto suma:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Žinutė:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Komentaras:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>Sandorio ID:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Išgautos monetos turi sulaukti 120 blokų, kol jos gali būti naudojamos. Kai sukūrėte šį bloką, jis buvo transliuojamas tinkle ir turėjo būti įtrauktas į blokų grandinę. Jei nepavyksta patekti į grandinę, bus pakeista į &quot;nepriėmė&quot;, o ne &quot;vartojamas&quot;. Tai kartais gali atsitikti, jei kitas mazgas per keletą sekundžių sukuria bloką po jūsų bloko.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>nežinomas</translation>
</message>
@@ -1352,14 +1357,14 @@ Adresas: %4</translation>
<translation>Atidaryta iki %1</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(nepriimta)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Debitas:&lt;/b&gt; </translation>
</message>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index 36adc91ad2..60426e5f2c 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -76,8 +76,8 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Signér Melding</translation>
+ <source>Sign &amp;Message</source>
+ <translation>Signér &amp;melding</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -166,7 +166,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>Merkelapp</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin vil nå lukkes for å fullføre krypteringsprosessen. Husk at kryptering av lommeboken ikke fullt ut kan beskytte dine bitcoins fra å bli stjålet om skadevare infiserer datamaskinen.</translation>
</message>
@@ -191,8 +191,8 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>Ny adgangsfrase</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>De angitte adgangsfrasene er ulike.</translation>
</message>
@@ -219,10 +219,10 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
<translation>Endre adgangsfrase</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Kryptering av lommebok feilet</translation>
</message>
@@ -232,7 +232,7 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
<translation>Bekreft kryptering av lommebok</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Kryptering av lommebok feilet på grunn av en intern feil. Din lommebok ble ikke kryptert.</translation>
</message>
@@ -257,36 +257,41 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
<translation>Skriv inn gammel og ny adgangsfrase for lommeboken.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Advarsel: Caps lock tasten er på.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Lommebok kryptert</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Adgangsfrase for lommebok endret.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Opplåsing av lommebok feilet</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Adgangsfrasen angitt for dekryptering av lommeboken var feil.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Dekryptering av lommebok feilet</translation>
</message>
@@ -1149,8 +1154,8 @@ Adresse: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>&amp;Send</translation>
+ <source>S&amp;end</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1265,70 +1270,70 @@ Adresse: %4
<translation>&lt;b&gt;Kilde:&lt;/b&gt; Generert&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Fra:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Til:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>ukjent</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (din)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (din, merkelapp: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 modnes om %2 flere blokker)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Kredit:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Debet:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Nettobeløp:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Kommentar:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>Transaksjons-ID:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Genererte mynter må vente 120 blokker før de kan brukes. Da du genererte denne blokken ble den kringkastet på nettverket for å bli lagt til i kjeden av blokker. Hvis den ikke kommer med i kjeden vil den endre seg til &quot;ikke akseptert og pengene vil ikke kunne brukes. Dette vil noen ganger skje hvis en annen node genererer en blokk noen sekunder i tid fra din egen.</translation>
</message>
@@ -1343,17 +1348,17 @@ Adresse: %4
<translation>, har ikke blitt kringkastet uten problemer enda.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(ikke akseptert)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Transaksjonsgebyr:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Melding:</translation>
</message>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 39bf5e7fa4..8df3e994ab 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -76,11 +76,6 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Toon &amp;QR-Code</translation>
</message>
<message>
- <location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Onderteken Bericht</translation>
- </message>
- <message>
<location filename="../forms/addressbookpage.ui" line="113"/>
<source>&amp;Delete</source>
<translation>&amp;Verwijder</translation>
@@ -91,6 +86,11 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Onderteken een bericht om te bewijzen dat u dit adres bezit</translation>
</message>
<message>
+ <location filename="../forms/addressbookpage.ui" line="99"/>
+ <source>Sign &amp;Message</source>
+ <translation>&amp;Onderteken Bericht</translation>
+ </message>
+ <message>
<location filename="../forms/addressbookpage.ui" line="110"/>
<source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source>
<translation>Verwijder het huidige geselecteerde adres van de lijst. Alleen zend-adressen kunnen verwijderd worden, niet uw ontvangstadressen.</translation>
@@ -172,7 +172,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Herhaal wachtwoord</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Portemonneewachtwoord is met succes gewijzigd.</translation>
</message>
@@ -198,7 +198,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Portemonnee versleuteld</translation>
</message>
@@ -235,18 +235,23 @@ Are you sure you wish to encrypt your wallet?</source>
Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin zal nu afsluiten om het versleutelingsproces te voltooien. Onthoud dat het versleutelen van uw portemonnee u niet volledig kan beschermen: Malware kan uw computer infecteren en uw bitcoins stelen.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Portemonneeversleuteling mislukt door een interne fout, Uw portemonnee is niet versleuteld.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Waarschuwing: De Caps-Lock-toets staat aan.</translation>
</message>
@@ -256,16 +261,16 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation>
<translation>Vul een nieuw wachtwoord in voor uw portemonnee. &lt;br/&gt; Gebruik een wachtwoord van &lt;b&gt;10 of meer lukrake karakters&lt;/b&gt;, of &lt;b&gt; acht of meer woorden&lt;/b&gt; . </translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>De opgegeven wachtwoorden komen niet overeen</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Portemonneeversleuteling mislukt</translation>
</message>
@@ -275,19 +280,19 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation>
<translation>Bevestig versleuteling van de portemonnee</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Portemonnee openen mislukt</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Het opgegeven wachtwoord voor de portemonnee-ontsleuteling is niet correct.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Portemonnee-ontsleuteling mislukt</translation>
</message>
@@ -1125,7 +1130,7 @@ Adres: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Verstuur</translation>
</message>
<message>
@@ -1271,37 +1276,37 @@ Adres: %4
<translation>&lt;b&gt;Bron:&lt;/b&gt;Gegenereerd&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Van:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Aan:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 komt beschikbaar na %2 blokken)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Af:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Opmerking:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>Transactie-ID:</translation>
</message>
@@ -1311,50 +1316,50 @@ Adres: %4
<translation>, is nog niet met succes uitgezonden</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>onbekend</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation>(Uw adres, label:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation>(uw)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Bij:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(niet geaccepteerd)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Transactiekosten:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Netto bedrag:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Bericht:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Gegeneerde munten moeten 120 blokken wachten voor ze kunnen worden uitgegeven. Uw net gegenereerde blok is uitgezonden aan het netwerk om te worden toegevoegd aan de blokkenketen. Als het niet wordt geaccepteerd in de keten, zal het blok als &quot;ongeldig&quot; worden aangemerkt en kan het niet worden uitgegeven. Dit kan soms gebeuren als een andere node net iets sneller een blok heeft gegenereerd; een paar seconden voor het uwe.</translation>
</message>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index c965f2109c..93621102d5 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -86,8 +86,8 @@ www.transifex.net/projects/p/bitcoin/</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>Podpi&amp;sz Wiadomość</translation>
+ <source>Sign &amp;Message</source>
+ <translation>Podpisz wiado&amp;mość</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -239,59 +239,64 @@ Czy na pewno chcesz zaszyfrować swój portfel?</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Portfel zaszyfrowany</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Program Bitcoin zamknie się aby dokończyć proces szyfrowania. Pamiętaj, że szyfrowanie portfela nie zabezpiecza w pełni Twoich bitcoinów przed kradzieżą przez wirusy lub trojany mogące zainfekować Twój komputer.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Szyfrowanie portfela nie powiodło się</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Szyfrowanie portfela nie powiodło się z powodu wewnętrznego błędu. Twój portfel nie został zaszyfrowany.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Podane hasła nie są takie same.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Odblokowanie portfela nie powiodło się</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Wprowadzone hasło do odszyfrowania portfela jest niepoprawne.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Odszyfrowywanie portfela nie powiodło się</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Hasło portfela zostało pomyślnie zmienione.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Ostrzeżenie: Caps Lock jest włączony.</translation>
</message>
@@ -666,7 +671,7 @@ Adres: %4
<message>
<location filename="../optionsdialog.cpp" line="285"/>
<source>Whether to show Bitcoin addresses in the transaction list</source>
- <translation type="unfinished"></translation>
+ <translation>Pokazuj adresy Bitcoin na liście transakcji.</translation>
</message>
</context>
<context>
@@ -822,12 +827,12 @@ Adres: %4
<message>
<location filename="../optionsdialog.cpp" line="232"/>
<source>Detach databases at shutdown</source>
- <translation type="unfinished"></translation>
+ <translation>Odłącz bazy danych przy zamknięciu</translation>
</message>
<message>
<location filename="../optionsdialog.cpp" line="233"/>
<source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source>
- <translation type="unfinished"></translation>
+ <translation>Odłącz bazę bloków i adresów podczas zamknięcia aplikcji. Oznacza to, że baza może zostać przeniesiona do innego folderu, ale jednocześnie zwiększa czas potrzebny na zamknięcie programu. Portfel jest zawsze odłączany.</translation>
</message>
</context>
<context>
@@ -1095,7 +1100,7 @@ Adres: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>Wy&amp;syłka</translation>
</message>
<message>
@@ -1281,80 +1286,80 @@ Adres: %4
<translation>&lt;b&gt;Źródło:&lt;/b&gt; Wygenerowano&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Do:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (twoje, etykieta: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (twoje)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Przypisy:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(niezaakceptowane)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Debet:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Prowizja transakcyjna:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Kwota netto:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Wiadomość:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Komentarz:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>ID transakcji:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Wygenerowane monety muszą zaczekać 120 bloków zanim będzie można je wydać. Kiedy wygenerowałeś ten blok, został on wyemitowany do sieci, aby dodać go do łańcucha bloków. Jeśli to się nie powiedzie nie zostanie on zaakceptowany i wygenerowanych monet nie będzie można wysyłać. Może się to czasami zdarzyć jeśli inny węzeł wygeneruje blok tuż przed tobą.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Od:&lt;/b&gt; </translation>
</message>
@@ -1364,7 +1369,7 @@ Adres: %4
<translation>, nie został jeszcze pomyślnie wyemitowany</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>nieznany</translation>
</message>
@@ -1955,7 +1960,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location filename="../bitcoinstrings.cpp" line="58"/>
<source>Allow DNS lookups for addnode and connect</source>
- <translation type="unfinished"></translation>
+ <translation>Zezwól -addnode i -connect na łączenie się z serwerem DNS</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="59"/>
@@ -1975,12 +1980,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location filename="../bitcoinstrings.cpp" line="67"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation type="unfinished"></translation>
+ <translation>Próg po którym nastąpi rozłączenie nietrzymających się zasad peerów (domyślnie: 100)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="68"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
- <translation type="unfinished"></translation>
+ <translation>Czas w sekundach, przez jaki nietrzymający się zasad peerzy nie będą mogli ponownie się podłączyć (domyślnie: 86400)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="71"/>
@@ -1990,7 +1995,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location filename="../bitcoinstrings.cpp" line="75"/>
<source>Detach block and address databases. Increases shutdown time (default: 0)</source>
- <translation type="unfinished"></translation>
+ <translation>Odłącz bazę bloków i adresów. Zwiększa czas wyłączenia (domyślnie: 0)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="81"/>
@@ -2000,17 +2005,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location filename="../bitcoinstrings.cpp" line="82"/>
<source>Prepend debug output with timestamp</source>
- <translation type="unfinished"></translation>
+ <translation>Poprzedź informacje debugowania znacznikiem czasowym</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="90"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
- <translation type="unfinished"></translation>
+ <translation>Wykonaj polecenie kiedy najlepszy blok ulegnie zmianie (%s w komendzie zastanie zastąpione przez hash bloku)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="97"/>
<source>How thorough the block verification is (0-6, default: 1)</source>
- <translation type="unfinished"></translation>
+ <translation>Głębokość weryfikacji bloku (0-6, domyślnie: 1)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="98"/>
@@ -2027,12 +2032,12 @@ opcje SSL: (sprawdź Bitcoin Wiki dla instrukcje konfiguracji SSL)</translation>
<message>
<location filename="../bitcoinstrings.cpp" line="123"/>
<source>Cannot initialize keypool</source>
- <translation type="unfinished"></translation>
+ <translation>Inicjalizacja puli kluczy nieudana</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="124"/>
<source>Cannot write default address</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać domyślnego adresu</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="127"/>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index 974f6af565..a87e846cf1 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -79,6 +79,11 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../forms/addressbookpage.ui" line="99"/>
+ <source>Sign &amp;Message</source>
+ <translation>&amp;Assinar Mensagem</translation>
+ </message>
+ <message>
<location filename="../forms/addressbookpage.ui" line="110"/>
<source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source>
<translation>Excluir o endereço selecionado da lista. Apenas endereços de envio podem ser excluídos.</translation>
@@ -94,11 +99,6 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Could not write to file %1.</translation>
</message>
<message>
- <location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Assinar Mensagem</translation>
- </message>
- <message>
<location filename="../addressbookpage.cpp" line="286"/>
<source>Comma separated file (*.csv)</source>
<translation>Arquivo separado por vírgulas (*. csv)</translation>
@@ -180,7 +180,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Diálogo</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>O Bitcoin irá fechar agora para finalizar o processo de encriptação. Lembre-se de que encriptar sua carteira não protege totalmente suas bitcoins de serem roubadas por malwares que tenham infectado o seu computador.</translation>
</message>
@@ -195,15 +195,15 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Desbloquear carteira</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>A criptografia da carteira falhou</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>A criptografia da carteira falhou devido a um erro interno. Sua carteira não estava criptografada.</translation>
</message>
@@ -213,25 +213,25 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Repita a nova frase de segurança</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>A frase de segurança digitada para a descriptografia da carteira estava incorreta.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Carteira criptografada</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>A descriptografia da carteira falhou</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>A abertura da carteira falhou</translation>
</message>
@@ -251,19 +251,24 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Confirmar criptografia da carteira</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>A frase de segurança fornecida não confere.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>A frase de segurança da carteira foi alterada com êxito.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -1064,8 +1069,8 @@ Endereço: %4</translation>
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>&amp;Send</translation>
+ <source>S&amp;end</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sendcoinsdialog.cpp" line="95"/>
@@ -1237,7 +1242,7 @@ Endereço: %4</translation>
<translation>%1 confirmations</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>unknown</translation>
</message>
@@ -1267,80 +1272,80 @@ Endereço: %4</translation>
<translation>&lt;b&gt;Source:&lt;/b&gt; Generated&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;From:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;To:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (yours, label: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (yours)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Credit:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 matures in %2 more blocks)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(not accepted)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Debit:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Transaction fee:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Net amount:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Comment:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Message:</translation>
</message>
@@ -2045,7 +2050,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)
<message>
<location filename="../bitcoinstrings.cpp" line="114"/>
<source>Error loading addr.dat</source>
- <translation type="unfinished"></translation>
+ <translation>Erro ao carregar addr.dat</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="116"/>
diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts
index 78dfdb2a34..6178f5e042 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -75,7 +75,7 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -228,59 +228,64 @@ Sunteţi sigur că doriţi să criptaţi portofelul electronic?</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Portofel criptat </translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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"></translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Criptarea portofelului a eșuat.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Criptarea portofelului a eșuat din cauza unei erori interne. Portofelul tău nu a fost criptat.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Fraza de acces introdusă nu se potrivește.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Deblocarea portofelului electronic a eşuat.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Parola introdusă pentru decriptarea portofelului electronic a fost incorectă.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Decriptarea portofelului electronic a eşuat.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Parola portofelului electronic a fost schimbată.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -1052,11 +1057,6 @@ Address: %4
<translation>Confirmă operaţiunea de trimitere</translation>
</message>
<message>
- <location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>&amp;S Trimite</translation>
- </message>
- <message>
<location filename="../sendcoinsdialog.cpp" line="95"/>
<source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
<translation>&lt;b&gt;%1&lt;/b&gt; la %2 (%3)</translation>
@@ -1139,6 +1139,11 @@ Address: %4
<translation>123.456 BTC</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsdialog.ui" line="147"/>
+ <source>S&amp;end</source>
+ <translation>&amp;S Trimite</translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsdialog.ui" line="87"/>
<source>Clear all</source>
<translation>Şterge tot</translation>
@@ -1246,38 +1251,38 @@ Address: %4
<translation>&lt;b&gt;Sursă:&lt;/b&gt; Generat&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;De la:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>necunoscut</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Comisionul tranzacţiei:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Suma netă:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Mesaj:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Monedele bitcoin generate se pot cheltui dupa parcurgerea a 120 de blocuri. După ce a fost generat, s-a propagat în reţea, urmând să fie adăugat lanţului de blocuri. Dacă nu poate fi inclus in lanţ, starea sa va deveni &quot;neacceptat&quot; si nu va putea fi folosit la tranzacţii. Acest fenomen se întâmplă atunci cand un alt nod a generat un bloc la o diferenţa de câteva secunde.</translation>
</message>
@@ -1307,49 +1312,49 @@ Address: %4
<translation>&lt;b&gt;Data:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Către:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (propriu, etichetă: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (propriu)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Credit:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 se definitivează peste %2 blocuri)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(nu este acceptat)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Debit:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Comentarii:</translation>
</message>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index c9139b74a6..6286999fd2 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -76,8 +76,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Подписать сообщение</translation>
+ <source>Sign &amp;Message</source>
+ <translation>Подписать &amp;сообщение</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -156,10 +156,10 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AskPassphraseDialog</name>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Не удалось зашифровать бумажник</translation>
</message>
@@ -230,40 +230,45 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Бумажник зашифрован</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Сейчас программа закроется для завершения процесса шифрования. Помните, что шифрование вашего бумажника не может полностью защитить ваши биткоины от кражи с помощью инфицирования вашего компьютера вредоносным ПО.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Шифрование бумажника не удалось из-за внутренней ошибки. Ваш бумажник не был зашифрован.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Указанный пароль не подходит.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Расшифрование бумажника не удалось</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Внимание: Caps Lock включен.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Разблокировка бумажника не удалась</translation>
</message>
@@ -273,7 +278,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Введите новый пароль для бумажника. &lt;br/&gt; Пожалуйста, используйте фразы из &lt;b&gt;10 или более случайных символов,&lt;/b&gt; или &lt;b&gt;восьми и более слов.&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Пароль бумажника успешно изменён.</translation>
</message>
@@ -285,8 +290,8 @@ Are you sure you wish to encrypt your wallet?</source>
Вы действительно хотите зашифровать ваш бумажник?</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Введённые пароли не совпадают.</translation>
</message>
@@ -1072,16 +1077,16 @@ Address: %4
<translation>Подтвердить отправку</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsdialog.ui" line="147"/>
+ <source>S&amp;end</source>
+ <translation>&amp;Отправить</translation>
+ </message>
+ <message>
<location filename="../sendcoinsdialog.cpp" line="95"/>
<source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
<translation>&lt;b&gt;%1&lt;/b&gt; адресату %2 (%3)</translation>
</message>
<message>
- <location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>&amp;Отправить</translation>
- </message>
- <message>
<location filename="../sendcoinsdialog.cpp" line="100"/>
<source>Confirm send coins</source>
<translation>Подтвердите отправку монет</translation>
@@ -1266,75 +1271,75 @@ Address: %4
<translation>&lt;b&gt;Источник:&lt;/b&gt; [сгенерированно]&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Отправитель:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Получатель:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (Ваш, метка: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (ваш)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Кредит:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 станет доступно через %2 блоков)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(не принято)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Дебет:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Комиссия:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Общая сумма:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Сообщение:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Комментарий:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>Идентификатор транзакции:</translation>
</message>
@@ -1354,12 +1359,12 @@ Address: %4
<translation>, ещё не было успешно разослано</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>неизвестно</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Сгенерированные монеты должны подождать 120 блоков прежде, чем они смогут быть отправлены. Когда Вы сгенерировали этот блок он был отправлен в сеть, чтобы он был добавлен к цепочке блоков. Если данная процедура не удастся, статус изменится на «не подтверждено» и монеты будут непередаваемыми. Такое может случайно происходить в случае, если другой узел сгенерирует блок на несколько секунд раньше.</translation>
</message>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index ba9c60e36d..18a65a921d 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -75,8 +75,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Podpísať Správu</translation>
+ <source>Sign &amp;Message</source>
+ <translation>Podpísať &amp;správu</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -228,59 +228,64 @@ Ste si istí, že si želáte zašifrovať peňaženku?</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Peňaženka zašifrovaná</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="117"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Heslo k peňaženke bolo úspešne zmenené.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Varovanie: Caps Lock je zapnutý</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Šifrovanie peňaženky zlyhalo</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Šifrovanie peňaženky zlyhalo kôli internej chybe. Vaša peňaženka nebola zašifrovaná.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Zadané heslá nesúhlasia.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Odomykanie peňaženky zlyhalo</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Zadané heslo pre dešifrovanie peňaženky bolo nesprávne.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Zlyhalo šifrovanie peňaženky.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Bitcoin sa teraz ukončí pre dokončenie procesu šifrovania. Pamätaj že šifrovanie peňaženky Ťa nemôže úplne ochrániť pred kráďežou bitcoinov pomocou škodlivého software.</translation>
</message>
@@ -1065,11 +1070,6 @@ Adresa: %4</translation>
<translation>Potvrďte odoslanie</translation>
</message>
<message>
- <location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>&amp;Odoslať</translation>
- </message>
- <message>
<location filename="../sendcoinsdialog.cpp" line="100"/>
<source>Confirm send coins</source>
<translation>Potvrdiť odoslanie bitcoins</translation>
@@ -1112,6 +1112,11 @@ Adresa: %4</translation>
<translation>Zmazať všetko</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsdialog.ui" line="147"/>
+ <source>S&amp;end</source>
+ <translation>&amp;Odoslať</translation>
+ </message>
+ <message>
<location filename="../sendcoinsdialog.cpp" line="145"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Duplikát adresy objavený, je možné poslať na každú adresu len raz v jednej odchádzajúcej transakcii.</translation>
@@ -1269,80 +1274,80 @@ Adresa: %4</translation>
<translation>&lt;b&gt;Zdroj:&lt;/b&gt; Generovaný&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;od:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>neznámy</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Komu:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation>(vaše)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Kredit:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(neprijaté)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Debet:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Transakčný poplatok:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Suma netto:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Správa:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Komentár:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>ID transakcie:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (vaše, popis: </translation>
</message>
@@ -1352,7 +1357,7 @@ Adresa: %4</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 dospeje o %2 blokov)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts
index 885d1b88ae..2390573b5f 100644
--- a/src/qt/locale/bitcoin_sr.ts
+++ b/src/qt/locale/bitcoin_sr.ts
@@ -75,7 +75,7 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
+ <source>Sign &amp;Message</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -228,59 +228,64 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Новчаник је шифрован</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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"></translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Неуспело шифровање новчаника</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Настала је унутрашња грешка током шифровања новчаника. Ваш новчаник није шифрован.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Лозинке које сте унели се не подударају.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Неуспело откључавање новчаника</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Лозинка коју сте унели за откључавање новчаника је нетачна.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Неуспело дешифровање новчаника</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Лозинка за приступ новчанику је успешно промењена.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation type="unfinished"></translation>
</message>
@@ -1090,7 +1095,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Пошаљи</translation>
</message>
<message>
@@ -1271,85 +1276,85 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 6243acafee..8186b89815 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -76,8 +76,8 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Signera meddelande</translation>
+ <source>Sign &amp;Message</source>
+ <translation>Signera &amp;meddelande</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -233,59 +233,64 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Plånboken är krypterad</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Programmet kommer nu att stänga ner för att färdigställa krypteringen. Tänk på att en krypterad plånbok inte skyddar mot stöld om din dator är infekterad med en keylogger.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Kryptering av plånbok misslyckades</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Kryptering av plånbok misslyckades på grund av ett internt fel. Din plånbok blev inte krypterad.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>De angivna lösenorden överensstämmer inte.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Upplåsning av plånbok misslyckades</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Lösenordet för dekryptering av plånbok var felaktig.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Dekryptering av plånbok misslyckades</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Plånbokens lösenord har ändrats.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Varning: Caps Lock är påslaget.</translation>
</message>
@@ -1093,7 +1098,7 @@ Adress: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Skicka</translation>
</message>
<message>
@@ -1219,7 +1224,7 @@ Adress: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>okänd</translation>
</message>
@@ -1274,80 +1279,80 @@ Adress: %4
<translation>&lt;b&gt;Datum:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (din, etikett: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation>(dina)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Kredit:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(inte accepterad)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Debet:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Transaktionsavgift:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Nettobelopp:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Meddelande:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Från:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Till:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Kommentar:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>Transaktions-ID:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Genererade mynt måste vänta 120 block innan de kan användas. När du skapade detta block sändes det till nätverket för att läggas till i blockkedjan. Om blocket inte kommer in i kedjan kommer det att ändras till &quot;accepteras inte&quot; och kommer ej att gå att spendera. Detta kan ibland hända om en annan nod genererar ett block nästan samtidigt som dig.</translation>
</message>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index c54a5f711b..b526d26484 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -81,8 +81,8 @@ Bu ürün OpenSSL projesi tarafından OpenSSL Toolkit (http://www.openssl.org/)
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>Mesaj &amp;imzala</translation>
+ <source>Sign &amp;Message</source>
+ <translation>&amp;Mesaj imzala</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="110"/>
@@ -234,59 +234,64 @@ Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Cüzdan şifrelendi</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Şifreleme işlemini tamamlamak için Bitcoin şimdi kapanacaktır. Cüzdanınızı şifrelemenin, Bitcoinlerinizin bilgisayara bulaşan kötücül bir yazılım tarafından çalınmaya karşı tamamen koruyamayacağını unutmayınız.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Cüzdan şifrelemesi başarısız oldu</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Dahili bir hata sebebiyle cüzdan şifrelemesi başarısız oldu. Cüzdanınız şifrelenmedi.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Girilen parolalar birbirleriyle uyumlu değil.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Cüzdan kilidinin açılması başarısız oldu</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Cüzdan şifresinin açılması için girilen parola yanlıştı.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Cüzdan şifresinin açılması başarısız oldu</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Cüzdan parolası başarılı bir şekilde değiştirildi.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Uyarı: Caps Lock tuşu etkin durumda.</translation>
</message>
@@ -1068,7 +1073,7 @@ Adres: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Gönder</translation>
</message>
<message>
@@ -1244,56 +1249,56 @@ Adres: %4
<translation>&lt;b&gt;Kaynak:&lt;/b&gt; Oluşturuldu&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Gönderen:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>bilinmiyor</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (sizin, etiket: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (sizin)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Net miktar:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Mesaj:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Yorum:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>Muamele kimliği:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Oluşturulan paraların (coin) harcanabilmelerinden önce 120 blok beklemeleri gerekmektedir. Bu blok, oluşturduğunuzda, blok zincirine eklenmesi için ağda yayınlandı. Zincire eklenmesi başarısız olursa, &quot;kabul edilmedi&quot; olarak değiştirilecek ve harcanamayacaktır. Bu, bazen başka bir düğüm sizden birkaç saniye önce ya da sonra blok oluşturursa meydana gelebilir.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Gelir:&lt;/b&gt; </translation>
</message>
@@ -1323,31 +1328,31 @@ Adres: %4
<translation>&lt;b&gt;Tarih:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Alıcı:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1, %2 ek blok sonrasında olgunlaşacak)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(kabul edilmedi)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Gider:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Muamele ücreti:&lt;b&gt; </translation>
</message>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index d6467925d8..b906d2000d 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -90,16 +90,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Підпишіть повідомлення щоб довести, що ви є власником цієї адреси</translation>
</message>
<message>
+ <location filename="../forms/addressbookpage.ui" line="99"/>
+ <source>Sign &amp;Message</source>
+ <translation>&amp;Підписати повідомлення</translation>
+ </message>
+ <message>
<location filename="../forms/addressbookpage.ui" line="110"/>
<source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source>
<translation>Видалити виділену адресу зі списку. Лише адреси з адресної книги можуть бути видалені.</translation>
</message>
<message>
- <location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;Підписати повідомлення</translation>
- </message>
- <message>
<location filename="../forms/addressbookpage.ui" line="113"/>
<source>&amp;Delete</source>
<translation>&amp;Видалити</translation>
@@ -156,7 +156,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AskPassphraseDialog</name>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Не вдалося розблокувати гаманець</translation>
</message>
@@ -221,7 +221,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Введіть новий пароль для гаманця.&lt;br/&gt;Будь ласка, використовуйте паролі що містять &lt;b&gt; як мінімум 10 випадкових символів &lt;/b&gt; або &lt;b&gt; як мінімум 8 слів&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Не вдалося розшифрувати гаманець</translation>
</message>
@@ -236,9 +236,9 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Ця операція потребує пароль для дешифрування гаманця.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>Введений пароль є невірним.</translation>
</message>
@@ -251,42 +251,47 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Гаманець зашифровано</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>Не вдалося зашифрувати гаманець</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Пароль було успішно змінено.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>Увага: Ввімкнено Caps Lock</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>Біткоін-клієнт буде закрито для завершення процесу шифрування. Пам’ятайте, що шифрування гаманця не може повністю захистити ваші біткоіни від кражі, у випадку якщо ваш комп’ютер буде інфіковано шкідливими програмами.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>Виникла помилка під час шифрування гаманця. Ваш гаманець не було зашифровано.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>Введені паролі не співпадають.</translation>
</message>
@@ -1090,7 +1095,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Відправити</translation>
</message>
<message>
@@ -1261,7 +1266,7 @@ Address: %4
<translation>&lt;b&gt;Дата:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>невідомий</translation>
</message>
@@ -1286,80 +1291,80 @@ Address: %4
<translation>&lt;b&gt;Джерело:&lt;/b&gt; згенеровано&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Відправник:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Одержувач:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (Ваша, мітка: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (ваша)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 «дозріє» через %2 блоків)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Дебет:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Комісія за переказ:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Загальна сума:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>Повідомлення:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>Коментар:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>ID транзакції:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Після генерації монет, потрібно зачекати 120 блоків, перш ніж їх можна буде використати. Коли ви згенерували цей блок, його було відправлено в мережу для того, щоб він був доданий до ланцюжка блоків. Якщо ця процедура не вдасться, статус буде змінено на «не підтверджено» і ви не зможете потратити згенеровані монету. Таке може статись, якщо хтось інший згенерував блок на декілька секунд раніше.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Кредит:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(не прийнято)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 7872158dc1..bdcd581b06 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -60,6 +60,11 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>发送签名消息以证明您是该比特币地址的拥有者</translation>
</message>
<message>
+ <location filename="../forms/addressbookpage.ui" line="99"/>
+ <source>Sign &amp;Message</source>
+ <translation>发送签名 &amp;消息</translation>
+ </message>
+ <message>
<location filename="../forms/addressbookpage.ui" line="110"/>
<source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source>
<translation>从列表中删除当前选中地址。只有发送地址可以被删除。</translation>
@@ -90,11 +95,6 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;删除</translation>
</message>
<message>
- <location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>&amp;发送签名消息</translation>
- </message>
- <message>
<location filename="../forms/addressbookpage.ui" line="85"/>
<source>Show &amp;QR Code</source>
<translation>显示二维码</translation>
@@ -166,7 +166,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>确认加密钱包</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>钱包解锁失败</translation>
</message>
@@ -191,7 +191,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>文本标签</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>钱包解密失败。</translation>
</message>
@@ -201,18 +201,18 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>该操作需要您首先使用口令解密钱包。</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>将关闭软件以完成加密过程。 请您谨记:钱包加密并不是万能的,电脑中毒,您的比特币还是有可能丢失。</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>由于一个本地错误,加密钱包操作已经失败。您的钱包没有被加密。</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>钱包已加密</translation>
</message>
@@ -260,33 +260,38 @@ Are you sure you wish to encrypt your wallet?</source>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>钱包加密失败</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>口令不匹配。</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>用于解密钱包的口令不正确。</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>警告:大写锁定键CapsLock开启</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>钱包口令修改成功</translation>
</message>
@@ -1078,7 +1083,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;发送</translation>
</message>
<message>
@@ -1214,7 +1219,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>交易费</translation>
</message>
@@ -1224,7 +1229,7 @@ Address: %4
<translation>%1/未确认</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;网络金额:&lt;/b&gt; </translation>
</message>
@@ -1239,14 +1244,14 @@ Address: %4
<translation>至 %1 个数据块时开启</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation>(您的, 标签:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;到:&lt;/b&gt; </translation>
</message>
@@ -1291,63 +1296,63 @@ Address: %4
<translation>&lt;b&gt;来源:&lt;/b&gt; 生成&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;从:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>未知</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation>(您的)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;到帐:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 成熟于 %2 以上数据块)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(未接受)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>支出</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>交易ID:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>新生产的比特币必须等待120个数据块之后才能被使用. 当您生产出此数据块,它将被广播至比特币网络并添加至数据链. 如果添加到数据链失败, 它的状态将变成&quot;不被接受&quot;,生产的比特币将不能使用. 在您生产新数据块的几秒钟内, 如果其它节点也生产出同样的数据块,有可能会发生这种情况.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>消息:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>备注</translation>
</message>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index 741085d64a..c7a134da16 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -55,6 +55,11 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>產生新位址</translation>
</message>
<message>
+ <location filename="../forms/addressbookpage.ui" line="99"/>
+ <source>Sign &amp;Message</source>
+ <translation>訊息簽署</translation>
+ </message>
+ <message>
<location filename="../forms/addressbookpage.ui" line="113"/>
<source>&amp;Delete</source>
<translation>刪除</translation>
@@ -85,11 +90,6 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>從列表中刪除目前選取的位址. 只能夠刪除付款位址.</translation>
</message>
<message>
- <location filename="../forms/addressbookpage.ui" line="99"/>
- <source>&amp;Sign Message</source>
- <translation>簽署訊息</translation>
- </message>
- <message>
<location filename="../forms/addressbookpage.ui" line="96"/>
<source>Sign a message to prove you own this address</source>
<translation>簽署一則訊息來證明你擁有這個位址</translation>
@@ -166,7 +166,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>輸入密碼</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>錢包解鎖失敗</translation>
</message>
@@ -197,12 +197,12 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>錢包已加密</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="112"/>
+ <location filename="../askpassphrasedialog.cpp" line="113"/>
<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>位元幣現在要關閉以完成加密程序. 請記住, 加密錢包無法完全防止入侵電腦的惡意程式偷取你的位元幣.</translation>
</message>
@@ -233,38 +233,43 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="117"/>
- <location filename="../askpassphrasedialog.cpp" line="124"/>
- <location filename="../askpassphrasedialog.cpp" line="166"/>
- <location filename="../askpassphrasedialog.cpp" line="172"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="126"/>
+ <location filename="../askpassphrasedialog.cpp" line="133"/>
+ <location filename="../askpassphrasedialog.cpp" line="175"/>
+ <location filename="../askpassphrasedialog.cpp" line="181"/>
<source>Wallet encryption failed</source>
<translation>錢包加密失敗</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="118"/>
+ <location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
<translation>錢包加密因程式內部有誤而失敗. 你的錢包還是沒有加密.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="125"/>
- <location filename="../askpassphrasedialog.cpp" line="173"/>
+ <location filename="../askpassphrasedialog.cpp" line="134"/>
+ <location filename="../askpassphrasedialog.cpp" line="182"/>
<source>The supplied passphrases do not match.</source>
<translation>提供的密碼不符.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="137"/>
- <location filename="../askpassphrasedialog.cpp" line="148"/>
- <location filename="../askpassphrasedialog.cpp" line="167"/>
+ <location filename="../askpassphrasedialog.cpp" line="146"/>
+ <location filename="../askpassphrasedialog.cpp" line="157"/>
+ <location filename="../askpassphrasedialog.cpp" line="176"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
<translation>用來解密錢包的密碼輸入錯誤.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>錢包密碼變更成功.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
+ <location filename="../askpassphrasedialog.cpp" line="217"/>
+ <location filename="../askpassphrasedialog.cpp" line="241"/>
<source>Warning: The Caps Lock key is on.</source>
<translation>警告: 鍵盤輸入鎖定為大寫字母中.</translation>
</message>
@@ -286,7 +291,7 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>這個動作需要用你的錢包密碼來解密</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>錢包解密失敗</translation>
</message>
@@ -1044,11 +1049,6 @@ Address: %4
<translation>餘額:</translation>
</message>
<message>
- <location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>付出</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsdialog.ui" line="144"/>
<source>Confirm the send action</source>
<translation>確認付款動作</translation>
@@ -1131,6 +1131,11 @@ Address: %4
<translation>123.456 BTC</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsdialog.ui" line="147"/>
+ <source>S&amp;end</source>
+ <translation>付出</translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsdialog.ui" line="64"/>
<source>Send to multiple recipients at once</source>
<translation>一次付給多個人</translation>
@@ -1258,60 +1263,60 @@ Address: %4
<translation>&lt;b&gt;來源:&lt;/b&gt; 生產所得&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="76"/>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="75"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;來自:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="94"/>
- <location filename="../transactiondesc.cpp" line="117"/>
- <location filename="../transactiondesc.cpp" line="176"/>
+ <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="116"/>
+ <location filename="../transactiondesc.cpp" line="175"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;目的:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="97"/>
+ <location filename="../transactiondesc.cpp" line="96"/>
<source> (yours, label: </source>
<translation> (你的, 標記為: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="99"/>
+ <location filename="../transactiondesc.cpp" line="98"/>
<source> (yours)</source>
<translation> (你的)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="134"/>
- <location filename="../transactiondesc.cpp" line="148"/>
- <location filename="../transactiondesc.cpp" line="193"/>
- <location filename="../transactiondesc.cpp" line="210"/>
+ <location filename="../transactiondesc.cpp" line="133"/>
+ <location filename="../transactiondesc.cpp" line="147"/>
+ <location filename="../transactiondesc.cpp" line="192"/>
+ <location filename="../transactiondesc.cpp" line="209"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;入帳:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="136"/>
+ <location filename="../transactiondesc.cpp" line="135"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 將在 %2 個區塊產出後熟成)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="140"/>
+ <location filename="../transactiondesc.cpp" line="139"/>
<source>(not accepted)</source>
<translation>(不被接受)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="184"/>
- <location filename="../transactiondesc.cpp" line="192"/>
- <location filename="../transactiondesc.cpp" line="207"/>
+ <location filename="../transactiondesc.cpp" line="183"/>
+ <location filename="../transactiondesc.cpp" line="191"/>
+ <location filename="../transactiondesc.cpp" line="206"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;出帳:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="198"/>
+ <location filename="../transactiondesc.cpp" line="197"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;交易手續費:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="214"/>
+ <location filename="../transactiondesc.cpp" line="213"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;淨額:&lt;/b&gt; </translation>
</message>
@@ -1326,27 +1331,27 @@ Address: %4
<translation>經確認 %1 次</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="93"/>
+ <location filename="../transactiondesc.cpp" line="92"/>
<source>unknown</source>
<translation>未知</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>Message:</source>
<translation>訊息:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="222"/>
+ <location filename="../transactiondesc.cpp" line="221"/>
<source>Comment:</source>
<translation>附註:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="224"/>
+ <location filename="../transactiondesc.cpp" line="223"/>
<source>Transaction ID:</source>
<translation>交易識別碼:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to &quot;not accepted&quot; and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>生產出來的錢要再等 120 個區塊產出之後, 才能夠花用. 當你產出區塊時, 它會被公布到網路上, 以被串連至區塊鎖鏈. 如果串連失敗了, 它的狀態就會變成&quot;不被接受&quot;, 且不能被花用. 當你產出區塊的幾秒鐘內, 其他節點也產出了區塊的話, 有時候就會發生這種情形.</translation>
</message>