aboutsummaryrefslogtreecommitdiff
path: root/src/qt/locale
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-10-09 23:28:53 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-10-09 23:28:53 +0000
commit6ec7ac15ff84080e7cfa65c860dd90b33d596ef2 (patch)
tree77caf2ffd16b01adead19c7bb6e3a270dde99be9 /src/qt/locale
parentcef36fad891fba0fd8f5aec73bb17135b7fb133a (diff)
downloadbitcoin-6ec7ac15ff84080e7cfa65c860dd90b33d596ef2.tar.xz
Update supported translations
Diffstat (limited to 'src/qt/locale')
-rw-r--r--src/qt/locale/bitcoin_da.ts83
-rw-r--r--src/qt/locale/bitcoin_de.ts83
-rw-r--r--src/qt/locale/bitcoin_en.ts83
-rw-r--r--src/qt/locale/bitcoin_es.ts93
-rw-r--r--src/qt/locale/bitcoin_es_CL.ts85
-rw-r--r--src/qt/locale/bitcoin_hu.ts85
-rw-r--r--src/qt/locale/bitcoin_it.ts93
-rw-r--r--src/qt/locale/bitcoin_nb.ts87
-rw-r--r--src/qt/locale/bitcoin_nl.ts83
-rw-r--r--src/qt/locale/bitcoin_pt_BR.ts87
-rw-r--r--src/qt/locale/bitcoin_ru.ts85
-rw-r--r--src/qt/locale/bitcoin_uk.ts83
-rw-r--r--src/qt/locale/bitcoin_zh_CN.ts83
-rw-r--r--src/qt/locale/bitcoin_zh_TW.ts91
14 files changed, 637 insertions, 567 deletions
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index bf50e18a6b..b91e595938 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -157,7 +157,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i 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>Tegnebog krypteret</translation>
</message>
@@ -187,43 +187,48 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Denne funktion har brug for din tegnebogs kodeord for at dekryptere tegnebogen.</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="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>Tegnebogskryptering 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>
<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>
<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>
<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>Tegnebogskryptering mislykkedes på grund af en intern fejl. Din tegnebog blev ikke krypteret.</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>
@@ -245,13 +250,13 @@ Are you sure you wish to encrypt your wallet?</source>
Er du sikker på at du ønsker at kryptere din 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>
@@ -839,7 +844,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>
@@ -1020,38 +1025,38 @@ Adresse: %4
<translation>&lt;b&gt;Kilde:&lt;/b&gt; Genereret&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<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="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>ukendt</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<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="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation> (din, etiket:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (din)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Kredit:&lt;/b&gt; </translation>
</message>
@@ -1066,44 +1071,44 @@ Adresse: %4
<translation>%1 bekræftelser</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 modnes i %2 blokke mere)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(ikke accepteret)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<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="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<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="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Besked:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Kommentar:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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 fe4dbfbff2..22a289ffb3 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -146,7 +146,7 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open
<translation>Brieftasche verschlüsseln</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>
@@ -182,20 +182,25 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open
</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>Verschlüsselung der Brieftasche fehlgeschlagen</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>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="111"/>
- <location filename="../askpassphrasedialog.cpp" line="160"/>
+ <location filename="../askpassphrasedialog.cpp" line="169"/>
<source>Wallet encrypted</source>
<translation>Brieftasche verschlüsselt</translation>
</message>
@@ -205,31 +210,31 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open
<translation>Dieser Vorgang benötigt Ihre Passphrase um die Brieftasche zu entsperren.</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="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="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>
<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>
@@ -250,7 +255,7 @@ 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>
@@ -827,7 +832,7 @@ Adresse: %4</translation>
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
+ <source>S&amp;end</source>
<translation>&amp;Überweisen</translation>
</message>
<message>
@@ -1013,38 +1018,38 @@ Adresse: %4</translation>
<translation>&lt;b&gt;Quelle:&lt;/b&gt; Generiert&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<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="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<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="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation> (Eigene Adresse, Bezeichnung: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (Eigene Adresse)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<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="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>%1 (reift noch %2 weitere Blöcke)</translation>
</message>
@@ -1064,44 +1069,44 @@ Adresse: %4</translation>
<translation>, wurde noch nicht erfolgreich übertragen</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>unbekannt</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(nicht angenommen)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<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="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Nettobetrag:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Nachricht:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Kommentar:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index e95625e202..63485cd65a 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -192,59 +192,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>
@@ -838,7 +843,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>
@@ -1019,80 +1024,80 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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 d687c2e2d3..198ca7796a 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -144,8 +144,8 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Para desbloquear el monedero esta operación necesita de su contraseña.</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>
@@ -160,14 +160,14 @@ 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="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 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>
@@ -203,17 +203,22 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
</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>
<message>
- <location filename="../askpassphrasedialog.cpp" line="208"/>
- <location filename="../askpassphrasedialog.cpp" line="232"/>
- <source>Warning: The Caps Lock key is on.</source>
+ <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>Aviso: ¡La tecla de bloqueo de mayúsculas está activada!</translation>
+ </message>
+ <message>
<location filename="../askpassphrasedialog.cpp" line="51"/>
<source>Decrypt wallet</source>
<translation>Descifrar monedero</translation>
@@ -224,12 +229,12 @@ 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="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="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>
@@ -241,20 +246,20 @@ 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="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Ha fallado el desbloqueo 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 se cerrará para finalizar el proceso de encriptación. Recuerda que encriptando tu cartera no garantiza mantener a salvo tus bitcoins en caso de tener viruses en el ordenador.</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>
@@ -552,7 +557,7 @@ Dirección: %4</translation>
<message>
<location filename="../bitcoin.cpp" line="133"/>
<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>
@@ -831,7 +836,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>
@@ -1027,40 +1032,40 @@ Dirección: %4</translation>
<translation>&lt;b&gt;Fuente:&lt;/b&gt; Generado&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<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="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<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="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation>(tuya, etiqueta: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (tuya)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Mensaje:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Comentario:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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>
@@ -1070,42 +1075,42 @@ Dirección: %4</translation>
<translation>%1/no confirmado</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>desconocido</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<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="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 madura en %2 bloques mas)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(no aceptada)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<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="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Cantidad total:&lt;/b&gt; </translation>
</message>
@@ -1488,13 +1493,13 @@ Dirección: %4</translation>
<location filename="../bitcoinstrings.cpp" line="34"/>
<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="36"/>
<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="43"/>
diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts
index 43a8c3adf0..9c605c58d3 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -149,10 +149,10 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Introduce contraseña actual </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>
@@ -162,8 +162,8 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Repite nueva contraseña:</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>
@@ -178,9 +178,9 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Introduce la nueva contraseña para la billetera.&lt;br/&gt;Por favor utiliza un contraseña &lt;b&gt;de 10 o mas caracteres aleatorios&lt;/b&gt;, u &lt;b&gt;ocho o mas palabras&lt;/b&gt;.</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>
@@ -215,22 +215,27 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<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="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>Ha fallado el desbloqueo de la billetera</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>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="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Ha fallado la decodificación de la billetera</translation>
</message>
@@ -242,19 +247,19 @@ Are you sure you wish to encrypt your wallet?</source>
¿Seguro que quieres seguir codificando 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>
<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>
@@ -836,7 +841,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>
@@ -977,7 +982,7 @@ Dirección: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>desconocido</translation>
</message>
@@ -1032,58 +1037,58 @@ Dirección: %4</translation>
<translation>&lt;b&gt;Fuente:&lt;/b&gt; Generado&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<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="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<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="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation> (tuya, etiqueta: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<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="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<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="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Comentario:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (tuya)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 madura en %2 bloques mas)</translation>
</message>
@@ -1093,19 +1098,19 @@ Dirección: %4</translation>
<translation>%1/no confirmado</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(no aceptada)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<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="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Mensaje:</translation>
</message>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index 12cc66b346..50b8610f14 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -146,26 +146,26 @@ 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="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>
<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>A megadott jelszavak nem egyeznek.</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>
@@ -195,13 +195,18 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>Írd be a tárca régi és új jelszavát.</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>Dekódolás sikertelen.</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>
@@ -223,7 +228,7 @@ 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="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>
@@ -233,19 +238,19 @@ Biztosan kódolni akarod a tárcát?</translation>
<translation>Tárca dekódolása</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="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>
<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>
@@ -826,7 +831,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>
@@ -1020,80 +1025,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="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<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="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>ismeretlen</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<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="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Megjegyzés:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation> (tiéd, címke: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (tiéd)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<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="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<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="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(elutasítva)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<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="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<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="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Üzenet:</translation>
</message>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index c76be020fa..927f3b898f 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -141,10 +141,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>
@@ -154,15 +154,15 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Ripeti la passphrase</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>
<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>
@@ -210,22 +210,27 @@ Si è sicuri di voler cifrare il portamonete?</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>Portamonete cifrato</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="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>Cifratura del portamonete fallita a causa di un errore interno. Il portamonete non è stato cifrato.</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="136"/>
+ <location filename="../askpassphrasedialog.cpp" line="145"/>
<source>Wallet unlock failed</source>
<translation>Sblocco del portamonete fallito</translation>
</message>
@@ -235,7 +240,7 @@ Si è sicuri di voler cifrare il portamonete?</translation>
<translation>Cambia la passphrase</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>
@@ -245,13 +250,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>
@@ -824,16 +829,16 @@ Indirizzo: %4
<translation>Conferma la spedizione</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsdialog.ui" line="147"/>
+ <source>S&amp;end</source>
+ <translation>&amp;Spedisci</translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsdialog.ui" line="113"/>
<source>123.456 BTC</source>
<translation>123,456 BTC</translation>
</message>
<message>
- <location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>&amp;Spedisci</translation>
- </message>
- <message>
<location filename="../sendcoinsdialog.cpp" line="93"/>
<source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
<translation>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</translation>
@@ -976,7 +981,7 @@ Indirizzo: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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>
@@ -1026,65 +1031,65 @@ Indirizzo: %4
<translation>&lt;b&gt;Fonte:&lt;/b&gt; Generato&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<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="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<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="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation> (vostro, etichetta: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (vostro)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<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="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 matura in altri %2 blocchi)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(non accettate)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<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="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<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="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Messaggio:</translation>
</message>
@@ -1099,12 +1104,12 @@ Indirizzo: %4
<translation>%1 conferme</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>sconosciuto</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Commento:</translation>
</message>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index fc24926303..c6a975d33d 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -158,7 +158,7 @@ Are you sure you wish to encrypt your wallet?</source>
Er du sikker på at du vil kryptere lommeboken?</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>
@@ -168,7 +168,7 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
<translation>Skriv inn den nye adgangsfrasen for lommeboken.&lt;br/&gt;Vennligst bruk en adgangsfrase med &lt;b&gt;10 eller flere tilfeldige tegn&lt;/b&gt;, eller &lt;b&gt;åtte eller flere ord&lt;/b&gt;.</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>
@@ -178,10 +178,10 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
<translation>Denne operasjonen krever adgangsfrasen til lommeboken for å låse den opp.</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>
@@ -211,42 +211,47 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
<translation>Lås opp lommebok</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>Adgangsfrasen angitt for dekryptering av lommeboken var feil.</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="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="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>Dekryptering av lommebok feilet</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>
<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>
<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>Advarsel: Caps lock tasten er på.</translation>
</message>
@@ -884,8 +889,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>
<message>
<location filename="../sendcoinsdialog.cpp" line="133"/>
@@ -1015,38 +1020,38 @@ Adresse: %4
<translation>&lt;b&gt;Kilde:&lt;/b&gt; Generert&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<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="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<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="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation> (din, merkelapp: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (din)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<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="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 modnes om %2 flere blokker)</translation>
</message>
@@ -1066,44 +1071,44 @@ Adresse: %4
<translation>, har ikke blitt kringkastet uten problemer enda.</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>ukjent</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(ikke akseptert)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<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="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<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="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Melding:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Kommentar:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index ba04310352..a93bf38a75 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -147,7 +147,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Versleutel portemonnee</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>
@@ -183,20 +183,25 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
</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>Portemonneeversleuteling mislukt</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>Portemonneeversleuteling mislukt door een interne fout, Uw portemonnee is niet versleuteld.</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>Portemonnee versleuteld</translation>
</message>
@@ -206,31 +211,31 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te openen.</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="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="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>
<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>
@@ -252,7 +257,7 @@ 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>
@@ -830,7 +835,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>
@@ -1021,25 +1026,25 @@ Adres: %4
<translation>&lt;b&gt;Bron:&lt;/b&gt;Gegenereerd&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<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="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<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="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation>(Uw adres, label:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation>(uw) </translation>
</message>
@@ -1054,57 +1059,57 @@ Adres: %4
<translation>, is nog niet met succes uitgezonden</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>onbekend</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<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="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 komt beschikbaar na %2 blokken)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(niet geaccepteerd)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<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="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<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="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Bericht:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Opmerking:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index 568de45ca0..f73a7184b6 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -140,18 +140,18 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>TextoDoRótulo</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>
<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>
<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>A frase de segurança fornecida não confere.</translation>
</message>
@@ -161,7 +161,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Esta operação precisa de sua frase de segurança para desbloquear a carteira.</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>
@@ -181,14 +181,14 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Digite a nova frase de seguraça da sua carteira. &lt;br/&gt; Por favor, use uma frase de &lt;b&gt;10 ou mais caracteres aleatórios,&lt;/b&gt; ou &lt;b&gt;oito ou mais palavras.&lt;/b&gt;</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="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>
@@ -215,18 +215,23 @@ 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>Carteira criptografada</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>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>
@@ -241,10 +246,10 @@ Are you sure you wish to encrypt your wallet?</source>
<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>
@@ -836,8 +841,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="../forms/sendcoinsdialog.ui" line="87"/>
@@ -967,7 +972,7 @@ Endereço: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>unknown</translation>
</message>
@@ -1012,60 +1017,60 @@ Endereço: %4</translation>
<translation>&lt;b&gt;Source:&lt;/b&gt; Generated&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<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="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<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="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation> (yours, label: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (yours)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<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="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 matures in %2 more blocks)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(not accepted)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<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="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;Net amount:&lt;/b&gt; </translation>
</message>
@@ -1080,17 +1085,17 @@ Endereço: %4</translation>
<translation>%1 confirmations</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Message:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Comment:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index 7b0f5436de..97210a2ae5 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -141,10 +141,10 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>TextLabel</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>
@@ -154,19 +154,19 @@ 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>
<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>
@@ -186,12 +186,12 @@ 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>
@@ -202,12 +202,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="161"/>
+ <location filename="../askpassphrasedialog.cpp" line="170"/>
<source>Wallet passphrase was successfully changed.</source>
<translation>Пароль бумажника успешно изменён.</translation>
</message>
@@ -244,14 +244,19 @@ 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="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>Введённые пароли не совпадают.</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>
@@ -839,7 +844,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>
@@ -1020,43 +1025,43 @@ Address: %4
<translation>&lt;b&gt;Источник:&lt;/b&gt; [сгенерированно]&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Отправитель:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>неизвестно</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Получатель:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation> (Ваш, метка: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (ваш)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Кредит:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 станет доступно через %2 блоков)</translation>
</message>
@@ -1076,39 +1081,39 @@ Address: %4
<translation>, ещё не было успешно разослано</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(не принято)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Дебет:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<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="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Комментарий:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Сообщение:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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_uk.ts b/src/qt/locale/bitcoin_uk.ts
index f317ff46cd..ce5abe032b 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -136,18 +136,18 @@ This product includes software developed by the OpenSSL Project for use in the O
<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="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>
@@ -203,26 +203,31 @@ 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="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>
@@ -235,18 +240,18 @@ 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="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>
@@ -859,7 +864,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>
@@ -1020,57 +1025,57 @@ Address: %4
<translation>&lt;b&gt;Джерело:&lt;/b&gt; згенеровано&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;Відправник:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>невідомий</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;Одержувач:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (ваша)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 «дозріє» через %2 блоків)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Дебет:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<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="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>Повідомлення:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>Коментар:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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>
@@ -1090,25 +1095,25 @@ Address: %4
<translation>%1/не підтверджено</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation> (Ваша, мітка: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;Кредит:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(не прийнято)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>&lt;b&gt;Комісія за переказ:&lt;/b&gt;</translation>
</message>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index cf440de916..e8e8e2e2db 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -161,7 +161,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>输入钱包的新口令。&lt;br/&gt;使用的口令请至少包含&lt;b&gt;10个以上随机字符&lt;/&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>
@@ -182,38 +182,43 @@ 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="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>
@@ -240,18 +245,18 @@ Are you sure you wish to encrypt your wallet?</source>
确定要加密钱包吗?</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="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>警告:大写锁定键CapsLock开启</translation>
</message>
@@ -834,7 +839,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>
@@ -970,7 +975,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<source>&lt;b&gt;Net amount:&lt;/b&gt; </source>
<translation>&lt;b&gt;网络金额:&lt;/b&gt; </translation>
</message>
@@ -980,19 +985,19 @@ Address: %4
<translation>&lt;b&gt;日期:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>未知</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation>(您的, 标签:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;到:&lt;/b&gt;</translation>
</message>
@@ -1027,26 +1032,26 @@ Address: %4
<translation>&lt;b&gt;来源:&lt;/b&gt; 生成&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;从:&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation>(您的)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;到帐:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 成熟于 %2 以上数据块)</translation>
</message>
@@ -1071,34 +1076,34 @@ Address: %4
<translation>%1 确认项</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(未接受)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>支出</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<source>&lt;b&gt;Transaction fee:&lt;/b&gt; </source>
<translation>交易费</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>消息:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>备注</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index 14d4eba51e..d448b72d9c 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -166,12 +166,12 @@ 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="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="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>
@@ -182,12 +182,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="147"/>
+ <location filename="../askpassphrasedialog.cpp" line="156"/>
<source>Wallet decryption failed</source>
<translation>錢包解密失敗</translation>
</message>
@@ -197,7 +197,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<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>
@@ -208,33 +208,38 @@ 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="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="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>
@@ -822,16 +827,16 @@ Address: %4
<translation>確認付款動作</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="113"/>
<source>123.456 BTC</source>
<translation>123.456 BTC</translation>
</message>
<message>
- <location filename="../forms/sendcoinsdialog.ui" line="147"/>
- <source>&amp;Send</source>
- <translation>付出</translation>
- </message>
- <message>
<location filename="../sendcoinsdialog.cpp" line="97"/>
<source> and </source>
<translation>和</translation>
@@ -1019,43 +1024,43 @@ Address: %4
<translation>&lt;b&gt;來源:&lt;/b&gt; 生產所得&lt;br&gt;</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="89"/>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="88"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>&lt;b&gt;From:&lt;/b&gt; </source>
<translation>&lt;b&gt;來自:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="107"/>
- <location filename="../transactiondesc.cpp" line="130"/>
- <location filename="../transactiondesc.cpp" line="189"/>
+ <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="129"/>
+ <location filename="../transactiondesc.cpp" line="188"/>
<source>&lt;b&gt;To:&lt;/b&gt; </source>
<translation>&lt;b&gt;目的:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="110"/>
+ <location filename="../transactiondesc.cpp" line="109"/>
<source> (yours, label: </source>
<translation> (你的, 標記為: </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="112"/>
+ <location filename="../transactiondesc.cpp" line="111"/>
<source> (yours)</source>
<translation> (你的)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="147"/>
- <location filename="../transactiondesc.cpp" line="161"/>
- <location filename="../transactiondesc.cpp" line="206"/>
- <location filename="../transactiondesc.cpp" line="223"/>
+ <location filename="../transactiondesc.cpp" line="146"/>
+ <location filename="../transactiondesc.cpp" line="160"/>
+ <location filename="../transactiondesc.cpp" line="205"/>
+ <location filename="../transactiondesc.cpp" line="222"/>
<source>&lt;b&gt;Credit:&lt;/b&gt; </source>
<translation>&lt;b&gt;入帳:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="149"/>
+ <location filename="../transactiondesc.cpp" line="148"/>
<source>(%1 matures in %2 more blocks)</source>
<translation>(%1 將在 %2 個區塊產出後熟成)</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="153"/>
+ <location filename="../transactiondesc.cpp" line="152"/>
<source>(not accepted)</source>
<translation>(不被接受)</translation>
</message>
@@ -1065,39 +1070,39 @@ Address: %4
<translation>在 %1 前未定</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="106"/>
+ <location filename="../transactiondesc.cpp" line="105"/>
<source>unknown</source>
<translation>未知</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="197"/>
- <location filename="../transactiondesc.cpp" line="205"/>
- <location filename="../transactiondesc.cpp" line="220"/>
+ <location filename="../transactiondesc.cpp" line="196"/>
+ <location filename="../transactiondesc.cpp" line="204"/>
+ <location filename="../transactiondesc.cpp" line="219"/>
<source>&lt;b&gt;Debit:&lt;/b&gt; </source>
<translation>&lt;b&gt;出帳:&lt;/b&gt; </translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="211"/>
+ <location filename="../transactiondesc.cpp" line="210"/>
<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="227"/>
+ <location filename="../transactiondesc.cpp" line="226"/>
<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="233"/>
+ <location filename="../transactiondesc.cpp" line="232"/>
<source>Message:</source>
<translation>訊息:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="235"/>
+ <location filename="../transactiondesc.cpp" line="234"/>
<source>Comment:</source>
<translation>附註:</translation>
</message>
<message>
- <location filename="../transactiondesc.cpp" line="238"/>
+ <location filename="../transactiondesc.cpp" line="237"/>
<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>