aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-11-14 22:53:34 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-11-14 22:53:34 +0000
commit13b0b1cd3d64cb1ec9f223512e8dcdc0ce1b2a00 (patch)
tree7626923b7997ae8f6934f144400be042fbcc64a9
parent8045273a015cc72857ca168b0ad224b3acbbaf8a (diff)
parentbbd76e071717d1805a68e4db51721644b80d6293 (diff)
downloadbitcoin-13b0b1cd3d64cb1ec9f223512e8dcdc0ce1b2a00.tar.xz
Update supported translations
-rw-r--r--src/qt/bitcoinstrings.cpp2
-rw-r--r--src/qt/locale/bitcoin_ca_ES.ts34
-rw-r--r--src/qt/locale/bitcoin_cs.ts44
-rw-r--r--src/qt/locale/bitcoin_da.ts44
-rw-r--r--src/qt/locale/bitcoin_de.ts44
-rw-r--r--src/qt/locale/bitcoin_en.ts28
-rw-r--r--src/qt/locale/bitcoin_es.ts45
-rw-r--r--src/qt/locale/bitcoin_es_CL.ts51
-rw-r--r--src/qt/locale/bitcoin_et.ts28
-rw-r--r--src/qt/locale/bitcoin_eu_ES.ts28
-rw-r--r--src/qt/locale/bitcoin_fa.ts44
-rw-r--r--src/qt/locale/bitcoin_fa_IR.ts44
-rw-r--r--src/qt/locale/bitcoin_fi.ts44
-rw-r--r--src/qt/locale/bitcoin_fr_CA.ts28
-rw-r--r--src/qt/locale/bitcoin_fr_FR.ts40
-rw-r--r--src/qt/locale/bitcoin_he.ts44
-rw-r--r--src/qt/locale/bitcoin_hr.ts44
-rw-r--r--src/qt/locale/bitcoin_hu.ts50
-rw-r--r--src/qt/locale/bitcoin_it.ts50
-rw-r--r--src/qt/locale/bitcoin_lt.ts44
-rw-r--r--src/qt/locale/bitcoin_nb.ts44
-rw-r--r--src/qt/locale/bitcoin_nl.ts50
-rw-r--r--src/qt/locale/bitcoin_pl.ts50
-rw-r--r--src/qt/locale/bitcoin_pt_BR.ts50
-rw-r--r--src/qt/locale/bitcoin_ro_RO.ts36
-rw-r--r--src/qt/locale/bitcoin_ru.ts50
-rw-r--r--src/qt/locale/bitcoin_sk.ts44
-rw-r--r--src/qt/locale/bitcoin_sr.ts34
-rw-r--r--src/qt/locale/bitcoin_sv.ts44
-rw-r--r--src/qt/locale/bitcoin_tr.ts44
-rw-r--r--src/qt/locale/bitcoin_uk.ts50
-rw-r--r--src/qt/locale/bitcoin_zh_CN.ts50
-rw-r--r--src/qt/locale/bitcoin_zh_TW.ts50
33 files changed, 687 insertions, 689 deletions
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index e95b3e5b64..1fa15e71f4 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -70,7 +70,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"@STRENGTH)"),
QT_TRANSLATE_NOOP("bitcoin-core", "This help message"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Cannot obtain a lock on data directory %s. Bitcoin is probably already "
+"Cannot obtain a lock on data directory %s. Bitcoin is probably already "
"running."),
QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading addr.dat"),
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index 13fbce8ccb..4c6dcc1d81 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -448,7 +448,12 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Posar-se al dia ...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Transacció enviada</translation>
</message>
@@ -568,22 +573,17 @@ Are you sure you wish to encrypt your wallet?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>L&apos;enviament de ...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -592,32 +592,32 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
@@ -1160,7 +1160,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1931,7 +1931,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index be042a617b..56d49dac57 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -405,7 +405,7 @@ Jsi si jistý, že chceš peněženku zašifrovat?</translation>
<translation>Po&amp;depiš zprávu</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Příchozí transakce</translation>
</message>
@@ -420,7 +420,7 @@ Jsi si jistý, že chceš peněženku zašifrovat?</translation>
<translation>Zašifruj nebo dešifruj peněženku</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Peněženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálně &lt;b&gt;zamčená&lt;/b&gt;</translation>
</message>
@@ -435,12 +435,12 @@ Jsi si jistý, že chceš peněženku zašifrovat?</translation>
<translation>Změň &amp;heslo</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Záloha peněženky</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Data peněženky (*.dat)</translation>
</message>
@@ -469,11 +469,6 @@ Jsi si jistý, že chceš peněženku zašifrovat?</translation>
<translation>Aktuální</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Tahle transakce přesahuje velikostní limit. I tak ji ale můžeš poslat, pokud za ni zaplatíš poplatek %1, který půjde uzlům, které tvou transakci zpracují, a navíc tak podpoříš síť. Chceš zaplatit poplatek?</translation>
- </message>
- <message>
<location filename="../bitcoingui.cpp" line="316"/>
<source>Actions toolbar</source>
<translation>Panel akcí</translation>
@@ -494,12 +489,12 @@ Jsi si jistý, že chceš peněženku zašifrovat?</translation>
<translation>Prokaž vlastnictví adresy</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Odeslané transakce</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -598,22 +593,27 @@ Adresa: %4
<translation>Poslední stažený blok byl vygenerován %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Posílám...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Peněženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálně &lt;b&gt;odemčená&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Zálohování selhalo</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Při ukládání peněženky na nové místo se přihodila nějaká chyba.</translation>
</message>
@@ -1176,8 +1176,8 @@ Adresa: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adresa příjemce (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1720,6 +1720,11 @@ Adresa: %4
<translation>Akceptovatelné šifry (výchozí: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="80"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Chyba při načítání wallet.dat: peněženka je poškozená</translation>
@@ -1760,11 +1765,6 @@ Adresa: %4
<translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Nedaří se mi získat zámek na datový adresář %s. Bitcoin pravděpodobně už jednou běží.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="54"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Spustit příkaz, když se změní nejlepší blok (%s se v příkazu nahradí hashem bloku)</translation>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index 46fc94e9e9..f1e3480b90 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -400,7 +400,7 @@ Er du sikker på at du ønsker at kryptere din tegnebog?</translation>
<translation>Downloadet %1 af %2 blokke af transaktionshistorie.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Afsendt transaktion</translation>
</message>
@@ -410,7 +410,7 @@ Er du sikker på at du ønsker at kryptere din tegnebog?</translation>
<translation>Skift kodeord anvendt til tegnebogskryptering</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -433,17 +433,22 @@ Adresse: %4
<translation>&amp;Indstillinger</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Sender...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Indgående transaktion</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Tegnebog er &lt;b&gt;krypteret&lt;/b&gt; og i øjeblikket &lt;b&gt;ulåst&lt;/b&gt;</translation>
</message>
@@ -481,7 +486,7 @@ Adresse: %4
<translation>Eksportér den aktuelle visning til en fil</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Tegnebog er &lt;b&gt;krypteret&lt;/b&gt; og i øjeblikket &lt;b&gt;låst&lt;/b&gt;</translation>
</message>
@@ -593,27 +598,22 @@ Adresse: %4
<translation>Sidst modtagne blok blev genereret %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Denne transaktion er over størrelsesbegrænsningen. Du kan stadig sende den for et gebyr på %1 som går til de noder der behandler din transaktion, og som hjælper med at støtte netværket. Ønsker du at betale gebyret?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Backup tegnebog</translation>
</message>
@@ -1166,8 +1166,8 @@ Adresse: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adresse som betalingen skal sendes til (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1663,11 +1663,6 @@ Adresse: %4
<translation>Indlæsning gennemført</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Kan låse data-biblioteket %s. Bitcoin kører sikkert allerede.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="8"/>
<source>Bitcoin version</source>
<translation>Bitcoinversion</translation>
@@ -1955,6 +1950,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="82"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"></translation>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index d564f050b9..814be52617 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -413,32 +413,37 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>&amp;Adressbuch</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Brieftasche ist &lt;b&gt;verschlüsselt&lt;/b&gt; und aktuell &lt;b&gt;entsperrt&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Brieftasche ist &lt;b&gt;verschlüsselt&lt;/b&gt; und aktuell &lt;b&gt;gesperrt&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Brieftasche sichern</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Brieftaschendaten (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Sicherung der Brieftasche fehlgeschlagen</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Fehler beim Abspeichern der Sicherungskopie der Brieftasche.</translation>
</message>
@@ -545,27 +550,22 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Der letzte empfangene Block wurde %1 generiert.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Die Transaktion übersteigt das Größenlimit. Sie können sie trotzdem senden, wenn Sie eine zusätzliche Transaktionsgebühr in Höhe von %1 zahlen. Diese wird an die Knoten verteilt, die Ihre Transaktion bearbeiten und unterstützt damit das Bitcoin-Netzwerk.&lt;br&gt;&lt;br&gt;Möchten Sie die Gebühr bezahlen?</translation>
- </message>
- <message>
<location filename="../bitcoingui.cpp" line="259"/>
<source>&amp;Change Passphrase</source>
<translation>Passphrase &amp;ändern...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Gesendete Transaktion</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Eingehende Transaktion</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -621,7 +621,7 @@ Adresse: %4</translation>
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Transaktionsgebühr bestätigen</translation>
</message>
@@ -1164,8 +1164,8 @@ Adresse: %4</translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Die Zahlungsadresse der Überweisung (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1898,6 +1898,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
SSL Einstellungen: (siehe Bitcoin-Wiki für SSL Installationsanweisungen)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="79"/>
<source>Loading wallet...</source>
<translation>Lade Brieftasche...</translation>
@@ -1958,11 +1963,6 @@ SSL Einstellungen: (siehe Bitcoin-Wiki für SSL Installationsanweisungen)</trans
<translation>Brieftasche kann nicht auf eine ältere Version herabgestuft werden</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde Bitcoin bereits gestartet.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="86"/>
<source>Cannot write default address</source>
<translation>Standardadresse kann nicht geschrieben werden</translation>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 3a3adad542..881447f385 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -558,27 +558,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -587,32 +587,32 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
@@ -1155,7 +1155,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1924,7 +1924,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index 625c6f9069..876eeedf5e 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -481,7 +481,7 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Firmar &amp;mensaje...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Ha habido un error al intentar guardar los datos del monedero a la nueva ubicación.</translation>
</message>
@@ -548,22 +548,17 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>El último bloque recibido fue generado %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Esta transacción supera el límite. Puede seguir enviándola incluyendo una comisión de %1 que se va a repartir entre los nodos que procesan su transacción y ayudan a mantener la red. ¿Desea pagar esa tarifa?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Transacción enviada</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Transacción entrante</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -585,12 +580,17 @@ Dirección: %4</translation>
<translation>Cambiar la contraseña utilizada para el cifrado del monedero</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;desbloqueado&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
</message>
@@ -600,12 +600,12 @@ Dirección: %4</translation>
<translation>A&amp;yuda</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Copia de seguridad del monedero</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Datos del monedero (*.dat)</translation>
</message>
@@ -615,7 +615,7 @@ Dirección: %4</translation>
<translation>[testnet]</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>La copia de seguridad ha fallado</translation>
</message>
@@ -625,7 +625,7 @@ Dirección: %4</translation>
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Enviando...</translation>
</message>
@@ -1168,8 +1168,8 @@ Dirección: %4</translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>La dirección donde enviar el pago (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1690,6 +1690,11 @@ Dirección: %4</translation>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="77"/>
<source>Loading block index...</source>
<translation>Cargando el índice de bloques...</translation>
@@ -1853,12 +1858,6 @@ Dirección: %4</translation>
<translation>Enviar rastrear/debug info a la consola en lugar de debug.log archivo</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>No se puede obtener permiso de trabajo en la carpeta de datos %s. Probablemente Bitcoin ya se está ejecutando.
-</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="54"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation>
diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts
index 0b5a2dc917..5ce93ef05c 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -418,7 +418,12 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Cambiar la contraseña utilizada para la codificación de la billetera</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
@@ -515,17 +520,17 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Barra de acciónes</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Respaldar billetera</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Datos de billetera (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Ha fallado el respaldo</translation>
</message>
@@ -588,22 +593,17 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>El ultimo bloque recibido fue generado %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Esta transacción supera el límite. Puedes seguir enviandola incluyendo una comisión de %s que se va a repartir entre los nodos que procesan su transacción y ayudan a mantener la red. ¿Quieres seguir con la transacción?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Transacción enviada</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Transacción entrante</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -615,17 +615,17 @@ Tipo: %3
Dirección: %4</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>La billetera esta &lt;b&gt;codificada&lt;/b&gt; y actualmente &lt;b&gt;desbloqueda&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>La billetera esta &lt;b&gt;codificada&lt;/b&gt; y actualmente &lt;b&gt;bloqueda&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Enviando...</translation>
</message>
@@ -1146,11 +1146,6 @@ Dirección: %4</translation>
<translation>&amp;Etiqueta:</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>La dirección donde enviar el pago (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="42"/>
<source>Pay &amp;To:</source>
<translation>&amp;Pagar a:</translation>
@@ -1172,6 +1167,11 @@ Dirección: %4</translation>
<translation>Introduce una etiqueta a esta dirección para añadirla a tu guia</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsentry.ui" line="93"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Elije dirección de la guia</translation>
@@ -1675,12 +1675,6 @@ Dirección: %4</translation>
<translation>Uso:</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>No se puede obtener permiso de trabajo en la carpeta de datos %s. Probablemente Bitcoin ya se está ejecutando.
-</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="84"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"></translation>
@@ -1772,6 +1766,11 @@ Dirección: %4</translation>
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>Error cargando addr.dat</translation>
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index bcd0437d24..2534be10c8 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -558,27 +558,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -587,32 +587,32 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
@@ -1155,7 +1155,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1924,7 +1924,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts
index fe7c55b6f0..45aaf971c2 100644
--- a/src/qt/locale/bitcoin_eu_ES.ts
+++ b/src/qt/locale/bitcoin_eu_ES.ts
@@ -558,27 +558,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -587,32 +587,32 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
@@ -1155,7 +1155,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1924,7 +1924,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 5d601a5301..1175fb51a8 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -363,17 +363,12 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>خرین بلوک در یافت شده تولید شده بود %1 </translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>این معامله از اندازه محدوده بیشتر است. شما می توانید آد را با دستمزد 1% بفرستید که شامل گره معامله شما می باشد و به شبکه های اینترنتی کمک خواهد کردو آیا شما می خواهید این پول پر داخت%1</translation>
- </message>
- <message>
<location filename="../bitcoingui.cpp" line="238"/>
<source>Quit application</source>
<translation>خروج از برنامه </translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>معامله ارسال شده</translation>
</message>
@@ -398,7 +393,7 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>در یافت سکه</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>زمایش شبکه</translation>
</message>
@@ -529,7 +524,12 @@ Are you sure you wish to encrypt your wallet?</source>
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -541,17 +541,17 @@ Address: %4
آدرس %4</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>نسخه پیشتیبان از wallet </translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>داده wallet (*.DAT)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>عملیات پیشتیبان گیری انجام نشد</translation>
</message>
@@ -608,22 +608,22 @@ Address: %4
<translation>ابتلا به بالا</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>معامله در یافت شده</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>زمایش شبکهه</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>در زمان انتقال داده wallet به محل جدید خطا روی داد</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>ارسال...</translation>
</message>
@@ -1161,8 +1161,8 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>آدرس برای ارسال پر داخت (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1666,6 +1666,11 @@ Address: %4
<translation>پیام کمکی</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="75"/>
<source>Loading addresses...</source>
<translation>بار گیری آدرس ها</translation>
@@ -1906,11 +1911,6 @@ Address: %4
<translation>ارتباط فقط به گره خاص</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>رمز گشایی دایرکتور داده ها امکان پذیر نیست. شاید بیت کویین در حال فعال می باشد%s</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>مدت زمان به ثانیه برای جلوگیری از همکاران بدرفتار برای اتصال دوباره (پیش‌فرض: 86400)</translation>
diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts
index 7f0ae62e2e..d6c001c532 100644
--- a/src/qt/locale/bitcoin_fa_IR.ts
+++ b/src/qt/locale/bitcoin_fa_IR.ts
@@ -479,11 +479,6 @@ Are you sure you wish to encrypt your wallet?</source>
<source>Last received block was generated %1.</source>
<translation>بلاک دریافت شده قبلی به میزان %1 تولید شده است</translation>
</message>
- <message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>تراکنش بیشتر از محدودیتهای شماست. شما می توانید همچنان با هزینه %1 آن را ارسال کنید که این هزینه به گره هایی که تراکنش را برایتان انجام می دهد تعلق می گیرد و به حمایت از شبکه کمک می کند. آیا شما می خواهید این هزینه را پرداخت کنید؟</translation>
- </message>
<message numerus="yes">
<location filename="../bitcoingui.cpp" line="516"/>
<source>%n second(s) ago</source>
@@ -564,22 +559,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>در حال روزآمد سازی..</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>در حال ارسال...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>ارسال تراکنش</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>تراکنش دریافتی</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -589,33 +589,33 @@ Address: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>wallet رمزگذاری شد و در حال حاضر از حالت قفل در آمده است</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>wallet رمزگذاری شد و در حال حاضر قفل است</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>گرفتن نسخه پیشتیبان از Wallet</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>داده های Wallet
(*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>عملیات گرفتن نسخه پیشتیبان انجام نشد</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>در هنگام ذخیره داده های wallet به نسخه جدید خطایی ایجاد شده است</translation>
</message>
@@ -1159,8 +1159,8 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>آدرس برای ارسال وجه به (برای مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1777,11 +1777,6 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>ciphers قابل قبول (پیش فرض: default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>قفل دایرکتوری داده ها %s قابل دریافت نیست. احتمال این وجود دارد که Bitcoin در حال اجرا باشد</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="89"/>
<source>Invalid -proxy address</source>
<translation type="unfinished"></translation>
@@ -1922,6 +1917,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>حافظه بانک داده را به مگابایت تنظیم کنید (پیش فرض: 25)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation type="unfinished">خطا در هنگام لود شدن addr.dat</translation>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index cf05761d3a..0c00f55524 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -324,7 +324,12 @@ Tahdotko varmasti salata lompakon?</translation>
<translation>Vaihda lompakon salaukseen käytettävä tunnuslause</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -336,7 +341,7 @@ Tyyppi: %3
Osoite: %4</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Lompakko on &lt;b&gt;salattu&lt;/b&gt; ja tällä hetkellä &lt;b&gt;lukittuna&lt;/b&gt;</translation>
</message>
@@ -544,37 +549,32 @@ Osoite: %4</translation>
<translation>Viimeisin vastaanotettu lohko tuotettu %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Tämä rahansiirto ylittää kokorajoituksen. Voit siitä huolimatta lähettää sen %1 siirtopalkkion mikä menee solmuille jotka käsittelevät rahansiirtosi tämä auttaa myös verkostoa. Haluatko maksaa siirtopalkkion? </translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Lähetetään...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Lähetetyt rahansiirrot</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Varmuuskopioi lompakko</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Lompakkodata (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Varmuuskopio epäonnistui</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Virhe tallennettaessa lompakkodataa uuteen sijaintiin.</translation>
</message>
@@ -607,12 +607,12 @@ Osoite: %4</translation>
<translation>Rahansiirtohistoria on ajan tasalla</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Saapuva rahansiirto</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Lompakko on &lt;b&gt;salattu&lt;/b&gt; ja tällä hetkellä &lt;b&gt;avoinna&lt;/b&gt;</translation>
</message>
@@ -1165,8 +1165,8 @@ Osoite: %4</translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Osoite, johon Bitcoinit lähetetään (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1733,11 +1733,6 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
<translation>Salli JSON-RPC yhteydet tietystä ip-osoitteesta</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>En pääse käsiksi data-hakemiston lukitukseen %s. Bitcoin on todennäköisesti jo käynnistetty.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="75"/>
<source>Loading addresses...</source>
<translation>Ladataan osoitteita...</translation>
@@ -1929,6 +1924,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL-asetukset: (lisätietoja Bitcoin-Wikistä)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>Virhe ladattaessa addr.dat-tiedostoa</translation>
diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts
index ae9d3ccc90..b5618cdb79 100644
--- a/src/qt/locale/bitcoin_fr_CA.ts
+++ b/src/qt/locale/bitcoin_fr_CA.ts
@@ -564,27 +564,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -593,32 +593,32 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
@@ -1161,7 +1161,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1930,7 +1930,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts
index 52b3bf51c0..ced0675553 100644
--- a/src/qt/locale/bitcoin_fr_FR.ts
+++ b/src/qt/locale/bitcoin_fr_FR.ts
@@ -565,27 +565,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Le dernier bloc reçu a été généré %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Cette transaction dépasse la limite de taille. Vous pouvez quand-même l&apos;envoyer en vous acquittant de frais d&apos;un montant de %1, qui iront aux nœuds qui traitent la transaction et aideront à soutenir le réseau. Voulez-vous payer les frais ?</translation>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Envoi en cours...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Transaction envoyée</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Transaction entrante</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -598,32 +598,32 @@ Adresse : %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Le porte-monnaie est &lt;b&gt;chiffré&lt;/b&gt; et est actuellement &lt;b&gt;déverrouillé&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Le porte-monnaie est &lt;b&gt;chiffré&lt;/b&gt; et est actuellement &lt;b&gt;verrouillé&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Sauvegarder le porte-monnaie</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Données de porte-monnaie (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>La sauvegarde a échoué</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Une erreur est survenue lors de l&apos;enregistrement des données de porte-monnaie à un autre emplacement.</translation>
</message>
@@ -1166,8 +1166,8 @@ Adresse : %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>L&apos;adresse à laquelle le paiement sera envoyé (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1915,11 +1915,6 @@ Options SSL : (cf. le wiki Bitcoin pour les réglages SSL)</translation>
<translation>Ce message d&apos;aide</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Impossible d&apos;obtenir un verrou sur le répertoire de données %s. Bitcoin fonctionne probablement déjà.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="75"/>
<source>Loading addresses...</source>
<translation>Chargement des adresses...</translation>
@@ -1960,6 +1955,11 @@ Options SSL : (cf. le wiki Bitcoin pour les réglages SSL)</translation>
<translation>Chargement de l&apos;index des blocs...</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="79"/>
<source>Loading wallet...</source>
<translation>Chargement du porte-monnaie...</translation>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index a52e9f9cf7..57470551e4 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -389,7 +389,7 @@ Are you sure you wish to encrypt your wallet?</source>
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>פעולה שהתקבלה</translation>
</message>
@@ -399,22 +399,17 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>מתעדכן...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>הארנק &lt;b&gt;מוצפן&lt;/b&gt; וכרגע &lt;b&gt;נעול&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>הפעולה הזאת חורגת מהמגבלה. ניתן לשלוח אותה תמורת עמלה בסך %1, שמגיעה לצמתים שמעבדים את הפעולה ועוזרת לתמוך ברשת. האם אתה מעוניין לשלם את העמלה?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>פעולה שנשלחה</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -426,7 +421,7 @@ Address: %4
כתובת: %4</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>הארנק &lt;b&gt;מוצפן&lt;/b&gt; וכרגע &lt;b&gt;פתוח&lt;/b&gt;</translation>
</message>
@@ -602,27 +597,32 @@ Address: %4
<translation>הבלוק האחרון שהתקבל נוצר ב-%1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>שולח...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>גיבוי ארנק</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>נתוני ארנק (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>הגיבוי נכשל</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>היתה שגיאה בניסיון לשמור את מידע הארנק למיקום החדש.</translation>
</message>
@@ -1165,8 +1165,8 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>הכתובת אליה יישלח התשלום (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1817,11 +1817,6 @@ Address: %4
<translation>הודעת העזרה הזו</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>אינו מסוגל לנעול את תיקיית הנתונים %s. כנראה שביטקוין כבר רץ.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="87"/>
<source>Rescanning...</source>
<translation>סורק מחדש...</translation>
@@ -1933,6 +1928,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished">קבל חיבורים מבחוץ (ברירת מחדל: 1 ללא -proxy או -connect)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="89"/>
<source>Invalid -proxy address</source>
<translation>כתובת פרוקסי לא תקינה</translation>
diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts
index 16acdb1807..c4a78a4d34 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -338,27 +338,32 @@ Jeste li sigurni da želite šifrirati svoj novčanik?</translation>
<translation>Preuzeto %1 od %2 blokova povijesti transakcije.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Slanje...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Backup novčanika</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Podaci novčanika (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Backup nije uspio</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Došlo je do pogreške kod spremanja podataka novčanika na novu lokaciju.</translation>
</message>
@@ -378,12 +383,12 @@ Jeste li sigurni da želite šifrirati svoj novčanik?</translation>
<translation>Zadnji primljeni blok je generiran %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Poslana transakcija</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -508,7 +513,7 @@ Adresa:%4
<translation>Slanje novca na bitcoin adresu</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Dolazna transakcija</translation>
</message>
@@ -566,17 +571,12 @@ Adresa:%4
<translation>Više o &amp;Qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Ova transakcija je preko ograničenja veličine. Možete ju ipak poslati za naknadu od %1, koja se daje čvorovima koji procesiraju vaše transakcije i tako podržavate mrežu. Želite li platiti naknadu?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Novčanik je &lt;b&gt;šifriran&lt;/b&gt; i trenutno &lt;b&gt;otključan&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Novčanik je &lt;b&gt;šifriran&lt;/b&gt; i trenutno &lt;b&gt;zaključan&lt;/b&gt;</translation>
</message>
@@ -1165,8 +1165,8 @@ Adresa:%4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adresa za slanje plaćanja (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1694,11 +1694,6 @@ Adresa:%4
<translation>Ova poruka za pomoć</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Program ne može pristupiti direktoriju s datotekama %s. Bitcoin program je vjerojatno već pokrenut.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="75"/>
<source>Loading addresses...</source>
<translation>Učitavanje adresa...</translation>
@@ -1960,6 +1955,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL postavke: (za detalje o podešavanju SSL opcija vidi Bitcoin Wiki)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>Greška kod učitavanja addr.dat</translation>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index 947a851be0..44625e900a 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -481,12 +481,17 @@ Biztosan kódolni akarod a tárcát?</translation>
<translation>%1 blokk letöltve a tranzakciótörténetből.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Beérkező tranzakció</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -567,47 +572,42 @@ Cím: %4
<translation>Az utolsóként kapott blokk generálva: %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Ez a tranzakció túllépi a mérethatárt, de %1 tranzakciós díj ellenében így is elküldheted. Ezt a plusz összeget a tranzakcióidat feldolgozó csomópontok kapják, így magát a hálózatot támogatod vele. Hajlandó vagy megfizetni a díjat?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Tranzakció elküldve.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Tárca &lt;b&gt;kódolva&lt;/b&gt; és jelenleg &lt;b&gt;nyitva&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Tárca &lt;b&gt;kódolva&lt;/b&gt; és jelenleg &lt;b&gt;zárva&lt;/b&gt;.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Küldés...</translation>
</message>
@@ -1145,11 +1145,6 @@ Cím: %4
<translation>Címke:</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Címzett címe (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Válassz egy címet a címjegyzékből</translation>
@@ -1170,6 +1165,11 @@ Cím: %4
<translation>Címzett:</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsentry.ui" line="93"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="113"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
@@ -1666,11 +1666,6 @@ Cím: %4
<translation>Blokkindex betöltése...</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Az %s adatkönyvtár nem zárható. A Bitcoin valószínűleg fut már.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="88"/>
<source>Done loading</source>
<translation>Betöltés befejezve.</translation>
@@ -1891,6 +1886,11 @@ Cím: %4
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>Hiba az addr.dat betöltése közben</translation>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 1061f31335..d9510a729f 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -455,22 +455,27 @@ Si è sicuri di voler cifrare il portamonete?</translation>
<translation>Mostra informazioni su Qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Backup Portamonete</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Dati Portamonete (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Backup fallito</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>C&apos;è stato un errore tentanto di salvare i dati del portamonete in un&apos;altra locazione</translation>
</message>
@@ -570,22 +575,17 @@ Si è sicuri di voler cifrare il portamonete?</translation>
<translation>L&apos;ultimo blocco ricevuto è stato generato %1</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Questa transazione è superiore al limite di dimensione. È comunque possibile inviarla con una commissione di %1, che va ai nodi che processano la tua transazione e contribuisce a sostenere la rete. Vuoi pagare la commissione?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Transazione inviata</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Transazione ricevuta</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -599,17 +599,17 @@ Indirizzo: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Il portamonete è &lt;b&gt;cifrato&lt;/b&gt; e attualmente &lt;b&gt;sbloccato&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Il portamonete è &lt;b&gt;cifrato&lt;/b&gt; e attualmente &lt;b&gt;bloccato&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Invio...</translation>
</message>
@@ -1150,11 +1150,6 @@ Indirizzo: %4
<translation>Modulo</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>L&apos;indirizzo del beneficiario cui inviare il pagamento (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="130"/>
<source>Alt+P</source>
<translation>Alt+P</translation>
@@ -1181,6 +1176,11 @@ Indirizzo: %4
<translation>&amp;Etichetta:</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsentry.ui" line="93"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Scegli l&apos;indirizzo dalla rubrica</translation>
@@ -1910,6 +1910,11 @@ Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL)
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="84"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"></translation>
@@ -1955,11 +1960,6 @@ Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL)
<translation>Versione di Bitcoin</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Non è possibile ottenere i dati sulla directory %s. Probabilmente Bitcoin è già in esecuzione.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="75"/>
<source>Loading addresses...</source>
<translation>Caricamento indirizzi...</translation>
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index dac8ced1ed..8ccf9ed646 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -527,42 +527,37 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation>
<translation>Paskutinis gautas blokas buvo sukurtas %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Šis sandoris viršija leistiną dydį. Jūs galite įvykdyti jį papildomai sumokėję %1 mokesčių, kurie bus išsiųsti tais pačiais mazgais kuriais vyko sandoris ir padės palaikyti tinklą. Ar jūs norite apmokėti papildomą mokestį?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Sandoris nusiųstas</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Piniginė &lt;b&gt;užšifruota&lt;/b&gt; ir šiuo metu &lt;b&gt;atrakinta&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Piniginė &lt;b&gt;užšifruota&lt;/b&gt; ir šiuo metu &lt;b&gt;užrakinta&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Backup piniginę</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Piniginės duomenys (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Nepavyko padaryti atsarginės kopijos</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
@@ -606,12 +601,17 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation>
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Ateinantis sandoris</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -628,7 +628,7 @@ Adresas: %4</translation>
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Siunčiama...</translation>
</message>
@@ -1171,8 +1171,8 @@ Adresas: %4</translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adresas mokėjimo siuntimui (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1690,11 +1690,6 @@ Adresas: %4</translation>
<translation>Pagelbos žinutė</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Negali gauti duomenų katalogo %s rakto. Bitcoin tikriausiai jau veikia.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="75"/>
<source>Loading addresses...</source>
<translation>Užkraunami adresai...</translation>
@@ -1961,6 +1956,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL opcijos (žr.e Bitcoin Wiki for SSL setup instructions)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>addr.dat pakrovimo klaida</translation>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index d6cb736224..853d2c4eb0 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -329,7 +329,7 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
<translation>&amp;Adressebok</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Sender...</translation>
</message>
@@ -426,12 +426,12 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
<translation>Verktøylinje for faner</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Sikkerhetskopiér Lommebok</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Lommeboksdata (*.dat)</translation>
</message>
@@ -495,22 +495,17 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Denne transaksjonen overstiger størrelsesbegrensningen. Du kan likevel sende den med et gebyr på %1, som går til nodene som prosesserer transaksjonen din og støtter nettverket. Vil du betale gebyret?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Sendt transaksjon</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Innkommende transaksjon</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -528,12 +523,12 @@ Adresse: %4
<translation>&amp;Avslutt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Lommeboken er &lt;b&gt;kryptert&lt;/b&gt; og for tiden &lt;b&gt;ulåst&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Lommeboken er &lt;b&gt;kryptert&lt;/b&gt; og for tiden &lt;b&gt;låst&lt;/b&gt;</translation>
</message>
@@ -578,12 +573,17 @@ Adresse: %4
<translation>Lastet ned %1 av %2 blokker med transaksjonshistorikk.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Sikkerhetskopiering feilet</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>En feil oppstod ved lagring av lommebok til nytt sted</translation>
</message>
@@ -1166,8 +1166,8 @@ Adresse: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adressen betalingen skal sendes til (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1683,11 +1683,6 @@ Adresse: %4
<translation>Bruk:</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Kunne ikke låse datamappen %s. Bitcoin kjører sannsynligvis allerede.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="78"/>
<source>Error loading blkindex.dat</source>
<translation>Feil ved lasting av blkindex.dat</translation>
@@ -2046,6 +2041,11 @@ SSL innstillinger: (se Bitcoin Wiki for instruksjoner om SSL oppsett)</translati
<translation>Denne hjelpemeldingen</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="86"/>
<source>Cannot write default address</source>
<translation>Kan ikke skrive standardadresse</translation>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 1f061b8bba..0f167fc734 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -415,32 +415,37 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation>
<translation>&amp;Adresboek</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Portemonnee is &lt;b&gt;versleuteld&lt;/b&gt; en momenteel &lt;b&gt;geopend&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Portemonnee is &lt;b&gt;versleuteld&lt;/b&gt; en momenteel &lt;b&gt;gesloten&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Backup Portemonnee</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Portemonnee-data (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Backup Mislukt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Er is een fout opgetreden bij het wegschrijven van de portemonnee-data naar de nieuwe locatie.</translation>
</message>
@@ -547,27 +552,22 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation>
<translation>Laatst ontvangen blok is %1 gegenereerd.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Deze transactie overschrijdt de groottelimiet. Om de transactie alsnog te versturen kunt u transactiekosten betalen van %1. Deze transactiekosten gaan naar de nodes die uw transactie verwerken en het helpt op deze manier bij het ondersteunen van het netwerk. Wilt u de transactiekosten betalen?</translation>
- </message>
- <message>
<location filename="../bitcoingui.cpp" line="259"/>
<source>&amp;Change Passphrase</source>
<translation>&amp;Wijzig Wachtwoord</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Verzonden transactie</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Binnenkomende transactie</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -624,7 +624,7 @@ Adres: %4
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Versturen...</translation>
</message>
@@ -1145,11 +1145,6 @@ Adres: %4
<translation>Betaal &amp;Aan:</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Het adres waaraan u wilt betalen (bijv. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="14"/>
<source>Form</source>
<translation>Vorm</translation>
@@ -1166,6 +1161,11 @@ Adres: %4
<translation>Vul een label in voor dit adres om het toe te voegen aan uw adresboek</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsentry.ui" line="93"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Kies adres uit adresboek</translation>
@@ -1659,11 +1659,6 @@ Adres: %4
<translation>Adressen aan het laden...</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Kan geen lock op de datamap %s verkrijgen. Bitcoin draait vermoedelijk reeds.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="77"/>
<source>Loading block index...</source>
<translation>Blokindex aan het laden...</translation>
@@ -1767,6 +1762,11 @@ Adres: %4
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>Fout bij laden addr.dat</translation>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index c94a179d56..0194a08b41 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -409,12 +409,17 @@ Czy na pewno chcesz zaszyfrować swój portfel?</translation>
<translation>Zaszyfruj lub odszyfruj portfel</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Transakcja wysłana</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Transakcja przychodząca</translation>
</message>
@@ -428,7 +433,7 @@ Czy na pewno chcesz zaszyfrować swój portfel?</translation>
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Portfel jest &lt;b&gt;zaszyfrowany&lt;/b&gt; i obecnie &lt;b&gt;zablokowany&lt;/b&gt;</translation>
</message>
@@ -508,7 +513,7 @@ Czy na pewno chcesz zaszyfrować swój portfel?</translation>
<translation>P&amp;referencje</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Dane Portfela (*.dat)</translation>
</message>
@@ -533,7 +538,7 @@ Czy na pewno chcesz zaszyfrować swój portfel?</translation>
<translation>&amp;Zakończ</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -608,32 +613,27 @@ Adres: %4
<translation>Ostatnio otrzymany blok została wygenerowany %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Transakcja przekracza limit. Możesz wysłać ją płacąc prowizję %1, która zostaje przekazana do węzłów, które ją prześlą i pomoże wspierać sieć Bitcoin. Czy chcesz zapłacić prowizję?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Portfel jest &lt;b&gt;zaszyfrowany&lt;/b&gt; i obecnie &lt;b&gt;niezablokowany&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Kopia Zapasowa Portfela</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Kopia Zapasowa Nie Została Wykonana</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Wystąpił błąd podczas próby zapisu portfela do nowej lokalizacji.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Wysyłanie...</translation>
</message>
@@ -1159,11 +1159,6 @@ Adres: %4
<translation>&amp;Etykieta:</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adres do wysłania należności do (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="120"/>
<source>Paste address from clipboard</source>
<translation>Wklej adres ze schowka</translation>
@@ -1185,6 +1180,11 @@ Adres: %4
<translation>Wprowadź etykietę dla tego adresu by dodać go do książki adresowej</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsentry.ui" line="93"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Wybierz adres z książki adresowej</translation>
@@ -1821,11 +1821,6 @@ Adres: %4
<translation>Przeskanuj blok łańcuchów żeby znaleźć zaginione transakcje portfela</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Nie można zablokować folderu danych %s. Bitcoin prawdopodobnie już działa.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="82"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Portfel wymaga przepisania: zrestartuj Bitcoina żeby ukończyć</translation>
@@ -1933,6 +1928,11 @@ opcje SSL: (sprawdź Bitcoin Wiki dla instrukcje konfiguracji SSL)</translation>
<translation>Aceptowalne szyfry (domyślnie: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>Błąd ładowania addr.dat</translation>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index ccf4a6e38f..441d1aaef2 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -515,22 +515,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Fazer cópia de segurança da Carteira</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Dados da Carteira (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Cópia de segurança Falhou</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Houve um erro ao tentar salvar os dados da carteira para uma nova localização.</translation>
</message>
@@ -540,11 +545,6 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Last received block was generated %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</translation>
- </message>
- <message>
<location filename="../bitcoingui.cpp" line="298"/>
<source>&amp;Help</source>
<translation>&amp;Ajuda</translation>
@@ -555,17 +555,17 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Barra de ferramentas</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Sent transaction</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Incoming transaction</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -582,12 +582,12 @@ Endereço: %4</translation>
<translation>Carregados %1 de %2 blocos do histórico de transações.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
</message>
@@ -610,7 +610,7 @@ Endereço: %4</translation>
<translation>Recuperando o atraso ...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Sending...</translation>
</message>
@@ -1136,11 +1136,6 @@ Endereço: %4</translation>
<translation>Form</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Choose address from address book</translation>
@@ -1177,6 +1172,11 @@ Endereço: %4</translation>
<translation>&amp;Label:</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsentry.ui" line="93"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="120"/>
<source>Paste address from clipboard</source>
<translation>Paste address from clipboard</translation>
@@ -1645,11 +1645,6 @@ Endereço: %4</translation>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="79"/>
<source>Loading wallet...</source>
<translation>Loading wallet...</translation>
@@ -1725,6 +1720,11 @@ Endereço: %4</translation>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>Erro ao carregar addr.dat</translation>
diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts
index ebb7a5167b..05680828a7 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -460,12 +460,17 @@ Sunteţi sigur că doriţi să criptaţi portofelul electronic?</translation>
<translation>Ultimul bloc primit a fost generat %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Tranzacţie expediată</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -474,32 +479,32 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Portofelul electronic este &lt;b&gt;criptat&lt;/b&gt; iar in momentul de faţă este &lt;b&gt;deblocat&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Portofelul electronic este &lt;b&gt;criptat&lt;/b&gt; iar in momentul de faţă este &lt;b&gt;blocat&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Backup portofelul electronic</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
@@ -593,22 +598,17 @@ Address: %4
<translation>Bara de acţiuni</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Această tranzacţie depăşeşte limita. Puteţi iniţia tranzacţia platind un comision de %1, de care vor beneficia nodurile care procesează tranzacţia şi ajută la menţinerea reţelei. Acceptaţi plata comisionului?</translation>
- </message>
- <message>
<location filename="../bitcoingui.cpp" line="421"/>
<source>bitcoin-qt</source>
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Tranzacţie recepţionată</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Expediază...</translation>
</message>
@@ -1161,8 +1161,8 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adresa către care se va face plata (de exemplu: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1987,7 +1987,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index d513d39f50..7fee66931f 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -394,7 +394,7 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>&amp;Помощь</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>При попытке сохранения данных бумажника в новое место произошла ошибка.</translation>
</message>
@@ -477,22 +477,17 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Последний полученный блок был сгенерирован %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Данная транзакция превышает предельно допустимый размер. Но Вы можете всё равно совершить её, добавив комиссию в %1, которая отправится тем узлам, которые обработают Вашу транзакцию, и поможет поддержать сеть. Вы хотите добавить комиссию?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Исходящая транзакция</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Входящая транзакция</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -505,17 +500,17 @@ Address: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Бумажник &lt;b&gt;зашифрован&lt;/b&gt; и в настоящее время &lt;b&gt;разблокирован&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Бумажник &lt;b&gt;зашифрован&lt;/b&gt; и в настоящее время &lt;b&gt;заблокирован&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Данные бумажника (*.dat)</translation>
</message>
@@ -550,12 +545,17 @@ Address: %4
<translation>Изменить настройки</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Сделать резервную копию бумажника</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Резервное копирование не удалось</translation>
</message>
@@ -613,7 +613,7 @@ Address: %4
<translation>Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Отправка...</translation>
</message>
@@ -1149,11 +1149,6 @@ Address: %4
<translation>Форма</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Адрес получателя платежа (например 1LA5FtQhnnWnkK6zjFfutR7Stiit4wKd63)</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="66"/>
<location filename="../sendcoinsentry.cpp" line="26"/>
<source>Enter a label for this address to add it to your address book</source>
@@ -1185,6 +1180,11 @@ Address: %4
<translation>Полу&amp;чатель:</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsentry.ui" line="93"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="120"/>
<source>Paste address from clipboard</source>
<translation>Вставить адрес из буфера обмена</translation>
@@ -1660,11 +1660,6 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Невозможно установить блокировку на рабочую директорию %s. Возможно, бумажник уже запущен.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="87"/>
<source>Rescanning...</source>
<translation>Сканирование...</translation>
@@ -1785,6 +1780,11 @@ Address: %4
<translation>Пароль для подключений JSON-RPC</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>Ошибка загрузки addr.dat</translation>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index a6a7c6bd85..f8ddac5cb5 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -409,7 +409,12 @@ Ste si istí, že si želáte zašifrovať peňaženku?</translation>
<translation>Zálohovať peňaženku na iné miesto</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation type="unfinished"></translation>
</message>
@@ -495,22 +500,17 @@ Ste si istí, že si želáte zašifrovať peňaženku?</translation>
<translation>Posledný prijatý blok bol generovaný %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Veľkosť tejto transakcie prekračuje limit. Stále ju však môžete odoslať za poplatok %1 ktorý bude pripísaný uzlu spracúvajúcemu vašu transakciu. Chcete zaplatiť poplatok?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Odoslané transakcie</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Prijaté transakcie</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -522,17 +522,17 @@ Typ: %3
Adresa: %4</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Peňaženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálne &lt;b&gt;zamknutá&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Nastala chyba pri pokuse uložiť peňaženku na nové miesto.</translation>
</message>
@@ -592,7 +592,7 @@ Adresa: %4</translation>
<translation>[testovacia sieť]</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Peňaženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálne &lt;b&gt;odomknutá&lt;/b&gt;</translation>
</message>
@@ -616,12 +616,12 @@ Adresa: %4</translation>
<translation type="unfinished">Stiahnutých %1 (of %2) blokov transakčnej histórie</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Zálohovať peňaženku</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Odosielanie...</translation>
</message>
@@ -1164,8 +1164,8 @@ Adresa: %4</translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adresa pre odoslanie platby je (napr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1743,6 +1743,11 @@ Adresa: %4</translation>
<translation>Prijateľné šifry (predvolené: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="80"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Chyba načítania wallet.dat: Peňaženka je poškodená</translation>
@@ -1969,11 +1974,6 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL možnosť: (pozrite Bitcoin Wiki pre návod na nastavenie SSL)</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>Chyba načítania addr.dat</translation>
diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts
index a8b3b63b0a..ff6606bb6f 100644
--- a/src/qt/locale/bitcoin_sr.ts
+++ b/src/qt/locale/bitcoin_sr.ts
@@ -480,22 +480,27 @@ Are you sure you wish to encrypt your wallet?</source>
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Backup новчаника</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation type="unfinished"></translation>
</message>
@@ -515,12 +520,12 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Последњи примљени блок је направљен %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Послана трансакција</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -529,12 +534,12 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Новчаник јс &lt;b&gt;шифрован&lt;/b&gt; и тренутно &lt;b&gt;откључан&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Новчаник јс &lt;b&gt;шифрован&lt;/b&gt; и тренутно &lt;b&gt;закључан&lt;/b&gt;</translation>
</message>
@@ -603,12 +608,7 @@ Address: %4
<translation>Промени &amp;лозинку</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Ова трансакција је превелика. И даље је можете послати уз накнаду од %1, која ће отићи чвору који прерађује трансакцију и помаже издржавању целе мреже. Да ли желите да дате напојницу?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Придошла трансакција</translation>
</message>
@@ -618,7 +618,7 @@ Address: %4
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Слање...</translation>
</message>
@@ -1161,7 +1161,7 @@ Address: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1937,7 +1937,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 0f4e321f2c..222e12c0b0 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -392,7 +392,7 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Visa listan med adresser för att ta emot betalningar</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Säkerhetskopiering misslyckades</translation>
</message>
@@ -402,7 +402,12 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Uppdaterad</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -415,12 +420,12 @@ Adress: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Denna plånbok är &lt;b&gt;krypterad&lt;/b&gt; och för närvarande &lt;b&gt;olåst&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Denna plånbok är &lt;b&gt;krypterad&lt;/b&gt; och för närvarande &lt;b&gt;låst&lt;/b&gt;</translation>
</message>
@@ -532,32 +537,27 @@ Adress: %4
<translation>Senast mottagna block genererades %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Transaktionen överskrider storleksgränsen. Du kan dock fortfarande skicka den mot en kostnad av %1. Denna avgift går till noderna som behandlar din transaktion och bidrar till nätverket. Vill du betala denna avgift?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Transaktion skickad</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Inkommande transaktion</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Säkerhetskopiera Plånbok</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Plånboks-data (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Det inträffade ett fel när plånboken skulle sparas till den nya platsen.</translation>
</message>
@@ -622,7 +622,7 @@ Adress: %4
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Skickar...</translation>
</message>
@@ -1165,8 +1165,8 @@ Adress: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adressen som betalningen skall skickas till (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1682,11 +1682,6 @@ Adress: %4
<translation>Generera mynt</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Kan inte låsa data-mappen %s. Bitcoin körs förmodligen redan.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="54"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Exekvera kommando när bästa blocket ändras (%s i cmd är utbytt av blockhash)</translation>
@@ -1947,6 +1942,11 @@ Adress: %4
<translation>Antal sekunder att hindra klienter som missköter sig från att ansluta (förval: 86400)</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="91"/>
<source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source>
<translation>Varning: -paytxfee är satt väldigt hög. Detta är avgiften du kommer betala för varje transaktion.</translation>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index ff7a70c382..9af782b877 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -422,17 +422,22 @@ Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Yollanıyor...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Cüzdan verileri (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Yedekleme başarısız oldu</translation>
</message>
@@ -442,7 +447,7 @@ Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
<translation>&amp;Yardım</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda &lt;b&gt;kilidi açıktır&lt;/b&gt;</translation>
</message>
@@ -457,7 +462,7 @@ Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
<translation>Son alınan blok şu vakit oluşturulmuştu: %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda &lt;b&gt;kilitlidir&lt;/b&gt;</translation>
</message>
@@ -506,12 +511,12 @@ Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Cüzdanı yedekle</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Cüzdan verilerinin başka bir konumda kaydedilmesi sırasında bir hata meydana geldi.</translation>
</message>
@@ -538,7 +543,7 @@ Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Muamele yollandı</translation>
</message>
@@ -570,17 +575,12 @@ Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Bu muamele boyut sınırlarını aşmıştır. Gene de %1 ücret ödeyerek gönderebilirsiniz, ki bu ücret muamelenizi işleyen ve şebekeye yardım eden düğümlere ödenecektir. Ücreti ödemek istiyor musunuz?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Gelen muamele</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -1161,8 +1161,8 @@ Adres: %4
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Ödemenin gönderileceği adres (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
@@ -1841,6 +1841,11 @@ Adres: %4
<translation>Bu yardım mesajı</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="81"/>
<source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
<translation>wallet.dat dosyasının yüklenmesinde hata oluştu: cüzdanın daha yeni bir Bitcoin sürümüne ihtiyacı var</translation>
@@ -1891,11 +1896,6 @@ Adres: %4
<translation>Sadece belirtilen düğüme bağlan</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>%s veri dizininde kilit elde edilemedi. Bitcoin muhtemelen hâlihazırda çalışmaktadır.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="33"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Aksaklık gösteren eşlerle bağlantıyı kesme sınırı (varsayılan: 100)</translation>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index 0d3a7cc52e..7e68c8dd0b 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -463,22 +463,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Показати вікно гаманця</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>Резервне копіювання гаманця</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>Дані гаманця (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>Резервне копіювання не вдалося</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>Виникла помилка при спробі зберегти гаманець в новому місці</translation>
</message>
@@ -580,22 +585,17 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Завантажено %1 з %2 блоків історії переказів.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Цей переказ перевищує максимально допустимий розмір. Проте ви можете здійснити її, додавши комісію в %1, яка відправиться тим вузлам що оброблять ваш переказ, та допоможе підтримати мережу. Ви хочете додати комісію?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>Надіслані перекази</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>Отримані перекази</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -608,17 +608,17 @@ Address: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>&lt;b&gt;Зашифрований&lt;/b&gt; гаманець &lt;b&gt;розблоковано&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>&lt;b&gt;Зашифрований&lt;/b&gt; гаманець &lt;b&gt;заблоковано&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>Відправлення...</translation>
</message>
@@ -1144,11 +1144,6 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Адреса для отримувача платежу (наприклад, 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="29"/>
<source>A&amp;mount:</source>
<translation>&amp;Кількість:</translation>
@@ -1175,6 +1170,11 @@ Address: %4
<translation>Форма</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsentry.ui" line="93"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Вибрати адресу з адресної книги</translation>
@@ -1823,6 +1823,11 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="76"/>
<source>Error loading addr.dat</source>
<translation>Помилка при завантаженні addr.dat</translation>
@@ -1942,11 +1947,6 @@ Address: %4
<translation>Максимальоий буфер , &lt;n&gt; * 1000 байт (за умовчанням: 10000)</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>Неможливо встановити блокування на робочий каталог %s. Можливо, гаманець вже запущено.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="75"/>
<source>Loading addresses...</source>
<translation>Завантаження адрес...</translation>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index bdbc2842f4..9feeb546ad 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -344,17 +344,22 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>&amp;备份钱包</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>流入交易</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>备份钱包</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>钱包文件(*.dat)</translation>
</message>
@@ -540,17 +545,12 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>动作工具栏</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>该笔交易的数据量超限.您可以选择支付 %1 交易费, 交易费将支付给处理该笔交易的网络节点,有助于维持比特币网络的运行. 您愿意支付交易费用吗?</translation>
- </message>
- <message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>已发送交易</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -568,12 +568,12 @@ Address: %4
<translation>退出</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>钱包已被&lt;b&gt;加密&lt;/b&gt;,当前为&lt;b&gt;解锁&lt;/b&gt;状态</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>钱包已被&lt;b&gt;加密&lt;/b&gt;,当前为&lt;b&gt;锁定&lt;/b&gt;状态</translation>
</message>
@@ -598,17 +598,17 @@ Address: %4
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>备份钱包到其它文件夹失败.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>发送中</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>备份失败</translation>
</message>
@@ -1144,11 +1144,6 @@ Address: %4
<translation>表单</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>付款地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="29"/>
<source>A&amp;mount:</source>
<translation>金额</translation>
@@ -1170,6 +1165,11 @@ Address: %4
<translation>&amp;标签:</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsentry.ui" line="93"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>从地址簿选择地址</translation>
@@ -1651,11 +1651,6 @@ Address: %4
<translation>比特币版本</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>无法给数据目录 %s 加锁。比特币进程可能已在运行。</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="79"/>
<source>Loading wallet...</source>
<translation>正在加载钱包...</translation>
@@ -1892,6 +1887,11 @@ SSL 选项: (SSL 安装教程具体见比特币维基百科)
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="87"/>
<source>Rescanning...</source>
<translation>正在重新扫描...</translation>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index 2abf0bf4dd..f210d8ad79 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -314,7 +314,7 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>顯示收款位址的列表</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Backup Wallet</source>
<translation>錢包備份</translation>
</message>
@@ -400,7 +400,7 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>變更密碼</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="621"/>
+ <location filename="../bitcoingui.cpp" line="619"/>
<source>Sending...</source>
<translation>付出中...</translation>
</message>
@@ -493,27 +493,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>最近收到的區塊產生於 %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>這筆交易的資料大小超過限制了. 你還是可以付出 %1 的費用來傳送. 這筆費用會付給處理該筆交易的節點, 並幫助維持整個網路. 你願意支付這項費用嗎?</translation>
- </message>
- <message>
<location filename="../bitcoingui.cpp" line="218"/>
<source>Prove you control an address</source>
<translation>證明你控制一個位址</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="648"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation>這筆交易的資料大小超過限制了. 你還是可以付出 %1 的費用來傳送. 這筆費用會付給處理該筆交易的節點, 並幫助維持整個網路. 你願意支付這項費用嗎?</translation>
+ </message>
+ <message>
+ <location filename="../bitcoingui.cpp" line="646"/>
<source>Sent transaction</source>
<translation>付款交易</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="649"/>
+ <location filename="../bitcoingui.cpp" line="647"/>
<source>Incoming transaction</source>
<translation>收款交易</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="650"/>
+ <location filename="../bitcoingui.cpp" line="648"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -525,12 +525,12 @@ Address: %4
位址: %4</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="775"/>
+ <location filename="../bitcoingui.cpp" line="773"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>錢包&lt;b&gt;已加密&lt;/b&gt;並且正&lt;b&gt;解鎖中&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="783"/>
+ <location filename="../bitcoingui.cpp" line="781"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
<translation>錢包&lt;b&gt;已加密&lt;/b&gt;並且正&lt;b&gt;上鎖中&lt;/b&gt;</translation>
</message>
@@ -592,17 +592,17 @@ Address: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="806"/>
+ <location filename="../bitcoingui.cpp" line="804"/>
<source>Wallet Data (*.dat)</source>
<translation>錢包資料檔 (*.dat)</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>There was an error trying to save the wallet data to the new location.</source>
<translation>儲存錢包資料到新的地方時發生錯誤</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="809"/>
+ <location filename="../bitcoingui.cpp" line="807"/>
<source>Backup Failed</source>
<translation>備份失敗</translation>
</message>
@@ -1138,6 +1138,11 @@ Address: %4
<translation>標記:</translation>
</message>
<message>
+ <location filename="../forms/sendcoinsentry.ui" line="93"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>付款的目標位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="120"/>
<source>Paste address from clipboard</source>
<translation>從剪貼簿貼上位址</translation>
@@ -1169,11 +1174,6 @@ Address: %4
<translation>給這個位址輸入一個標記, 並加到位址簿中</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="93"/>
- <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>付款的目標位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>從位址簿中選一個位址</translation>
@@ -1645,11 +1645,6 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="72"/>
- <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>無法鎖定資料目錄 %s. 也許位元幣已經在執行了.</translation>
- </message>
- <message>
<location filename="../bitcoinstrings.cpp" line="75"/>
<source>Loading addresses...</source>
<translation>載入位址中...</translation>
@@ -1899,6 +1894,11 @@ SSL 選項: (SSL 設定程序請見 Bitcoin Wiki)
<translation>載入 addr.dat 失敗</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="72"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation>無法鎖定資料目錄 %s. 也許位元幣已經在執行了.</translation>
+ </message>
+ <message>
<location filename="../bitcoinstrings.cpp" line="78"/>
<source>Error loading blkindex.dat</source>
<translation>載入 blkindex.dat 失敗</translation>