aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-11-14 22:52:02 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-11-14 22:52:02 +0000
commitbbd76e071717d1805a68e4db51721644b80d6293 (patch)
tree8c9ab7f095b042ead2e1577d3802ebd9b64dda54
parentd9b50a8cfdfa0b327629dc18076dbd1563dfba3e (diff)
downloadbitcoin-bbd76e071717d1805a68e4db51721644b80d6293.tar.xz
Update supported translations
-rw-r--r--src/qt/bitcoinstrings.cpp2
-rw-r--r--src/qt/locale/bitcoin_da.ts42
-rw-r--r--src/qt/locale/bitcoin_de.ts42
-rw-r--r--src/qt/locale/bitcoin_en.ts20
-rw-r--r--src/qt/locale/bitcoin_es.ts36
-rw-r--r--src/qt/locale/bitcoin_es_CL.ts36
-rw-r--r--src/qt/locale/bitcoin_hu.ts42
-rw-r--r--src/qt/locale/bitcoin_it.ts36
-rw-r--r--src/qt/locale/bitcoin_nb.ts42
-rw-r--r--src/qt/locale/bitcoin_nl.ts34
-rw-r--r--src/qt/locale/bitcoin_pt_BR.ts42
-rw-r--r--src/qt/locale/bitcoin_ru.ts34
-rw-r--r--src/qt/locale/bitcoin_uk.ts42
-rw-r--r--src/qt/locale/bitcoin_zh_CN.ts42
-rw-r--r--src/qt/locale/bitcoin_zh_TW.ts42
15 files changed, 267 insertions, 267 deletions
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index d544ec369e..89f7c44713 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -62,7 +62,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"@STRENGTH)\n"),
QT_TRANSLATE_NOOP("bitcoin-core", "This help message\n"),
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 \n"),
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index b91e595938..69a93df73d 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -413,17 +413,22 @@ 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="615"/>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="613"/>
<source>Sent transaction</source>
<translation>Afsendt transaktion</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Indgående transaktion</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -436,7 +441,7 @@ Adresse: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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>
@@ -461,7 +466,7 @@ Adresse: %4
<translation>&amp;Hjælp</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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>
@@ -528,11 +533,6 @@ Adresse: %4
<translation>Sidst modtagne blok blev genereret %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="280"/>
<source>Tabs toolbar</source>
<translation>Faneværktøjslinje</translation>
@@ -543,7 +543,7 @@ Adresse: %4
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="588"/>
+ <location filename="../bitcoingui.cpp" line="586"/>
<source>Sending...</source>
<translation>Sender...</translation>
</message>
@@ -952,6 +952,11 @@ Adresse: %4
<translation>&amp;Etiket:</translation>
</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>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Vælg adresse fra adressebog</translation>
@@ -967,11 +972,6 @@ Adresse: %4
<translation>Fjern denne modtager</translation>
</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>
- </message>
- <message>
<location filename="../sendcoinsentry.cpp" line="25"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Indtast en Bitcoinadresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1450,11 +1450,6 @@ Adresse: %4
<translation>Advarsel: Diskplads er lav</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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>
@@ -1807,6 +1802,11 @@ SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translati
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="68"/>
<source>Error loading addr.dat
</source>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 6bf2c7c3b2..c7310c2cd2 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -298,7 +298,12 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Passphrase &amp;ändern...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="588"/>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="586"/>
<source>Sending...</source>
<translation>Transaktionsgebühr bestätigen</translation>
</message>
@@ -474,27 +479,22 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Anwendung beenden</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="226"/>
<source>Show information about Bitcoin</source>
<translation>Informationen über Bitcoin anzeigen</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="615"/>
+ <location filename="../bitcoingui.cpp" line="613"/>
<source>Sent transaction</source>
<translation>Gesendete Transaktion</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Eingehende Transaktion</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -521,12 +521,12 @@ Adresse: %4</translation>
<translation>Brieftasche ent- oder verschlüsseln</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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>
@@ -935,11 +935,6 @@ Adresse: %4</translation>
<translation>Adressbezeichnung eingeben (diese wird bei unbekannten Adressen inkl. der Adresse dem Adressbuch hinzugefügt)</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>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="120"/>
<source>Paste address from clipboard</source>
<translation>Adresse aus der Zwischenablage einfügen</translation>
@@ -960,6 +955,11 @@ Adresse: %4</translation>
<translation>&amp;Bezeichnung:</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>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Adresse aus Adressbuch wählen</translation>
@@ -1463,11 +1463,6 @@ Adresse: %4</translation>
<translation>Warnung: Festplattenplatz wird knapp</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="67"/>
<source>Loading addresses...</source>
<translation>Lade Adressen...</translation>
@@ -1804,6 +1799,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)
<translation>Dieser Hilfetext</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="68"/>
<source>Error loading addr.dat
</source>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 63485cd65a..946311b5c8 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -503,27 +503,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="582"/>
+ <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="588"/>
+ <location filename="../bitcoingui.cpp" line="586"/>
<source>Sending...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="615"/>
+ <location filename="../bitcoingui.cpp" line="613"/>
<source>Sent transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -532,12 +532,12 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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>
@@ -932,7 +932,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>
@@ -1703,7 +1703,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="64"/>
- <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 ec8665a477..3825648b47 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -490,22 +490,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="583"/>
- <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="615"/>
+ <location filename="../bitcoingui.cpp" line="613"/>
<source>Sent transaction</source>
<translation>Transacción enviada</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Transacción entrante</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -522,12 +517,12 @@ Dirección: %4</translation>
<translation>Cambiar la contraseña utilizada para el cifrado del monedero</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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>
@@ -550,7 +545,12 @@ Dirección: %4</translation>
<translation>Se han bajado %1 de %2 bloques de historial.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="588"/>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="586"/>
<source>Sending...</source>
<translation>Enviando...</translation>
</message>
@@ -945,7 +945,7 @@ 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>
+ <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>
@@ -1427,12 +1427,6 @@ Dirección: %4</translation>
<translation>Uso:</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="77"/>
<source>Rescanning...</source>
<translation>Rescaneando...</translation>
@@ -1769,6 +1763,12 @@ Dirección: %4</translation>
<translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="75"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete
</source>
diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts
index 9c605c58d3..d054c3a155 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -378,6 +378,11 @@ 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="582"/>
+ <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="228"/>
<source>About &amp;Qt</source>
<translation>Acerca de</translation>
@@ -508,22 +513,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="583"/>
- <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="615"/>
+ <location filename="../bitcoingui.cpp" line="613"/>
<source>Sent transaction</source>
<translation>Transacción enviada</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Transacción entrante</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -535,17 +535,17 @@ Tipo: %3
Dirección: %4</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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="588"/>
+ <location filename="../bitcoingui.cpp" line="586"/>
<source>Sending...</source>
<translation>Enviando...</translation>
</message>
@@ -955,7 +955,7 @@ 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>
+ <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>
@@ -1518,12 +1518,6 @@ Dirección: %4</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="71"/>
<source>Loading wallet...</source>
<translation>Cargando cartera...</translation>
@@ -1720,6 +1714,12 @@ Dirección: %4</translation>
<translation>Enviar informacion de seguimiento al depurador</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="75"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete
</source>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index 50b8610f14..bec353dddb 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -379,11 +379,6 @@ Biztosan kódolni akarod a tárcát?</translation>
<translation>Tárcakódoló jelszó megváltoztatása</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="236"/>
<source>&amp;Export...</source>
<translation>&amp;Exportálás...</translation>
@@ -509,17 +504,22 @@ Biztosan kódolni akarod a tárcát?</translation>
<translation>Az utolsóként kapott blokk generálva: %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="615"/>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="613"/>
<source>Sent transaction</source>
<translation>Tranzakció elküldve.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Beérkező tranzakció</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -532,17 +532,17 @@ Cím: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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="588"/>
+ <location filename="../bitcoingui.cpp" line="586"/>
<source>Sending...</source>
<translation>Küldés...</translation>
</message>
@@ -942,6 +942,11 @@ Cím: %4
<translation>&amp;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>
@@ -957,11 +962,6 @@ Cím: %4
<translation>Összeg:</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="113"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
@@ -1498,11 +1498,6 @@ Cím: %4
<translation>A %d port nem elérhető ezen a gépen. A Bitcoin valószínűleg fut már.</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="71"/>
<source>Loading wallet...</source>
<translation>Tárca betöltése...</translation>
@@ -1808,6 +1803,11 @@ SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit)</translation
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="68"/>
<source>Error loading addr.dat
</source>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 927f3b898f..20af222003 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -500,22 +500,22 @@ 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="583"/>
- <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="582"/>
+ <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="615"/>
+ <location filename="../bitcoingui.cpp" line="613"/>
<source>Sent transaction</source>
<translation>Transazione inviata</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Transazione ricevuta</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -529,17 +529,17 @@ Indirizzo: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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="588"/>
+ <location filename="../bitcoingui.cpp" line="586"/>
<source>Sending...</source>
<translation>Invio...</translation>
</message>
@@ -943,11 +943,6 @@ 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>L&apos;indirizzo del beneficiario cui inviare il pagamento (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</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>
@@ -973,6 +968,11 @@ Indirizzo: %4
<translation>Paga &amp;a:</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="137"/>
<source>Remove this recipient</source>
<translation>Rimuovere questo beneficiario</translation>
@@ -1426,11 +1426,6 @@ Indirizzo: %4
<translation>Versione di Bitcoin</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="67"/>
<source>Loading addresses...</source>
<translation>Caricamento indirizzi...</translation>
@@ -1813,6 +1808,11 @@ Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL)
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="68"/>
<source>Error loading addr.dat
</source>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index c6a975d33d..a5129ca2df 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -363,7 +363,12 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="588"/>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="586"/>
<source>Sending...</source>
<translation>Sender...</translation>
</message>
@@ -470,22 +475,17 @@ Er du sikker på at du vil kryptere lommeboken?</translation>
<translation>Kommer ajour...</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="615"/>
+ <location filename="../bitcoingui.cpp" line="613"/>
<source>Sent transaction</source>
<translation>Sendt transaksjon</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Innkommende transaksjon</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -498,12 +498,12 @@ Adresse: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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>
@@ -921,6 +921,11 @@ Adresse: %4
<translation>&amp;Beløp:</translation>
</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>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="113"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
@@ -947,11 +952,6 @@ Adresse: %4
<translation>&amp;Merkelapp:</translation>
</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>
- </message>
- <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Velg adresse fra adresseboken</translation>
@@ -1480,11 +1480,6 @@ Adresse: %4
<translation>Advarsel: Lite ledig diskplass</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="86"/>
<source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source>
<translation>Klarer ikke binde til port %d på denne datamaskinen. Bitcoin kjører sannsynligvis allerede.</translation>
@@ -1688,6 +1683,11 @@ Adresse: %4
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="75"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete
</source>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index e031ffb7db..d9d5cdcbc5 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -300,7 +300,12 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation>
<translation>&amp;Wijzig Wachtwoord</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="588"/>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="586"/>
<source>Sending...</source>
<translation>Versturen...</translation>
</message>
@@ -476,27 +481,22 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation>
<translation>Programma afsluiten</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="226"/>
<source>Show information about Bitcoin</source>
<translation>Laat informatie zien over Bitcoin</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="615"/>
+ <location filename="../bitcoingui.cpp" line="613"/>
<source>Sent transaction</source>
<translation>Verzonden transactie</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Binnenkomende transactie</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -524,12 +524,12 @@ Adres: %4
<translation>Versleutel of ontsleutel portemonnee</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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>
@@ -949,7 +949,7 @@ Adres: %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>Het adres waaraan u wilt betalen (bijv. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
@@ -1466,11 +1466,6 @@ Adres: %4
<translation>Waarschuwing: Weinig schijfruimte over</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="69"/>
<source>Loading block index...</source>
<translation>Blokindex aan het laden...</translation>
@@ -1819,6 +1814,11 @@ SSL opties: (zie de Bitcoin wiki voor SSL instructies)
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="68"/>
<source>Error loading addr.dat
</source>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index f73a7184b6..49d2ba8b34 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -465,11 +465,6 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>&amp;Mudar frase de segurança</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="273"/>
<source>&amp;Help</source>
<translation>&amp;Ajuda</translation>
@@ -485,17 +480,22 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Carregados %1 de %2 blocos do histórico de transações.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="615"/>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="613"/>
<source>Sent transaction</source>
<translation>Sent transaction</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Incoming transaction</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -507,12 +507,12 @@ Tipo: %3
Endereço: %4</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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>
@@ -540,7 +540,7 @@ Endereço: %4</translation>
<translation>Atualizado</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="588"/>
+ <location filename="../bitcoingui.cpp" line="586"/>
<source>Sending...</source>
<translation>Sending...</translation>
</message>
@@ -934,6 +934,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="103"/>
<source>Choose address from address book</source>
<translation>Choose address from address book</translation>
@@ -963,11 +968,6 @@ Endereço: %4</translation>
<source>Pay &amp;To:</source>
<translation>Pay &amp;To:</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>
</context>
<context>
<name>TransactionDesc</name>
@@ -1417,11 +1417,6 @@ Endereço: %4</translation>
<translation>Usage:</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="71"/>
<source>Loading wallet...</source>
<translation>Loading wallet...</translation>
@@ -1805,6 +1800,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="68"/>
<source>Error loading addr.dat
</source>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index bded8e24b1..0d0daf3f98 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -432,27 +432,27 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Синхронизированно</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="205"/>
<source>Send coins to a bitcoin address</source>
<translation>Отправить монеты на указанный адрес</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="615"/>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="613"/>
<source>Sent transaction</source>
<translation>Исходящая транзакция</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Входящая транзакция</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -465,12 +465,12 @@ Address: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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>
@@ -558,7 +558,7 @@ Address: %4
<translation>Загружено %1 из %2 блоков истории транзакций.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="588"/>
+ <location filename="../bitcoingui.cpp" line="586"/>
<source>Sending...</source>
<translation>Отправка...</translation>
</message>
@@ -948,7 +948,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>Адрес получателя платежа (например 1LA5FtQhnnWnkK6zjFfutR7Stiit4wKd63)</translation>
</message>
<message>
@@ -1432,11 +1432,6 @@ Address: %4
<translation>Версия</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="67"/>
<source>Loading addresses...</source>
<translation>Загрузка адресов...</translation>
@@ -1825,6 +1820,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="68"/>
<source>Error loading addr.dat
</source>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index ce5abe032b..e81cd1e8fb 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -370,6 +370,11 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Показати &amp;гаманець</translation>
</message>
<message>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="229"/>
<source>Show information about Qt</source>
<translation>Показати інформацію про Qt</translation>
@@ -515,22 +520,17 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>Останній отриманий блок було згенеровано %1.</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="615"/>
+ <location filename="../bitcoingui.cpp" line="613"/>
<source>Sent transaction</source>
<translation>Надіслані перекази</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>Отримані перекази</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -543,17 +543,17 @@ Address: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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="588"/>
+ <location filename="../bitcoingui.cpp" line="586"/>
<source>Sending...</source>
<translation>Відправлення...</translation>
</message>
@@ -947,6 +947,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>Адреса для отримувача платежу (наприклад, 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="103"/>
<source>Choose address from address book</source>
<translation>Вибрати адресу з адресної книги</translation>
@@ -972,11 +977,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="../sendcoinsentry.cpp" line="25"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1438,11 +1438,6 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="67"/>
<source>Loading addresses...</source>
<translation>Завантаження адрес...</translation>
@@ -1712,6 +1707,11 @@ Address: %4
<translation>Відсилаті налагоджувальну інформацію до налагоджувача</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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>Wallet needed to be rewritten: restart Bitcoin to complete
</source>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 9ae24ac8ed..9131442ffa 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -340,7 +340,12 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>显示比特币的相关信息</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="614"/>
<source>Incoming transaction</source>
<translation>流入交易</translation>
</message>
@@ -483,7 +488,7 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>最新收到的区块产生于 %1。</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -496,12 +501,12 @@ Address: %4
</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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>
@@ -523,17 +528,12 @@ Address: %4
<translation>bitcoin-qt</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="588"/>
+ <location filename="../bitcoingui.cpp" line="586"/>
<source>Sending...</source>
<translation>发送中</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="615"/>
+ <location filename="../bitcoingui.cpp" line="613"/>
<source>Sent transaction</source>
<translation>已发送交易</translation>
</message>
@@ -916,6 +916,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>付款地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
<location filename="../forms/sendcoinsentry.ui" line="120"/>
<source>Paste address from clipboard</source>
<translation>从剪贴板粘贴地址</translation>
@@ -947,11 +952,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>
@@ -1445,11 +1445,6 @@ Address: %4
<translation>每个连接的最大发送缓存,&lt;n&gt;*1000 字节(缺省:10000)</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="77"/>
<source>Rescanning...</source>
<translation>正在重新扫描...</translation>
@@ -1808,6 +1803,11 @@ SSL 选项: (SSL 安装教程具体见比特币维基百科)
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="68"/>
<source>Error loading addr.dat
</source>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index f3aeae5e60..ac7bf7c221 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -305,7 +305,12 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>變更密碼</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="588"/>
+ <location filename="../bitcoingui.cpp" line="582"/>
+ <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="586"/>
<source>Sending...</source>
<translation>付出中...</translation>
</message>
@@ -480,27 +485,22 @@ Are you sure you wish to encrypt your wallet?</source>
<translation>關於%1</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="583"/>
- <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="232"/>
<source>Modify configuration options for bitcoin</source>
<translation>修改位元幣的設定選項</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="615"/>
+ <location filename="../bitcoingui.cpp" line="613"/>
<source>Sent transaction</source>
<translation>付款交易</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="616"/>
+ <location filename="../bitcoingui.cpp" line="614"/>
<source>Incoming transaction</source>
<translation>收款交易</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="617"/>
+ <location filename="../bitcoingui.cpp" line="615"/>
<source>Date: %1
Amount: %2
Type: %3
@@ -517,12 +517,12 @@ Address: %4
<translation>錢包加密</translation>
</message>
<message>
- <location filename="../bitcoingui.cpp" line="711"/>
+ <location filename="../bitcoingui.cpp" line="709"/>
<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="719"/>
+ <location filename="../bitcoingui.cpp" line="717"/>
<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>
@@ -926,11 +926,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="14"/>
<source>Form</source>
<translation>表單</translation>
@@ -946,6 +941,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="103"/>
<source>Choose address from address book</source>
<translation>從位址簿中選一個位址</translation>
@@ -1417,11 +1417,6 @@ Address: %4
<translation>用法:</translation>
</message>
<message>
- <location filename="../bitcoinstrings.cpp" line="64"/>
- <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="67"/>
<source>Loading addresses...</source>
<translation>載入位址中...</translation>
@@ -1805,6 +1800,11 @@ SSL 選項: (SSL 設定程序請見 Bitcoin Wiki)
</translation>
</message>
<message>
+ <location filename="../bitcoinstrings.cpp" line="64"/>
+ <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="68"/>
<source>Error loading addr.dat
</source>