aboutsummaryrefslogtreecommitdiff
path: root/src/qt/locale
diff options
context:
space:
mode:
Diffstat (limited to 'src/qt/locale')
-rw-r--r--src/qt/locale/bitcoin_ach.ts353
-rw-r--r--src/qt/locale/bitcoin_af_ZA.ts353
-rw-r--r--src/qt/locale/bitcoin_be_BY.ts361
-rw-r--r--src/qt/locale/bitcoin_bg.ts361
-rw-r--r--src/qt/locale/bitcoin_bs.ts353
-rw-r--r--src/qt/locale/bitcoin_ca.ts353
-rw-r--r--src/qt/locale/bitcoin_ca_ES.ts365
-rw-r--r--src/qt/locale/bitcoin_cs.ts363
-rw-r--r--src/qt/locale/bitcoin_cy.ts353
-rw-r--r--src/qt/locale/bitcoin_da.ts369
-rw-r--r--src/qt/locale/bitcoin_de_AT.ts379
-rw-r--r--src/qt/locale/bitcoin_el_GR.ts363
-rw-r--r--src/qt/locale/bitcoin_en.ts177
-rw-r--r--src/qt/locale/bitcoin_eo.ts381
-rw-r--r--src/qt/locale/bitcoin_es.ts78
-rw-r--r--src/qt/locale/bitcoin_es_MX.ts449
-rw-r--r--src/qt/locale/bitcoin_es_UY.ts217
-rw-r--r--src/qt/locale/bitcoin_et.ts361
-rw-r--r--src/qt/locale/bitcoin_eu_ES.ts361
-rw-r--r--src/qt/locale/bitcoin_fa.ts363
-rw-r--r--src/qt/locale/bitcoin_fa_IR.ts361
-rw-r--r--src/qt/locale/bitcoin_fi.ts363
-rw-r--r--src/qt/locale/bitcoin_fr.ts371
-rw-r--r--src/qt/locale/bitcoin_fr_CA.ts353
-rw-r--r--src/qt/locale/bitcoin_gu_IN.ts353
-rw-r--r--src/qt/locale/bitcoin_he.ts363
-rw-r--r--src/qt/locale/bitcoin_hi_IN.ts361
-rw-r--r--src/qt/locale/bitcoin_hr.ts363
-rw-r--r--src/qt/locale/bitcoin_hu.ts363
-rw-r--r--src/qt/locale/bitcoin_id_ID.ts361
-rw-r--r--src/qt/locale/bitcoin_it.ts373
-rw-r--r--src/qt/locale/bitcoin_ja.ts363
-rw-r--r--src/qt/locale/bitcoin_kk_KZ.ts401
-rw-r--r--src/qt/locale/bitcoin_ko_KR.ts30
-rw-r--r--src/qt/locale/bitcoin_la.ts361
-rw-r--r--src/qt/locale/bitcoin_lt.ts363
-rw-r--r--src/qt/locale/bitcoin_lv_LV.ts365
-rw-r--r--src/qt/locale/bitcoin_ms_MY.ts353
-rw-r--r--src/qt/locale/bitcoin_nb.ts397
-rw-r--r--src/qt/locale/bitcoin_pam.ts363
-rw-r--r--src/qt/locale/bitcoin_pt_BR.ts535
-rw-r--r--src/qt/locale/bitcoin_pt_PT.ts437
-rw-r--r--src/qt/locale/bitcoin_ro_RO.ts41
-rw-r--r--src/qt/locale/bitcoin_ru.ts375
-rw-r--r--src/qt/locale/bitcoin_sl_SI.ts713
-rw-r--r--src/qt/locale/bitcoin_sq.ts361
-rw-r--r--src/qt/locale/bitcoin_sr.ts361
-rw-r--r--src/qt/locale/bitcoin_sv.ts363
-rw-r--r--src/qt/locale/bitcoin_th_TH.ts353
-rw-r--r--src/qt/locale/bitcoin_tr.ts371
-rw-r--r--src/qt/locale/bitcoin_uk.ts363
-rw-r--r--src/qt/locale/bitcoin_vi.ts353
-rw-r--r--src/qt/locale/bitcoin_vi_VN.ts353
-rw-r--r--src/qt/locale/bitcoin_zh_CN.ts515
54 files changed, 11284 insertions, 7904 deletions
diff --git a/src/qt/locale/bitcoin_ach.ts b/src/qt/locale/bitcoin_ach.ts
index 848ffc9d4c..195c41f37a 100644
--- a/src/qt/locale/bitcoin_ach.ts
+++ b/src/qt/locale/bitcoin_ach.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation type="unfinished"/>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts
index ab6f88d377..e8e6464823 100644
--- a/src/qt/locale/bitcoin_af_ZA.ts
+++ b/src/qt/locale/bitcoin_af_ZA.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 agter</translation>
@@ -681,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Bedrag</translation>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Beursie</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Die adres waarheen die betaling gestuur moet word (b.v. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopieer bedrag</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Stuur Munstukke</translation>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Stuur aan vele ontvangers op eens</translation>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Balans:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation>S&amp;tuur</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Die adres waarheen die betaling gestuur moet word (b.v. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(geen etiket)</translation>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation>Boodskap:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Die adres waarheen die betaling gestuur moet word (b.v. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Die adres waarheen die betaling gestuur moet word (b.v. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>onbekend</translation>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation>Bedrag</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Ontvang met</translation>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation>(n.v.t)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Gebruik:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Gebruik die toets netwerk</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informasie</translation>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Sisteem fout:</translation>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Hierdie help boodskap</translation>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Laai adresse...</translation>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Laai blok indeks...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Laai beursie...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Klaar gelaai</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts
index 5fbb794719..9c89795017 100644
--- a/src/qt/locale/bitcoin_be_BY.ts
+++ b/src/qt/locale/bitcoin_be_BY.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -685,7 +701,7 @@ Address: %4
<translation>Гаманец &lt;b&gt;зашыфраваны&lt;/b&gt; і зараз &lt;b&gt;заблакаваны&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -746,7 +762,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -761,7 +777,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Колькасць</translation>
</message>
@@ -912,7 +928,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1094,7 +1110,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1238,7 +1254,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1248,7 +1264,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1263,12 +1279,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Пазначыць памер кэшу базы звестак у мегабайтах (тыпова: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1283,7 +1294,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1318,7 +1334,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1433,17 +1459,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1483,18 +1509,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Непацверджана:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1503,7 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1651,6 +1677,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Увядзіце Біткойн-адрас (ўзор 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1871,22 +1902,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>Пазнака:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1896,27 +1927,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1926,17 +1960,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1955,6 +1989,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Капіяваць пазнаку</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Капіяваць колькасць</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2056,12 +2105,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Даслаць Манеты</translation>
@@ -2137,7 +2191,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Даслаць адразу некалькім атрымальнікам</translation>
</message>
@@ -2147,7 +2201,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2157,12 +2211,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Баланс:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Пацвердзіць дасыланне</translation>
</message>
@@ -2172,7 +2226,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Пацвердзіць дасыланне манет</translation>
</message>
@@ -2185,12 +2239,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Увядзіце Біткойн-адрас (ўзор 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2289,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2275,12 +2324,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>непазначаны</translation>
</message>
@@ -2290,7 +2339,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2300,7 +2349,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2377,12 +2426,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2392,7 +2436,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2408,11 +2457,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Увядзіце Біткойн-адрас (ўзор 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2450,19 +2494,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Уставіць адрас з буферу абмена</translation>
</message>
@@ -2503,12 +2547,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2523,7 +2567,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2538,43 +2582,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Увядзіце Біткойн-адрас (ўзор 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2594,7 +2632,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2655,6 +2693,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2816,12 +2859,12 @@ Address: %4
<translation>, пакуль не было паспяхова транслявана</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>невядома</translation>
</message>
@@ -2862,12 +2905,12 @@ Address: %4
<translation>Колькасць</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2877,23 +2920,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline (%1 пацверджанняў)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Непацверджана (%1 з %2 пацверджанняў)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Пацверджана (%1 пацверджанняў)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Гэты блок не быў прыняты іншымі вузламі і магчыма не будзе ўхвалены!</translation>
</message>
@@ -2903,7 +2935,27 @@ Address: %4
<translation>Згенеравана, але не прынята</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Прынята з</translation>
</message>
@@ -2933,7 +2985,7 @@ Address: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Статус транзакцыі. Навядзіце курсар на гэтае поле, каб паказаць колькасць пацверджанняў.</translation>
</message>
@@ -3199,12 +3251,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Ужыванне:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Спіс каманд</translation>
</message>
@@ -3259,12 +3311,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Парог для адлучэння злаўмысных карыстальнікаў (тыпова: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Колькасць секунд для ўстрымання асобаў да перадалучэння (заходна: 86400)</translation>
</message>
@@ -3284,17 +3336,17 @@ Address: %4
<translation>Прымаць камандны радок і JSON-RPC каманды</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Запусціць у фоне як дэман і прымаць каманды</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Ужываць тэставае сеціва</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Пароль для JSON-RPC злучэнняў</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Дазволіць JSON-RPC злучэнні з пэўнага IP адрасу</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Адпраўляць каманды вузлу на &lt;ip&gt; (зыходна: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Выканаць каманду калі лепшы блок зменіцца (%s замяняецца на хэш блока)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Абнавіць гаманец на новы фармат</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Устанавіць памер фонда ключоў у &lt;n&gt; (тыпова: 100)</translation>
</message>
@@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Перасканаваць ланцуг блокаў дзеля пошуку адсутных транзакцый</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Ужываць OpenSSL (https) для JSON-RPC злучэнняў</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Файл-сертыфікат сервера (зыходна: server.cert)</translation>
</message>
@@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Прыватны ключ сервера (зыходна: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Загружаем адрасы...</translation>
</message>
@@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Памылка загрузкі wallet.dat: гаманец патрабуе новую версію Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Гаманец мае быць перазапісаны: патрэбны перазапуск Bitcoin для выканання</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Памылка загрузкі wallet.dat</translation>
</message>
@@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Загружаем індэкс блокаў...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Загружаем гаманец...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Перасканаванне...</translation>
</message>
@@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Загрузка выканана</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Памылка</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts
index c8a403346d..eb0eb9ec07 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -686,7 +702,7 @@ Address: %4
<translation>Портфейлът е &lt;b&gt;криптиран&lt;/b&gt; и &lt;b&gt;заключен&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -747,7 +763,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -762,7 +778,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Сума</translation>
</message>
@@ -913,7 +929,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1095,7 +1111,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1239,7 +1255,7 @@ Address: %4
<translation>&amp;Основни</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1249,7 +1265,7 @@ Address: %4
<translation>&amp;Такса за изходяща транзакция</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1264,12 +1280,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1284,7 +1295,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1319,7 +1335,17 @@ Address: %4
<translation>&amp;Мрежа</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Автоматично отваряне на входящия Bitcoin порт. Работи само с рутери поддържащи UPnP.</translation>
</message>
@@ -1434,17 +1460,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1484,18 +1510,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Непотвърдени:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Портфейл</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1504,7 +1525,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1652,6 +1678,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Въведете Биткоин адрес (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1872,22 +1903,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Име:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1897,27 +1928,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1927,17 +1961,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1956,6 +1990,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Копирай име</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Копирай сума</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2057,12 +2106,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Изпращане</translation>
@@ -2138,7 +2192,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Изпращане към повече от един получател</translation>
</message>
@@ -2148,7 +2202,7 @@ Address: %4
<translation>Добави &amp;получател</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2158,12 +2212,12 @@ Address: %4
<translation>&amp;Изчисти</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Баланс:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Потвърдете изпращането</translation>
</message>
@@ -2173,7 +2227,7 @@ Address: %4
<translation>И&amp;зпрати</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Потвърждаване</translation>
</message>
@@ -2186,12 +2240,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Въведете Биткоин адрес (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2241,7 +2290,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Невалиден адрес на получателя.</translation>
</message>
@@ -2276,12 +2325,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(без име)</translation>
</message>
@@ -2291,7 +2340,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2301,7 +2350,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2378,12 +2427,7 @@ Address: %4
<translation>Съобщение:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2393,7 +2437,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2409,11 +2458,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Въведете Биткоин адрес (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2451,19 +2495,19 @@ Address: %4
<translation>Адресът, с който ще подпишете съобщението (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Вмъкни от клипборда</translation>
</message>
@@ -2504,12 +2548,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>&amp;Изчисти</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Провери</translation>
</message>
@@ -2524,7 +2568,7 @@ Address: %4
<translation>Адресът, с който е подписано съобщението (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Проверете съобщение, за да сте сигурни че е подписано с определен Биткоин адрес</translation>
</message>
@@ -2539,43 +2583,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Въведете Биткоин адрес (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Натиснете &quot;Подписване на съобщение&quot; за да създадете подпис</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Биткоин подпис</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Въведеният адрес е невалиден.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Моля проверете адреса и опитайте отново.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2595,7 +2633,7 @@ Address: %4
<translation>Съобщението е подписано.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Подписът не може да бъде декодиран.</translation>
</message>
@@ -2656,6 +2694,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/офлайн</translation>
</message>
@@ -2817,12 +2860,12 @@ Address: %4
<translation>, все още не е изпратено</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>неизвестен</translation>
</message>
@@ -2863,12 +2906,12 @@ Address: %4
<translation>Сума</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2878,23 +2921,12 @@ Address: %4
<translation>Подлежи на промяна до %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Офлайн (%1 потвърждения)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Непотвърдени (%1 от %2 потвърждения)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Потвърдени (%1 потвърждения)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Блокът не е получен от останалите участници и най-вероятно няма да бъде одобрен.</translation>
</message>
@@ -2904,7 +2936,27 @@ Address: %4
<translation>Генерирана, но отхвърлена от мрежата</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Получени с</translation>
</message>
@@ -2934,7 +2986,7 @@ Address: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Състояние на транзакцията. Задръжте върху това поле за брой потвърждения.</translation>
</message>
@@ -3200,12 +3252,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Използване:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Вписване на команди</translation>
</message>
@@ -3260,12 +3312,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Праг на прекъсване на връзката при непорядъчно държащи се пиъри (по подразбиране:100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Брой секунди до възтановяване на връзката за зле държащите се пиъри (по подразбиране:86400)</translation>
</message>
@@ -3285,17 +3337,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Използвайте тестовата мрежа</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3426,6 +3478,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3636,6 +3693,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Включи Биткойн сървър</translation>
</message>
@@ -3685,12 +3747,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3710,7 +3772,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3780,7 +3842,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3826,6 +3888,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3835,32 +3902,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Парола за JSON-RPC връзките</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Разреши JSON-RPC връзките от отучнен IP адрес</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Изпрати команди до възел функциониращ на &lt;ip&gt; (По подразбиране: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3870,12 +3937,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Повторно сканиране на блок-връзка за липсващи портефейлни транзакции</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Използвайте OpenSSL (https) за JSON-RPC връзките</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Сертификатен файл на сървъра (По подразбиране:server.cert)</translation>
</message>
@@ -3885,7 +3952,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Поверителен ключ за сървъра (default: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Това помощно съобщение</translation>
</message>
@@ -3895,12 +3962,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Зареждане на адресите...</translation>
</message>
@@ -3915,12 +3982,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3930,7 +3997,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Невалиден -proxy address: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3940,7 +4007,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3950,7 +4017,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3970,7 +4037,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Зареждане на блок индекса...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3980,12 +4047,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Зареждане на портфейла...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3995,7 +4062,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Преразглеждане на последовтелността от блокове...</translation>
</message>
@@ -4005,17 +4072,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Зареждането е завършено</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Грешка</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_bs.ts b/src/qt/locale/bitcoin_bs.ts
index 768d874fc5..be8575c4ca 100644
--- a/src/qt/locale/bitcoin_bs.ts
+++ b/src/qt/locale/bitcoin_bs.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Jezrga</translation>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation type="unfinished"/>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts
index 72a5339cc3..52595a9a15 100644
--- a/src/qt/locale/bitcoin_ca.ts
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation>La cartera està &lt;b&gt;encriptada&lt;b/&gt; i &lt;b&gt;bloquejada&lt;b/&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(sense etiqueta)</translation>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index 4c86a99a2c..ea4b8575a2 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 radera</translation>
@@ -681,7 +697,7 @@ Address: %4
<translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;bloquejat&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ha tingut lloc un error fatal. Bitcoin no pot continuar executant-se de manera segura i es tancará.</translation>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation>Canvi:</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation>Mode llista</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Quantitat</translation>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation>Pols</translation>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Nucli de Bitcoin</translation>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation>&amp;Principal</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation>Pagar &amp;comisió de transacció</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Iniciar automàticament Bitcoin després de l&apos;inici de sessió del sistema.</translation>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Establir tamany de la memoria cau en megabytes (per defecte: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>MB</translation>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation>&amp;Xarxa</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Obrir el port del client de Bitcoin al router de forma automàtica. Això només funciona quan el teu router implementa UPnP i l&apos;opció està activada.</translation>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation>&amp;Cancel·la</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>Per defecte</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Confirmi el reestabliment de les opcions</translation>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation>La informació mostrada pot no estar al día. El teu moneder es sincronitza automàticament amb la xarxa Bitcoin un cop s&apos;ha establert connexió, però aquest proces no s&apos;ha completat encara.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Sense confirmar:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Moneder</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>&amp;Quantitat:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>&amp;Missatge:</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Esborra tots els camps del formuari.</translation>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation>Esborra</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
- <translation>&amp;Sol·licitud de pagament</translation>
+ <location line="+78"/>
+ <source>Requested payments history</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation type="unfinished"/>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>&amp;Sol·licitud de pagament</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation>Esborra</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Copiar etiqueta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copiar quantitat</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation>(sense missatge)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Enviar monedes</translation>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Enviar a multiples destinataris al mateix temps</translation>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation>Affegir &amp;Destinatari</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Netejar tots els camps del formulari.</translation>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation>Esborrar &amp;Tot</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Balanç:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Confirmi l&apos;acció d&apos;enviament</translation>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation>E&amp;nviar</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Confirmar l&apos;enviament de monedes</translation>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation>o</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>L&apos;adreça remetent no és vàlida, si us plau comprovi-la.</translation>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(sense etiqueta)</translation>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Estàs segur que ho vols enviar?</translation>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation>S&apos;ha afegit una taxa de transacció</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>La sol·licitud de pagament ha caducat</translation>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation>Missatge:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation>La adreça amb la que signat els missatges (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Escull adreces fetes servir amb anterioritat</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alta+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Enganxar adreça del porta-retalls</translation>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Esborrar &amp;Tot</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Verificar el missatge</translation>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation>La adreça amb el que el missatge va ser signat (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Verificar el missatge per assegurar-se que ha estat signat amb una adreça Bitcoin específica</translation>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation>Neteja tots els camps de verificació de missatge</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Clica &quot;Signar Missatge&quot; per a generar una signatura</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Introduïr una clau Bitcoin</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>L&apos;adreça intoduïda és invàlida.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Siu us plau, comprovi l&apos;adreça i provi de nou.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>L&apos;adreça introduïda no referencia a cap clau.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>El desbloqueig del moneder ha estat cancelat.</translation>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation>Missatge signat.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>La signatura no s&apos;ha pogut decodificar .</translation>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/offline</translation>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation>, encara no ha estat emès correctement</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Obre per %n bloc més</numerusform><numerusform>Obre per %n blocs més</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>desconegut</translation>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation>Quantitat</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Obre per %n bloc més</numerusform><numerusform>Obre per %n blocs més</numerusform></translation>
</message>
@@ -2873,23 +2916,12 @@ Address: %4
<translation>Obert fins %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Sense connexió (%1 confirmacions)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Sense confirmar (%1 de %2 confirmacions)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmat (%1 confirmacions)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation>
</message>
@@ -2899,7 +2931,27 @@ Address: %4
<translation>Generat però no acceptat</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Rebut amb</translation>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Estat de la transacció. Desplaça&apos;t per aquí sobre per mostrar el nombre de confirmacions.</translation>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Ús:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Llista d&apos;ordres</translation>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation>Especificar la teva adreça pública</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Límit per a desconectar connexions errònies (per defecte: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Nombre de segons abans de reconectar amb connexions errònies (per defecte: 86400)</translation>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation>Acceptar línia d&apos;ordres i ordres JSON-RPC </translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Executar en segon pla com a programa dimoni i acceptar ordres</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Usar la xarxa de prova</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Aceptar connexions d&apos;afora (per defecte: 1 si no -proxy o -connect)</translation>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Connectar només al(s) node(s) especificats</translation>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Arranca el servidor de Bitcoin</translation>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importa blocs de un fitxer blk000??.dat extern</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>&amp;Informació</translation>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Especificar el temps limit per a un intent de connexió en milisegons (per defecte: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Error de sistema:</translation>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versió</translation>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>L&apos;arxiu wallet.data és corrupte, el rescat de les dades ha fallat</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Contrasenya per a connexions JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Permetre connexions JSON-RPC d&apos;adreces IP específiques</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Enviar ordre al node en execució a &lt;ip&gt; (per defecte: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Executar orde quan el millor bloc canviï (%s al cmd es reemplaça per un bloc de hash)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Actualitzar moneder a l&apos;últim format</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Establir límit de nombre de claus a &lt;n&gt; (per defecte: 100)</translation>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Re-escanejar cadena de blocs en cerca de transaccions de moneder perdudes</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Utilitzar OpenSSL (https) per a connexions JSON-RPC</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Arxiu del certificat de servidor (per defecte: server.cert)</translation>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Clau privada del servidor (per defecte: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Aquest misatge d&apos;ajuda</translation>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Impossible d&apos;unir %s a aquest ordinador (s&apos;ha retornat l&apos;error %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permetre consultes DNS per a -addnode, -seednode i -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Carregant adreces...</translation>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Error carregant wallet.dat: El moneder requereix una versió de Bitcoin més moderna</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>El moneder necesita ser re-escrit: re-inicia Bitcoin per a completar la tasca</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Error carregant wallet.dat</translation>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Adreça -proxy invalida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Xarxa desconeguda especificada a -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>S&apos;ha demanat una versió desconeguda de -socks proxy: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>No es pot resoldre l&apos;adreça -bind: &apos;%s&apos;</translation>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>No es pot resoldre l&apos;adreça -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Quantitat invalida per a -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Carregant índex de blocs...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Afegir un node per a connectar&apos;s-hi i intentar mantenir la connexió oberta</translation>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Impossible d&apos;unir %s en aquest ordinador. Probablement Bitcoin ja estigui en execució.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Carregant moneder...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>No es pot reduir la versió del moneder</translation>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>No es pot escriure l&apos;adreça per defecte</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Re-escanejant...</translation>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Càrrega acabada</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Utilitza la opció %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index 668afd3acc..05ebe1741f 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -36,6 +36,12 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,6 +623,16 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation><numerusform>týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>Stahuji ještě bloky transakcí za poslední %1</translation>
@@ -690,7 +706,7 @@ Adresa: %4
<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>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Stala se fatální chyba. Bitcoin nemůže bezpečně pokračovat v činnosti, a proto skončí.</translation>
</message>
@@ -751,7 +767,7 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -766,7 +782,7 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Částka</translation>
</message>
@@ -917,7 +933,7 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1099,7 +1115,7 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Jádro Bitcoinu</translation>
</message>
@@ -1243,7 +1259,7 @@ Adresa: %4
<translation>&amp;Hlavní</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Dobrovolný transakční poplatek za každý započatý kB dopomáhá k rychlému zpracování tvých transakcí. Většina transakcí má do 1 kB.</translation>
</message>
@@ -1253,7 +1269,7 @@ Adresa: %4
<translation>Platit &amp;transakční poplatek</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Automaticky spustí Bitcoin po přihlášení do systému.</translation>
</message>
@@ -1268,12 +1284,7 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Nastavit velikost databázové vyrovnávací paměti v megabajtech (výchozí: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1288,7 +1299,12 @@ Adresa: %4
<translation>Nastavení počtu vláken pro verifikaci skriptů (max. 16, 0 = automaticky, &lt;0 = nechat daný počet jader volný, výchozí: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1323,7 +1339,17 @@ Adresa: %4
<translation>&amp;Síť</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Automaticky otevře potřebný port na routeru. Tohle funguje jen za předpokladu, že tvůj router podporuje UPnP a že je UPnP povolené.</translation>
</message>
@@ -1438,17 +1464,17 @@ Adresa: %4
<translation>&amp;Zrušit</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>výchozí</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Potvrzení obnovení nastavení</translation>
</message>
@@ -1488,19 +1514,14 @@ Adresa: %4
<translation>Zobrazené informace nemusí být aktuální. Tvá peněženka se automaticky sesynchronizuje s Bitcoinovou sítí, jakmile se s ní spojí. Zatím ale ještě není synchronizace dokončena.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Nepotvrzeno:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Peněženka</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Potvrzeno:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1508,7 +1529,12 @@ Adresa: %4
<translation>Aktuální disponibilní stav tvého účtu</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Celkem z transakcí, které ještě nejsou potvrzené a které se ještě nezapočítávají do celkového disponibilního stavu účtu</translation>
</message>
@@ -1656,6 +1682,11 @@ Adresa: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Zadej Bitcoinovou adresu (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1876,22 +1907,22 @@ Adresa: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>O&amp;značení:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1901,27 +1932,30 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1931,17 +1965,17 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1960,6 +1994,21 @@ Adresa: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopírovat popis</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopíruj částku</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2061,12 +2110,17 @@ Adresa: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Pošli mince</translation>
@@ -2142,7 +2196,7 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Pošli více příjemcům naráz</translation>
</message>
@@ -2152,7 +2206,7 @@ Adresa: %4
<translation>Při&amp;dej příjemce</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2162,12 +2216,12 @@ Adresa: %4
<translation>Všechno s&amp;maž</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Stav účtu:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Potvrď odeslání</translation>
</message>
@@ -2177,7 +2231,7 @@ Adresa: %4
<translation>P&amp;ošli</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Potvrď odeslání mincí</translation>
</message>
@@ -2190,12 +2244,7 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Zadej Bitcoinovou adresu (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2245,7 +2294,7 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Adresa příjemce je neplatná, překontroluj ji prosím.</translation>
</message>
@@ -2280,12 +2329,12 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(bez popisu)</translation>
</message>
@@ -2295,7 +2344,7 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2305,7 +2354,7 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2382,12 +2431,7 @@ Adresa: %4
<translation>Zpráva:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2397,7 +2441,12 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2413,11 +2462,6 @@ Adresa: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Zadej Bitcoinovou adresu (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2455,19 +2499,19 @@ Adresa: %4
<translation>Adresa, kterou se zpráva podepíše (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Vlož adresu ze schránky</translation>
</message>
@@ -2508,12 +2552,12 @@ Adresa: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Všechno &amp;smaž</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Ověř zprávu</translation>
</message>
@@ -2528,7 +2572,7 @@ Adresa: %4
<translation>Adresa, kterou je zpráva podepsána (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Ověř zprávu, aby ses ujistil, že byla podepsána danou Bitcoinovou adresou</translation>
</message>
@@ -2543,43 +2587,37 @@ Adresa: %4
<translation>Vymaž všechna pole formuláře pro ověření zrávy</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Zadej Bitcoinovou adresu (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Kliknutím na &quot;Podepiš zprávu&quot; vygeneruješ podpis</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Vlož Bitcoinový podpis</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Zadaná adresa je neplatná.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Zkontroluj ji prosím a zkus to pak znovu.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Zadaná adresa nepasuje ke klíči.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Odemčení peněženky bylo zrušeno.</translation>
</message>
@@ -2599,7 +2637,7 @@ Adresa: %4
<translation>Zpráv podepsána.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Podpis nejde dekódovat.</translation>
</message>
@@ -2660,6 +2698,11 @@ Adresa: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/offline</translation>
</message>
@@ -2821,12 +2864,12 @@ Adresa: %4
<translation>, ještě nebylo rozesláno</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Otevřeno pro 1 další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>neznámo</translation>
</message>
@@ -2867,12 +2910,12 @@ Adresa: %4
<translation>Částka</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Otevřeno pro 1 další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation>
</message>
@@ -2882,23 +2925,12 @@ Adresa: %4
<translation>Otřevřeno dokud %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline (%1 potvrzení)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Nepotvrzeno (%1 z %2 potvrzení)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Potvrzeno (%1 potvrzení)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Tento blok nedostal žádný jiný uzel a pravděpodobně nebude akceptován!</translation>
</message>
@@ -2908,7 +2940,27 @@ Adresa: %4
<translation>Vygenerováno, ale neakceptováno</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Přijato do</translation>
</message>
@@ -2938,7 +2990,7 @@ Adresa: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Stav transakce. Najetím myši na toto políčko si zobrazíš počet potvrzení.</translation>
</message>
@@ -3204,12 +3256,12 @@ Adresa: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Užití:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Výpis příkazů</translation>
</message>
@@ -3264,12 +3316,12 @@ Adresa: %4
<translation>Specifikuj svou veřejnou adresu</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Práh pro odpojování zlobivých uzlů (výchozí: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Doba ve vteřinách, po kterou se nebudou moci zlobivé uzly znovu připojit (výchozí: 86400)</translation>
</message>
@@ -3289,17 +3341,17 @@ Adresa: %4
<translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Běžet na pozadí jako démon a akceptovat příkazy</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Použít testovací síť (testnet)</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation>
</message>
@@ -3440,6 +3492,11 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Připojit se pouze k zadanému uzlu (příp. zadaným uzlům)</translation>
</message>
@@ -3650,6 +3707,11 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3699,12 +3761,12 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Je třeba přestavět databázi použitím -reindex, aby bylo možné změnit -txindex</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importovat bloky z externího souboru blk000??.dat</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3724,7 +3786,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nastavení počtu vláken pro verifikaci skriptů (max. 16, 0 = automaticky, &lt;0 = nechat daný počet jader volný, výchozí: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informace</translation>
</message>
@@ -3794,7 +3856,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Zadej časový limit spojení v milisekundách (výchozí: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Systémová chyba: </translation>
</message>
@@ -3840,6 +3902,11 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>verze</translation>
</message>
@@ -3849,32 +3916,32 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Soubor wallet.dat je poškozen, jeho záchrana se nezdařila</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Heslo pro JSON-RPC spojení</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Povolit JSON-RPC spojení ze specifikované IP adresy</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Posílat příkazy uzlu běžícím na &lt;ip&gt; (výchozí: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<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>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Převést peněženku na nejnovější formát</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Nastavit zásobník klíčů na velikost &lt;n&gt; (výchozí: 100)</translation>
</message>
@@ -3884,12 +3951,12 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Přeskenovat řetězec bloků na chybějící transakce tvé pěněženky</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Použít OpenSSL (https) pro JSON-RPC spojení</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Soubor se serverovým certifikátem (výchozí: server.cert)</translation>
</message>
@@ -3899,7 +3966,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Soubor se serverovým soukromým klíčem (výchozí: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Tato nápověda</translation>
</message>
@@ -3909,12 +3976,12 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nedaří se mi připojit na %s na tomhle počítači (operace bind vrátila chybu %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Povolit DNS dotazy pro -addnode (přidání uzlu), -seednode a -connect (připojení)</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Načítám adresy...</translation>
</message>
@@ -3929,12 +3996,12 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Chyba při načítání wallet.dat: peněženka vyžaduje novější verzi Bitcoinu</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Soubor s peněženkou potřeboval přepsat: restartuj Bitcoin, aby se operace dokončila</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Chyba při načítání wallet.dat</translation>
</message>
@@ -3944,7 +4011,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Neplatná -proxy adresa: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>V -onlynet byla uvedena neznámá síť: &apos;%s&apos;</translation>
</message>
@@ -3954,7 +4021,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>V -socks byla požadována neznámá verze proxy: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Nemohu přeložit -bind adresu: &apos;%s&apos;</translation>
</message>
@@ -3964,7 +4031,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nemohu přeložit -externalip adresu: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Neplatná částka pro -paytxfee=&lt;částka&gt;: &apos;%s&apos;</translation>
</message>
@@ -3984,7 +4051,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Načítám index bloků...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Přidat uzel, ke kterému se připojit a snažit se spojení udržet</translation>
</message>
@@ -3994,12 +4061,12 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nedaří se mi připojit na %s na tomhle počítači. Bitcoin už pravděpodobně jednou běží.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Načítám peněženku...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Nemohu převést peněženku do staršího formátu</translation>
</message>
@@ -4009,7 +4076,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nemohu napsat výchozí adresu</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Přeskenovávám...</translation>
</message>
@@ -4019,17 +4086,17 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Načítání dokončeno</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>K použití volby %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts
index a28772d748..b49b68d21a 100644
--- a/src/qt/locale/bitcoin_cy.ts
+++ b/src/qt/locale/bitcoin_cy.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation>Mae&apos;r waled &lt;b&gt;wedi&apos;i amgryptio&lt;/b&gt; ac &lt;b&gt;ar glo&lt;/b&gt; ar hyn o bryd</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Nas cadarnheir:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Anfon arian</translation>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Anfon at pobl lluosog ar yr un pryd</translation>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Gweddill:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Cadarnhau&apos;r gweithrediad anfon</translation>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation>%1 i %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(heb label)</translation>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Gludo cyfeiriad o&apos;r glipfwrdd</translation>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation>Agor tan %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Gwybodaeth</translation>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Gwall</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index 56b4ebb3fe..ac295220c7 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -36,6 +36,12 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,6 +623,16 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation><numerusform>%n uge(r)</numerusform><numerusform>%n uge(r)</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 bagud</translation>
@@ -690,7 +706,7 @@ Adresse: %4
<translation>Tegnebog er &lt;b&gt;krypteret&lt;/b&gt; og i øjeblikket &lt;b&gt;låst&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Der opstod en fatal fejl. Bitcoin kan ikke længere fortsætte sikkert og vil afslutte.</translation>
</message>
@@ -751,7 +767,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -766,7 +782,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Beløb</translation>
</message>
@@ -917,7 +933,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1099,7 +1115,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
</message>
@@ -1243,7 +1259,7 @@ Adresse: %4
<translation>Generelt</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Valgfrit transaktionsgebyr pr. kB, der hjælper dine transaktioner med at blive behandlet hurtigt. De fleste transaktioner er på 1 kB.</translation>
</message>
@@ -1253,7 +1269,7 @@ Adresse: %4
<translation>Betal transaktionsgebyr</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Start Bitcoin automatisk, når der logges ind på systemet</translation>
</message>
@@ -1268,12 +1284,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Angiv databasecachestørrelse i megabytes (standard: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1288,7 +1299,12 @@ Adresse: %4
<translation>Angiv nummeret af tråde til verificering af script (op til 16, 0 = automatisk, &lt;0 = efterlad det antal kerner tilgængelige, standard: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1323,7 +1339,17 @@ Adresse: %4
<translation>Netværk</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Åbn Bitcoin-klientens port på routeren automatisk. Dette virker kun, når din router understøtter UPnP og UPnP er aktiveret.</translation>
</message>
@@ -1438,17 +1464,17 @@ Adresse: %4
<translation>Annuller</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>standard</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Bekræft nulstilling af indstillinger</translation>
</message>
@@ -1488,19 +1514,14 @@ Adresse: %4
<translation>Den viste information kan være forældet. Din tegnebog synkroniserer automatisk med Bitcoin-netværket, når en forbindelse etableres, men denne proces er ikke gennemført endnu.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Ubekræftede:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Tegnebog</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Bekræftede:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1508,12 +1529,17 @@ Adresse: %4
<translation>Din nuværende tilgængelige saldo</translation>
</message>
<message>
- <location line="+32"/>
- <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+ <location line="+16"/>
+ <source>Pending:</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
+ <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+ <translation>Total transaktioner, som ikke er blevet bekræftet endnu, og som ikke endnu er en del af den nuværende saldo</translation>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Umodne:</translation>
</message>
@@ -1656,6 +1682,11 @@ Adresse: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Indtast en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1876,22 +1907,22 @@ Adresse: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>&amp;Mængde:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>Mærkat:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>&amp;Besked:</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1901,27 +1932,30 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Ryd alle fælter af formen.</translation>
</message>
@@ -1931,17 +1965,17 @@ Adresse: %4
<translation>Ryd</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
- <translation>&amp;Anmod betaling</translation>
+ <location line="+78"/>
+ <source>Requested payments history</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation type="unfinished"/>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>&amp;Anmod betaling</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1960,6 +1994,21 @@ Adresse: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopier mærkat</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopier beløb</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2061,12 +2110,17 @@ Adresse: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Send bitcoins</translation>
@@ -2142,7 +2196,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Send til flere modtagere på en gang</translation>
</message>
@@ -2152,7 +2206,7 @@ Adresse: %4
<translation>Tilføj modtager</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Ryd alle fælter af formen.</translation>
</message>
@@ -2162,12 +2216,12 @@ Adresse: %4
<translation>Ryd alle</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Bekræft afsendelsen</translation>
</message>
@@ -2177,7 +2231,7 @@ Adresse: %4
<translation>Afsend</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Bekræft afsendelse af bitcoins</translation>
</message>
@@ -2190,12 +2244,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Indtast en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2245,7 +2294,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Modtagerens adresse er ikke gyldig. Tjek venligst adressen igen.</translation>
</message>
@@ -2280,12 +2329,12 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(ingen mærkat)</translation>
</message>
@@ -2295,7 +2344,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Er du sikker på at du vil sende?</translation>
</message>
@@ -2305,7 +2354,7 @@ Adresse: %4
<translation>tilføjet som transaktionsgebyr</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>Betalingsforespørgsel udløb</translation>
</message>
@@ -2382,12 +2431,7 @@ Adresse: %4
<translation>Besked:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2397,7 +2441,12 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2413,11 +2462,6 @@ Adresse: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Indtast en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2455,19 +2499,19 @@ Adresse: %4
<translation>Bitcoin-adressen som beskeden skal underskrives med (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Indsæt adresse fra udklipsholderen</translation>
</message>
@@ -2508,12 +2552,12 @@ Adresse: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Ryd alle</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>Verificér besked</translation>
</message>
@@ -2528,7 +2572,7 @@ Adresse: %4
<translation>Bitcoin-adressen som beskeden er underskrevet med (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Verificér beskeden for at sikre, at den er underskrevet med den angivne Bitcoin-adresse</translation>
</message>
@@ -2543,43 +2587,37 @@ Adresse: %4
<translation>Nulstil alle &quot;verificér besked&quot;-felter</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Indtast en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Klik &quot;Underskriv besked&quot; for at generere underskriften</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Indtast Bitcoin-underskriften</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Den indtastede adresse er ugyldig.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Tjek venligst adressen, og forsøg igen.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Den indtastede adresse henviser ikke til en nøgle.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Tegnebogsoplåsning annulleret.</translation>
</message>
@@ -2599,7 +2637,7 @@ Adresse: %4
<translation>Besked underskrevet.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Underskriften kunne ikke afkodes.</translation>
</message>
@@ -2660,6 +2698,11 @@ Adresse: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/offline</translation>
</message>
@@ -2821,12 +2864,12 @@ Adresse: %4
<translation>, er ikke blevet transmitteret endnu</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Åben %n blok yderligere</numerusform><numerusform>Åben %n blokke yderligere</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>ukendt</translation>
</message>
@@ -2867,12 +2910,12 @@ Adresse: %4
<translation>Beløb</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Åben %n blok(ke) yderligere</numerusform><numerusform>Åben %n blok(ke) yderligere</numerusform></translation>
</message>
@@ -2882,23 +2925,12 @@ Adresse: %4
<translation>Åben indtil %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline (%1 bekræftelser)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Ubekræftet (%1 af %2 bekræftelser)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Bekræftet (%1 bekræftelser)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Denne blok blev ikke modtaget af nogen andre knuder og vil formentlig ikke blive accepteret!</translation>
</message>
@@ -2908,7 +2940,27 @@ Adresse: %4
<translation>Genereret, men ikke accepteret</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Modtaget med</translation>
</message>
@@ -2938,7 +2990,7 @@ Adresse: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Transaktionsstatus. Hold musen over dette felt for at vise antallet af bekræftelser.</translation>
</message>
@@ -3204,12 +3256,12 @@ Adresse: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Anvendelse:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Liste over kommandoer</translation>
</message>
@@ -3264,12 +3316,12 @@ Adresse: %4
<translation>Angiv din egen offentlige adresse</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Grænse for afbrydelse til dårlige forbindelser (standard: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Antal sekunder dårlige forbindelser skal vente før reetablering (standard: 86400)</translation>
</message>
@@ -3289,17 +3341,17 @@ Adresse: %4
<translation>Accepter kommandolinje- og JSON-RPC-kommandoer</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Kør i baggrunden som en service, og accepter kommandoer</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Brug testnetværket</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Accepter forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</translation>
</message>
@@ -3440,6 +3492,11 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Tilslut kun til de(n) angivne knude(r)</translation>
</message>
@@ -3650,6 +3707,11 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Start Bitcoin server</translation>
</message>
@@ -3699,12 +3761,12 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importerer blokke fra ekstern blk000??.dat fil</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3724,7 +3786,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Angiv nummeret af tråde til verificering af script (op til 16, 0 = automatisk, &lt;0 = efterlad det antal kerner tilgængelige, standard: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Information</translation>
</message>
@@ -3794,7 +3856,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Angiv tilslutningstimeout i millisekunder (standard: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Systemfejl: </translation>
</message>
@@ -3840,6 +3902,11 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>version</translation>
</message>
@@ -3849,32 +3916,32 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>wallet.dat ødelagt, redning af data mislykkedes</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Adgangskode til JSON-RPC-forbindelser</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Tillad JSON-RPC-forbindelser fra bestemt IP-adresse</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Send kommandoer til knude, der kører på &lt;ip&gt; (standard: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Udfør kommando, når den bedste blok ændres (%s i kommandoen erstattes med blokhash)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Opgrader tegnebog til seneste format</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Angiv nøglepoolstørrelse til &lt;n&gt; (standard: 100)</translation>
</message>
@@ -3884,12 +3951,12 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Gennemsøg blokkæden for manglende tegnebogstransaktioner</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Brug OpenSSL (https) for JSON-RPC-forbindelser</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Servercertifikat-fil (standard: server.cert)</translation>
</message>
@@ -3899,7 +3966,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Serverens private nøgle (standard: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Denne hjælpebesked</translation>
</message>
@@ -3909,12 +3976,12 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Kunne ikke tildele %s på denne computer (bind returnerede fejl %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Tillad DNS-opslag for -addnode, -seednode og -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Indlæser adresser...</translation>
</message>
@@ -3929,12 +3996,12 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Det var nødvendigt at genskrive tegnebogen: genstart Bitcoin for at gennemføre</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Fejl ved indlæsning af wallet.dat</translation>
</message>
@@ -3944,7 +4011,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Ugyldig -proxy adresse: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Ukendt netværk anført i -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3954,7 +4021,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Ukendt -socks proxy-version: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kan ikke finde -bind adressen: &apos;%s&apos;</translation>
</message>
@@ -3964,7 +4031,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Kan ikke finde -externalip adressen: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Ugyldigt beløb for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3984,7 +4051,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Indlæser blokindeks...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Tilføj en knude til at forbinde til og forsøg at holde forbindelsen åben</translation>
</message>
@@ -3994,12 +4061,12 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Kunne ikke tildele %s på denne computer. Bitcoin kører sikkert allerede.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Indlæser tegnebog...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Kan ikke nedgradere tegnebog</translation>
</message>
@@ -4009,7 +4076,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Kan ikke skrive standardadresse</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Genindlæser...</translation>
</message>
@@ -4019,17 +4086,17 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Indlæsning gennemført</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>For at bruge %s mulighed</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Fejl</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_de_AT.ts b/src/qt/locale/bitcoin_de_AT.ts
index 5dd65e0de4..ba5a622c8a 100644
--- a/src/qt/locale/bitcoin_de_AT.ts
+++ b/src/qt/locale/bitcoin_de_AT.ts
@@ -31,13 +31,19 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
<message>
<location filename="../forms/addressbookpage.ui" line="+30"/>
<source>Double-click to edit address or label</source>
- <translation>Doppelklickn zan Editian vo Adress und Titl</translation>
+ <translation>Doppelklickn zan Editian vo da Adress und Titl</translation>
</message>
<message>
<location line="+27"/>
@@ -52,7 +58,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+11"/>
<source>Copy the currently selected address to the system clipboard</source>
- <translation>Kopia di ausgwöhte Adress in&apos; Puffa</translation>
+ <translation>Kopia de ausgwöhte Adress in de Zwischenoblog</translation>
</message>
<message>
<location line="+3"/>
@@ -142,7 +148,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+1"/>
<source>Comma separated file (*.csv)</source>
- <translation>Beistrich &apos;trennte Weate (*.csv)</translation>
+ <translation>Mid Beistrich &apos;trennte Weate (*.csv)</translation>
</message>
<message>
<location line="+13"/>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -685,7 +701,7 @@ Wohin: %4
<translation>&apos;s Beasl is &lt;b&gt;vaschlisslt&lt;/b&gt; und deazeit grod &lt;b&gt;zuagschpeat&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -728,7 +744,7 @@ Wohin: %4
<message>
<location line="+45"/>
<source>Fee:</source>
- <translation>Gebühr:</translation>
+ <translation>Obolus:</translation>
</message>
<message>
<location line="+32"/>
@@ -746,7 +762,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -761,7 +777,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Betrog</translation>
</message>
@@ -912,19 +928,19 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
<source>yes</source>
- <translation>ja</translation>
+ <translation>jo</translation>
</message>
<message>
<location line="+0"/>
<source>no</source>
- <translation>nein</translation>
+ <translation>na</translation>
</message>
<message>
<location line="+10"/>
@@ -1094,7 +1110,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1238,7 +1254,7 @@ Wohin: %4
<translation>&amp;Masta</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1248,7 +1264,7 @@ Wohin: %4
<translation>Iwaweisungs-Gebührn zoin</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Bitcoin automatisch nochm Einloggn starten.</translation>
</message>
@@ -1263,12 +1279,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Zwischnspeichagreß fia de Datenbank in megabeits (sunsta: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1283,7 +1294,12 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1318,7 +1334,17 @@ Wohin: %4
<translation>&amp;Netzwerk</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Automatisch den Router fia &apos;n Bitcoin port eistölln. Des geht nur, waunn da Router UPnP kaunn und waunns des durtn aa eigschoitn is.</translation>
</message>
@@ -1433,17 +1459,17 @@ Wohin: %4
<translation>&amp;Na Ned!</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>sunsta</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1483,18 +1509,13 @@ Wohin: %4
<translation>De aunzeigtn Datn san meglichaweis ned aktuö. Dei Beasl gleicht si automatisch mitm Netz au, soboid a Vabindung aufrecht is, owa soweit samma no ned.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Gerüchteweis:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Beasl</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1503,7 +1524,12 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1536,7 +1562,7 @@ Wohin: %4
<location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
- <translation>nimma atkuö</translation>
+ <translation>nimma aktuö</translation>
</message>
</context>
<context>
@@ -1651,6 +1677,11 @@ Wohin: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Gib a Bitcoin-Adress ei (sowos wia: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1871,22 +1902,22 @@ Wohin: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Titl:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1896,27 +1927,30 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1926,17 +1960,17 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1955,6 +1989,21 @@ Wohin: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Titl in&apos; Puffa kopian</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Betrog in&apos; Puffa kopian</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2056,12 +2105,17 @@ Wohin: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Vaschick Zasta</translation>
@@ -2109,7 +2163,7 @@ Wohin: %4
<message>
<location line="+48"/>
<source>Fee:</source>
- <translation>Gebühr:</translation>
+ <translation>Obolus:</translation>
</message>
<message>
<location line="+32"/>
@@ -2137,7 +2191,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Vaschick Zasta glei aun mehrare auf aamoi</translation>
</message>
@@ -2147,7 +2201,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2157,12 +2211,12 @@ Wohin: %4
<translation>&amp;Ois Leschn</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Kontostaund:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Bschtätige de Iwaweisung</translation>
</message>
@@ -2172,7 +2226,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Iwaweisung bschtätign</translation>
</message>
@@ -2185,12 +2239,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Gib a Bitcoin-Adress ei (sowos wia: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2237,10 +2286,10 @@ Wohin: %4
<message>
<location line="+2"/>
<source>or</source>
- <translation>oder</translation>
+ <translation>oda</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2275,12 +2324,12 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>nixda</translation>
</message>
@@ -2290,7 +2339,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2300,7 +2349,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2377,12 +2426,7 @@ Wohin: %4
<translation>Mödung:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2392,7 +2436,12 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2408,11 +2457,6 @@ Wohin: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Gib a Bitcoin-Adress ei (sowos wia: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2450,19 +2494,19 @@ Wohin: %4
<translation>De Adress mit dera&apos;st untaschreibst (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Eifügn da Adress ausm Puffa</translation>
</message>
@@ -2503,12 +2547,12 @@ Wohin: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>&amp;Ois Leschn</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Untaschrift tscheckn</translation>
</message>
@@ -2523,7 +2567,7 @@ Wohin: %4
<translation>De Adress, mit dera untaschriem wuan is (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Tscheck, doss de Mödung a wiakli mit da aungebanan Adress untaschriem wuan is</translation>
</message>
@@ -2538,43 +2582,37 @@ Wohin: %4
<translation>Olle Föda zrucksetzn</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Gib a Bitcoin-Adress ei (sowos wia: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Klick auf &quot;Mödung untaschreim&quot; zum Untaschreim</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Gib de Untaschrift ei</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>De eingebane Adress is a Kas.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Tscheck dassd Adress richtig is, und prowias noamoi.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>De eingebene Adress gheat zu kaan Schlissl.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2594,7 +2632,7 @@ Wohin: %4
<translation>Mödung is untaschriem.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>De Untaschrift woara Kas.</translation>
</message>
@@ -2655,6 +2693,11 @@ Wohin: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/koa netz</translation>
</message>
@@ -2816,12 +2859,12 @@ Wohin: %4
<translation>, is no ned eafoigreich oogschickt wuan.</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>unbekaunnt</translation>
</message>
@@ -2862,12 +2905,12 @@ Wohin: %4
<translation>Betrog</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2877,23 +2920,12 @@ Wohin: %4
<translation>Offn bis %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Koa Netz (%1 Bschtätigungen)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>unbschtätigt (nua %1 vo %2 Bschtätigungen)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>bschtätigt (%1 Bschtätigungen)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Den Block kaunnst da in d&apos; Hoa schmian!</translation>
</message>
@@ -2903,7 +2935,27 @@ Wohin: %4
<translation>Eazeigt, owa ned aungnumman</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Empfaungen mid</translation>
</message>
@@ -2933,7 +2985,7 @@ Wohin: %4
<translation>(nix)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Zuastaund da Iwaweisung. Fia de Aunzoi da Bschtätigungan foah mid da Maus driwa.</translation>
</message>
@@ -3199,12 +3251,12 @@ Wohin: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Vawendung:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Kommandos aunzeign</translation>
</message>
@@ -3259,12 +3311,12 @@ Wohin: %4
<translation>Gib dei eigene öffentliche Adress aun</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Geduidsfodnstärke gegniwa deppate Netz-Knotn (sunsta: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Waunn Geduidsfodn amoi grissn, daunn wia long bis wieda guat (sunsta: 86400)</translation>
</message>
@@ -3284,17 +3336,17 @@ Wohin: %4
<translation>Hob a Uawaschl offn fia de Kommandozeuln und JSON-RPC Beföhle</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Ois Dämon im Hintagrund laafn und auf Beföhle lauschn</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Des Test-Netz vawenden</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Nimm Vabindungen vo aussn aun (waunn nix aungebn is, güt 1, aussa waunn -proxy oda -connect optionen aungebm san)</translation>
</message>
@@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Nur mit de aungebanen Netz-Knotn vabindn.</translation>
</message>
@@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>A programmal startn, waunn de Alarmglockn leitn, oda waunn de Block-Kettn oag vazweigt. (a %s wiad dabei duach a Nochricht easetzt)</translation>
</message>
@@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>veasion</translation>
</message>
@@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Geheimwuat fia JSON-RPC Vabindungen</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>JSON-RPC Beföhle nua vo da aungebanen Netz-Adress ealaubn</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Beföhle zum Netz-Knotn mit da &lt;ip&gt;-Adress schickn (sunsta: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>A programmal startn, waunn si wos am bestn Block ändat. (a %s wiad dabei duachn Block-Hash easetzt)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>&apos;s Beasl ins neichaste Foamat bringan</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Schlisslvorratsgreß auf &lt;n&gt; setzn (sunsta: 100)</translation>
</message>
@@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>De gaunze Block-kettn noch föhlende Iwaweisungen oosuachn</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Vawend OpenSSL (https) fia JSON-RPC Vabindungan</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Söawa Zeatifikatsdatei (sunsta: server.cert)</translation>
</message>
@@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Söawa Privatschlissl (sunsta: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Dea Hüfe-Text</translation>
</message>
@@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kaun mi ned aun %s auf dera Maschin draunhängan (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Ealaub DNS nochfrogn fia -addnode, -seednode und -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Adressbiachl lodn...</translation>
</message>
@@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Föhla beim Lodn vom Beasl: fia des Beasl brauchst a neichare Bitcoin veasion</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>&apos;s Beasl hod neich gschriem weadn miassn: beend des Programmal und starts noamoi zum Featigmochn</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Föhla beim Lodn vom Beasl (wallet.dat)</translation>
</message>
@@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ungültige &quot;-proxy&quot; Adress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Des Netzwerk in -onlynet is a Kas: &apos;%s&apos;</translation>
</message>
@@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>De valongte -socks proxy version is ned bekaunnt: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kaunn de -bind Adressn ned auflösn: &apos;%s&apos;</translation>
</message>
@@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kaunn de -externalip Adressn ned auflösn: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Da Betrog fia -paytxfee=&lt;amount&gt; is a Kas: &apos;%s&apos;</translation>
</message>
@@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Block index lodn...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>An Netz-Knotn aufnehman, und bei da Staungan hoitn</translation>
</message>
@@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Konnt mi ned aun %s auf dera Maschin aunhängan. Meglichaweis rennt des Programmal scho.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Beasl lodn...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Zrucksteign geht nimma beim Beasl</translation>
</message>
@@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>De Easotz Adress kaunn ned gschriem weadn</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Noch-tscheckn...</translation>
</message>
@@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Featig midm Lodn</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Um de Option %s z&apos;vawendn</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Föhla</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts
index da09f39f4f..bffec0002d 100644
--- a/src/qt/locale/bitcoin_el_GR.ts
+++ b/src/qt/locale/bitcoin_el_GR.ts
@@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -618,6 +624,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation><numerusform>%n εβδομαδες</numerusform><numerusform>%n εβδομαδες</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 πίσω</translation>
@@ -691,7 +707,7 @@ Address: %4
<translation>Το πορτοφόλι είναι &lt;b&gt;κρυπτογραφημένο&lt;/b&gt; και &lt;b&gt;κλειδωμένο&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Παρουσιάστηκε ανεπανόρθωτο σφάλμα. Το Bitcoin δεν μπορεί πλέον να συνεχίσει με ασφάλεια και θα τερματισθει.</translation>
</message>
@@ -752,7 +768,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -767,7 +783,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Ποσό</translation>
</message>
@@ -918,7 +934,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1100,7 +1116,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation>&amp;Κύριο</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Η προαιρετική αμοιβή για κάθε kB επισπεύδει την επεξεργασία των συναλλαγών σας. Οι περισσότερες συναλλαγές είναι 1 kB. </translation>
</message>
@@ -1254,7 +1270,7 @@ Address: %4
<translation>Αμοιβή &amp;συναλλαγής</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Αυτόματη εκκίνηση του Bitcoin μετά την εισαγωγή στο σύστημα</translation>
</message>
@@ -1269,12 +1285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Όρισε το μέγεθος της βάσης προσωρινής αποθήκευσης σε megabytes(προεπιλογή:25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1289,7 +1300,12 @@ Address: %4
<translation>Ορίσμος του αριθμό των νημάτων ελέγχου σεναρίου (μέχρι 16, 0 = auto, &lt;0 = αφήνουν τους πολλους πυρήνες δωρεάν, default: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1324,7 +1340,17 @@ Address: %4
<translation>&amp;Δίκτυο</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Αυτόματο άνοιγμα των θυρών Bitcoin στον δρομολογητή. Λειτουργεί μόνο αν ο δρομολογητής σας υποστηρίζει τη λειτουργία UPnP.</translation>
</message>
@@ -1439,17 +1465,17 @@ Address: %4
<translation>&amp;Ακύρωση</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>προεπιλογή</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Επιβεβαιώση των επιλογων επαναφοράς </translation>
</message>
@@ -1489,19 +1515,14 @@ Address: %4
<translation>Οι πληροφορίες που εμφανίζονται μπορεί να είναι ξεπερασμένες. Το πορτοφόλι σας συγχρονίζεται αυτόματα με το δίκτυο Bitcoin μετά από μια σύνδεση, αλλά αυτή η διαδικασία δεν έχει ακόμη ολοκληρωθεί. </translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Ανεπιβεβαίωτες</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Πορτοφόλι</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Επικυρωμένες:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1509,7 +1530,12 @@ Address: %4
<translation>Το τρέχον διαθέσιμο υπόλοιπο</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Το άθροισμα των συναλλαγών που δεν έχουν ακόμα επιβεβαιωθεί και δεν προσμετρώνται στο τρέχον διαθέσιμο υπόλοιπό σας</translation>
</message>
@@ -1657,6 +1683,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Σφάλμα: Άκυρος συνδυασμός των -regtest και -testnet</translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Εισάγετε μια διεύθυνση Bitcoin (π.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1877,22 +1908,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Επιγραφή</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1902,27 +1933,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Καθαρισμός όλων των πεδίων της φόρμας.</translation>
</message>
@@ -1932,17 +1966,17 @@ Address: %4
<translation>Καθαρισμός</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1961,6 +1995,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Αντιγραφή επιγραφής</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Αντιγραφή ποσού</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2062,12 +2111,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Αποστολή νομισμάτων</translation>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Αποστολή σε πολλούς αποδέκτες ταυτόχρονα</translation>
</message>
@@ -2153,7 +2207,7 @@ Address: %4
<translation>&amp;Προσθήκη αποδέκτη</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Καθαρισμός όλων των πεδίων της φόρμας.</translation>
</message>
@@ -2163,12 +2217,12 @@ Address: %4
<translation>Καθαρισμός &amp;Όλων</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Υπόλοιπο:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Επιβεβαίωση αποστολής</translation>
</message>
@@ -2178,7 +2232,7 @@ Address: %4
<translation>Αποστολη</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Επιβεβαίωση αποστολής νομισμάτων</translation>
</message>
@@ -2191,12 +2245,7 @@ Address: %4
<translation>%1 σε %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Εισάγετε μια διεύθυνση Bitcoin (π.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2246,7 +2295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Η διεύθυνση του αποδέκτη δεν είναι σωστή. Παρακαλώ ελέγξτε ξανά.</translation>
</message>
@@ -2281,12 +2330,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(χωρίς ετικέτα)</translation>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Είστε βέβαιοι για την αποστολή;</translation>
</message>
@@ -2306,7 +2355,7 @@ Address: %4
<translation>προστέθηκαν ως αμοιβή συναλλαγής</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>Έληξε η αίτηση πληρωμής</translation>
</message>
@@ -2383,12 +2432,7 @@ Address: %4
<translation>Μήνυμα:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2398,7 +2442,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2414,11 +2463,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Εισάγετε μια διεύθυνση Bitcoin (π.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2456,19 +2500,19 @@ Address: %4
<translation>Εισάγετε μια διεύθυνση Bitcoin (π.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Επιλογή διεύθυνσης που έχει ήδη χρησιμοποιηθεί</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Επικόλληση διεύθυνσης από το βιβλίο διευθύνσεων</translation>
</message>
@@ -2509,12 +2553,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Καθαρισμός &amp;Όλων</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Επιβεβαίωση μηνύματος</translation>
</message>
@@ -2529,7 +2573,7 @@ Address: %4
<translation>Εισάγετε μια διεύθυνση Bitcoin (π.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Υπογράψτε ένα μήνυμα για ν&apos; αποδείξετε πως υπογραφθηκε απο μια συγκεκριμένη διεύθυνση Bitcoin</translation>
</message>
@@ -2544,43 +2588,37 @@ Address: %4
<translation>Επαναφορά όλων επαλήθευμενων πεδίων μήνυματος </translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Εισάγετε μια διεύθυνση Bitcoin (π.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Κάντε κλικ στο &quot;Υπογραφή Μηνύματος&quot; για να λάβετε την υπογραφή</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Εισαγωγή υπογραφής Bitcoin</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Η διεύθυνση που εισήχθη είναι λάθος.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Παρακαλούμε ελέγξτε την διεύθυνση και δοκιμάστε ξανά.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Η διεύθυνση που έχει εισαχθεί δεν αναφέρεται σε ένα πλήκτρο.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>το ξεκλείδωμα του πορτοφολιού απέτυχε</translation>
</message>
@@ -2600,7 +2638,7 @@ Address: %4
<translation>Μήνυμα υπεγράφη.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Η υπογραφή δεν μπόρεσε να αποκρυπτογραφηθεί.</translation>
</message>
@@ -2661,6 +2699,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/χωρίς σύνδεση;</translation>
</message>
@@ -2822,12 +2865,12 @@ Address: %4
<translation>, δεν έχει ακόμα μεταδοθεί μ&apos; επιτυχία</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Ανοιχτό για %n μπλοκ</numerusform><numerusform>Ανοιχτό για %n μπλοκ</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>άγνωστο</translation>
</message>
@@ -2868,12 +2911,12 @@ Address: %4
<translation>Ποσό</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Ανοιχτό για %n μπλοκ</numerusform><numerusform>Ανοιχτό για %n μπλοκ</numerusform></translation>
</message>
@@ -2883,23 +2926,12 @@ Address: %4
<translation>Ανοιχτό μέχρι %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Χωρίς σύνδεση (%1 επικυρώσεις)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Χωρίς επιβεβαίωση (%1 από %2 επικυρώσεις)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Επικυρωμένη (%1 επικυρώσεις)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Αυτό το μπλοκ δεν έχει παραληφθεί από κανέναν άλλο κόμβο και κατά πάσα πιθανότητα θα απορριφθεί!</translation>
</message>
@@ -2909,7 +2941,27 @@ Address: %4
<translation>Δημιουργήθηκε αλλά απορρίφθηκε</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Παραλαβή με</translation>
</message>
@@ -2939,7 +2991,7 @@ Address: %4
<translation>(δ/α)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Κατάσταση συναλλαγής. Πηγαίνετε το ποντίκι πάνω από αυτό το πεδίο για να δείτε τον αριθμό των επικυρώσεων</translation>
</message>
@@ -3205,12 +3257,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Χρήση:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Λίστα εντολών</translation>
</message>
@@ -3265,12 +3317,12 @@ Address: %4
<translation>Διευκρινίστε τη δικιά σας δημόσια διεύθυνση.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Όριο αποσύνδεσης προβληματικών peers (προεπιλογή: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Δευτερόλεπτα πριν επιτραπεί ξανά η σύνδεση των προβληματικών peers (προεπιλογή: 86400)</translation>
</message>
@@ -3290,17 +3342,17 @@ Address: %4
<translation>Αποδοχή εντολών κονσόλας και JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Εκτέλεση στο παρασκήνιο κι αποδοχή εντολών</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Χρήση του δοκιμαστικού δικτύου</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Να δέχεσαι συνδέσεις από έξω(προεπιλογή:1)</translation>
</message>
@@ -3442,6 +3494,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Σύνδεση μόνο με ορισμένους κόμβους</translation>
</message>
@@ -3652,6 +3709,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3701,12 +3763,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Εισαγωγή μπλοκ από εξωτερικό αρχείο blk000?.dat</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3726,7 +3788,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ορίσμος του αριθμό των νημάτων ελέγχου σεναρίου (μέχρι 16, 0 = auto, &lt;0 = αφήνουν τους πολλους πυρήνες δωρεάν, default: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Πληροφορία</translation>
</message>
@@ -3796,7 +3858,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ορισμός λήξης χρονικού ορίου σε χιλιοστά του δευτερολέπτου(προεπιλογή:5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Λάθος Συστήματος:</translation>
</message>
@@ -3842,6 +3904,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>έκδοση</translation>
</message>
@@ -3851,32 +3918,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Το αρχειο wallet.dat ειναι διεφθαρμένο, η διάσωση απέτυχε</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Κωδικός για τις συνδέσεις JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Αποδοχή συνδέσεων JSON-RPC από συγκεκριμένη διεύθυνση IP</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Αποστολή εντολών στον κόμβο &lt;ip&gt; (προεπιλογή: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Αναβάθμισε το πορτοφόλι στην τελευταία έκδοση</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Όριο πλήθους κλειδιών pool &lt;n&gt; (προεπιλογή: 100)</translation>
</message>
@@ -3886,12 +3953,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Επανέλεγχος της αλυσίδας μπλοκ για απούσες συναλλαγές</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Χρήση του OpenSSL (https) για συνδέσεις JSON-RPC</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Αρχείο πιστοποιητικού του διακομιστή (προεπιλογή: server.cert)</translation>
</message>
@@ -3901,7 +3968,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Προσωπικό κλειδί του διακομιστή (προεπιλογή: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Αυτό το κείμενο βοήθειας</translation>
</message>
@@ -3911,12 +3978,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Αδύνατη η σύνδεση με τη θύρα %s αυτού του υπολογιστή (bind returned error %d, %s) </translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Να επιτρέπονται οι έλεγχοι DNS για προσθήκη και σύνδεση κόμβων</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Φόρτωση διευθύνσεων...</translation>
</message>
@@ -3931,12 +3998,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Σφάλμα φόρτωσης wallet.dat: Το Πορτοφόλι απαιτεί μια νεότερη έκδοση του Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Απαιτείται η επανεγγραφή του Πορτοφολιού, η οποία θα ολοκληρωθεί στην επανεκκίνηση του Bitcoin</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Σφάλμα φόρτωσης αρχείου wallet.dat</translation>
</message>
@@ -3946,7 +4013,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Δεν είναι έγκυρη η διεύθυνση διαμεσολαβητή: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Άγνωστo δίκτυο ορίζεται σε onlynet: &apos;%s&apos;</translation>
</message>
@@ -3956,7 +4023,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Άγνωστo δίκτυο ορίζεται: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση: &apos;%s&apos;</translation>
</message>
@@ -3966,7 +4033,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Μη έγκυρο ποσό για την παράμετρο -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3986,7 +4053,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Φόρτωση ευρετηρίου μπλοκ...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Προσέθεσε ένα κόμβο για σύνδεση και προσπάθησε να κρατήσεις την σύνδεση ανοιχτή</translation>
</message>
@@ -3996,12 +4063,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Αδύνατη η σύνδεση με τη θύρα %s αυτού του υπολογιστή. Το Bitcoin είναι πιθανώς ήδη ενεργό.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Φόρτωση πορτοφολιού...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Δεν μπορώ να υποβαθμίσω το πορτοφόλι</translation>
</message>
@@ -4011,7 +4078,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Ανίχνευση...</translation>
</message>
@@ -4021,17 +4088,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Η φόρτωση ολοκληρώθηκε</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Χρήση της %s επιλογής</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index ebcfde35c4..9523a38801 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="en">
+<TS version="2.1" language="en">
<context>
<name>AboutDialog</name>
<message>
@@ -73,7 +73,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+58"/>
<source>C&amp;lose</source>
<translation type="unfinished"></translation>
</message>
@@ -83,7 +83,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Copy Address</translation>
</message>
<message>
- <location filename="../forms/addressbookpage.ui" line="-41"/>
+ <location filename="../forms/addressbookpage.ui" line="-47"/>
<source>Delete the currently selected address from the list</source>
<translation>Delete the currently selected address from the list</translation>
</message>
@@ -330,7 +330,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+295"/>
+ <location filename="../bitcoingui.cpp" line="+294"/>
<source>Sign &amp;message...</source>
<translation>Sign &amp;message...</translation>
</message>
@@ -345,12 +345,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Overview</translation>
</message>
<message>
- <location line="-137"/>
+ <location line="-136"/>
<source>Node</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+138"/>
+ <location line="+137"/>
<source>Show general overview of wallet</source>
<translation>Show general overview of wallet</translation>
</message>
@@ -471,17 +471,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Verify message...</translation>
</message>
<message>
- <location line="+430"/>
+ <location line="+440"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-643"/>
+ <location line="-652"/>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
<message>
- <location line="+146"/>
+ <location line="+145"/>
<source>&amp;Send</source>
<translation>&amp;Send</translation>
</message>
@@ -537,18 +537,18 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Tabs toolbar</translation>
</message>
<message>
- <location line="-284"/>
- <location line="+376"/>
+ <location line="-283"/>
+ <location line="+375"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-401"/>
+ <location line="-400"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
</message>
<message>
- <location line="+163"/>
+ <location line="+162"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"></translation>
</message>
@@ -613,7 +613,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Processed %1 blocks of transaction history.</translation>
</message>
<message numerus="yes">
- <location line="+23"/>
+ <location line="+27"/>
<source>%n hour(s)</source>
<translation>
<numerusform>%n hour</numerusform>
@@ -630,6 +630,7 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message numerus="yes">
<location line="+4"/>
+ <location line="+6"/>
<source>%n week(s)</source>
<translation>
<numerusform>%n week</numerusform>
@@ -680,12 +681,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Information</translation>
</message>
<message>
- <location line="-85"/>
+ <location line="-95"/>
<source>Up to date</source>
<translation>Up to date</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+44"/>
<source>Catching up...</source>
<translation>Catching up...</translation>
</message>
@@ -723,7 +724,7 @@ Address: %4
<translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+435"/>
+ <location filename="../bitcoin.cpp" line="+441"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</translation>
</message>
@@ -731,7 +732,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+119"/>
+ <location filename="../clientmodel.cpp" line="+128"/>
<source>Network Alert</source>
<translation>Network Alert</translation>
</message>
@@ -829,7 +830,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../coincontroldialog.cpp" line="+42"/>
+ <location filename="../coincontroldialog.cpp" line="+41"/>
<source>Copy address</source>
<translation type="unfinished">Copy address</translation>
</message>
@@ -895,7 +896,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+323"/>
+ <location line="+332"/>
<source>highest</source>
<translation type="unfinished"></translation>
</message>
@@ -1013,7 +1014,7 @@ Address: %4
</message>
<message>
<location line="+43"/>
- <location line="+66"/>
+ <location line="+63"/>
<source>(no label)</source>
<translation type="unfinished">(no label)</translation>
</message>
@@ -1210,7 +1211,7 @@ Address: %4
<translation>Use a custom data directory:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+85"/>
+ <location filename="../intro.cpp" line="+82"/>
<source>Bitcoin</source>
<translation type="unfinished">Bitcoin</translation>
</message>
@@ -1316,12 +1317,7 @@ Address: %4
<translation type="unfinished">Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</translation>
</message>
<message>
- <location line="+107"/>
- <source>&amp;Spend unconfirmed change (experts only)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+37"/>
+ <location line="+153"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"></translation>
</message>
@@ -1336,7 +1332,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+224"/>
+ <location line="+214"/>
<source>Active command-line options that override above options:</source>
<translation type="unfinished"></translation>
</message>
@@ -1351,22 +1347,37 @@ Address: %4
<translation>&amp;Reset Options</translation>
</message>
<message>
- <location line="-323"/>
+ <location line="-313"/>
<source>&amp;Network</source>
<translation>&amp;Network</translation>
</message>
<message>
- <location line="-86"/>
+ <location line="-95"/>
<source>W&amp;allet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+65"/>
+ <source>Expert</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Enable coin &amp;control features</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
<source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+3"/>
+ <source>&amp;Spend unconfirmed change</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</translation>
</message>
@@ -1461,17 +1472,12 @@ Address: %4
<translation>&amp;Display addresses in transaction list</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-262"/>
<source>Whether to show coin control features or not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Display coin &amp;control features (experts only)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+136"/>
+ <location line="+398"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1684,18 +1690,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+71"/>
- <location line="+11"/>
+ <location filename="../bitcoin.cpp" line="+63"/>
+ <location line="+14"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-13"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Error: Specified data directory &quot;%1&quot; does not exist.</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="+13"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"></translation>
</message>
@@ -1746,7 +1752,7 @@ Address: %4
<location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+359"/>
+ <location filename="../rpcconsole.cpp" line="+373"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
@@ -1842,11 +1848,13 @@ Address: %4
</message>
<message>
<location line="+64"/>
+ <location filename="../rpcconsole.cpp" line="-10"/>
<source>In:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+80"/>
+ <location filename="../rpcconsole.cpp" line="+1"/>
<source>Out:</source>
<translation type="unfinished"></translation>
</message>
@@ -1871,7 +1879,7 @@ Address: %4
<translation>Clear console</translation>
</message>
<message>
- <location filename="../rpcconsole.cpp" line="-30"/>
+ <location filename="../rpcconsole.cpp" line="-35"/>
<source>Welcome to the Bitcoin RPC console.</source>
<translation>Welcome to the Bitcoin RPC console.</translation>
</message>
@@ -1886,7 +1894,7 @@ Address: %4
<translation>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</translation>
</message>
<message>
- <location line="+122"/>
+ <location line="+136"/>
<source>%1 B</source>
<translation type="unfinished"></translation>
</message>
@@ -2002,7 +2010,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>Remove the selected entries from the list</source>
<translation type="unfinished"></translation>
</message>
@@ -2012,7 +2020,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <location filename="../receivecoinsdialog.cpp" line="+39"/>
<source>Copy label</source>
<translation type="unfinished">Copy label</translation>
</message>
@@ -2233,12 +2241,12 @@ Address: %4
<translation>Clear &amp;All</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+58"/>
<source>Balance:</source>
<translation>Balance:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-84"/>
<source>Confirm the send action</source>
<translation>Confirm the send action</translation>
</message>
@@ -3148,7 +3156,7 @@ Address: %4
<translation>Show transaction details</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+140"/>
<source>Export Transaction History</source>
<translation type="unfinished"></translation>
</message>
@@ -3285,7 +3293,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+223"/>
+ <location filename="../bitcoinstrings.cpp" line="+226"/>
<source>Usage:</source>
<translation>Usage:</translation>
</message>
@@ -3320,12 +3328,7 @@ Address: %4
<translation>Specify data directory</translation>
</message>
<message>
- <location line="-9"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Set database cache size in megabytes (default: 25)</translation>
- </message>
- <message>
- <location line="-26"/>
+ <location line="-35"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</translation>
</message>
@@ -3350,22 +3353,22 @@ Address: %4
<translation>Threshold for disconnecting misbehaving peers (default: 100)</translation>
</message>
<message>
- <location line="-150"/>
+ <location line="-151"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-38"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>An error occurred while setting up the RPC port %u for listening on IPv4: %s</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+45"/>
+ <location line="+46"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Accept command line and JSON-RPC commands</translation>
</message>
@@ -3385,7 +3388,7 @@ Address: %4
<translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
</message>
<message>
- <location line="-95"/>
+ <location line="-98"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3425,12 +3428,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation>
</message>
<message>
- <location line="+3"/>
- <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 line="+3"/>
+ <location line="+6"/>
<source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source>
<translation>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</translation>
</message>
@@ -3441,6 +3439,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+3"/>
+ <source>Error: Listening for incoming connections failed (listen returned error %d)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</translation>
</message>
@@ -3460,7 +3463,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"></translation>
</message>
@@ -3720,7 +3728,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+5"/>
+ <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"></translation>
</message>
@@ -3795,7 +3808,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Imports blocks from external blk000??.dat file</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-126"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</translation>
</message>
@@ -3815,7 +3833,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+91"/>
<source>Information</source>
<translation>Information</translation>
</message>
@@ -3960,12 +3978,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-134"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
</message>
<message>
- <location line="+163"/>
+ <location line="+164"/>
<source>Upgrade wallet to latest format</source>
<translation>Upgrade wallet to latest format</translation>
</message>
@@ -4085,12 +4103,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Add a node to connect to and attempt to keep the connection open</translation>
</message>
<message>
- <location line="-32"/>
- <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
- <translation>Unable to bind to %s on this computer. Bitcoin is probably already running.</translation>
- </message>
- <message>
- <location line="+96"/>
+ <location line="+64"/>
<source>Loading wallet...</source>
<translation>Loading wallet...</translation>
</message>
diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts
index 329ff7a57f..62a4220e00 100644
--- a/src/qt/locale/bitcoin_eo.ts
+++ b/src/qt/locale/bitcoin_eo.ts
@@ -36,6 +36,12 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<source>The Bitcoin Core developers</source>
<translation>La programistoj de Bitmona Kerno</translation>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -188,12 +194,12 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<message>
<location line="+21"/>
<source>Enter passphrase</source>
- <translation>Tajpu vian pasfrazon</translation>
+ <translation>Enigu pasfrazon</translation>
</message>
<message>
<location line="+14"/>
<source>New passphrase</source>
- <translation>Tajpu novan pasfrazon</translation>
+ <translation>Nova pasfrazo</translation>
</message>
<message>
<location line="+14"/>
@@ -617,6 +623,16 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation><numerusform>%n semajno</numerusform><numerusform>%n semajnoj</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation>%1 kaj %2</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>mankas %1</translation>
@@ -690,7 +706,7 @@ Adreso: %4
<translation>Monujo estas &lt;b&gt;ĉifrita&lt;/b&gt; kaj aktuale &lt;b&gt;ŝlosita&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Okazis neriparebla eraro. Bitmono ne plu povas sekure daŭri, do ĝi sekure ĉesos.</translation>
</message>
@@ -751,7 +767,7 @@ Adreso: %4
<translation>Restmono:</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation>(mal)elekti ĉion</translation>
</message>
@@ -766,7 +782,7 @@ Adreso: %4
<translation>Listreĝimo</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Sumo</translation>
</message>
@@ -917,7 +933,7 @@ Adreso: %4
<translation>neniu</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation>Polvo</translation>
</message>
@@ -1099,7 +1115,7 @@ Adreso: %4
<translation>Bitmona Kerno - Komandliniaj agordaĵoj</translation>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Kerno de Bitmono</translation>
</message>
@@ -1243,7 +1259,7 @@ Adreso: %4
<translation>Ĉ&amp;efa</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Nedeviga krompago por ĉiu kB, kiu helpas plirapidigi la traktadon de via transakcio. Plej multaj transakcioj grandas je 1kB.</translation>
</message>
@@ -1253,7 +1269,7 @@ Adreso: %4
<translation>Krompago</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Aŭtomate lanĉi Bitmonon post ensaluto al la sistemo.</translation>
</message>
@@ -1268,12 +1284,7 @@ Adreso: %4
<translation>Dosiergrando de &amp;datumbasa kaŝmemoro</translation>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Specifi grandon de datumbazo je megabajtoj (defaŭlte: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>MB</translation>
</message>
@@ -1288,7 +1299,12 @@ Adreso: %4
<translation>Agordi la nombron de fadenoj por skriptkontrolado (ĝis 16, 0 = aŭtomate, &lt;0 = lasi tiom da kernoj liberaj, defaŭlte: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1323,7 +1339,17 @@ Adreso: %4
<translation>&amp;Reto</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Aŭtomate malfermi la kursilan pordon por Bitmono. Tio funkcias nur se via kursilo havas la UPnP-funkcion, kaj se tiu ĉi estas ŝaltita.</translation>
</message>
@@ -1438,17 +1464,17 @@ Adreso: %4
<translation>&amp;Nuligi</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>defaŭlta</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation>neniu</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Konfirmi reŝargo de agordoj</translation>
</message>
@@ -1488,19 +1514,14 @@ Adreso: %4
<translation>Eblas, ke la informoj videblaj ĉi tie estas eksdataj. Via monujo aŭtomate sinkoniĝas kun la bitmona reto kiam ili konektiĝas, sed tiu procezo ankoraŭ ne finfariĝis.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Nekonfirmita:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Monujo</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Konfirmita:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1508,7 +1529,12 @@ Adreso: %4
<translation>via aktuala elspezebla saldo</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>la sumo de transakcioj ankoraŭ ne konfirmitaj, kiuj ankoraŭ ne elspezeblas</translation>
</message>
@@ -1656,6 +1682,11 @@ Adreso: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Eraro: nevalida kunigo de -regtest kaj -testnet</translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Enigi Bitmon-adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1677,7 +1708,7 @@ Adreso: %4
<message>
<location line="+0"/>
<source>PNG Image (*.png)</source>
- <translation type="unfinished"/>
+ <translation>PNG-bildo (*.png)</translation>
</message>
</context>
<context>
@@ -1715,7 +1746,7 @@ Adreso: %4
<message>
<location line="-10"/>
<source>Debug window</source>
- <translation type="unfinished"/>
+ <translation>Sencimiga fenestro</translation>
</message>
<message>
<location line="+25"/>
@@ -1876,22 +1907,22 @@ Adreso: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>&amp;Kvanto:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Etikedo:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>&amp;Mesaĝo:</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Reuzi unu el la jam uzitaj ricevaj adresoj. Reuzo de adresoj povas krei problemojn pri sekureco kaj privateco. Ne uzu tiun ĉi funkcion krom por rekrei antaŭe faritan pagopeton.</translation>
</message>
@@ -1901,27 +1932,30 @@ Adreso: %4
<translation>R&amp;euzi ekzistantan ricevan adreson (malrekomendinda)</translation>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Malplenigi ĉiujn kampojn de la formularo.</translation>
</message>
@@ -1931,24 +1965,24 @@ Adreso: %4
<translation>Forigi</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
- <translation>&amp;Peti pagon</translation>
+ <location line="+78"/>
+ <source>Requested payments history</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation type="unfinished"/>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>&amp;Peti pagon</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
<source>Show</source>
- <translation type="unfinished"/>
+ <translation>Vidigi</translation>
</message>
<message>
<location line="+11"/>
@@ -1960,6 +1994,21 @@ Adreso: %4
<source>Remove</source>
<translation>Forigi</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopii etikedon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation>Kopiu mesaĝon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopii sumon</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2061,12 +2110,17 @@ Adreso: %4
<source>(no message)</source>
<translation>(neniu mesaĝo)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Sendi Monon</translation>
@@ -2074,7 +2128,7 @@ Adreso: %4
<message>
<location line="+76"/>
<source>Coin Control Features</source>
- <translation type="unfinished"/>
+ <translation>Monregaj Opcioj</translation>
</message>
<message>
<location line="+20"/>
@@ -2089,7 +2143,7 @@ Adreso: %4
<message>
<location line="+19"/>
<source>Insufficient funds!</source>
- <translation type="unfinished"/>
+ <translation>Nesufiĉa mono!</translation>
</message>
<message>
<location line="+89"/>
@@ -2142,7 +2196,7 @@ Adreso: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Sendi samtempe al pluraj ricevantoj</translation>
</message>
@@ -2152,7 +2206,7 @@ Adreso: %4
<translation>Aldoni &amp;Ricevonton</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Malplenigi ĉiujn kampojn de la formularo.</translation>
</message>
@@ -2162,12 +2216,12 @@ Adreso: %4
<translation>&amp;Forigi ĉion</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Konfirmi la sendon</translation>
</message>
@@ -2177,7 +2231,7 @@ Adreso: %4
<translation>Ŝendi</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Konfirmi sendon de bitmono</translation>
</message>
@@ -2190,12 +2244,7 @@ Adreso: %4
<translation>%1 al %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Enigi Bitmon-adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation>Kopii kvanton</translation>
</message>
@@ -2245,7 +2294,7 @@ Adreso: %4
<translation>aŭ</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>La adreso de la ricevonto ne validas. Bonvolu kontroli.</translation>
</message>
@@ -2280,12 +2329,12 @@ Adreso: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Averto: Nevalida Bitmon-adreso</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(neniu etikedo)</translation>
</message>
@@ -2295,7 +2344,7 @@ Adreso: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Ĉu vi certas, ke vi volas sendi?</translation>
</message>
@@ -2305,7 +2354,7 @@ Adreso: %4
<translation>aldonita kiel krompago</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>Pagopeto nun estas eksdata</translation>
</message>
@@ -2382,12 +2431,7 @@ Adreso: %4
<translation>Mesaĝo:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2397,7 +2441,12 @@ Adreso: %4
<translation>Tajpu etikedon por tiu ĉi adreso por aldoni ĝin al la listo de uzitaj adresoj</translation>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2413,11 +2462,6 @@ Adreso: %4
<source>Memo:</source>
<translation>Memorando:</translation>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Enigi Bitmon-adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2455,19 +2499,19 @@ Adreso: %4
<translation>La adreso por subskribi la mesaĝon (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Elektu la jam uzitan adreson</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Alglui adreson de tondejo</translation>
</message>
@@ -2508,12 +2552,12 @@ Adreso: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>&amp;Forigi Ĉion</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Kontroli Mesaĝon</translation>
</message>
@@ -2528,7 +2572,7 @@ Adreso: %4
<translation>La adreso per kio oni subskribis la mesaĝon (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Kontroli la mesaĝon por pravigi, ke ĝi ja estas subskribita per la specifa Bitmon-adreso</translation>
</message>
@@ -2543,43 +2587,37 @@ Adreso: %4
<translation>Reagordigi ĉiujn prikontrolajn kampojn</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Enigi Bitmon-adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Klaku &quot;Subskribi Mesaĝon&quot; por krei subskribon</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Enigi Bitmon-subskribon</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>La adreso, kiun vi enmetis, estas nevalida.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Bonvolu kontroli la adreson kaj reprovi.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>La adreso, kiun vi enmetis, referencas neniun ŝlosilon.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Malŝloso de monujo estas nuligita.</translation>
</message>
@@ -2599,7 +2637,7 @@ Adreso: %4
<translation>Mesaĝo estas subskribita.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Ne eblis malĉifri la subskribon.</translation>
</message>
@@ -2660,6 +2698,11 @@ Adreso: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/senkonekte</translation>
</message>
@@ -2821,12 +2864,12 @@ Adreso: %4
<translation>, ankoraŭ ne elsendita sukcese</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Malferma dum ankoraŭ %n bloko</numerusform><numerusform>Malferma dum ankoraŭ %n blokoj</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>nekonata</translation>
</message>
@@ -2867,12 +2910,12 @@ Adreso: %4
<translation>Sumo</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Malferma dum ankoraŭ %n bloko</numerusform><numerusform>Malferma dum ankoraŭ %n blokoj</numerusform></translation>
</message>
@@ -2882,23 +2925,12 @@ Adreso: %4
<translation>Malferma ĝis %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Senkonekta (%1 konfirmoj)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Nekonfirmita (%1 el %2 konfirmoj)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Konfirmita (%1 konfirmoj)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Tiun ĉi blokon ne ricevis ajna alia nodo, kaj ĝi verŝajne ne akceptiĝos!</translation>
</message>
@@ -2908,7 +2940,27 @@ Adreso: %4
<translation>Kreita sed ne akceptita</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation>Senkonekte</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation>Nekonfirmita</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Ricevita kun</translation>
</message>
@@ -2938,7 +2990,7 @@ Adreso: %4
<translation>neaplikebla</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Transakcia stato. Ŝvebi super tiu ĉi kampo por montri la nombron de konfirmoj.</translation>
</message>
@@ -3204,12 +3256,12 @@ Adreso: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Uzado:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Listigi komandojn</translation>
</message>
@@ -3264,12 +3316,12 @@ Adreso: %4
<translation>Specifi vian propran publikan adreson</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Sojlo por malkonekti misagantajn samtavolanojn (defaŭlte: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Nombro da sekundoj por rifuzi rekonekton de misagantaj samtavolanoj (defaŭlte: 86400)</translation>
</message>
@@ -3289,17 +3341,17 @@ Adreso: %4
<translation>Akcepti komandojn JSON-RPC kaj el komandlinio</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Ruli fone kiel demono kaj akcepti komandojn</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Uzi la test-reton</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Akcepti konektojn el ekstere (defaŭlte: 1 se ne estas -proxy nek -connect)</translation>
</message>
@@ -3440,6 +3492,11 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Konekti nur al specifita(j) nodo(j)</translation>
</message>
@@ -3650,6 +3707,11 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Starti bitmonan servilon</translation>
</message>
@@ -3699,12 +3761,12 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Vi devas rekontrui la datumbazon kun -reindex por ŝanĝi -txindex</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importas blokojn el ekstera dosiero blk000??.dat</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Plenumi komandon kiam rilata alerto riceviĝas, aŭ kiam ni vidas tre longan forkon (%s en cms anstataŭiĝas per mesaĝo)</translation>
</message>
@@ -3724,7 +3786,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Agordi la nombron de fadenoj por skriptkontrolado (ĝis 16, 0 = aŭtomate, &lt;0 = lasi tiom da kernoj liberaj, defaŭlte: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informoj</translation>
</message>
@@ -3794,7 +3856,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Specifi konektan tempolimon je milisekundoj (defaŭlte: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Sistema eraro: </translation>
</message>
@@ -3840,6 +3902,11 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versio</translation>
</message>
@@ -3849,32 +3916,32 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>wallet.dat estas difektita, riparo malsukcesis</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Pasvorto por konektoj JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Permesi konektojn JSON-RPC de specifa IP-adreso</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Sendi komandon al nodo ĉe &lt;ip&gt; (defaŭlte: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Plenumi komandon kiam plej bona bloko ŝanĝiĝas (%s en cmd anstataŭiĝas per bloka haketaĵo)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Ĝisdatigi monujon al plej lasta formato</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Agordi la grandon de la ŝlosilo-vico al &lt;n&gt; (defaŭlte: 100)</translation>
</message>
@@ -3884,12 +3951,12 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Reskani la blokĉenon por mankantaj monujaj transakcioj</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Uzi OpenSSL (https) por konektoj JSON-RPC</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Dosiero de servila atestilo (defaŭlte: server.cert)</translation>
</message>
@@ -3899,7 +3966,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Dosiero de servila privata ŝlosilo (defaŭlte: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Tiu ĉi helpmesaĝo</translation>
</message>
@@ -3909,12 +3976,12 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Ne eblis bindi al %s en tiu ĉi komputilo (bind resendis eraron %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permesi DNS-elserĉojn por -addnote, -seednote kaj -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Ŝarĝante adresojn...</translation>
</message>
@@ -3929,12 +3996,12 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Eraro dum ŝargo de wallet.dat: monujo bezonas pli novan version de Bitmono</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Monujo bezonas esti reskribita: relanĉu Bitmonon por finfari tion</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Eraro dum ŝargado de wallet.dat</translation>
</message>
@@ -3944,7 +4011,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Nevalid adreso -proxy: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Nekonata reto specifita en -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3954,7 +4021,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Nekonata versio de -socks petita: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Ne eblas trovi la adreson -bind: &apos;%s&apos;</translation>
</message>
@@ -3964,7 +4031,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Ne eblas trovi la adreson -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Nevalida sumo por -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3984,7 +4051,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Ŝarĝante blok-indekson...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Aldoni nodon por alkonekti kaj provi daŭrigi la malferman konekton</translation>
</message>
@@ -3994,12 +4061,12 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Ne eblas bindi al %s ĉe tiu ĉi komputilo. Bitmono verŝajne jam rulas.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Ŝargado de monujo...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Ne eblas malpromocii monujon</translation>
</message>
@@ -4009,7 +4076,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Ne eblas skribi defaŭltan adreson</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Reskanado...</translation>
</message>
@@ -4019,17 +4086,17 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Ŝargado finiĝis</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Por uzi la agordon %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Eraro</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index 3807c8bbaf..df88d59f90 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -9,7 +9,7 @@
<message>
<location line="+39"/>
<source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
- <translation>Versión del &lt;b&gt;Núcleo de Bitcoin&lt;b&gt;</translation>
+ <translation>Versión de &lt;b&gt;Bitcoin Core&lt;b&gt;</translation>
</message>
<message>
<location line="+57"/>
@@ -37,7 +37,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<message>
<location line="+0"/>
<source>The Bitcoin Core developers</source>
- <translation>Los desarrolladores del Núcleo de Bitcoin</translation>
+ <translation>Los desarrolladores de Bitcoin Core</translation>
</message>
<message>
<location line="+12"/>
@@ -404,7 +404,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<message>
<location line="+3"/>
<source>&amp;Backup Wallet...</source>
- <translation>Copia de &amp;respaldo del monedero...</translation>
+ <translation>%Guardar copia del monedero...</translation>
</message>
<message>
<location line="+2"/>
@@ -577,12 +577,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<message>
<location line="+2"/>
<source>&amp;Command-line options</source>
- <translation>&amp;Opciones de línea de comandos</translation>
+ <translation>&amp;Opciones de consola de comandos</translation>
</message>
<message>
<location line="+1"/>
<source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
- <translation>Muestra el mensaje de ayuda Bitcoin Core para obtener una lista con las posibles opciones de línea de comandos Bitcoin</translation>
+ <translation>Muestra el mensaje de ayuda Bitcoin Core para obtener una lista con las posibles opciones de la consola de comandos de Bitcoin</translation>
</message>
<message>
<location line="+159"/>
@@ -626,6 +626,16 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation>%1 y %2</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation><numerusform>%n año</numerusform><numerusform>%n años</numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 por detrás</translation>
@@ -762,12 +772,12 @@ Dirección: %4
<message>
<location line="+56"/>
<source>(un)select all</source>
- <translation>(des)selecciona todos</translation>
+ <translation>(des)marcar todos</translation>
</message>
<message>
<location line="+13"/>
<source>Tree mode</source>
- <translation>Modo arbol</translation>
+ <translation>Modo árbol</translation>
</message>
<message>
<location line="+16"/>
@@ -923,7 +933,7 @@ Dirección: %4
<message>
<location line="+31"/>
<source>none</source>
- <translation>nada</translation>
+ <translation>ninguna</translation>
</message>
<message>
<location line="+141"/>
@@ -1105,12 +1115,12 @@ Dirección: %4
<message>
<location filename="../forms/helpmessagedialog.ui" line="+19"/>
<source>Bitcoin Core - Command-line options</source>
- <translation>Bitcoin Core - opciones de línea de comandos</translation>
+ <translation>Bitcoin Core - Opciones de consola de comandos</translation>
</message>
<message>
<location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
- <translation>Núcleo de Bitcoin</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
<location line="+0"/>
@@ -1125,7 +1135,7 @@ Dirección: %4
<message>
<location line="+1"/>
<source>command-line options</source>
- <translation>opciones de la línea de órdenes</translation>
+ <translation>opciones de la consola de comandos</translation>
</message>
<message>
<location line="+4"/>
@@ -1163,7 +1173,7 @@ Dirección: %4
<message>
<location line="+9"/>
<source>Welcome to Bitcoin Core.</source>
- <translation>Bienvenido al Núcleo de Bitcoin</translation>
+ <translation>Bienvenido a Bitcoin Core</translation>
</message>
<message>
<location line="+26"/>
@@ -1284,7 +1294,7 @@ Dirección: %4
<message>
<location line="+27"/>
<source>Number of script &amp;verification threads</source>
- <translation>Número de hilos de &amp;verificación de scripts</translation>
+ <translation>Número de procesos de &amp;verificación de scripts</translation>
</message>
<message>
<location line="+13"/>
@@ -1314,7 +1324,7 @@ Dirección: %4
<message>
<location line="+224"/>
<source>Active command-line options that override above options:</source>
- <translation>Opciones activas de línea de comandos que tienen preferencia sobre las opciones antes mencionadas:</translation>
+ <translation>Opciones activas de consola de comandos que tienen preferencia sobre las opciones antes mencionadas:</translation>
</message>
<message>
<location line="+43"/>
@@ -1464,7 +1474,7 @@ Dirección: %4
<message>
<location line="+58"/>
<source>none</source>
- <translation>nada</translation>
+ <translation>ninguna</translation>
</message>
<message>
<location line="+78"/>
@@ -1809,7 +1819,7 @@ Dirección: %4
<message>
<location line="+52"/>
<source>&amp;Clear</source>
- <translation>&amp;Limpiar</translation>
+ <translation>&amp;Vaciar</translation>
</message>
<message>
<location line="+13"/>
@@ -1854,7 +1864,7 @@ Dirección: %4
<message>
<location line="+1"/>
<source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
- <translation>Use las flechas arriba y abajo para navegar por el historial y &lt;b&gt;Control+L&lt;/b&gt; para limpiar la pantalla.</translation>
+ <translation>Use las flechas arriba y abajo para navegar por el historial y &lt;b&gt;Control+L&lt;/b&gt; para vaciar la pantalla.</translation>
</message>
<message>
<location line="+1"/>
@@ -1939,7 +1949,7 @@ Dirección: %4
<message>
<location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
- <translation>Utiliza este formulario para solicitar pagos. Todos los campos son &lt;b&gt;opcionales&lt;/b&gt;.</translation>
+ <translation>Utilice este formulario para solicitar pagos. Todos los campos son &lt;b&gt;opcionales&lt;/b&gt;.</translation>
</message>
<message>
<location line="+23"/>
@@ -1950,17 +1960,17 @@ Dirección: %4
<message>
<location line="+32"/>
<source>Clear all fields of the form.</source>
- <translation>Limpiar todos los campos del formulario.</translation>
+ <translation>Vaciar todos los campos del formulario.</translation>
</message>
<message>
<location line="+3"/>
<source>Clear</source>
- <translation>Limpiar</translation>
+ <translation>Vaciar</translation>
</message>
<message>
<location line="+78"/>
<source>Requested payments history</source>
- <translation>Se solicita historial de pagos</translation>
+ <translation>Historial de pagos solicitados</translation>
</message>
<message>
<location line="-98"/>
@@ -2131,7 +2141,7 @@ Dirección: %4
<message>
<location line="+7"/>
<source>automatically selected</source>
- <translation>Seleccionado automaticamente</translation>
+ <translation>Seleccionado automáticamente</translation>
</message>
<message>
<location line="+19"/>
@@ -2181,7 +2191,7 @@ Dirección: %4
<message>
<location line="+44"/>
<source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
- <translation>Si esto se activa pero la dirección de cambio está vacía o es inválida, el cambio se enviará a una nueva dirección recién generada.</translation>
+ <translation>Si se marca esta opción pero la dirección de cambio está vacía o es inválida, el cambio se enviará a una nueva dirección recién generada.</translation>
</message>
<message>
<location line="+3"/>
@@ -2201,12 +2211,12 @@ Dirección: %4
<message>
<location line="-23"/>
<source>Clear all fields of the form.</source>
- <translation>Limpiar todos los campos del formulario</translation>
+ <translation>Vaciar todos los campos del formulario</translation>
</message>
<message>
<location line="+3"/>
<source>Clear &amp;All</source>
- <translation>Limpiar &amp;todo</translation>
+ <translation>Vaciar &amp;todo</translation>
</message>
<message>
<location line="+52"/>
@@ -2461,7 +2471,7 @@ Dirección: %4
<message>
<location filename="../utilitydialog.cpp" line="+48"/>
<source>Bitcoin Core is shutting down...</source>
- <translation>El núcleo de Bitcoin se está cerrando...
+ <translation>Bitcoin Core se está cerrando...
</translation>
</message>
<message>
@@ -2542,13 +2552,13 @@ Dirección: %4
<message>
<location line="+14"/>
<source>Reset all sign message fields</source>
- <translation>Limpiar todos los campos de la firma de mensaje</translation>
+ <translation>Vaciar todos los campos de la firma de mensaje</translation>
</message>
<message>
<location line="+3"/>
<location line="+143"/>
<source>Clear &amp;All</source>
- <translation>Limpiar &amp;todo</translation>
+ <translation>Vaciar &amp;todo</translation>
</message>
<message>
<location line="-84"/>
@@ -2578,7 +2588,7 @@ Dirección: %4
<message>
<location line="+14"/>
<source>Reset all verify message fields</source>
- <translation>Limpiar todos los campos de la verificación de mensaje</translation>
+ <translation>Vaciar todos los campos de la verificación de mensaje</translation>
</message>
<message>
<location filename="../signverifymessagedialog.cpp" line="+30"/>
@@ -2662,12 +2672,12 @@ Dirección: %4
<message>
<location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
- <translation>Núcleo de Bitcoin</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
<location line="+2"/>
<source>The Bitcoin Core developers</source>
- <translation>Los desarrolladores del Núcleo de Bitcoin</translation>
+ <translation>Los desarrolladores de Bitcoin Core</translation>
</message>
<message>
<location line="+1"/>
@@ -3219,7 +3229,7 @@ Dirección: %4
<message>
<location line="+181"/>
<source>Backup Wallet</source>
- <translation>Respaldo de monedero</translation>
+ <translation>Copia de seguridad del monedero</translation>
</message>
<message>
<location line="+1"/>
@@ -3244,7 +3254,7 @@ Dirección: %4
<message>
<location line="+0"/>
<source>Backup Successful</source>
- <translation>Se ha completado con éxito la copia de respaldo</translation>
+ <translation>Se ha completado la copia de seguridad del monedero</translation>
</message>
</context>
<context>
@@ -3700,7 +3710,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
- <translation>Establecer el número de hilos para atender las llamadas RPC (predeterminado: 4)</translation>
+ <translation>Establecer el número de procesos para atender las llamadas RPC (predeterminado: 4)</translation>
</message>
<message>
<location line="+7"/>
diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts
index cb0a3bc5cf..a933051f2c 100644
--- a/src/qt/locale/bitcoin_es_MX.ts
+++ b/src/qt/locale/bitcoin_es_MX.ts
@@ -29,6 +29,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+0"/>
<source>The Bitcoin Core developers</source>
+ <translation>El nucleo de Bitcoin de desarrolladores</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -147,12 +153,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+13"/>
<source>Exporting Failed</source>
- <translation type="unfinished"/>
+ <translation>Fallo en la exportación</translation>
</message>
<message>
<location line="+1"/>
<source>There was an error trying to save the address list to %1.</source>
- <translation type="unfinished"/>
+ <translation>Ocurrio un error al intentar guardar la lista de direccione en %1</translation>
</message>
</context>
<context>
@@ -563,12 +569,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+2"/>
<source>&amp;Command-line options</source>
- <translation type="unfinished"/>
+ <translation>opciones de la &amp;Linea de comandos</translation>
</message>
<message>
<location line="+1"/>
<source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
- <translation type="unfinished"/>
+ <translation>Mostrar mensaje de ayuda del nucleo de Bitcoin para optener una lista con los posibles comandos de Bitcoin</translation>
</message>
<message>
<location line="+159"/>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation>La cartera esta &lt;b&gt;encriptada&lt;/b&gt; y &lt;b&gt;bloqueada&lt;/b&gt; actualmente </translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Monto</translation>
</message>
@@ -800,7 +816,7 @@ Address: %4
<location line="+1"/>
<location line="+26"/>
<source>Copy amount</source>
- <translation type="unfinished"/>
+ <translation>copiar monto</translation>
</message>
<message>
<location line="-25"/>
@@ -820,27 +836,27 @@ Address: %4
<message>
<location line="+22"/>
<source>Copy quantity</source>
- <translation type="unfinished"/>
+ <translation>copiar cantidad</translation>
</message>
<message>
<location line="+2"/>
<source>Copy fee</source>
- <translation type="unfinished"/>
+ <translation>copiar cuota</translation>
</message>
<message>
<location line="+1"/>
<source>Copy after fee</source>
- <translation type="unfinished"/>
+ <translation>copiar despues de cuota</translation>
</message>
<message>
<location line="+1"/>
<source>Copy bytes</source>
- <translation type="unfinished"/>
+ <translation>copiar bytes</translation>
</message>
<message>
<location line="+1"/>
<source>Copy priority</source>
- <translation type="unfinished"/>
+ <translation>copiar prioridad</translation>
</message>
<message>
<location line="+1"/>
@@ -850,7 +866,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Copy change</source>
- <translation type="unfinished"/>
+ <translation>copiar cambio</translation>
</message>
<message>
<location line="+323"/>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1087,10 +1103,10 @@ Address: %4
<message>
<location filename="../forms/helpmessagedialog.ui" line="+19"/>
<source>Bitcoin Core - Command-line options</source>
- <translation type="unfinished"/>
+ <translation>Opciones de lineas de comando del nucleo de Bitcoin</translation>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>nucleo Bitcoin</translation>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Inconformidad :</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
- <translation>Etiqueta opcional para asocuar con el nuevo domicilio de entrgas.</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+14"/>
+ <location line="+23"/>
<source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation>Mensaje opcional para agregar a la solicitud de pago, el cual será mostrado cuando la solicitud este abierta. Nota: El mensaje no se manda con el pago a travéz de la red de Bitcoin.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation>Use este formulario para la solicitud de pagos. Todos los campos son &lt;b&gt;opcionales&lt;/b&gt;</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation>Monto opcional a solicitar. Dejarlo vacion o en cero no solicita un monto especifico.</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Copiar capa </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>copiar monto</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Mandar monedas</translation>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Enviar a múltiples receptores a la vez</translation>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Confirme la acción de enviar</translation>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Confirme para mandar monedas</translation>
</message>
@@ -2181,39 +2235,34 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
- <translation type="unfinished"/>
+ <translation>copiar cantidad</translation>
</message>
<message>
<location line="+1"/>
<source>Copy amount</source>
- <translation type="unfinished"/>
+ <translation>copiar monto</translation>
</message>
<message>
<location line="+1"/>
<source>Copy fee</source>
- <translation type="unfinished"/>
+ <translation>copiar cuota</translation>
</message>
<message>
<location line="+1"/>
<source>Copy after fee</source>
- <translation type="unfinished"/>
+ <translation>copiar despues de cuota</translation>
</message>
<message>
<location line="+1"/>
<source>Copy bytes</source>
- <translation type="unfinished"/>
+ <translation>copiar bytes</translation>
</message>
<message>
<location line="+1"/>
<source>Copy priority</source>
- <translation type="unfinished"/>
+ <translation>copiar prioridad</translation>
</message>
<message>
<location line="+1"/>
@@ -2223,20 +2272,20 @@ Address: %4
<message>
<location line="+1"/>
<source>Copy change</source>
- <translation type="unfinished"/>
+ <translation>copiar cambio</translation>
</message>
<message>
<location line="+170"/>
<source>Total Amount %1 (= %2)</source>
- <translation type="unfinished"/>
+ <translation>Monto total %1(=%2)</translation>
</message>
<message>
<location line="+2"/>
<source>or</source>
- <translation type="unfinished"/>
+ <translation>o</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2263,30 +2312,30 @@ Address: %4
<message>
<location line="+3"/>
<source>Transaction creation failed!</source>
- <translation type="unfinished"/>
+ <translation>¡La creación de transacion falló!</translation>
</message>
<message>
<location line="+4"/>
<source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"/>
+ <translation>¡La transación fue rechazada! Esto puede ocurrir si algunas de tus monedas en tu cartera han sido gastadas, al igual que si usas una cartera copiada y la monedas fueron gastadas en la copia pero no se marcaron como gastadas.</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Advertencia: Dirección de Bitcoin invalida</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(sin etiqueta)</translation>
</message>
<message>
<location line="-11"/>
<source>Warning: Unknown change address</source>
- <translation type="unfinished"/>
+ <translation>Advertencia: Cambio de dirección desconocido</translation>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2343,7 +2392,7 @@ Address: %4
<message>
<location line="-40"/>
<source>This is a normal payment.</source>
- <translation type="unfinished"/>
+ <translation>Este es un pago normal</translation>
</message>
<message>
<location line="+50"/>
@@ -2365,7 +2414,7 @@ Address: %4
<location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
- <translation type="unfinished"/>
+ <translation>Quitar esta entrada</translation>
</message>
<message>
<location line="-1008"/>
@@ -2373,14 +2422,9 @@ Address: %4
<translation>Mensaje:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation>Mensaje que se agrgará al URI de Bitcoin el cual sera almacenado con la transacción para su referencia. Nota: Este mensaje no será mandado a travéz de la red de Bitcoin.</translation>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
- <translation type="unfinished"/>
+ <translation>Esta es una verificación de solicituda de pago.</translation>
</message>
<message>
<location line="-991"/>
@@ -2388,15 +2432,20 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
- <source>This is an unverified payment request.</source>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+426"/>
+ <source>This is an unverified payment request.</source>
+ <translation>Esta es una solicitud de pago no verificada.</translation>
+ </message>
+ <message>
<location line="+18"/>
<location line="+532"/>
<source>Pay To:</source>
- <translation type="unfinished"/>
+ <translation>Pago para:</translation>
</message>
<message>
<location line="-498"/>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Pegar dirección del portapapeles</translation>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2626,7 +2664,7 @@ Address: %4
<message>
<location line="+2"/>
<source>The Bitcoin Core developers</source>
- <translation type="unfinished"/>
+ <translation>El nucleo de Bitcoin de desarrolladores</translation>
</message>
<message>
<location line="+1"/>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation>, no ha sido transmitido aun</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>desconocido</translation>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation>Monto</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2873,23 +2916,12 @@ Address: %4
<translation>Abrir hasta %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Sin conexion (%1 confirmaciones)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>sin confirmar (%1 de %2 confirmaciones)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confimado (%1 confirmaciones)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Este bloque no fue recibido por ningun nodo y probablemente no fue aceptado !</translation>
</message>
@@ -2899,7 +2931,27 @@ Address: %4
<translation>Generado pero no aprovado</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Recivido con</translation>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3040,7 +3092,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Copy amount</source>
- <translation type="unfinished"/>
+ <translation>copiar monto</translation>
</message>
<message>
<location line="+1"/>
@@ -3060,27 +3112,27 @@ Address: %4
<message>
<location line="+142"/>
<source>Export Transaction History</source>
- <translation type="unfinished"/>
+ <translation>Exportar el historial de transacción</translation>
</message>
<message>
<location line="+19"/>
<source>Exporting Failed</source>
- <translation type="unfinished"/>
+ <translation>Fallo en la exportación</translation>
</message>
<message>
<location line="+0"/>
<source>There was an error trying to save the transaction history to %1.</source>
- <translation type="unfinished"/>
+ <translation>Ocurrio un error intentando guardar el historial de transaciones a %1</translation>
</message>
<message>
<location line="+4"/>
<source>Exporting Successful</source>
- <translation type="unfinished"/>
+ <translation>Exportacion satisfactoria</translation>
</message>
<message>
<location line="+0"/>
<source>The transaction history was successfully saved to %1.</source>
- <translation type="unfinished"/>
+ <translation>el historial de transaciones ha sido guardado exitosamente en 1%</translation>
</message>
<message>
<location line="-22"/>
@@ -3138,7 +3190,7 @@ Address: %4
<message>
<location filename="../walletframe.cpp" line="+26"/>
<source>No wallet has been loaded.</source>
- <translation type="unfinished"/>
+ <translation>No se há cargado la cartera.</translation>
</message>
</context>
<context>
@@ -3179,12 +3231,12 @@ Address: %4
<message>
<location line="+0"/>
<source>There was an error trying to save the wallet data to %1.</source>
- <translation type="unfinished"/>
+ <translation>Ocurrio un error tratando de guardar la información de la cartera %1</translation>
</message>
<message>
<location line="+4"/>
<source>The wallet data was successfully saved to %1.</source>
- <translation type="unfinished"/>
+ <translation>La información de la cartera fué guardada exitosamente a 1%</translation>
</message>
<message>
<location line="+0"/>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Uso:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Lista de comandos</translation>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3397,7 +3449,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+9"/>
<source>&lt;category&gt; can be:</source>
- <translation type="unfinished"/>
+ <translation>&lt;categoria&gt; puede ser:</translation>
</message>
<message>
<location line="+6"/>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Iniciar servidor Bitcoin</translation>
</message>
@@ -3667,7 +3729,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Wallet options:</source>
- <translation type="unfinished"/>
+ <translation>Opciones de cartera:</translation>
</message>
<message>
<location line="+2"/>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>Versión</translation>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Cargando direcciones...</translation>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Cargando indice de bloques... </translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Cargando billetera...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Carga completa</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_es_UY.ts b/src/qt/locale/bitcoin_es_UY.ts
index 748a588419..4cd1ca70e2 100644
--- a/src/qt/locale/bitcoin_es_UY.ts
+++ b/src/qt/locale/bitcoin_es_UY.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation>El Monedero esta &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
@@ -769,7 +785,7 @@ Address: %4
<message>
<location line="+5"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Fecha</translation>
</message>
<message>
<location line="+5"/>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Sin confirmar:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -2048,7 +2074,7 @@ Address: %4
<message>
<location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Fecha</translation>
</message>
<message>
<location line="+0"/>
@@ -2663,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2689,7 +2720,7 @@ Address: %4
<message>
<location line="+4"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Fecha</translation>
</message>
<message>
<location line="+7"/>
@@ -2824,14 +2855,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
- <translation type="unfinished"/>
+ <translation>desconocido</translation>
</message>
</context>
<context>
@@ -2852,7 +2883,7 @@ Address: %4
<message>
<location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Fecha</translation>
</message>
<message>
<location line="+0"/>
@@ -2870,12 +2901,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2885,33 +2916,42 @@ Address: %4
<translation>Abrir hasta %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2941,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3107,7 +3147,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Fecha</translation>
</message>
<message>
<location line="+1"/>
@@ -3207,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3267,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3292,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3433,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3643,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3692,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3717,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3787,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3833,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3842,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3877,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3892,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3902,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3922,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3937,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3947,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3957,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3977,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3987,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -4002,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4012,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index 9addf3009c..957e30581e 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -36,6 +36,12 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,6 +623,16 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation><numerusform>%n nädal</numerusform><numerusform>%n nädalat</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 maas</translation>
@@ -689,7 +705,7 @@ Aadress: %4⏎</translation>
<translation>Rahakott on &lt;b&gt;krüpteeritud&lt;/b&gt; ning hetkel &lt;b&gt;suletud&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ilmnes kriitiline tõrge. Bitcoin suletakse turvakaalutluste tõttu.</translation>
</message>
@@ -750,7 +766,7 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -765,7 +781,7 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Kogus</translation>
</message>
@@ -916,7 +932,7 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1098,7 +1114,7 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoini tuumik</translation>
</message>
@@ -1242,7 +1258,7 @@ Aadress: %4⏎</translation>
<translation>%Peamine</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1252,7 +1268,7 @@ Aadress: %4⏎</translation>
<translation>Tasu tehingu &amp;fee</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Käivita Bitcoin süsteemi logimisel.</translation>
</message>
@@ -1267,12 +1283,7 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Sea andmebaasi vahemälu suurus MB (vaikeväärtus: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1287,7 +1298,12 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1322,7 +1338,17 @@ Aadress: %4⏎</translation>
<translation>&amp;Võrk</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Bitcoini kliendi pordi automaatne avamine ruuteris. Toimib, kui sinu ruuter aktsepteerib UPnP ühendust.</translation>
</message>
@@ -1437,17 +1463,17 @@ Aadress: %4⏎</translation>
<translation>&amp;Katkesta</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>vaikeväärtus</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Kinnita valikute algseadistamine</translation>
</message>
@@ -1487,18 +1513,13 @@ Aadress: %4⏎</translation>
<translation>Kuvatav info ei pruugi olla ajakohane. Ühenduse loomisel süngitakse sinu rahakott automaatselt Bitconi võrgustikuga, kuid see toiming on hetkel lõpetamata.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Kinnitamata:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Rahakott</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1507,7 +1528,12 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1655,6 +1681,11 @@ Aadress: %4⏎</translation>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Sisesta Bitcoini aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1875,22 +1906,22 @@ Aadress: %4⏎</translation>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Märgis</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1900,27 +1931,30 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1930,17 +1964,17 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1959,6 +1993,21 @@ Aadress: %4⏎</translation>
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Märgise kopeerimine</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopeeri summa</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2060,12 +2109,17 @@ Aadress: %4⏎</translation>
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Müntide saatmine</translation>
@@ -2141,7 +2195,7 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Saatmine mitmele korraga</translation>
</message>
@@ -2151,7 +2205,7 @@ Aadress: %4⏎</translation>
<translation>Lisa &amp;Saaja</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2161,12 +2215,12 @@ Aadress: %4⏎</translation>
<translation>Puhasta &amp;Kõik</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Jääk:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Saatmise kinnitamine</translation>
</message>
@@ -2176,7 +2230,7 @@ Aadress: %4⏎</translation>
<translation>S&amp;aada</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Müntide saatmise kinnitamine</translation>
</message>
@@ -2189,12 +2243,7 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Sisesta Bitcoini aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2244,7 +2293,7 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Saaja aadress ei ole kehtiv, palun kontrolli.</translation>
</message>
@@ -2279,12 +2328,12 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(silti pole)</translation>
</message>
@@ -2294,7 +2343,7 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2304,7 +2353,7 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2381,12 +2430,7 @@ Aadress: %4⏎</translation>
<translation>Sõnum:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2396,7 +2440,12 @@ Aadress: %4⏎</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2412,11 +2461,6 @@ Aadress: %4⏎</translation>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Sisesta Bitcoini aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2454,19 +2498,19 @@ Aadress: %4⏎</translation>
<translation>Sõnumi signeerimise aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Kleebi aadress vahemälust</translation>
</message>
@@ -2507,12 +2551,12 @@ Aadress: %4⏎</translation>
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Puhasta &amp;Kõik</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Kinnita Sõnum</translation>
</message>
@@ -2527,7 +2571,7 @@ Aadress: %4⏎</translation>
<translation>Aadress, millega sõnum allkirjastati (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Kinnita sõnum tõestamaks selle allkirjastatust määratud Bitcoini aadressiga.</translation>
</message>
@@ -2542,43 +2586,37 @@ Aadress: %4⏎</translation>
<translation>Tühjenda kõik sõnumi kinnitamise väljad</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Sisesta Bitcoini aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Signatuuri genereerimiseks vajuta &quot;Allkirjasta Sõnum&quot;</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Sisesta Bitcoini allkiri</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Sisestatud aadress ei kehti.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Palun kontrolli aadressi ning proovi uuesti.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Sisestatud aadress ei viita võtmele.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Rahakoti avamine katkestati.</translation>
</message>
@@ -2598,7 +2636,7 @@ Aadress: %4⏎</translation>
<translation>Sõnum signeeritud.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Signatuuri ei õnnestunud dekodeerida.</translation>
</message>
@@ -2659,6 +2697,11 @@ Aadress: %4⏎</translation>
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%/1offline&apos;is</translation>
</message>
@@ -2820,12 +2863,12 @@ Aadress: %4⏎</translation>
<translation>, veel esitlemata</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Avaneb %n bloki pärast</numerusform><numerusform>Avaneb %n bloki pärast</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>tundmatu</translation>
</message>
@@ -2866,12 +2909,12 @@ Aadress: %4⏎</translation>
<translation>Kogus</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Avaneb %n bloki pärast</numerusform><numerusform>Avaneb %n bloki pärast</numerusform></translation>
</message>
@@ -2881,23 +2924,12 @@ Aadress: %4⏎</translation>
<translation>Avatud kuni %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Ühenduseta (%1 kinnitust)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Kinnitamata (%1/%2 kinnitust)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Kinnitatud (%1 kinnitust)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Antud klotsi pole saanud ükski osapool ning tõenäoliselt seda ei aktsepteerita!</translation>
</message>
@@ -2907,7 +2939,27 @@ Aadress: %4⏎</translation>
<translation>Loodud, kuid aktsepteerimata</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Saadud koos</translation>
</message>
@@ -2937,7 +2989,7 @@ Aadress: %4⏎</translation>
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Tehingu staatus. Kinnituste arvu kuvamiseks liigu hiire noolega selle peale.</translation>
</message>
@@ -3203,12 +3255,12 @@ Aadress: %4⏎</translation>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Kasutus:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Käskluste loetelu</translation>
</message>
@@ -3263,12 +3315,12 @@ Aadress: %4⏎</translation>
<translation>Täpsusta enda avalik aadress</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Ulakate peeride valulävi (vaikeväärtus: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Mitme sekundi pärast ulakad peerid tagasi võivad tulla (vaikeväärtus: 86400)</translation>
</message>
@@ -3288,17 +3340,17 @@ Aadress: %4⏎</translation>
<translation>Luba käsurea ning JSON-RPC käsklusi</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Tööta taustal ning aktsepteeri käsklusi</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Testvõrgu kasutamine</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Luba välisühendusi (vaikeväärtus: 1 kui puudub -proxy või -connect)</translation>
</message>
@@ -3439,6 +3491,11 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Ühendu ainult määratud node&apos;i(de)ga</translation>
</message>
@@ -3649,6 +3706,11 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3698,12 +3760,12 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Impordi blokid välisest blk000??.dat failist</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3723,7 +3785,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informatsioon</translation>
</message>
@@ -3793,7 +3855,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Sea ühenduse timeout millisekundites (vaikeväärtus: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Süsteemi tõrge:</translation>
</message>
@@ -3839,6 +3901,11 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versioon</translation>
</message>
@@ -3848,32 +3915,32 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>wallet.dat fail on katki, päästmine ebaõnnestus</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC ühenduste salasõna</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>JSON-RPC ühenduste lubamine kindla IP pealt</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Saada käsklusi node&apos;ile IP&apos;ga &lt;ip&gt; (vaikeväärtus: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Käivita käsklus, kui parim plokk muutub (käskluse %s asendatakse ploki hash&apos;iga)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Uuenda rahakott uusimasse vormingusse</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Sea võtmete hulgaks &lt;n&gt; (vaikeväärtus: 100)</translation>
</message>
@@ -3883,12 +3950,12 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Otsi ploki jadast rahakoti kadunud tehinguid</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Kasuta JSON-RPC ühenduste jaoks OpenSSL&apos;i (https)</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Serveri sertifikaadifail (vaikeväärtus: server.cert)</translation>
</message>
@@ -3898,7 +3965,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Serveri privaatvõti (vaikeväärtus: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Käesolev abitekst</translation>
</message>
@@ -3908,12 +3975,12 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Selle arvutiga ei ole võimalik siduda %s külge (katse nurjus %d, %s tõttu)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>-addnode, -seednode ja -connect tohivad kasutada DNS lookup&apos;i</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Aadresside laadimine...</translation>
</message>
@@ -3928,12 +3995,12 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Viga wallet.dat käivitamisel: Rahakott nõuab Bitcoini uusimat versiooni</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Rahakott tuli ümberkirjutada: toimingu lõpetamiseks taaskäivita Bitcoin</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Viga wallet.dat käivitamisel</translation>
</message>
@@ -3943,7 +4010,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Vigane -proxi aadress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Kirjeldatud tundmatu võrgustik -onlynet&apos;is: &apos;%s&apos;</translation>
</message>
@@ -3953,7 +4020,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Küsitud tundmatu -socks proxi versioon: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Tundmatu -bind aadress: &apos;%s&apos;</translation>
</message>
@@ -3963,7 +4030,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Tundmatu -externalip aadress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>-paytxfee=&lt;amount&gt; jaoks vigane kogus: &apos;%s&apos;</translation>
</message>
@@ -3983,7 +4050,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Klotside indeksi laadimine...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Lisa node ning hoia ühendus avatud</translation>
</message>
@@ -3993,12 +4060,12 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>%s&apos;ga ei ole võimalik sellest arvutist siduda. Bitcoin juba töötab.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Rahakoti laadimine...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Rahakoti vanandamine ebaõnnestus</translation>
</message>
@@ -4008,7 +4075,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Tõrge vaikimisi aadressi kirjutamisel</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Üleskaneerimine...</translation>
</message>
@@ -4018,17 +4085,17 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Laetud</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>%s valiku kasutamine</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Tõrge</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts
index 074c2dbaf8..801991282a 100644
--- a/src/qt/locale/bitcoin_eu_ES.ts
+++ b/src/qt/locale/bitcoin_eu_ES.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation>Zorroa &lt;b&gt;enkriptatuta&lt;/b&gt; eta &lt;b&gt;blokeatuta&lt;/b&gt; dago une honetan</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Kopurua</translation>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Konfirmatu gabe:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Etiketa:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopiatu etiketa</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Bidali txanponak</translation>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Bidali hainbat jasotzaileri batera</translation>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Saldoa:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Berretsi bidaltzeko ekintza</translation>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Berretsi txanponak bidaltzea</translation>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(etiketarik ez)</translation>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation>Mezua</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Itsatsi helbidea arbeletik</translation>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation>, ez da arrakastaz emititu oraindik</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>ezezaguna</translation>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation>Kopurua</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2873,23 +2916,12 @@ Address: %4
<translation>Zabalik %1 arte</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline (%1 konfirmazio)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Konfirmatuta (%1 konfirmazio)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Bloke hau ez du beste inongo nodorik jaso, eta seguruenik ez da onartuko!</translation>
</message>
@@ -2899,7 +2931,27 @@ Address: %4
<translation>Sortua, baina ez onartua</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Jasoa honekin: </translation>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Transakzioaren egoera. Pasatu sagua gainetik konfirmazio kopurua ikusteko.</translation>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Komandoen lista</translation>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Laguntza mezu hau</translation>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Birbilatzen...</translation>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Zamaketa amaitua</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 201b18d6b0..8feb80a61b 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation><numerusform>%n هفته</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 عقب‌تر</translation>
@@ -685,7 +701,7 @@ Address: %4
<translation>کیف پول &lt;b&gt;رمزنگاری شده&lt;/b&gt; است و هم‌اکنون &lt;b&gt;قفل&lt;/b&gt; است</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>یک خطای مهلک اتفاق افتاده است. بیت‌کوین نمی‌تواند بدون مشکل به کار خود ادامه دهد و بسته خواهد شد.</translation>
</message>
@@ -746,7 +762,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -761,7 +777,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>مبلغ</translation>
</message>
@@ -912,7 +928,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1094,7 +1110,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation> هسته Bitcoin </translation>
</message>
@@ -1238,7 +1254,7 @@ Address: %4
<translation>&amp;عمومی</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>کارمزد اختیاریِ هر کیلوبایت برای انتقال سریع‌تر تراکنش. اکثر تراکنش‌ها ۱ کیلوبایتی هستند.</translation>
</message>
@@ -1248,7 +1264,7 @@ Address: %4
<translation>پرداخت &amp;کارمزد تراکنش</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>اجرای خودکار بیت‌کوین در زمان ورود به سیستم.</translation>
</message>
@@ -1263,12 +1279,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>تنظیم اندازهٔ کَش پایگاه‌داده برحسب مگابایت (پیش‌فرض: ۲۵)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1283,7 +1294,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1318,7 +1334,17 @@ Address: %4
<translation>&amp;شبکه</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>باز کردن خودکار درگاه شبکهٔ بیت‌کوین روی روترها. تنها زمانی کار می‌کند که روتر از پروتکل UPnP پشتیبانی کند و این پروتکل فعال باشد.</translation>
</message>
@@ -1433,17 +1459,17 @@ Address: %4
<translation>&amp;لغو</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>پیش‌فرض</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>تأییدِ بازنشانی گزینه‌ها</translation>
</message>
@@ -1483,19 +1509,14 @@ Address: %4
<translation>اطلاعات نمایش‌داده شده ممکن است قدیمی باشند. بعد از این که یک اتصال با شبکه برقرار شد، کیف پول شما به‌صورت خودکار با شبکهٔ بیت‌کوین همگام‌سازی می‌شود. اما این روند هنوز کامل نشده است.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>تأیید نشده:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>کیف پول</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>تأیید شده:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1503,7 +1524,12 @@ Address: %4
<translation>تراز علی‌الحساب شما</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>مجموع تراکنش‌هایی که هنوز تأیید نشده‌اند؛ و هنوز روی تراز علی‌الحساب اعمال نشده‌اند</translation>
</message>
@@ -1651,6 +1677,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>یک آدرس بیت‌کوین وارد کنید (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1871,22 +1902,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;برچسب:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1896,27 +1927,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1926,17 +1960,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1955,6 +1989,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>کپی برچسب</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>کپی مقدار</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2056,12 +2105,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>ارسال سکه</translation>
@@ -2137,7 +2191,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>ارسال به چند دریافت‌کنندهٔ به‌طور همزمان</translation>
</message>
@@ -2147,7 +2201,7 @@ Address: %4
<translation>&amp;دریافت‌کنندهٔ جدید</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2157,12 +2211,12 @@ Address: %4
<translation>پاکسازی &amp;همه</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>تزار:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>عملیات ارسال را تأیید کنید</translation>
</message>
@@ -2172,7 +2226,7 @@ Address: %4
<translation>&amp;ارسال</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>ارسال سکه را تأیید کنید</translation>
</message>
@@ -2185,12 +2239,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>یک آدرس بیت‌کوین وارد کنید (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2289,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>نشانی گیرنده معتبر نیست؛ لطفا دوباره بررسی کنید.</translation>
</message>
@@ -2275,12 +2324,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(بدون برچسب)</translation>
</message>
@@ -2290,7 +2339,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2300,7 +2349,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2377,12 +2426,7 @@ Address: %4
<translation>پیام:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2392,7 +2436,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2408,11 +2457,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>یک آدرس بیت‌کوین وارد کنید (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2450,19 +2494,19 @@ Address: %4
<translation>نشانی مورد استفاده برای امضا کردن پیام (برای مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>چسباندن نشانی از حافظهٔ سیستم</translation>
</message>
@@ -2503,12 +2547,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>پاک &amp;کردن همه</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;شناسایی پیام</translation>
</message>
@@ -2523,7 +2567,7 @@ Address: %4
<translation>نشانی مورد استفاده برای امضا کردن پیام (برای مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>برای حصول اطمینان از اینکه پیام با نشانی بیت‌کوین مشخص شده امضا است یا خیر، پیام را شناسایی کنید</translation>
</message>
@@ -2538,43 +2582,37 @@ Address: %4
<translation>بازنشانی تمام فیلدهای پیام</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>یک نشانی بیت‌کوین وارد کنید (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>برای ایجاد یک امضای جدید روی «امضای پیام» کلیک کنید</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>امضای بیت‌کوین را وارد کنید</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>نشانی وارد شده نامعتبر است.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>لطفاً نشانی را بررسی کنید و دوباره تلاش کنید.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>نشانی وارد شده به هیچ کلیدی اشاره نمی‌کند.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>عملیات باز کرن قفل کیف پول لغو شد.</translation>
</message>
@@ -2594,7 +2632,7 @@ Address: %4
<translation>پیام امضا شد.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>امضا نمی‌تواند کدگشایی شود.</translation>
</message>
@@ -2655,6 +2693,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/آفلاین</translation>
</message>
@@ -2816,12 +2859,12 @@ Address: %4
<translation>، هنوز با موفقیت ارسال نشده</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>باز برای %n بلوک دیگر</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>ناشناس</translation>
</message>
@@ -2862,12 +2905,12 @@ Address: %4
<translation>مبلغ</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>باز برای %n بلوک دیگر</numerusform></translation>
</message>
@@ -2877,23 +2920,12 @@ Address: %4
<translation>باز شده تا %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>آفلاین (%1 تأییدیه)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>تأیید نشده (%1 از %2 تأییدیه)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>تأیید شده (%1 تأییدیه)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>این بلوک از هیچ همتای دیگری دریافت نشده است و احتمال می‌رود پذیرفته نشود!</translation>
</message>
@@ -2903,7 +2935,27 @@ Address: %4
<translation>تولید شده ولی قبول نشده</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>دریافت‌شده با</translation>
</message>
@@ -2933,7 +2985,7 @@ Address: %4
<translation>(ناموجود)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>وضعیت تراکنش. نشانگر را روی این فیلد نگه دارید تا تعداد تأییدیه‌ها نشان داده شود.</translation>
</message>
@@ -3199,12 +3251,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>استفاده:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>نمایش لیست فرمان‌ها</translation>
</message>
@@ -3259,12 +3311,12 @@ Address: %4
<translation>آدرس عمومی خود را مشخص کنید</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>حد آستانه برای قطع ارتباط با همتایان بدرفتار (پیش‌فرض: ۱۰۰)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>مدت زمان جلوگیری از اتصال مجدد همتایان بدرفتار، به ثانیه (پیش‌فرض: ۸۴۶۰۰)</translation>
</message>
@@ -3284,17 +3336,17 @@ Address: %4
<translation>پذیرش دستورات خط فرمان و دستورات JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>اجرا در پشت زمینه به‌صورت یک سرویس و پذیرش دستورات</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>استفاده از شبکهٔ آزمایش</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>پذیرش اتصالات از بیرون (پیش فرض:1 بدون پراکسی یا اتصال)</translation>
</message>
@@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>تنها در گره (های) مشخص شده متصل شوید</translation>
</message>
@@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>اطلاعات</translation>
</message>
@@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>(میلی ثانیه )فاصله ارتباط خاص</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>خطای سامانه</translation>
</message>
@@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>نسخه</translation>
</message>
@@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC عبارت عبور برای ارتباطات</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>از آدرس آی پی خاص JSON-RPC قبول ارتباطات</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>(127.0.0.1پیش فرض: ) &amp;lt;ip&amp;gt; دادن فرمانها برای استفاده گره ها روی</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>زمانی که بهترین بلاک تغییر کرد، دستور را اجرا کن (%s در cmd با block hash جایگزین شده است)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>wallet را به جدیدترین فرمت روزآمد کنید</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation> (100پیش فرض:)&amp;lt;n&amp;gt; گذاشتن اندازه کلید روی </translation>
</message>
@@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>اسکان مجدد زنجیر بلوکها برای گم والت معامله</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>JSON-RPCبرای ارتباطات استفاده کنید OpenSSL (https)</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation> (server.certپیش فرض: )گواهی نامه سرور</translation>
</message>
@@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>(server.pemپیش فرض: ) کلید خصوصی سرور</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>پیام کمکی</translation>
</message>
@@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>امکان اتصال به %s از این رایانه وجود ندارد ( bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>به DNS اجازه بده تا برای addnode ، seednode و اتصال جستجو کند</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>بار گیری آدرس ها</translation>
</message>
@@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>خطا در بارگیری wallet.dat: کیف پول به ویرایش جدیدتری از Biticon نیاز دارد</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>سلام</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>خطا در بارگیری wallet.dat</translation>
</message>
@@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>آدرس پراکسی اشتباه %s</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>شبکه مشخص شده غیرقابل شناسایی در onlynet: &apos;%s&apos;</translation>
</message>
@@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>نسخه پراکسی ساکس غیرقابل شناسایی درخواست شده است: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>آدرس قابل اتصال- شناسایی نیست %s</translation>
</message>
@@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>آدرس خارجی قابل اتصال- شناسایی نیست %s</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>میزان وجه اشتباه برای paytxfee=&lt;میزان وجه&gt;: %s</translation>
</message>
@@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>بار گیری شاخص بلوک</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>به اتصال یک گره اضافه کنید و اتصال را باز نگاه دارید</translation>
</message>
@@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>اتصال به %s از این رایانه امکان پذیر نیست. Bitcoin احتمالا در حال اجراست.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>بار گیری والت</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>امکان تنزل نسخه در wallet وجود ندارد</translation>
</message>
@@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>آدرس پیش فرض قابل ذخیره نیست</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>اسکان مجدد</translation>
</message>
@@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>بار گیری انجام شده است</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>برای استفاده از %s از انتخابات</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>خطا</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts
index fe547113d9..bd2c9a9ca3 100644
--- a/src/qt/locale/bitcoin_fa_IR.ts
+++ b/src/qt/locale/bitcoin_fa_IR.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -613,6 +619,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -683,7 +699,7 @@ Address: %4
<translation>wallet رمزگذاری شد و در حال حاضر قفل است</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -744,7 +760,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -759,7 +775,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>میزان</translation>
</message>
@@ -910,7 +926,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1093,7 +1109,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1237,7 +1253,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1247,7 +1263,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1262,12 +1278,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>حافظه بانک داده را به مگابایت تنظیم کنید (پیش فرض: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1282,7 +1293,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1317,7 +1333,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1432,17 +1458,17 @@ Address: %4
<translation>و رد</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>پیش فرض</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1482,18 +1508,13 @@ Address: %4
<translation>اطلاعات نمایش داده شده ممکن است روزآمد نباشد. wallet شما به صورت خودکار بعد از برقراری اتصال با شبکه bitcoin به روز می شود اما این فرایند هنوز تکمیل نشده است.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>تایید نشده</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>کیف پول</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1502,7 +1523,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1650,6 +1676,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1870,22 +1901,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>و برچسب</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1895,27 +1926,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1925,17 +1959,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1954,6 +1988,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>برچسب را کپی کنید</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>میزان وجه کپی شود</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2055,12 +2104,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>سکه های ارسالی</translation>
@@ -2136,7 +2190,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>ارسال همزمان به گیرنده های متعدد</translation>
</message>
@@ -2146,7 +2200,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2156,12 +2210,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>مانده حساب:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>تایید عملیات ارسال </translation>
</message>
@@ -2171,7 +2225,7 @@ Address: %4
<translation>و ارسال</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>تایید ارسال بیت کوین ها</translation>
</message>
@@ -2184,12 +2238,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2288,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2274,12 +2323,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(برچسب ندارد)</translation>
</message>
@@ -2289,7 +2338,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2299,7 +2348,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2376,12 +2425,7 @@ Address: %4
<translation>پیام:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2391,7 +2435,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2407,11 +2456,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2449,19 +2493,19 @@ Address: %4
<translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt و A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>آدرس را بر کلیپ بورد کپی کنید</translation>
</message>
@@ -2502,12 +2546,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2522,7 +2566,7 @@ Address: %4
<translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2537,43 +2581,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2593,7 +2631,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2654,6 +2692,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2815,12 +2858,12 @@ Address: %4
<translation>، هنوز با موفقیت ارسال نگردیده است</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>ناشناس</translation>
</message>
@@ -2861,12 +2904,12 @@ Address: %4
<translation>میزان وجه</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2876,23 +2919,12 @@ Address: %4
<translation>باز کن تا %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>برون خطی (%1 تاییدها)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>تایید نشده (%1 از %2 تاییدها)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>تایید شده (%1 تاییدها)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>این block توسط گره های دیگری دریافت نشده است و ممکن است قبول نشود</translation>
</message>
@@ -2902,7 +2934,27 @@ Address: %4
<translation>تولید شده اما قبول نشده است</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>قبول با </translation>
</message>
@@ -2932,7 +2984,7 @@ Address: %4
<translation>خالی</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>وضعیت تراکنش. با اشاره به این بخش تعداد تاییدها نمایش داده می شود</translation>
</message>
@@ -3198,12 +3250,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>میزان استفاده:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>فهرست دستورها</translation>
</message>
@@ -3258,12 +3310,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>آستانه قطع برای قرینه سازی اشتباه (پیش فرض:100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>تعداد ثانیه ها برای اتصال دوباره قرینه های اشتباه (پیش فرض:86400)</translation>
</message>
@@ -3283,17 +3335,17 @@ Address: %4
<translation>command line و JSON-RPC commands را قبول کنید</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>به عنوان daemon بک گراند را اجرا کنید و دستورات را قبول نمایید</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>از تستِ شبکه استفاده نمایید</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3424,6 +3476,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3634,6 +3691,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3683,12 +3745,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3708,7 +3770,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3778,7 +3840,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>تعیین مدت زمان وقفه (time out) به هزارم ثانیه</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3824,6 +3886,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>نسخه</translation>
</message>
@@ -3833,32 +3900,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>رمز برای ارتباطاتِ JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>ارتباطاتِ JSON-RPC را از آدرس آی.پی. مشخصی برقرار کنید.</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>دستورات را به گره اجرا شده در&lt;ip&gt; ارسال کنید (پیش فرض:127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>دستور را وقتی بهترین بلاک تغییر کرد اجرا کن (%s در دستور توسط block hash جایگزین شده است)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>wallet را به جدیدترین نسخه روزآمد کنید</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>حجم key pool را به اندازه &lt;n&gt; تنظیم کنید (پیش فرض:100)</translation>
</message>
@@ -3868,12 +3935,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>زنجیره بلاک را برای تراکنش جا افتاده در WALLET دوباره اسکن کنید</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>برای ارتباطاتِ JSON-RPC از OpenSSL (https) استفاده کنید</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>فایل certificate سرور (پیش فرض server.cert)</translation>
</message>
@@ -3883,7 +3950,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>رمز اختصاصی سرور (پیش فرض: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>این پیام راهنما</translation>
</message>
@@ -3893,12 +3960,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>لود شدن آدرسها..</translation>
</message>
@@ -3913,12 +3980,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>خطا در هنگام لود شدن wallet.dat. به نسخه جدید Bitocin برای wallet نیاز است.</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>wallet نیاز به بازنویسی دارد. Bitcoin را برای تکمیل عملیات دوباره اجرا کنید.</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>خطا در هنگام لود شدن wallet.dat</translation>
</message>
@@ -3928,7 +3995,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3938,7 +4005,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3948,7 +4015,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>میزان اشتباه است for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3968,7 +4035,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>لود شدن نمایه بلاکها..</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>یک گره برای اتصال اضافه کنید و تلاش کنید تا اتصال را باز نگاه دارید</translation>
</message>
@@ -3978,12 +4045,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>wallet در حال لود شدن است...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>قابلیت برگشت به نسخه قبلی برای wallet امکان پذیر نیست</translation>
</message>
@@ -3993,7 +4060,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>آدرس پیش فرض قابل ذخیره نیست</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>اسکنِ دوباره...</translation>
</message>
@@ -4003,17 +4070,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>اتمام لود شدن</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>برای استفاده از %s از اختیارات</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>خطا</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index 2006db509d..0b4bb7e822 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -37,6 +37,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -618,6 +624,16 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation><numerusform>%n viikko</numerusform><numerusform>%n viikkoa</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -690,7 +706,7 @@ Osoite: %4</translation>
<translation>Lompakko on &lt;b&gt;salattu&lt;/b&gt; ja tällä hetkellä &lt;b&gt;lukittuna&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Peruuttamaton virhe on tapahtunut. Bitcoin ei voi enää jatkaa turvallisesti ja sammutetaan.</translation>
</message>
@@ -751,7 +767,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -766,7 +782,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Määrä</translation>
</message>
@@ -917,7 +933,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1099,7 +1115,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin-ydin</translation>
</message>
@@ -1243,7 +1259,7 @@ Osoite: %4</translation>
<translation>&amp;Yleiset</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1253,7 +1269,7 @@ Osoite: %4</translation>
<translation>Maksa rahansiirtopalkkio</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Käynnistä Bitcoin kirjautumisen yhteydessä.</translation>
</message>
@@ -1268,12 +1284,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Aseta tietokannan välimuistin koko megatavuina (oletus: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1288,7 +1299,12 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1323,7 +1339,17 @@ Osoite: %4</translation>
<translation>&amp;Verkko</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Avaa Bitcoin-asiakasohjelman portti reitittimellä automaattisesti. Tämä toimii vain, jos reitittimesi tukee UPnP:tä ja se on käytössä.</translation>
</message>
@@ -1438,17 +1464,17 @@ Osoite: %4</translation>
<translation>&amp;Peruuta</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>oletus</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1488,19 +1514,14 @@ Osoite: %4</translation>
<translation>Näytetyt tiedot eivät välttämättä ole ajantasalla. Lompakkosi synkronoituu Bitcoin-verkon kanssa automaattisesti yhteyden muodostamisen jälkeen, mutta synkronointi on vielä meneillään.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Vahvistamatta:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Lompakko</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Vahvistettu</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1508,7 +1529,12 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1656,6 +1682,11 @@ Osoite: %4</translation>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1876,22 +1907,22 @@ Osoite: %4</translation>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Nimi:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1901,27 +1932,30 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1931,17 +1965,17 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1960,6 +1994,21 @@ Osoite: %4</translation>
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopioi nimi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopioi määrä</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2061,12 +2110,17 @@ Osoite: %4</translation>
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Lähetä Bitcoineja</translation>
@@ -2142,7 +2196,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Lähetä monelle vastaanottajalle</translation>
</message>
@@ -2152,7 +2206,7 @@ Osoite: %4</translation>
<translation>Lisää &amp;Vastaanottaja</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2162,12 +2216,12 @@ Osoite: %4</translation>
<translation>&amp;Tyhjennnä Kaikki</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Vahvista lähetys</translation>
</message>
@@ -2177,7 +2231,7 @@ Osoite: %4</translation>
<translation>&amp;Lähetä</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Hyväksy Bitcoinien lähettäminen</translation>
</message>
@@ -2190,12 +2244,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2245,7 +2294,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Vastaanottajan osoite on virheellinen. Tarkista osoite.</translation>
</message>
@@ -2280,12 +2329,12 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(ei nimeä)</translation>
</message>
@@ -2295,7 +2344,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2305,7 +2354,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2382,12 +2431,7 @@ Osoite: %4</translation>
<translation>Viesti:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2397,7 +2441,12 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2413,11 +2462,6 @@ Osoite: %4</translation>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2455,19 +2499,19 @@ Osoite: %4</translation>
<translation>Osoite, jolla viesti allekirjoitetaan (esimerkiksi 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Liitä osoite leikepöydältä</translation>
</message>
@@ -2508,12 +2552,12 @@ Osoite: %4</translation>
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>&amp;Tyhjennä Kaikki</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Varmista viesti</translation>
</message>
@@ -2528,7 +2572,7 @@ Osoite: %4</translation>
<translation>Osoite, jolla viesti allekirjoitettiin (esimerkiksi 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Tarkista viestin allekirjoitus varmistaaksesi, että se allekirjoitettiin tietyllä Bitcoin-osoitteella</translation>
</message>
@@ -2543,43 +2587,37 @@ Osoite: %4</translation>
<translation>Tyhjennä kaikki varmista-viesti-kentät</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Klikkaa &quot;Allekirjoita Viesti luodaksesi allekirjoituksen </translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Syötä Bitcoin-allekirjoitus</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Syötetty osoite on virheellinen.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Tarkista osoite ja yritä uudelleen.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Syötetyn osoitteen avainta ei löydy.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Lompakon avaaminen peruttiin.</translation>
</message>
@@ -2599,7 +2637,7 @@ Osoite: %4</translation>
<translation>Viesti allekirjoitettu.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Allekirjoitusta ei pystytty tulkitsemaan.</translation>
</message>
@@ -2660,6 +2698,11 @@ Osoite: %4</translation>
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/offline</translation>
</message>
@@ -2821,12 +2864,12 @@ Osoite: %4</translation>
<translation>, ei ole vielä onnistuneesti lähetetty</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>tuntematon</translation>
</message>
@@ -2867,12 +2910,12 @@ Osoite: %4</translation>
<translation>Määrä</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2882,23 +2925,12 @@ Osoite: %4</translation>
<translation>Avoinna %1 asti</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Ei yhteyttä verkkoon (%1 vahvistusta)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Vahvistamatta (%1/%2 vahvistusta)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Vahvistettu (%1 vahvistusta)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Tätä lohkoa ei vastaanotettu mistään muusta solmusta ja sitä ei mahdollisesti hyväksytä!</translation>
</message>
@@ -2908,7 +2940,27 @@ Osoite: %4</translation>
<translation>Generoitu mutta ei hyväksytty</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Vastaanotettu osoitteella</translation>
</message>
@@ -2938,7 +2990,7 @@ Osoite: %4</translation>
<translation>(ei saatavilla)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Rahansiirron tila. Siirrä osoitin kentän päälle nähdäksesi vahvistusten lukumäärä.</translation>
</message>
@@ -3204,12 +3256,12 @@ Osoite: %4</translation>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Käyttö:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Lista komennoista</translation>
</message>
@@ -3264,12 +3316,12 @@ Osoite: %4</translation>
<translation>Määritä julkinen osoitteesi</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Kynnysarvo aikakatkaisulle heikosti toimiville verkoille (oletus: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Sekuntien määrä, kuinka kauan uudelleenkytkeydytään verkkoihin (oletus: 86400)</translation>
</message>
@@ -3289,17 +3341,17 @@ Osoite: %4</translation>
<translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Aja taustalla daemonina ja hyväksy komennot</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Käytä test -verkkoa</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation>
</message>
@@ -3430,6 +3482,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Yhidstä ainoastaan määrättyihin noodeihin</translation>
</message>
@@ -3640,6 +3697,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3689,12 +3751,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Tuodaan lohkoja ulkoisesta blk000??.dat tiedostosta</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3714,7 +3776,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Tietoa</translation>
</message>
@@ -3784,7 +3846,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Määritä yhteyden aikakataisu millisekunneissa (vakioasetus: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Järjestelmävirhe:</translation>
</message>
@@ -3830,6 +3892,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versio</translation>
</message>
@@ -3839,32 +3906,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Salasana JSON-RPC-yhteyksille</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Salli JSON-RPC yhteydet tietystä ip-osoitteesta</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Lähetä käskyjä solmuun osoitteessa &lt;ip&gt; (oletus: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Suorita käsky kun paras lohko muuttuu (%s cmd on vaihdettu block hashin kanssa)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Päivitä lompakko uusimpaan formaattiin</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Aseta avainpoolin koko arvoon &lt;n&gt; (oletus: 100)</translation>
</message>
@@ -3874,12 +3941,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Skannaa uudelleen lohkoketju lompakon puuttuvien rahasiirtojen vuoksi</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Käytä OpenSSL:ää (https) JSON-RPC-yhteyksille</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Palvelimen sertifikaatti-tiedosto (oletus: server.cert)</translation>
</message>
@@ -3889,7 +3956,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Palvelimen yksityisavain (oletus: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Tämä ohjeviesti</translation>
</message>
@@ -3899,12 +3966,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kytkeytyminen %s tällä tietokonella ei onnistu (kytkeytyminen palautti virheen %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Salli DNS kyselyt -addnode, -seednode ja -connect yhteydessä</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Ladataan osoitteita...</translation>
</message>
@@ -3919,12 +3986,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Virhe ladattaessa wallet.dat-tiedostoa: Tarvitset uudemman version Bitcoinista</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä Bitcoin uudelleen</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Virhe ladattaessa wallet.dat-tiedostoa</translation>
</message>
@@ -3934,7 +4001,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Virheellinen proxy-osoite &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Tuntematon verkko -onlynet parametrina: &apos;%s&apos;</translation>
</message>
@@ -3944,7 +4011,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Tuntematon -socks proxy versio pyydetty: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>-bind osoitteen &apos;%s&apos; selvittäminen epäonnistui</translation>
</message>
@@ -3954,7 +4021,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>-externalip osoitteen &apos;%s&apos; selvittäminen epäonnistui</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>-paytxfee=&lt;amount&gt;: &apos;%s&apos; on virheellinen</translation>
</message>
@@ -3974,7 +4041,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ladataan lohkoindeksiä...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Linää solmu mihin liittyä pitääksesi yhteyden auki</translation>
</message>
@@ -3984,12 +4051,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kytkeytyminen %s ei onnistu tällä tietokoneella. Bitcoin on todennäköisesti jo ajamassa.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Ladataan lompakkoa...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Et voi päivittää lompakkoasi vanhempaan versioon</translation>
</message>
@@ -3999,7 +4066,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Oletusosoitetta ei voi kirjoittaa</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Skannataan uudelleen...</translation>
</message>
@@ -4009,17 +4076,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Lataus on valmis</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Käytä %s optiota</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Virhe</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index 3ae5a8154c..f53b5fe16d 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation>Les développeurs Bitcoin Core</translation>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation> (%1-bit)</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation>%1 et %2</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 en retard</translation>
@@ -690,7 +706,7 @@ Adresse : %4
<translation>Le portefeuille est &lt;b&gt;chiffré&lt;/b&gt; et actuellement &lt;b&gt;verrouillé&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Une erreur fatale est survenue. Bitcoin ne peut plus continuer de façon sûre et va s&apos;arrêter.</translation>
</message>
@@ -751,7 +767,7 @@ Adresse : %4
<translation>Monnaie :</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation>Tout (dé)sélectionner</translation>
</message>
@@ -766,7 +782,7 @@ Adresse : %4
<translation>Mode liste</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Montant</translation>
</message>
@@ -917,7 +933,7 @@ Adresse : %4
<translation>aucun</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation>Poussière</translation>
</message>
@@ -1099,7 +1115,7 @@ Adresse : %4
<translation>Bitcoin Core - Options de ligne de commande</translation>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
</message>
@@ -1243,7 +1259,7 @@ Adresse : %4
<translation>Réglages &amp;principaux</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Frais de transaction optionnel par ko qui aident à garantir un traitement rapide des transactions. La plupart des transactions utilisent 1 ko.</translation>
</message>
@@ -1253,7 +1269,7 @@ Adresse : %4
<translation>Payer des &amp;frais de transaction</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Démarrer Bitcoin automatiquement après avoir ouvert une session sur l&apos;ordinateur.</translation>
</message>
@@ -1268,12 +1284,7 @@ Adresse : %4
<translation>Taille du cache de la base de &amp;données</translation>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Définir la taille du cache de la base de données en mégaoctets (par défaut : 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>Mo</translation>
</message>
@@ -1288,7 +1299,12 @@ Adresse : %4
<translation>Défini le nombre d&apos;exétrons de vérification de script (jusqu&apos;à 16, 0 = auto, &lt;0 = laisse autant de cœurs libre, par défaut : 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation>&amp;Dépenser la monnaie non confirmée (experts seulement)</translation>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation>Se connecter au réseau Bitcoin par un mandataire SOCKS.</translation>
</message>
@@ -1323,7 +1339,17 @@ Adresse : %4
<translation>&amp;Réseau</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation>&amp;Portefeuille</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation>Si vous désactivé la dépense de la monnaie non confirmée, la monnaie d&apos;une transaction ne peut pas être utilisée tant que cette transaction n&apos;a pas reçu au moins une confirmation. Ceci affecte aussi comment votre solde est calculé.</translation>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Ouvrir le port du client Bitcoin automatiquement sur le routeur. Ceci ne fonctionne que si votre routeur supporte l&apos;UPnP et si la fonctionnalité est activée.</translation>
</message>
@@ -1438,17 +1464,17 @@ Adresse : %4
<translation>A&amp;nnuler</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>par défaut</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation>aucune</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Confirmer la réinitialisation des options</translation>
</message>
@@ -1488,19 +1514,14 @@ Adresse : %4
<translation>Les informations affichées peuvent être obsolètes. Votre portefeuille est automatiquement synchronisé avec le réseau Bitcoin lorsque la connexion s&apos;établit, or ce processus n&apos;est pas encore terminé.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Non confirmé :</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Portefeuille</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Confirmé :</translation>
+ <source>Available:</source>
+ <translation>Disponible :</translation>
</message>
<message>
<location line="+16"/>
@@ -1508,7 +1529,12 @@ Adresse : %4
<translation>Votre solde actuel pouvant être dépensé</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation>En attente :</translation>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Total des transactions qui doivent encore être confirmées et qu&apos;il n&apos;est pas encore possible de dépenser</translation>
</message>
@@ -1656,6 +1682,11 @@ Adresse : %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Erreur : combinaison invalide de -regtest et de -testnet.</translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Saisir une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1876,22 +1907,22 @@ Adresse : %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>&amp;Montant :</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Étiquette :</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>M&amp;essage :</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Réutilise une adresse de réception précédemment utilisée. Réutiliser une adresse pose des problèmes de sécurité et de vie privée. N&apos;utilisez pas cette option sauf si vous générez à nouveau une demande de paiement déjà faite.</translation>
</message>
@@ -1901,27 +1932,30 @@ Adresse : %4
<translation>Ré&amp;utiliser une adresse de réception existante (non recommandé)</translation>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
- <translation>Un étiquette optionnelle à associer à la nouvelle adresse de réception</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+14"/>
+ <location line="+23"/>
<source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation>Un message optionnel à joindre à la demande de paiement qui sera affiché à l&apos;ouverture de celle-ci. Note : le message ne sera pas envoyé avec le paiement par le réseau Bitcoin.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
+ <translation>Un étiquette optionnelle à associer à la nouvelle adresse de réception</translation>
+ </message>
+ <message>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation>Utiliser ce formulaire pour demander des paiements. Tous les champs sont &lt;b&gt;optionnels&lt;/b&gt;.</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation>Un montant optionnel à demander. Laisser ceci vide ou à zéro pour ne pas demander de montant spécifique.</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Effacer tous les champs du formulaire.</translation>
</message>
@@ -1931,17 +1965,17 @@ Adresse : %4
<translation>Effacer</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
- <translation>&amp;Demande de paiement</translation>
+ <location line="+78"/>
+ <source>Requested payments history</source>
+ <translation>Historique des paiements demandés</translation>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation>Paiements demandés</translation>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>&amp;Demande de paiement</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Afficher la demande choisie (identique à un double-clic sur une entrée)</translation>
</message>
@@ -1960,6 +1994,21 @@ Adresse : %4
<source>Remove</source>
<translation>Enlever</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Copier l’étiquette</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation>Copier le message</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copier le montant</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2061,12 +2110,17 @@ Adresse : %4
<source>(no message)</source>
<translation>(pas de message)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation>(aucun montant)</translation>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Envoyer des pièces</translation>
@@ -2142,7 +2196,7 @@ Adresse : %4
<translation>Adresse personnalisée de monnaie rendue</translation>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Envoyer à plusieurs destinataires à la fois</translation>
</message>
@@ -2152,7 +2206,7 @@ Adresse : %4
<translation>Ajouter un &amp;destinataire</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Effacer tous les champs du formulaire.</translation>
</message>
@@ -2162,12 +2216,12 @@ Adresse : %4
<translation>&amp;Tout nettoyer</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Solde :</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Confirmer l’action d&apos;envoi</translation>
</message>
@@ -2177,7 +2231,7 @@ Adresse : %4
<translation>E&amp;nvoyer</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Confirmer l’envoi des pièces</translation>
</message>
@@ -2190,12 +2244,7 @@ Adresse : %4
<translation>%1 à %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Saisir une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation>Copier la quantité</translation>
</message>
@@ -2245,7 +2294,7 @@ Adresse : %4
<translation>ou</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>L&apos;adresse du destinataire n’est pas valide, veuillez la vérifier.</translation>
</message>
@@ -2280,12 +2329,12 @@ Adresse : %4
<translation>La transaction a été rejetée ! Ceci peut arriver si certaines pièces de votre portefeuille étaient déjà dépensées, par exemple si vous avez utilisé une copie de wallet.dat et que des pièces ont été dépensées dans la copie sans être marquées comme telles ici.</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Attention : adresse Bitcoin invalide</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(pas d&apos;étiquette)</translation>
</message>
@@ -2295,7 +2344,7 @@ Adresse : %4
<translation>Attention : adresse de monnaie rendue inconnue</translation>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Êtes-vous sûr de vouloir envoyer ?</translation>
</message>
@@ -2305,7 +2354,7 @@ Adresse : %4
<translation>ajouté en tant que frais de transaction</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>La demande de paiement a expiré</translation>
</message>
@@ -2382,12 +2431,7 @@ Adresse : %4
<translation>Message :</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation>Un message qui était joint à l&apos;URI Bitcoin et qui sera stocké avec la transaction pour référence. Note : ce message ne sera pas envoyé par le réseau Bitcoin.</translation>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation>Ceci est une demande de paiement vérifiée.</translation>
</message>
@@ -2397,7 +2441,12 @@ Adresse : %4
<translation>Saisir une étiquette pour cette adresse afin de l&apos;ajouter à la liste d&apos;adresses utilisées</translation>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>Un message qui était joint à l&apos;URI Bitcoin et qui sera stocké avec la transaction pour référence. Note : ce message ne sera pas envoyé par le réseau Bitcoin.</translation>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation>Ceci est une demande de paiement non vérifiée.</translation>
</message>
@@ -2413,11 +2462,6 @@ Adresse : %4
<source>Memo:</source>
<translation>Mémo :</translation>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Saisir une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2455,19 +2499,19 @@ Adresse : %4
<translation>L&apos;adresse avec laquelle le message sera signé (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Choisir une adresse précédemment utilisée</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Coller une adresse depuis le presse-papier</translation>
</message>
@@ -2508,12 +2552,12 @@ Adresse : %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>&amp;Tout nettoyer</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Vérifier un message</translation>
</message>
@@ -2528,7 +2572,7 @@ Adresse : %4
<translation>L&apos;adresse avec laquelle le message a été signé (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Vérifier le message pour vous assurer qu&apos;il a bien été signé par l&apos;adresse Bitcoin spécifiée</translation>
</message>
@@ -2543,43 +2587,37 @@ Adresse : %4
<translation>Réinitialiser tous les champs de vérification de message</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Saisir une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Cliquez sur « Signer le message » pour générer la signature</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Saisir une signature Bitcoin</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>L&apos;adresse saisie est invalide.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Veuillez vérifier l&apos;adresse et réessayer.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>L&apos;adresse saisie ne fait pas référence à une clef.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Le déverrouillage du portefeuille a été annulé.</translation>
</message>
@@ -2599,7 +2637,7 @@ Adresse : %4
<translation>Le message a été signé.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>La signature n&apos;a pu être décodée.</translation>
</message>
@@ -2660,6 +2698,11 @@ Adresse : %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation>en conflit</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/hors ligne</translation>
</message>
@@ -2821,12 +2864,12 @@ Adresse : %4
<translation>, n’a pas encore été diffusée avec succès</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>inconnu</translation>
</message>
@@ -2867,12 +2910,12 @@ Adresse : %4
<translation>Montant</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation>Immature (%1 confirmations, sera disponible après %2)</translation>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
</message>
@@ -2882,23 +2925,12 @@ Adresse : %4
<translation>Ouvert jusqu&apos;à %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Hors ligne (%1 confirmations)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Non confirmée (%1 confirmations sur %2)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmée (%1 confirmations)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ce bloc n’a été reçu par aucun autre nœud et ne sera probablement pas accepté !</translation>
</message>
@@ -2908,7 +2940,27 @@ Adresse : %4
<translation>Généré mais pas accepté</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation>Hors ligne</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation>Non confirmé</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation>Confirmation (%1 sur %2 confirmations recommandées)</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation>En conflit</translation>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Reçue avec</translation>
</message>
@@ -2938,7 +2990,7 @@ Adresse : %4
<translation>(n.d)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>État de la transaction. Laissez le pointeur de la souris sur ce champ pour voir le nombre de confirmations.</translation>
</message>
@@ -3204,12 +3256,12 @@ Adresse : %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Utilisation :</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Lister les commandes</translation>
</message>
@@ -3264,12 +3316,12 @@ Adresse : %4
<translation>Spécifier votre propre adresse publique</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Seuil de déconnexion des pairs de mauvaise qualité (par défaut : 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Délai en secondes de refus de reconnexion aux pairs de mauvaise qualité (par défaut : 86400)</translation>
</message>
@@ -3289,17 +3341,17 @@ Adresse : %4
<translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Utiliser le réseau de test</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Accepter les connexions entrantes (par défaut : 1 si aucun -proxy ou -connect )</translation>
</message>
@@ -3440,6 +3492,11 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation>Effacer la liste des transactions du portefeuille (outil de diagnostic, implique un nouveau balayage -rescan)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Ne se connecter qu&apos;au(x) nœud(s) spécifié(s)</translation>
</message>
@@ -3650,6 +3707,11 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation>Dépenser la monnaie non confirmée lors de l&apos;envoi de transactions (par défaut : 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Démarrer le serveur Bitcoin</translation>
</message>
@@ -3699,12 +3761,12 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Vous devez reconstruire la base de données en utilisant -reindex afin de modifier -txindex</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importe des blocs depuis un fichier blk000??.dat externe</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Exécuter une commande lorsqu&apos;une alerte pertinente est reçue ou si nous voyons une bifurcation vraiment étendue (%s dans la commande est remplacé par le message)</translation>
</message>
@@ -3724,7 +3786,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Définir le nombre d&apos;exétrons de vérification des scripts (maximum 16, 0 = auto, &lt; 0 = laisser ce nombre de cœurs libres, par défaut : 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informations</translation>
</message>
@@ -3794,7 +3856,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Spécifier le délai d&apos;expiration de la connexion en millisecondes (par défaut : 5 000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Erreur système :</translation>
</message>
@@ -3840,6 +3902,11 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation>Supprimer toutes les transactions du portefeuille...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>version</translation>
</message>
@@ -3849,32 +3916,32 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>wallet.dat corrompu, la récupération a échoué</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Mot de passe pour les connexions JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Autoriser les connexions JSON-RPC depuis l&apos;adresse IP spécifiée</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Envoyer des commandes au nœud fonctionnant sur &lt;ip&gt; (par défaut : 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Exécuter la commande lorsque le meilleur bloc change (%s dans cmd est remplacé par le hachage du bloc)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Mettre à niveau le portefeuille vers le format le plus récent</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Régler la taille de la réserve de clefs sur &lt;n&gt; (par défaut : 100)</translation>
</message>
@@ -3884,12 +3951,12 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Réanalyser la chaîne de blocs pour les transactions de portefeuille manquantes</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Utiliser OpenSSL (https) pour les connexions JSON-RPC</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Fichier de certificat serveur (par défaut : server.cert)</translation>
</message>
@@ -3899,7 +3966,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Clef privée du serveur (par défaut : server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Ce message d&apos;aide</translation>
</message>
@@ -3909,12 +3976,12 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Impossible de se lier à %s sur cet ordinateur (bind a retourné l&apos;erreur %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Autoriser les recherches DNS pour -addnode, -seednode et -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Chargement des adresses…</translation>
</message>
@@ -3929,12 +3996,12 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Erreur lors du chargement de wallet.dat : le portefeuille exige une version plus récente de Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Le portefeuille devait être réécrit : redémarrer Bitcoin pour terminer l&apos;opération.</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Erreur lors du chargement de wallet.dat</translation>
</message>
@@ -3944,7 +4011,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Adresse -proxy invalide : « %s »</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Réseau inconnu spécifié sur -onlynet : « %s »</translation>
</message>
@@ -3954,7 +4021,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Version inconnue de serveur mandataire -socks demandée : %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Impossible de résoudre l&apos;adresse -bind : « %s »</translation>
</message>
@@ -3964,7 +4031,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Impossible de résoudre l&apos;adresse -externalip : « %s »</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Montant invalide pour -paytxfee=&lt;montant&gt; : « %s »</translation>
</message>
@@ -3984,7 +4051,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Chargement de l’index des blocs…</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Ajouter un nœud auquel se connecter et tenter de garder la connexion ouverte</translation>
</message>
@@ -3994,12 +4061,12 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Impossible de se lier à %s sur cet ordinateur. Bitcoin fonctionne probablement déjà.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Chargement du portefeuille…</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Impossible de revenir à une version inférieure du portefeuille</translation>
</message>
@@ -4009,7 +4076,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Impossible d&apos;écrire l&apos;adresse par défaut</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Nouvelle analyse…</translation>
</message>
@@ -4019,17 +4086,17 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Chargement terminé</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Pour utiliser l&apos;option %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts
index 71de06dea0..d35a1ea6e9 100644
--- a/src/qt/locale/bitcoin_fr_CA.ts
+++ b/src/qt/locale/bitcoin_fr_CA.ts
@@ -36,6 +36,12 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,6 +623,16 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -686,7 +702,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -747,7 +763,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -762,7 +778,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
@@ -913,7 +929,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1095,7 +1111,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1239,7 +1255,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1249,7 +1265,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1264,12 +1280,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1284,7 +1295,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1319,7 +1335,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1434,17 +1460,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1484,18 +1510,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1504,7 +1525,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1652,6 +1678,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1872,22 +1903,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1897,27 +1928,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1927,17 +1961,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1956,6 +1990,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2057,12 +2106,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
@@ -2138,7 +2192,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2148,7 +2202,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2158,12 +2212,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2173,7 +2227,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2186,12 +2240,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2241,7 +2290,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2276,12 +2325,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation type="unfinished"/>
</message>
@@ -2291,7 +2340,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2301,7 +2350,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2378,12 +2427,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2393,7 +2437,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2409,11 +2458,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2451,19 +2495,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2504,12 +2548,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2524,7 +2568,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2539,43 +2583,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2595,7 +2633,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2656,6 +2694,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2817,12 +2860,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2863,12 +2906,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2878,33 +2921,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2934,7 +2986,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3200,12 +3252,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3260,12 +3312,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3285,17 +3337,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3426,6 +3478,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3636,6 +3693,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3685,12 +3747,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3710,7 +3772,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3780,7 +3842,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3826,6 +3888,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3835,32 +3902,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3870,12 +3937,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3885,7 +3952,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3895,12 +3962,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3915,12 +3982,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3930,7 +3997,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3940,7 +4007,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3950,7 +4017,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3970,7 +4037,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3980,12 +4047,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3995,7 +4062,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4005,17 +4072,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_gu_IN.ts b/src/qt/locale/bitcoin_gu_IN.ts
index c261c07dbb..3b351f1dfb 100644
--- a/src/qt/locale/bitcoin_gu_IN.ts
+++ b/src/qt/locale/bitcoin_gu_IN.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation type="unfinished"/>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index 3a13801dae..2c070d20b3 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation><numerusform>%n שבוע</numerusform><numerusform>%n שבועות</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>1% מאחור</translation>
@@ -689,7 +705,7 @@ Address: %4
<translation>הארנק &lt;b&gt;מוצפן&lt;/b&gt; וכרגע &lt;b&gt;נעול&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>שגיאה סופנית אירעה. ביטקוין אינו יכול להמשיך לפעול בבטחה ולכן ייסגר.</translation>
</message>
@@ -750,7 +766,7 @@ Address: %4
<translation>שינוי:</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation>(מחק)(בחר) הכל</translation>
</message>
@@ -765,7 +781,7 @@ Address: %4
<translation>מצר רשימה</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>כמות</translation>
</message>
@@ -916,7 +932,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation>אבק</translation>
</message>
@@ -1098,7 +1114,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>ליבת ביטקוין</translation>
</message>
@@ -1242,7 +1258,7 @@ Address: %4
<translation>ראשי</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>עמלת פעולה אופציונלית לכל kB תבטיח שהפעולה שלך תעובד בזריזות. רוב הפעולות הן 1 kB. מומלצת עמלה בסך 0.01.</translation>
</message>
@@ -1252,7 +1268,7 @@ Address: %4
<translation>שלם &amp;עמלת פעולה</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>הפעל את ביטקוין באופן עצמאי לאחר התחברות למערכת.</translation>
</message>
@@ -1267,12 +1283,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>קבע את גודל המטמון של מסד הנתונים במגהבייט (ברירת מחדל: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>מגה בייט</translation>
</message>
@@ -1287,7 +1298,12 @@ Address: %4
<translation>קבע את מספר תהליכוני אימות הסקריפטים (1-16, 0 = אוטומטי, ברירת מחדל: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1322,7 +1338,17 @@ Address: %4
<translation>רשת</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>פתח את פורט ביטקוין בנתב באופן אוטומטי. עובד רק אם UPnP מאופשר ונתמך ע&quot;י הנתב.</translation>
</message>
@@ -1437,17 +1463,17 @@ Address: %4
<translation>ביטול</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>ברירת מחדל</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>אשר את איפוס האפשרויות</translation>
</message>
@@ -1487,19 +1513,14 @@ Address: %4
<translation>המידע המוצג עשוי להיות מיושן. הארנק שלך מסתנכרן באופן אוטומטי עם רשת הביטקוין לאחר כינון חיבור, אך התהליך טרם הסתיים.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>ממתין לאישור:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>ארנק</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>מאושר:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1507,7 +1528,12 @@ Address: %4
<translation>היתרה הזמינה הנוכחית</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>הסכום הכולל של פעולות שטרם אושרו, ועוד אינן נספרות בחישוב היתרה הזמינה</translation>
</message>
@@ -1655,6 +1681,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>הכנס כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1875,22 +1906,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>ת&amp;וית:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1900,27 +1931,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>נקה את כל השדות</translation>
</message>
@@ -1930,17 +1964,17 @@ Address: %4
<translation>נקה</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1959,6 +1993,21 @@ Address: %4
<source>Remove</source>
<translation>הסר</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>העתק תוית</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>העתק כמות</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2060,12 +2109,17 @@ Address: %4
<source>(no message)</source>
<translation>(אין הודעות)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>שלח מטבעות</translation>
@@ -2141,7 +2195,7 @@ Address: %4
<translation>כתובת לעודף מותאמת אישית</translation>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>שלח למספר מקבלים בו-זמנית</translation>
</message>
@@ -2151,7 +2205,7 @@ Address: %4
<translation>הוסף מקבל</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>נקה את כל השדות</translation>
</message>
@@ -2161,12 +2215,12 @@ Address: %4
<translation>נקה הכל</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>יתרה:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>אשר את פעולת השליחה</translation>
</message>
@@ -2176,7 +2230,7 @@ Address: %4
<translation>שלח</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>אשר שליחת מטבעות</translation>
</message>
@@ -2189,12 +2243,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>הכנס כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation>העתק כמות</translation>
</message>
@@ -2244,7 +2293,7 @@ Address: %4
<translation>או</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>כתובת המקבל אינה תקינה, אנא בדוק שנית.</translation>
</message>
@@ -2279,12 +2328,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(ללא תוית)</translation>
</message>
@@ -2294,7 +2343,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>האם אכן לשלוח?</translation>
</message>
@@ -2304,7 +2353,7 @@ Address: %4
<translation>הוסף מחיר טיפול</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>תוקף בקשת תשלום פג</translation>
</message>
@@ -2381,12 +2430,7 @@ Address: %4
<translation>הודעה:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation>זוהי בקשה מאומתת לתשלום.</translation>
</message>
@@ -2396,7 +2440,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation>זוהי בקשת תשלום בלתי־מאומתת.</translation>
</message>
@@ -2412,11 +2461,6 @@ Address: %4
<source>Memo:</source>
<translation>תזכורת:</translation>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>הכנס כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2454,19 +2498,19 @@ Address: %4
<translation>הכתובת איתה לחתום על ההודעה (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>בחר כתובת שהייתה בשימוש</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>הדבק כתובת מהלוח</translation>
</message>
@@ -2507,12 +2551,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>נקה הכל</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>אמת הודעה</translation>
</message>
@@ -2527,7 +2571,7 @@ Address: %4
<translation>הכתובת איתה ההודעה נחתמה (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>אמת את ההודעה כדי להבטיח שהיא נחתמה עם כתובת הביטקוין הנתונה</translation>
</message>
@@ -2542,43 +2586,37 @@ Address: %4
<translation>אפס את כל שדות אימות הודעה</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>הכנס כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>לחץ &quot;חתום על ההודעה&quot; כדי לחולל חתימה</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>הכנס חתימת ביטקוין</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>הכתובת שהוכנסה אינה תקינה.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>אנא בדוק את הכתובת ונסה שנית.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>הכתובת שהוכנסה אינה מתייחסת למפתח.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>פתיחת הארנק בוטלה.</translation>
</message>
@@ -2598,7 +2636,7 @@ Address: %4
<translation>ההודעה נחתמה.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>לא ניתן לפענח את החתימה.</translation>
</message>
@@ -2659,6 +2697,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/מנותק</translation>
</message>
@@ -2820,12 +2863,12 @@ Address: %4
<translation>, טרם שודר בהצלחה</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>פתח למשך בלוק %n יותר</numerusform><numerusform>פתח למשך %n בלוקים נוספים</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>לא ידוע</translation>
</message>
@@ -2866,12 +2909,12 @@ Address: %4
<translation>כמות</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>פתח למשך בלוק %n יותר</numerusform><numerusform>פתח למשך %n בלוקים נוספים</numerusform></translation>
</message>
@@ -2881,23 +2924,12 @@ Address: %4
<translation>פתוח עד %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>לא מחובר (%1 אישורים)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>ממתין לאישור (%1 מתוך %2 אישורים)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>מאושר (%1 אישורים)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>הבלוק הזה לא נקלט על ידי אף צומת אחר, וכנראה לא יתקבל!</translation>
</message>
@@ -2907,7 +2939,27 @@ Address: %4
<translation>נוצר אך לא התקבל</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>התקבל עם</translation>
</message>
@@ -2937,7 +2989,7 @@ Address: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>מצב הפעולה. השהה את הסמן מעל שדה זה כדי לראות את מספר האישורים.</translation>
</message>
@@ -3203,12 +3255,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>שימוש:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>רשימת פקודות</translation>
</message>
@@ -3263,12 +3315,12 @@ Address: %4
<translation>ציין את הכתובת הפומבית שלך</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>סף להתנתקות מעמיתים הנוהגים שלא כהלכה (ברירת מחדל: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>מספר שניות למנוע מעמיתים הנוהגים שלא כהלכה מלהתחבר מחדש (ברירת מחדל: 86400)</translation>
</message>
@@ -3288,17 +3340,17 @@ Address: %4
<translation>קבל פקודות משורת הפקודה ו- JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>רוץ ברקע כדימון וקבל פקודות</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>השתמש ברשת הבדיקה</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>קבל חיבורים מבחוץ (ברירת מחדל: 1 ללא -proxy או -connect)</translation>
</message>
@@ -3439,6 +3491,11 @@ rpcpassword=%s
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>התחבר רק לצמתים המצוינים</translation>
</message>
@@ -3649,6 +3706,11 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>הפעל ביטקוין סרוור</translation>
</message>
@@ -3698,12 +3760,12 @@ rpcpassword=%s
<translation>עליך לבנות מחדש את מסד הנתונים תוך שימוש ב- -reindex על מנת לשנות את -txindex</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>מייבא בלוקים מקובצי blk000??.dat חיצוניים</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3723,7 +3785,7 @@ rpcpassword=%s
<translation>קבע את מספר תהליכוני אימות הסקריפטים (1-16, 0 = אוטומטי, ברירת מחדל: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>מידע</translation>
</message>
@@ -3793,7 +3855,7 @@ rpcpassword=%s
<translation>ציין הגבלת זמן לחיבור במילישניות (ברירת מחדל: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>שגיאת מערכת:</translation>
</message>
@@ -3839,6 +3901,11 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>גרסה</translation>
</message>
@@ -3848,32 +3915,32 @@ rpcpassword=%s
<translation>קובץ wallet.dat מושחת, החילוץ נכשל</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>סיסמה לחיבורי JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>אפשר חיבורי JSON-RPC מכתובת האינטרנט המצוינת</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>שלח פקודות לצומת ב-&lt;ip&gt; (ברירת מחדל: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>בצע פקודה זו כשהבלוק הטוב ביותר משתנה (%s בפקודה יוחלף בגיבוב הבלוק)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>שדרג את הארנק לפורמט העדכני</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>קבע את גודל המאגר ל -&lt;n&gt; (ברירת מחדל: 100)</translation>
</message>
@@ -3883,12 +3950,12 @@ rpcpassword=%s
<translation>סרוק מחדש את שרשרת הבלוקים למציאת פעולות חסרות בארנק</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>השתמש ב-OpenSSL (https( עבור חיבורי JSON-RPC</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>קובץ תעודת שרת (ברירת מחדל: server.cert)</translation>
</message>
@@ -3898,7 +3965,7 @@ rpcpassword=%s
<translation>מפתח פרטי של השרת (ברירת מחדל: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>הודעת העזרה הזו</translation>
</message>
@@ -3908,12 +3975,12 @@ rpcpassword=%s
<translation>לא מסוגל לקשור ל-%s במחשב זה (הקשירה החזירה שגיאה %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>אפשר בדיקת DNS עבור -addnode, -seednode ו- -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>טוען כתובות...</translation>
</message>
@@ -3928,12 +3995,12 @@ rpcpassword=%s
<translation>שגיאה בטעינת הקובץ wallet.dat: הארנק דורש גרסה חדשה יותר של ביטקוין</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>יש לכתוב מחדש את הארנק: אתחל את ביטקוין לסיום</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>שגיאה בטעינת הקובץ wallet.dat</translation>
</message>
@@ -3943,7 +4010,7 @@ rpcpassword=%s
<translation>כתובת -proxy לא תקינה: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>רשת לא ידועה צוינה ב- -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3953,7 +4020,7 @@ rpcpassword=%s
<translation>התבקשה גרסת פרוקסי -socks לא ידועה: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>לא מסוגל לפתור כתובת -bind: &apos;%s&apos;</translation>
</message>
@@ -3963,7 +4030,7 @@ rpcpassword=%s
<translation>לא מסוגל לפתור כתובת -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>כמות לא תקינה עבור -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3983,7 +4050,7 @@ rpcpassword=%s
<translation>טוען את אינדקס הבלוקים...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>הוסף צומת להתחברות ונסה לשמור את החיבור פתוח</translation>
</message>
@@ -3993,12 +4060,12 @@ rpcpassword=%s
<translation>לא ניתן לקשור ל-%s במחשב זה. ביטקוין כנראה עדיין רץ.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>טוען ארנק...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>לא יכול להוריד דרגת הארנק</translation>
</message>
@@ -4008,7 +4075,7 @@ rpcpassword=%s
<translation>לא יכול לכתוב את כתובת ברירת המחדל</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>סורק מחדש...</translation>
</message>
@@ -4018,17 +4085,17 @@ rpcpassword=%s
<translation>טעינה הושלמה</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>להשתמש באפשרות %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>שגיאה</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts
index ba10250526..e62e1daa16 100644
--- a/src/qt/locale/bitcoin_hi_IN.ts
+++ b/src/qt/locale/bitcoin_hi_IN.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -613,6 +619,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation><numerusform>%n हफ़्ता</numerusform><numerusform>%n हफ्ते</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 पीछे</translation>
@@ -685,7 +701,7 @@ Address: %4
<translation>वॉलेट एन्क्रिप्टेड है तथा अभी लॉक्ड है</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -746,7 +762,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -761,7 +777,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>राशि</translation>
</message>
@@ -912,7 +928,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1094,7 +1110,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1238,7 +1254,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1248,7 +1264,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1263,12 +1279,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1283,7 +1294,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1318,7 +1334,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1433,17 +1459,17 @@ Address: %4
<translation>&amp;कैन्सल</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1483,18 +1509,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>अपुष्ट :</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>वॉलेट</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1503,7 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1651,6 +1677,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Bitcoin एड्रेस लिखें (उदाहरण: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1872,22 +1903,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>लेबल:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1897,27 +1928,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1927,17 +1961,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1956,6 +1990,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>लेबल कॉपी करे </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>कॉपी राशि</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2057,12 +2106,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>सिक्के भेजें|</translation>
@@ -2138,7 +2192,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>एक साथ कई प्राप्तकर्ताओं को भेजें</translation>
</message>
@@ -2148,7 +2202,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2158,12 +2212,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>बाकी रकम :</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>भेजने की पुष्टि करें</translation>
</message>
@@ -2173,7 +2227,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>सिक्के भेजने की पुष्टि करें</translation>
</message>
@@ -2186,12 +2240,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Bitcoin एड्रेस लिखें (उदाहरण: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2241,7 +2290,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2276,12 +2325,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(कोई लेबल नही !)</translation>
</message>
@@ -2291,7 +2340,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2301,7 +2350,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2378,12 +2427,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2393,7 +2437,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2409,11 +2458,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Bitcoin एड्रेस लिखें (उदाहरण: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2451,19 +2495,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt-A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Clipboard से एड्रेस paste करें</translation>
</message>
@@ -2504,12 +2548,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2524,7 +2568,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2539,43 +2583,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Bitcoin एड्रेस लिखें (उदाहरण: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2595,7 +2633,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2656,6 +2694,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2817,12 +2860,12 @@ Address: %4
<translation>, अभी तक सफलतापूर्वक प्रसारित नहीं किया गया है</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>अज्ञात</translation>
</message>
@@ -2863,12 +2906,12 @@ Address: %4
<translation>राशि</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2878,23 +2921,12 @@ Address: %4
<translation>खुला है जबतक %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>ऑफलाइन ( %1 पक्का करना)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>अपुष्ट ( %1 मे %2 पक्के )</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>पक्के ( %1 पक्का करना)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>यह ब्लॉक किसी भी और नोड को मिला नही है ! शायद यह ब्लॉक कोई भी नोड स्वीकारे गा नही !</translation>
</message>
@@ -2904,7 +2936,27 @@ Address: %4
<translation>जेनरेट किया गया किंतु स्वीकारा नही गया !</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>स्वीकारा गया</translation>
</message>
@@ -2934,7 +2986,7 @@ Address: %4
<translation>(लागू नहीं)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>ट्रांसेक्शन स्तिथि| पुष्टियों की संख्या जानने के लिए इस जगह पर माउस लायें|</translation>
</message>
@@ -3200,12 +3252,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>खपत :</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>commands की लिस्ट बनाएं</translation>
</message>
@@ -3260,12 +3312,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3285,17 +3337,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>बैकग्राउंड में डेमॉन बन कर रन करे तथा कमांड्स स्वीकार करें </translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>टेस्ट नेटवर्क का इस्तेमाल करे </translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3426,6 +3478,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3636,6 +3693,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3685,12 +3747,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3710,7 +3772,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>जानकारी</translation>
</message>
@@ -3780,7 +3842,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3826,6 +3888,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>संस्करण</translation>
</message>
@@ -3835,32 +3902,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3870,12 +3937,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3885,7 +3952,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3895,12 +3962,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>पता पुस्तक आ रही है...</translation>
</message>
@@ -3915,12 +3982,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3930,7 +3997,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3940,7 +4007,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3950,7 +4017,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3970,7 +4037,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ब्लॉक इंडेक्स आ रहा है...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3980,12 +4047,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>वॉलेट आ रहा है...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3995,7 +4062,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>रि-स्केनी-इंग...</translation>
</message>
@@ -4005,17 +4072,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>लोड हो गया|</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>भूल</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts
index e3143e9964..e503f1313a 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -685,7 +701,7 @@ Adresa:%4
<translation>Novčanik je &lt;b&gt;šifriran&lt;/b&gt; i trenutno &lt;b&gt;zaključan&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -746,7 +762,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -761,7 +777,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Iznos</translation>
</message>
@@ -912,7 +928,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1094,7 +1110,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Jezgra</translation>
</message>
@@ -1238,7 +1254,7 @@ Adresa:%4
<translation>&amp;Glavno</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1248,7 +1264,7 @@ Adresa:%4
<translation>Plati &amp;naknadu za transakciju</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Automatski pokreni Bitcoin kad se uključi računalo</translation>
</message>
@@ -1263,12 +1279,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Postavi cache za bazu podataka u MB (zadano:25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1283,7 +1294,12 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1318,7 +1334,17 @@ Adresa:%4
<translation>&amp;Mreža</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Automatski otvori port Bitcoin klijenta na ruteru. To radi samo ako ruter podržava UPnP i ako je omogućen.</translation>
</message>
@@ -1433,17 +1459,17 @@ Adresa:%4
<translation>&amp;Odustani</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>standardne vrijednosti</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1483,19 +1509,14 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Nepotvrđene:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Novčanik</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Potvrđeno:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1503,7 +1524,12 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1651,6 +1677,11 @@ Adresa:%4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1871,22 +1902,22 @@ Adresa:%4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Oznaka:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1896,27 +1927,30 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1926,17 +1960,17 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1955,6 +1989,21 @@ Adresa:%4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopirati oznaku</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopiraj iznos</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2056,12 +2105,17 @@ Adresa:%4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Slanje novca</translation>
@@ -2137,7 +2191,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Pošalji k nekoliko primatelja odjednom</translation>
</message>
@@ -2147,7 +2201,7 @@ Adresa:%4
<translation>&amp;Dodaj primatelja</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2157,12 +2211,12 @@ Adresa:%4
<translation>Obriši &amp;sve</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Stanje:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Potvrdi akciju slanja</translation>
</message>
@@ -2172,7 +2226,7 @@ Adresa:%4
<translation>&amp;Pošalji</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Potvrdi slanje novca</translation>
</message>
@@ -2185,12 +2239,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2289,7 @@ Adresa:%4
<translation>ili</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Adresa primatelja je nevaljala, molimo provjerite je ponovo.</translation>
</message>
@@ -2275,12 +2324,12 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(bez oznake)</translation>
</message>
@@ -2290,7 +2339,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2300,7 +2349,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2377,12 +2426,7 @@ Adresa:%4
<translation>Poruka:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2392,7 +2436,12 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2408,11 +2457,6 @@ Adresa:%4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2450,19 +2494,19 @@ Adresa:%4
<translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Zalijepi adresu iz međuspremnika</translation>
</message>
@@ -2503,12 +2547,12 @@ Adresa:%4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Obriši &amp;sve</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Potvrdite poruku</translation>
</message>
@@ -2523,7 +2567,7 @@ Adresa:%4
<translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2538,43 +2582,37 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Otključavanje novčanika je otkazano.</translation>
</message>
@@ -2594,7 +2632,7 @@ Adresa:%4
<translation>Poruka je potpisana.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2655,6 +2693,11 @@ Adresa:%4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1 nije dostupan</translation>
</message>
@@ -2816,12 +2859,12 @@ Adresa:%4
<translation>, još nije bio uspješno emitiran</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>nepoznato</translation>
</message>
@@ -2862,12 +2905,12 @@ Adresa:%4
<translation>Iznos</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2877,23 +2920,12 @@ Adresa:%4
<translation>Otvoren do %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Nije na mreži (%1 potvrda)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Nepotvrđen (%1 od %2 potvrda)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Potvrđen (%1 potvrda)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Generirano - Upozorenje: ovaj blok nije bio primljen od strane bilo kojeg drugog noda i vjerojatno neće biti prihvaćen!</translation>
</message>
@@ -2903,7 +2935,27 @@ Adresa:%4
<translation>Generirano, ali nije prihvaćeno</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Primljeno s</translation>
</message>
@@ -2933,7 +2985,7 @@ Adresa:%4
<translation>(n/d)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Status transakcije</translation>
</message>
@@ -3199,12 +3251,12 @@ Adresa:%4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Upotreba:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Prikaži komande</translation>
</message>
@@ -3259,12 +3311,12 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Prag za odspajanje članova koji se čudno ponašaju (default: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Broj sekundi koliko se članovima koji se čudno ponašaju neće dopustiti da se opet spoje (default: 86400)</translation>
</message>
@@ -3284,17 +3336,17 @@ Adresa:%4
<translation>Prihvati komande iz tekst moda i JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Izvršavaj u pozadini kao uslužnik i prihvaćaj komande</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Koristi test mrežu</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Poveži se samo sa određenim nodom</translation>
</message>
@@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importiraj blokove sa vanjskog blk000??.dat fajla</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informacija</translation>
</message>
@@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Odredi vremenski prozor za spajanje na mrežu u milisekundama (ugrađeni izbor: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Pogreška sistema:</translation>
</message>
@@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>verzija</translation>
</message>
@@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Lozinka za JSON-RPC veze</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Dozvoli JSON-RPC povezivanje s određene IP adrese</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Pošalji komande nodu na adresi &lt;ip&gt; (ugrađeni izbor: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Izvršite naredbu kada se najbolji blok promjeni (%s u cmd je zamjenjen sa block hash)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Nadogradite novčanik u posljednji format.</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Podesi memorijski prostor za ključeve na &lt;n&gt; (ugrađeni izbor: 100)</translation>
</message>
@@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ponovno pretraži lanac blokova za transakcije koje nedostaju</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Koristi OpenSSL (https) za JSON-RPC povezivanje</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Uslužnikov SSL certifikat (ugrađeni izbor: server.cert)</translation>
</message>
@@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Uslužnikov privatni ključ (ugrađeni izbor: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Ova poruka za pomoć</translation>
</message>
@@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Program ne može koristiti %s na ovom računalu (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Dozvoli DNS upite za dodavanje nodova i povezivanje</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Učitavanje adresa...</translation>
</message>
@@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Greška kod učitavanja wallet.dat: Novčanik zahtjeva noviju verziju Bitcoina</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Novčanik je trebao prepravak: ponovo pokrenite Bitcoin</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Greška kod učitavanja wallet.dat</translation>
</message>
@@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nevaljala -proxy adresa: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Nevaljali iznos za opciju -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Učitavanje indeksa blokova...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Unesite nod s kojim se želite spojiti and attempt to keep the connection open</translation>
</message>
@@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Program ne može koristiti %s na ovom računalu. Bitcoin program je vjerojatno već pokrenut.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Učitavanje novčanika...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Nije moguće novčanik vratiti na prijašnju verziju.</translation>
</message>
@@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nije moguće upisati zadanu adresu.</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Rescaniranje</translation>
</message>
@@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Učitavanje gotovo</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Greška</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index ee4152aa5b..e24871dc13 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -35,6 +35,12 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -616,6 +622,16 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation><numerusform>%n hét</numerusform><numerusform>%n hét</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 lemaradás</translation>
@@ -689,7 +705,7 @@ Cím: %4
<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="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -750,7 +766,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -765,7 +781,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Összeg</translation>
</message>
@@ -916,7 +932,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1098,7 +1114,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
</message>
@@ -1243,7 +1259,7 @@ Cím: %4
<translation>&amp;Fő</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Opcionális, kB-onkénti tranzakciós díj a tranzakcióid minél gyorsabb feldolgozásának elősegítésére. A legtöbb tranzakció 1 kB-os.</translation>
</message>
@@ -1253,7 +1269,7 @@ Cím: %4
<translation>Tranzakciós &amp;díj fizetése</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Induljon el a Bitcoin a számítógép bekapcsolásakor</translation>
</message>
@@ -1268,12 +1284,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Az adatbázis gyorsítótár mérete megabájtban (alapértelmezés: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1288,7 +1299,12 @@ Cím: %4
<translation>Szkriptellenőrzési szálak számának beállítása (maximum 16, 0 = automatikus, &lt;0 = szabadon hagyott magok száma, alapértelmezett: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1323,7 +1339,17 @@ Cím: %4
<translation>&amp;Hálózat</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>A Bitcoin-kliens portjának automatikus megnyitása a routeren. Ez csak akkor működik, ha a routered támogatja az UPnP-t és az engedélyezve is van rajta.</translation>
</message>
@@ -1438,17 +1464,17 @@ Cím: %4
<translation>Megszakítás</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>alapértelmezett</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Beállítások törlésének jóváhagyása.</translation>
</message>
@@ -1488,19 +1514,14 @@ Cím: %4
<translation>A kijelzett információ lehet, hogy elavult. A pénztárcája automatikusan szinkronizálja magát a Bitcoin hálózattal miután a kapcsolat létrejön, de ez e folyamat még nem fejeződött be.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Megerősítetlen:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Tárca</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Megerősítve:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1508,7 +1529,12 @@ Cím: %4
<translation>Jelenlegi egyenleg</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Még megerősítésre váró, a jelenlegi egyenlegbe be nem számított tranzakciók</translation>
</message>
@@ -1656,6 +1682,11 @@ Cím: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1876,22 +1907,22 @@ Cím: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>Címke:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1901,27 +1932,30 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1931,17 +1965,17 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1960,6 +1994,21 @@ Cím: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Címke másolása</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Összeg másolása</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2061,12 +2110,17 @@ Cím: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Érmék küldése</translation>
@@ -2142,7 +2196,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Küldés több címzettnek egyszerre</translation>
</message>
@@ -2152,7 +2206,7 @@ Cím: %4
<translation>&amp;Címzett hozzáadása</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2162,12 +2216,12 @@ Cím: %4
<translation>Mindent &amp;töröl</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Egyenleg:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Küldés megerősítése</translation>
</message>
@@ -2177,7 +2231,7 @@ Cím: %4
<translation>&amp;Küldés</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Küldés megerősítése</translation>
</message>
@@ -2190,12 +2244,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2245,7 +2294,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>A címzett címe érvénytelen, kérlek, ellenőrizd.</translation>
</message>
@@ -2280,12 +2329,12 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(nincs címke)</translation>
</message>
@@ -2295,7 +2344,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2305,7 +2354,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2383,12 +2432,7 @@ Cím: %4
<translation>Üzenet:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2398,7 +2442,12 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2414,11 +2463,6 @@ Cím: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2456,19 +2500,19 @@ Cím: %4
<translation>Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Cím beillesztése a vágólapról</translation>
</message>
@@ -2509,12 +2553,12 @@ Cím: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Mindent &amp;töröl</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>Üzenet ellenőrzése</translation>
</message>
@@ -2529,7 +2573,7 @@ Cím: %4
<translation>Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2544,43 +2588,37 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Adja meg a Bitcoin aláírást</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>A megadott cím nem érvényes.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Ellenőrizze a címet és próbálja meg újra.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2600,7 +2638,7 @@ Cím: %4
<translation>Üzenet aláírva.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Az aláírást nem sikerült dekódolni.</translation>
</message>
@@ -2661,6 +2699,11 @@ Cím: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2822,12 +2865,12 @@ Cím: %4
<translation>, még nem sikerült elküldeni.</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>%n további blokkra megnyitva</numerusform><numerusform>%n további blokkra megnyitva</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>ismeretlen</translation>
</message>
@@ -2868,12 +2911,12 @@ Cím: %4
<translation>Összeg</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>%n további blokkra megnyitva</numerusform><numerusform>%n további blokkra megnyitva</numerusform></translation>
</message>
@@ -2883,23 +2926,12 @@ Cím: %4
<translation>%1-ig megnyitva</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline (%1 megerősítés)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Megerősítetlen (%1 %2 megerősítésből)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Megerősítve (%1 megerősítés)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ezt a blokkot egyetlen másik csomópont sem kapta meg, így valószínűleg nem lesz elfogadva!</translation>
</message>
@@ -2909,7 +2941,27 @@ Cím: %4
<translation>Legenerálva, de még el nem fogadva.</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Erre a címre</translation>
</message>
@@ -2939,7 +2991,7 @@ Cím: %4
<translation>(nincs)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Tranzakció állapota. Húzd ide a kurzort, hogy lásd a megerősítések számát.</translation>
</message>
@@ -3205,12 +3257,12 @@ Cím: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Használat:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Parancsok kilistázása
</translation>
@@ -3271,12 +3323,12 @@ Cím: %4
<translation>Adja meg az Ön saját nyilvános címét</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Helytelenül viselkedő peerek leválasztási határértéke (alapértelmezés: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Helytelenül viselkedő peerek kizárási ideje másodpercben (alapértelmezés: 86400)</translation>
</message>
@@ -3297,19 +3349,19 @@ Cím: %4
</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Háttérben futtatás daemonként és parancsok elfogadása
</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Teszthálózat használata
</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3440,6 +3492,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Csatlakozás csak a megadott csomóponthoz</translation>
</message>
@@ -3650,6 +3707,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Bitcoin szerver indítása</translation>
</message>
@@ -3699,12 +3761,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Az adatbázist újra kell építeni -reindex használatával (módosítás -tindex).</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3724,7 +3786,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Szkriptellenőrzési szálak számának beállítása (maximum 16, 0 = automatikus, &lt;0 = szabadon hagyott magok száma, alapértelmezett: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Információ</translation>
</message>
@@ -3794,7 +3856,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Csatlakozás időkerete milliszekundumban (alapértelmezett: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Rendszerhiba:</translation>
</message>
@@ -3841,6 +3903,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>verzió</translation>
</message>
@@ -3850,35 +3917,35 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Jelszó JSON-RPC csatlakozásokhoz
</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>JSON-RPC csatlakozások engedélyezése meghatározott IP-címről
</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Parancsok küldése &lt;ip&gt; címen működő csomóponthoz (alapértelmezett: 127.0.0.1)
</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Parancs, amit akkor hajt végre, amikor a legjobb blokk megváltozik (%s a cmd-ban lecserélődik a blokk hash-re)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>A Tárca frissítése a legfrissebb formátumra</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Kulcskarika mérete &lt;n&gt; (alapértelmezett: 100)
</translation>
@@ -3890,13 +3957,13 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>OpenSSL (https) használata JSON-RPC csatalkozásokhoz
</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Szervertanúsítvány-fájl (alapértelmezett: server.cert)
</translation>
@@ -3908,7 +3975,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Ez a súgó-üzenet
</translation>
@@ -3919,12 +3986,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>A %s nem elérhető ezen a gépen (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Címek betöltése...</translation>
</message>
@@ -3939,12 +4006,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Hiba a wallet.dat betöltése közben: ehhez a tárcához újabb verziójú Bitcoin-kliens szükséges</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>A Tárca újraírása szükséges: Indítsa újra a teljesen a Bitcoin-t</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Hiba az wallet.dat betöltése közben</translation>
</message>
@@ -3954,7 +4021,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Érvénytelen -proxy cím: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Ismeretlen hálózat lett megadva -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3964,7 +4031,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ismeretlen -socks proxy kérése: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Csatlakozási cím (-bind address) feloldása nem sikerült: &apos;%s&apos;</translation>
</message>
@@ -3974,7 +4041,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Külső cím (-externalip address) feloldása nem sikerült: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Étvénytelen -paytxfee=&lt;összeg&gt; összeg: &apos;%s&apos;</translation>
</message>
@@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Blokkindex betöltése...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Elérendő csomópont megadása and attempt to keep the connection open</translation>
</message>
@@ -4004,12 +4071,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>A %s nem elérhető ezen a gépen. A Bitcoin valószínűleg fut már.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Tárca betöltése...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Nem sikerült a Tárca visszaállítása a korábbi verzióra</translation>
</message>
@@ -4019,7 +4086,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nem sikerült az alapértelmezett címet írni.</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Újraszkennelés...</translation>
</message>
@@ -4029,17 +4096,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Betöltés befejezve.</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Használd a %s opciót</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Hiba</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts
index 6c28be4dc8..ff97375f67 100644
--- a/src/qt/locale/bitcoin_id_ID.ts
+++ b/src/qt/locale/bitcoin_id_ID.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -685,7 +701,7 @@ Alamat: %4
<translation>Dompet saat ini &lt;b&gt;terenkripsi&lt;/b&gt; dan &lt;b&gt;terkunci&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -746,7 +762,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -761,7 +777,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Jumlah</translation>
</message>
@@ -912,7 +928,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1094,7 +1110,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1238,7 +1254,7 @@ Alamat: %4
<translation>&amp;Utama</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1248,7 +1264,7 @@ Alamat: %4
<translation>Bayar &amp;biaya transaksi</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Menyalakan Bitcoin secara otomatis setelah masuk ke dalam sistem.</translation>
</message>
@@ -1263,12 +1279,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Atur ukuran tembolok dalam megabyte (standar: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1283,7 +1294,12 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1318,7 +1334,17 @@ Alamat: %4
<translation>&amp;Jaringan</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Otomatis membuka port client Bitcoin di router. Hanya berjalan apabila router anda mendukung UPnP dan di-enable.</translation>
</message>
@@ -1433,17 +1459,17 @@ Alamat: %4
<translation>&amp;Batal</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>standar</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1483,18 +1509,13 @@ Alamat: %4
<translation>Informasi terlampir mungkin sudah kedaluwarsa. Dompet Anda secara otomatis mensinkronisasi dengan jaringan Bitcoin ketika sebuah hubungan terbentuk, namun proses ini belum selesai.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Tidak terkonfirmasi:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Dompet</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1503,7 +1524,12 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1651,6 +1677,11 @@ Alamat: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Masukkan alamat Bitcoin (cth. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1871,22 +1902,22 @@ Alamat: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1896,27 +1927,30 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1926,17 +1960,17 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1955,6 +1989,21 @@ Alamat: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Salin label</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Salin jumlah</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2056,12 +2105,17 @@ Alamat: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Kirim Koin</translation>
@@ -2137,7 +2191,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Kirim ke beberapa penerima sekaligus</translation>
</message>
@@ -2147,7 +2201,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2157,12 +2211,12 @@ Alamat: %4
<translation>Hapus %Semua</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Konfirmasi aksi pengiriman</translation>
</message>
@@ -2172,7 +2226,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Konfirmasi pengiriman koin</translation>
</message>
@@ -2185,12 +2239,7 @@ Alamat: %4
<translation>%1 ke %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Masukkan alamat Bitcoin (cth. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2289,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2275,12 +2324,12 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(tidak ada label)</translation>
</message>
@@ -2290,7 +2339,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2300,7 +2349,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2377,12 +2426,7 @@ Alamat: %4
<translation>Pesan:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2392,7 +2436,12 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2408,11 +2457,6 @@ Alamat: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Masukkan alamat Bitcoin (cth. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2450,19 +2494,19 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Pilih alamat yang telah digunakan sebelumnya</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+J</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Tempel alamat dari salinan</translation>
</message>
@@ -2503,12 +2547,12 @@ Alamat: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Hapus %Semua</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2523,7 +2567,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2538,43 +2582,37 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Masukkan alamat Bitcoin (cth. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Alamat yang dimasukkan tidak sesuai.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Silahkan periksa alamat dan coba lagi.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2594,7 +2632,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2655,6 +2693,11 @@ Alamat: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2816,12 +2859,12 @@ Alamat: %4
<translation>, belum berhasil disiarkan</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>tidak diketahui</translation>
</message>
@@ -2862,12 +2905,12 @@ Alamat: %4
<translation>Jumlah</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2877,23 +2920,12 @@ Alamat: %4
<translation>Buka hingga %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline (%1 konfirmasi)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Tidak terkonfirmasi (%1 dari %2 konfirmasi)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Terkonfirmasi (%1 konfirmasi)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Blok ini tidak diterima oleh node lainnya dan kemungkinan tidak akan diterima!</translation>
</message>
@@ -2903,7 +2935,27 @@ Alamat: %4
<translation>Terbuat tetapi tidak diterima</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Diterima dengan</translation>
</message>
@@ -2933,7 +2985,7 @@ Alamat: %4
<translation>(t/s)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Status transaksi. Arahkan ke bagian ini untuk menampilkan jumlah konfrimasi.</translation>
</message>
@@ -3199,12 +3251,12 @@ Alamat: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Penggunaan:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Daftar perintah</translation>
</message>
@@ -3259,12 +3311,12 @@ Alamat: %4
<translation>Tentukan alamat publik Anda sendiri</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Batas untuk memutuskan peer buruk (standar: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Jumlah kedua untuk menjaga peer buruk dari hubung-ulang (standar: 86400)</translation>
</message>
@@ -3284,17 +3336,17 @@ Alamat: %4
<translation>Menerima perintah baris perintah dan JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Berjalan dibelakang sebagai daemin dan menerima perintah</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Gunakan jaringan uji</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Mulai Bitcoin server</translation>
</message>
@@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informasi</translation>
</message>
@@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versi</translation>
</message>
@@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Kata sandi untuk hubungan JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Izinkan hubungan JSON-RPC dari alamat IP yang ditentukan</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Kirim perintah ke node berjalan pada &lt;ip&gt; (standar: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Menjalankan perintah ketika perubahan blok terbaik (%s dalam cmd digantikan oleh hash blok)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Perbarui dompet ke format terbaru</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Kirim ukuran kolam kunci ke &lt;n&gt; (standar: 100)</translation>
</message>
@@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Pindai ulang rantai-blok untuk transaksi dompet yang hilang</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Gunakan OpenSSL (https) untuk hubungan JSON-RPC</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Berkas sertifikat server (standar: server.cert)</translation>
</message>
@@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kunci pribadi server (standar: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Pesan bantuan ini</translation>
</message>
@@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Tidak dapat mengikat ke %s dengan komputer ini (ikatan gagal %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Izinkan peninjauan DNS untuk -addnote, -seednode dan -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Memuat alamat...</translation>
</message>
@@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Gagal memuat wallet.dat: Dompet memerlukan versi Bitcoin yang terbaru</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Dompet diperlukan untuk disimpan-ulang: nyala-ulangkan Bitcoin untuk menyelesaikan</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Gagal memuat wallet.dat</translation>
</message>
@@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Alamat -proxy salah: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Jaringan tidak diketahui yang ditentukan dalam -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Diminta versi proxy -socks tidak diketahui: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Tidak dapat menyelesaikan alamat -bind: &apos;%s&apos;</translation>
</message>
@@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Tidak dapat menyelesaikan alamat -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Jumlah salah untuk -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Memuat indeks blok...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Tambahkan node untuk dihubungkan dan upaya untuk menjaga hubungan tetap terbuka</translation>
</message>
@@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Memuat dompet...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Tidak dapat menurunkan versi dompet</translation>
</message>
@@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Tidak dapat menyimpan alamat standar</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Memindai ulang...</translation>
</message>
@@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Memuat selesai</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Gunakan pilihan %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Gagal</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 11d539d8c2..4d3c84132d 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -36,6 +36,12 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<source>The Bitcoin Core developers</source>
<translation>Gli sviluppatori del Bitcoin Core</translation>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation>(%1-bit)</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,9 +623,19 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation><numerusform>%n settimana</numerusform><numerusform>%n settimane</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation>%1 e %2</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation><numerusform>%n anno</numerusform><numerusform>%n anni</numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
- <translation>%1 dietro</translation>
+ <translation>Indietro di %1</translation>
</message>
<message>
<location line="+21"/>
@@ -691,7 +707,7 @@ Indirizzo: %4
<translation>Il portamonete è &lt;b&gt;cifrato&lt;/b&gt; e attualmente &lt;b&gt;bloccato&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Riscontrato un errore irreversibile. Bitcoin non può più continuare in sicurezza e verrà terminato.</translation>
</message>
@@ -752,7 +768,7 @@ Indirizzo: %4
<translation>Resto:</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation>(de)seleziona tutto</translation>
</message>
@@ -767,7 +783,7 @@ Indirizzo: %4
<translation>Modalità Lista</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Importo</translation>
</message>
@@ -918,7 +934,7 @@ Indirizzo: %4
<translation>nessuno</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation>Trascurabile</translation>
</message>
@@ -1100,7 +1116,7 @@ Indirizzo: %4
<translation>Bitcoin Core - Opzioni linea di comando</translation>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
</message>
@@ -1244,7 +1260,7 @@ Indirizzo: %4
<translation>&amp;Principale</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Commissione di transazione per kB; è opzionale e contribuisce ad assicurare che le transazioni siano elaborate velocemente. Le transazioni sono per la maggior parte da 1 kB. Commissione raccomandata 0,01.</translation>
</message>
@@ -1254,7 +1270,7 @@ Indirizzo: %4
<translation>Paga la &amp;commissione</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Avvia automaticamente Bitcoin all&apos;accensione del computer</translation>
</message>
@@ -1269,12 +1285,7 @@ Indirizzo: %4
<translation>Dimensione della cache del &amp;database.</translation>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Imposta la dimensione cache del database in megabyte (predefinita: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>MB</translation>
</message>
@@ -1289,7 +1300,12 @@ Indirizzo: %4
<translation>Imposta il numero di thread di verifica script (fino a 16, 0 = auto, &lt;0 = lascia il maggior numero di core liberi, predefinito: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation>&amp;Spendere resti non confermati (solo per esperti)</translation>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation>Connetti alla rete Bitcoin attraverso un proxy SOCKS.</translation>
</message>
@@ -1324,7 +1340,17 @@ Indirizzo: %4
<translation>Rete</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation>Port&amp;afoglio</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation>Se disabiliti l&apos;uso di resti non confermati, il resto di una transazione non potrà essere usato fintanto che la transazione non avrà almeno una conferma. Questo influisce anche su come è calcolato il saldo.</translation>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Apri automaticamente la porta del client Bitcoin sul router. Questo funziona solo se il router supporta UPnP ed è abilitato.</translation>
</message>
@@ -1439,17 +1465,17 @@ Indirizzo: %4
<translation>&amp;Cancella</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>predefinito</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation>nessuno</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Conferma ripristino opzioni</translation>
</message>
@@ -1489,19 +1515,14 @@ Indirizzo: %4
<translation>Le informazioni visualizzate sono datate. Il tuo partafogli verrà sincronizzato automaticamente con il network Bitcoin dopo che la connessione è stabilita, ma questo processo non può essere completato ora.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Non confermato:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Portamonete</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Confermato:</translation>
+ <source>Available:</source>
+ <translation>Disponibile:</translation>
</message>
<message>
<location line="+16"/>
@@ -1509,7 +1530,12 @@ Indirizzo: %4
<translation>Saldo spendibile attuale</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation>In attesa:</translation>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Totale delle transazioni in corso di conferma, che non sono ancora incluse nel saldo spendibile attuale</translation>
</message>
@@ -1657,6 +1683,11 @@ Indirizzo: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Errore: combinazione di -regtest e -testnet non valida.</translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1877,22 +1908,22 @@ Indirizzo: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>&amp;Importo:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Etichetta</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>&amp;Messaggio:</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Riutilizza un indirizzo di ricezione già usato. Riutilizzare indirizza non è sicuro. Non usare senza rigenerare una richiesta di pagamanto.</translation>
</message>
@@ -1902,27 +1933,30 @@ Indirizzo: %4
<translation>R&amp;iusa un indirizzo di pagamento (non raccomandato)</translation>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
- <translation>Un&apos;etichetta facoltativa da associare al nuovo indirizzo ricevente</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+14"/>
+ <location line="+23"/>
<source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation>Un messaggio facoltativo da allegare alla richiesta di pagamento, il quale sarà mostrato quando la richiesta è aperta. Nota: Il messaggio non verrà inviato con il pagamento attraverso il network Bitcoin.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
+ <translation>Un&apos;etichetta facoltativa da associare al nuovo indirizzo ricevente</translation>
+ </message>
+ <message>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation>Usa questo modulo per richiedere pagamenti. Tutti i campi sono &lt;b&gt;opzionali&lt;/b&gt;.</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation>Un importo facoltativo da richiedere. Lasciare vuoto o a zero per non richiedere un importo specifico.</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Cancellare tutti i campi del modulo.</translation>
</message>
@@ -1932,17 +1966,17 @@ Indirizzo: %4
<translation>Cancella</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
- <translation>&amp;Richiedi pagamento</translation>
+ <location line="+78"/>
+ <source>Requested payments history</source>
+ <translation>Cronologia pagamenti richiesti</translation>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation>Pagamenti richiesti</translation>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>&amp;Richiedi pagamento</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Mostra la richiesta selezionata (fa la stessa cosa che il doppio click sul campo)</translation>
</message>
@@ -1961,6 +1995,21 @@ Indirizzo: %4
<source>Remove</source>
<translation>Rimuovi</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Copia l&apos;etichetta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation>Copia messaggio</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copia l&apos;importo</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2062,12 +2111,17 @@ Indirizzo: %4
<source>(no message)</source>
<translation>(nessun messaggio)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation>(nessun importo)</translation>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Spedisci Bitcoin</translation>
@@ -2143,7 +2197,7 @@ Indirizzo: %4
<translation>Personalizza indirizzo di resto</translation>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Spedisci a diversi beneficiari in una volta sola</translation>
</message>
@@ -2153,7 +2207,7 @@ Indirizzo: %4
<translation>&amp;Aggiungi beneficiario</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Cancellare tutti i campi del modulo.</translation>
</message>
@@ -2163,12 +2217,12 @@ Indirizzo: %4
<translation>Cancella &amp;tutto</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Conferma la spedizione</translation>
</message>
@@ -2178,7 +2232,7 @@ Indirizzo: %4
<translation>&amp;Spedisci</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Conferma la spedizione di bitcoin</translation>
</message>
@@ -2191,12 +2245,7 @@ Indirizzo: %4
<translation>%1 a %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation>Copia quantità</translation>
</message>
@@ -2246,7 +2295,7 @@ Indirizzo: %4
<translation>o</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>L&apos;indirizzo del beneficiario non è valido, per cortesia controlla.</translation>
</message>
@@ -2281,12 +2330,12 @@ Indirizzo: %4
<translation>La transazione e&apos; stata rifiutata! Questo puo&apos; accadere se alcune delle monete nel tuo portafoglio sono gia&apos; state spese, per esempio se hai fatto una copia di un file wallet.dat le quali monete eran gia&apos; state spese, ma non marcate come tali nel file.</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Attenzione: Indirizzo Bitcoin non valido</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(nessuna etichetta)</translation>
</message>
@@ -2296,7 +2345,7 @@ Indirizzo: %4
<translation>Attenzione: Indirizzo di ritorno sconosciuto</translation>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Sei sicuro di voler inviare?</translation>
</message>
@@ -2306,7 +2355,7 @@ Indirizzo: %4
<translation>aggiunto come tassa di transazione</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>Richiesta di pagamento scaduta</translation>
</message>
@@ -2383,12 +2432,7 @@ Indirizzo: %4
<translation>Messaggio:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation>Messaggio che era incluso nel Bitcoin URI che sarà memorizzato con la transazione per vostro riferimento. Nota: Questo messaggio non sarà inviato attraverso la rete Bitcoin.</translation>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation>Questa è una richiesta di pagamento verificata.</translation>
</message>
@@ -2398,7 +2442,12 @@ Indirizzo: %4
<translation>Inserisci un&apos;etichetta per questo indirizzo per aggiungerlo nella rubrica</translation>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>Messaggio che era incluso nel bitcoin URI che sarà memorizzato con la transazione per vostro riferimento. Nota: Questo messaggio non sarà inviato attraverso la rete Bitcoin.</translation>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation>Questa è una richiesta di pagamento non verificata.</translation>
</message>
@@ -2414,11 +2463,6 @@ Indirizzo: %4
<source>Memo:</source>
<translation>Memo:</translation>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2456,19 +2500,19 @@ Indirizzo: %4
<translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Scegli indirizzo usato precedentemente</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Incollare l&apos;indirizzo dagli appunti</translation>
</message>
@@ -2509,12 +2553,12 @@ Indirizzo: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Cancella &amp;tutto</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Verifica Messaggio</translation>
</message>
@@ -2529,7 +2573,7 @@ Indirizzo: %4
<translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Verifica il messaggio per assicurarsi che sia stato firmato con l&apos;indirizzo Bitcoin specificato</translation>
</message>
@@ -2544,43 +2588,37 @@ Indirizzo: %4
<translation>Reimposta tutti i campi della verifica messaggio</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Clicca &quot;Firma il messaggio&quot; per ottenere la firma</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Inserisci firma Bitcoin</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>L&apos;indirizzo inserito non è valido.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Per favore controlla l&apos;indirizzo e prova ancora</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>L&apos;indirizzo bitcoin inserito non è associato a nessuna chiave.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Sblocco del portafoglio annullato.</translation>
</message>
@@ -2600,7 +2638,7 @@ Indirizzo: %4
<translation>Messaggio firmato.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Non è stato possibile decodificare la firma.</translation>
</message>
@@ -2661,6 +2699,11 @@ Indirizzo: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation>in conflitto</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/offline</translation>
</message>
@@ -2822,12 +2865,12 @@ Indirizzo: %4
<translation>, non è stato ancora trasmesso con successo</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Aperto per %n altro blocco</numerusform><numerusform>Aperto per altri %n blocchi</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>sconosciuto</translation>
</message>
@@ -2868,12 +2911,12 @@ Indirizzo: %4
<translation>Importo</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation>Immaturo (%1 conferme, sarà disponibile fra %2)</translation>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Aperto per %n altro blocco</numerusform><numerusform>Aperto per altri %n blocchi</numerusform></translation>
</message>
@@ -2883,23 +2926,12 @@ Indirizzo: %4
<translation>Aperto fino a %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline (%1 conferme)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Non confermati (%1 su %2 conferme)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confermato (%1 conferme)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Questo blocco non è stato ricevuto da altri nodi e probabilmente non sarà accettato!</translation>
</message>
@@ -2909,7 +2941,27 @@ Indirizzo: %4
<translation>Generati, ma non accettati</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation>Offline</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation>Non confermato:</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation>In conferma (%1 di %2 conferme raccomandate)</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation>In conflitto</translation>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Ricevuto tramite</translation>
</message>
@@ -2939,7 +2991,7 @@ Indirizzo: %4
<translation>(N / a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Stato della transazione. Passare con il mouse su questo campo per vedere il numero di conferme.</translation>
</message>
@@ -3205,12 +3257,12 @@ Indirizzo: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Utilizzo:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Lista comandi
</translation>
@@ -3269,12 +3321,12 @@ Indirizzo: %4
<translation>Specifica il tuo indirizzo pubblico</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Soglia di disconnessione dei peer di cattiva qualità (predefinita: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Numero di secondi di sospensione che i peer di cattiva qualità devono trascorrere prima di riconnettersi (predefiniti: 86400)</translation>
</message>
@@ -3295,19 +3347,19 @@ Indirizzo: %4
</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Esegui in background come demone e accetta i comandi
</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Utilizza la rete di prova
</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Accetta connessioni dall&apos;esterno (predefinito: 1 se no -proxy o -connect)</translation>
</message>
@@ -3448,6 +3500,11 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation>Elenco chiaro delle transazioni sul portafoglio (strumento di diagnostica; implica -rescan)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Connetti solo al nodo specificato</translation>
</message>
@@ -3658,6 +3715,11 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation>Spendere il resto non confermato con l&apos;invio delle transazioni (predefinito: 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Avvia server Bitcoin</translation>
</message>
@@ -3707,12 +3769,12 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Serve ricostruire il database usando -reindex per cambiare -txindex</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importa blocchi da un file blk000??.dat esterno</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Eseguire comando quando un rilevante allarme viene ricevuto o vediamo una fork veramente lunga (%s in cmd è sostituito dal messaggio)</translation>
</message>
@@ -3732,7 +3794,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Imposta il numero di thread di verifica script (fino a 16, 0 = auto, &lt;0 = lascia il maggior numero di core liberi, predefinito: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informazioni</translation>
</message>
@@ -3802,7 +3864,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Specifica il timeout di connessione in millisecondi (predefinito: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Errore di sistema:</translation>
</message>
@@ -3849,6 +3911,11 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation>Cancella e ricompila tutte le transazioni dal wallet...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versione</translation>
</message>
@@ -3858,34 +3925,34 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>wallet.dat corrotto, salvataggio fallito</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Password per connessioni JSON-RPC
</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Consenti connessioni JSON-RPC dall&apos;indirizzo IP specificato
</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Inviare comandi al nodo in esecuzione su &lt;ip&gt; (predefinito: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Esegui il comando quando il miglior block cambia(%s nel cmd è sostituito dall&apos;hash del blocco)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Aggiorna il wallet all&apos;ultimo formato</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Impostare la quantità di chiavi di riserva a &lt;n&gt; (predefinita: 100)</translation>
</message>
@@ -3896,13 +3963,13 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Utilizzare OpenSSL (https) per le connessioni JSON-RPC
</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>File certificato del server (predefinito: server.cert)</translation>
</message>
@@ -3912,7 +3979,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Chiave privata del server (predefinito: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Questo messaggio di aiuto
</translation>
@@ -3923,13 +3990,13 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Impossibile collegarsi alla %s su questo computer (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Consenti ricerche DNS per aggiungere nodi e collegare
</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Caricamento indirizzi...</translation>
</message>
@@ -3944,12 +4011,12 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Errore caricamento wallet.dat: il wallet richiede una versione nuova di Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Il portamonete deve essere riscritto: riavviare Bitcoin per completare</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Errore caricamento wallet.dat</translation>
</message>
@@ -3959,7 +4026,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Indirizzo -proxy non valido: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Rete sconosciuta specificata in -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3969,7 +4036,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Versione -socks proxy sconosciuta richiesta: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Impossibile risolvere -bind address: &apos;%s&apos;</translation>
</message>
@@ -3979,7 +4046,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Impossibile risolvere indirizzo -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Importo non valido per -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3999,7 +4066,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Caricamento dell&apos;indice del blocco...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Elérendő csomópont megadása and attempt to keep the connection open</translation>
</message>
@@ -4009,12 +4076,12 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Impossibile collegarsi alla %s su questo computer. Probabilmente Bitcoin è già in esecuzione.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Caricamento portamonete...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Non è possibile retrocedere il wallet</translation>
</message>
@@ -4024,7 +4091,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Non è possibile scrivere l&apos;indirizzo predefinito</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Ripetere la scansione...</translation>
</message>
@@ -4034,17 +4101,17 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Caricamento completato</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Per usare la opzione %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index 216f23c46e..808f377a20 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -36,6 +36,12 @@ MIT/X11 ソフトウェア ライセンスの下で配布されています。
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,6 +623,16 @@ MIT/X11 ソフトウェア ライセンスの下で配布されています。
<translation><numerusform>%n 週間</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 遅延</translation>
@@ -689,7 +705,7 @@ Address: %4
<translation>ウォレットは&lt;b&gt;暗号化されて、ロックされています&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>致命的なエラーが発生しました。Bitcoin は安全に継続することができず終了するでしょう。
</translation>
@@ -751,7 +767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -766,7 +782,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>総額</translation>
</message>
@@ -917,7 +933,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1099,7 +1115,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin のコア</translation>
</message>
@@ -1243,7 +1259,7 @@ Address: %4
<translation>メイン (&amp;M)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>あたなの取引が早く処理されるように任意で kB 毎の取引手数料を設定します。ほとんどの取引は 1 kB です。</translation>
</message>
@@ -1253,7 +1269,7 @@ Address: %4
<translation>支払う取引手数料 (&amp;f)</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>システムにログインした時に自動的に Bitcoin を起動します。</translation>
</message>
@@ -1268,12 +1284,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>データベースのキャッシュサイズをメガバイトで設定 (初期値: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1288,7 +1299,12 @@ Address: %4
<translation>スクリプト検証スレッドを設定 (最大 16, 0 = 自動, &lt;0 = たくさんのコアを自由にしておく, 初期値: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1323,7 +1339,17 @@ Address: %4
<translation>ネットワーク (&amp;N)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>自動的にルーター上の Bitcoin クライアントのポートを開きます。あなたのルーターが UPnP に対応していて、それが有効になっている場合に作動します。</translation>
</message>
@@ -1438,17 +1464,17 @@ Address: %4
<translation>キャンセル (&amp;C)</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>初期値</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>オプションのリセットの確認</translation>
</message>
@@ -1488,19 +1514,14 @@ Address: %4
<translation>表示された情報は古いかもしれません。接続が確立されると、あなたのウォレットは Bitcoin ネットワークと自動的に同期しますが、このプロセスはまだ完了していません。</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>未確認:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>ウォレット</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>確認済み:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1508,7 +1529,12 @@ Address: %4
<translation>あなたの利用可能残高</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>未検証の取引で利用可能残高に反映されていない数</translation>
</message>
@@ -1657,6 +1683,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>エラー: -regtestと-testnetは一緒にするのは無効です。</translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Bitcoin アドレスを入力します (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1877,22 +1908,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>ラベル(&amp;L):</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1902,27 +1933,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1932,17 +1966,17 @@ Address: %4
<translation>クリア</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1961,6 +1995,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>ラベルをコピーする</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>総額のコピー</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2062,12 +2111,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>コインを送る</translation>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>一度に複数の人に送る</translation>
</message>
@@ -2153,7 +2207,7 @@ Address: %4
<translation>受取人を追加 (&amp;R)</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2163,12 +2217,12 @@ Address: %4
<translation>すべてクリア (&amp;A)</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>残高:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>送る操作を確認する</translation>
</message>
@@ -2178,7 +2232,7 @@ Address: %4
<translation>送る (&amp;e)</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>コインを送る確認</translation>
</message>
@@ -2191,12 +2245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Bitcoin アドレスを入力します (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2246,7 +2295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>受取人のアドレスが不正です。再確認してください。</translation>
</message>
@@ -2281,12 +2330,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(ラベル無し)</translation>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>送ってよろしいですか?</translation>
</message>
@@ -2306,7 +2355,7 @@ Address: %4
<translation>取引手数料として追加された</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>支払いのリクエストは期限切れです</translation>
</message>
@@ -2383,12 +2432,7 @@ Address: %4
<translation>メッセージ:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2398,7 +2442,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2414,11 +2463,6 @@ Address: %4
<source>Memo:</source>
<translation>メモ:</translation>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Bitcoin アドレスを入力します (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2456,19 +2500,19 @@ Address: %4
<translation>メッセージの署名に使うアドレス (例 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>前に使用したアドレスを選ぶ</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>クリップボードからアドレスを貼付ける</translation>
</message>
@@ -2509,12 +2553,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>すべてクリア (&amp;A)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>メッセージの検証 (&amp;V)</translation>
</message>
@@ -2529,7 +2573,7 @@ Address: %4
<translation>メッセージが署名されたアドレス (例 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>指定された Bitcoin アドレスで署名されたことを保証するメッセージを検証</translation>
</message>
@@ -2544,43 +2588,37 @@ Address: %4
<translation>入力項目の内容をすべて消去します</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Bitcoin アドレスを入力します (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>署名を作成するには&quot;メッセージの署名&quot;をクリック</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Bitcoin 署名を入力</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>不正なアドレスが入力されました。</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>アドレスを確かめてからもう一度試してください。</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>入力されたアドレスに関連するキーがありません。</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>ウォレットのアンロックはキャンセルされました。</translation>
</message>
@@ -2600,7 +2638,7 @@ Address: %4
<translation>メッセージに署名しました。</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>署名がデコードできません。</translation>
</message>
@@ -2661,6 +2699,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/オフライン</translation>
</message>
@@ -2822,12 +2865,12 @@ Address: %4
<translation>まだブロードキャストが成功していません</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>%n 以上のブロックを開く</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>未確認</translation>
</message>
@@ -2868,12 +2911,12 @@ Address: %4
<translation>総額</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>%n 以上のブロックを開く</numerusform></translation>
</message>
@@ -2883,23 +2926,12 @@ Address: %4
<translation>ユニット %1 を開く</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>オフライン (%1 検証済み)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>検証済み (%2) 未検証 (%1)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>検証されました (%1 検証済み)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>このブロックは他のどのノードによっても受け取られないで、多分受け入れられないでしょう!</translation>
</message>
@@ -2909,7 +2941,27 @@ Address: %4
<translation>生成されましたが承認されませんでした</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>受信元</translation>
</message>
@@ -2939,7 +2991,7 @@ Address: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>取引の状況。このフィールドの上にカーソルを置くと検証の数を表示します。</translation>
</message>
@@ -3205,12 +3257,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>使用法:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>コマンド一覧</translation>
</message>
@@ -3265,12 +3317,12 @@ Address: %4
<translation>あなた自身のパブリックなアドレスを指定</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>不正なピアを切断するためのしきい値 (初期値: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>不正なピアを再接続するまでの秒数 (初期値: 86400)</translation>
</message>
@@ -3290,17 +3342,17 @@ Address: %4
<translation>コマンドラインと JSON-RPC コマンドを許可</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>デーモンとしてバックグランドで実行しコマンドを許可</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>テストのためのネットワークを使用</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>外部からの接続を許可 (初期値: -proxy または -connect を使用していない場合は1)</translation>
</message>
@@ -3440,6 +3492,11 @@ rpcpassword=%s
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>指定したノードだけに接続</translation>
</message>
@@ -3651,6 +3708,11 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Bitcoinサーバーを始める</translation>
</message>
@@ -3700,12 +3762,12 @@ rpcpassword=%s
<translation>-txindex を変更するには -reindex を使用してデータベースを再構築する必要があります</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>外部の blk000??.dat ファイルからブロックをインポート</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>関連のアラートをもらってもすごく長いのフォークを見てもコマンドを実行 (コマンドの中にあるの%sはメッセージから置き換えさせる)</translation>
</message>
@@ -3725,7 +3787,7 @@ rpcpassword=%s
<translation>スクリプト検証スレッドを設定 (最大 16, 0 = 自動, &lt;0 = たくさんのコアを自由にしておく, 初期値: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>情報</translation>
</message>
@@ -3795,7 +3857,7 @@ rpcpassword=%s
<translation>接続のタイムアウトをミリセコンドで指定 (初期値: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>システム エラー:</translation>
</message>
@@ -3841,6 +3903,11 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>バージョン</translation>
</message>
@@ -3850,32 +3917,32 @@ rpcpassword=%s
<translation>wallet.dat が壊れ、復旧に失敗しました</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC 接続のパスワード</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>指定した IP アドレスからの JSON-RPC 接続を許可</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>&lt;ip&gt; (初期値: 127.0.0.1) で実行中のノードにコマンドを送信</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>最良のブロックに変更する際にコマンドを実行 (cmd の %s はブロック ハッシュに置換される)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>ウォレットを最新のフォーマットにアップグレード</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>key pool のサイズを &lt;n&gt; (初期値: 100) にセット</translation>
</message>
@@ -3885,12 +3952,12 @@ rpcpassword=%s
<translation>失ったウォレットの取引のブロック チェーンを再スキャン</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>JSON-RPC 接続に OpenSSL (https) を使用</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>サーバ証明書ファイル (初期値: server.cert)</translation>
</message>
@@ -3900,7 +3967,7 @@ rpcpassword=%s
<translation>サーバの秘密鍵 (初期値: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>このヘルプ メッセージ</translation>
</message>
@@ -3910,12 +3977,12 @@ rpcpassword=%s
<translation>このコンピュータの %s にバインドすることができません (バインドが返したエラーは %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>-addnode, -seednode と -connect で DNS ルックアップを許可する</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>アドレスを読み込んでいます...</translation>
</message>
@@ -3930,12 +3997,12 @@ rpcpassword=%s
<translation>wallet.dat 読み込みエラー: ウォレットは Bitcoin の最新バージョンを必要とします</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>ウォレットが書き直される必要がありました: 完了するために Bitcoin を再起動します</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>wallet.dat 読み込みエラー</translation>
</message>
@@ -3945,7 +4012,7 @@ rpcpassword=%s
<translation>無効な -proxy アドレス: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>-onlynet で指定された &apos;%s&apos; は未知のネットワークです</translation>
</message>
@@ -3955,7 +4022,7 @@ rpcpassword=%s
<translation>-socks で指定された %i は未知のバージョンです</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>-bind のアドレス &apos;%s&apos; を解決できません</translation>
</message>
@@ -3965,7 +4032,7 @@ rpcpassword=%s
<translation>-externalip のアドレス &apos;%s&apos; を解決できません</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>-paytxfee=&lt;amount&gt; の額 &apos;%s&apos; が無効です</translation>
</message>
@@ -3985,7 +4052,7 @@ rpcpassword=%s
<translation>ブロック インデックスを読み込んでいます...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>接続するノードを追加し接続を持続するように試します</translation>
</message>
@@ -3995,12 +4062,12 @@ rpcpassword=%s
<translation>このコンピュータの %s にバインドすることができません。おそらく Bitcoin は既に実行されています。</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>ウォレットを読み込んでいます...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>ウォレットのダウングレードはできません</translation>
</message>
@@ -4010,7 +4077,7 @@ rpcpassword=%s
<translation>初期値のアドレスを書き込むことができません</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>再スキャン中...</translation>
</message>
@@ -4020,17 +4087,17 @@ rpcpassword=%s
<translation>読み込み完了</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>%s オプションを使うには</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_kk_KZ.ts b/src/qt/locale/bitcoin_kk_KZ.ts
index f1aa412469..60849509de 100644
--- a/src/qt/locale/bitcoin_kk_KZ.ts
+++ b/src/qt/locale/bitcoin_kk_KZ.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -160,17 +166,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>таңба</translation>
</message>
<message>
<location line="+0"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation>Адрес</translation>
</message>
<message>
<location line="+36"/>
<source>(no label)</source>
- <translation type="unfinished"/>
+ <translation>(таңбасыз)</translation>
</message>
</context>
<context>
@@ -183,52 +189,52 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+21"/>
<source>Enter passphrase</source>
- <translation type="unfinished"/>
+ <translation>Құпия сөзді енгізу</translation>
</message>
<message>
<location line="+14"/>
<source>New passphrase</source>
- <translation type="unfinished"/>
+ <translation>Жаңа құпия сөзі</translation>
</message>
<message>
<location line="+14"/>
<source>Repeat new passphrase</source>
- <translation type="unfinished"/>
+ <translation>Жаңа құпия сөзді қайта енгізу</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="+40"/>
<source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
- <translation type="unfinished"/>
+ <translation>Әмиянға жаңа қүпия сөзді енгізіңіз.&lt;br/&gt;&lt;b&gt;10 немесе одан әрі кездейсоқ белгілерді&lt;/b&gt;, әлде &lt;b&gt;сегіз немесе одан әрі сөздерді&lt;/b&gt;құпия сөзіңізде пайдалану өтінеміз.</translation>
</message>
<message>
<location line="+1"/>
<source>Encrypt wallet</source>
- <translation type="unfinished"/>
+ <translation>Әмиянді шифрлау</translation>
</message>
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to unlock the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Бұл операциясы бойынша сіздің әмиянізді қоршаудан шығару үшін әмиянның құпия сөзі керек</translation>
</message>
<message>
<location line="+5"/>
<source>Unlock wallet</source>
- <translation type="unfinished"/>
+ <translation>Әмиянізді қоршаудан шығару</translation>
</message>
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to decrypt the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Бұл операциясы бойынша сіздің әмиянізді шифрлап тастау үшін әмиянның құпия сөзі керек</translation>
</message>
<message>
<location line="+5"/>
<source>Decrypt wallet</source>
- <translation type="unfinished"/>
+ <translation>Әмиянізді шифрлап тастау</translation>
</message>
<message>
<location line="+3"/>
<source>Change passphrase</source>
- <translation type="unfinished"/>
+ <translation>Құпия сөзді өзгерту</translation>
</message>
<message>
<location line="+1"/>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,14 +773,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation>Адрес</translation>
</message>
<message>
<location line="+5"/>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -973,7 +989,7 @@ Address: %4
<location line="+43"/>
<location line="+66"/>
<source>(no label)</source>
- <translation type="unfinished"/>
+ <translation>(таңбасыз)</translation>
</message>
<message>
<location line="-9"/>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1992,7 +2041,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation>Адрес</translation>
</message>
<message>
<location line="+2"/>
@@ -2002,7 +2051,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>таңба</translation>
</message>
<message>
<location line="+2"/>
@@ -2030,7 +2079,7 @@ Address: %4
<message>
<location line="+0"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>таңба</translation>
</message>
<message>
<location line="+0"/>
@@ -2045,19 +2094,24 @@ Address: %4
<message>
<location line="+38"/>
<source>(no label)</source>
- <translation type="unfinished"/>
+ <translation>(таңбасыз)</translation>
</message>
<message>
<location line="+9"/>
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,14 +2320,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
- <translation type="unfinished"/>
+ <translation>(таңбасыз)</translation>
</message>
<message>
<location line="-11"/>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2850,7 +2893,7 @@ Address: %4
<message>
<location line="+0"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation>Адрес</translation>
</message>
<message>
<location line="+0"/>
@@ -2858,12 +2901,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3085,7 +3137,7 @@ Address: %4
<message>
<location line="-22"/>
<source>Comma separated file (*.csv)</source>
- <translation>Үтірмен бөлінген текст (*.csv)</translation>
+ <translation>Үтірмен бөлінген файл (*.csv)</translation>
</message>
<message>
<location line="+9"/>
@@ -3105,12 +3157,12 @@ Address: %4
<message>
<location line="+1"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>таңба</translation>
</message>
<message>
<location line="+1"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation>Адрес</translation>
</message>
<message>
<location line="+1"/>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts
index 102567ec96..54b29ce848 100644
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
@@ -48,7 +48,7 @@ MIT/X11 프로그램 라이선스에 따라 배포합니다. COPYING 또는 http
<message>
<location filename="../forms/addressbookpage.ui" line="+30"/>
<source>Double-click to edit address or label</source>
- <translation>표 또는 주소를 편집하기 위해 더블클릭 하세요</translation>
+ <translation>주소 또는 표를 편집하기 위해 더블클릭 하시오</translation>
</message>
<message>
<location line="+27"/>
@@ -411,12 +411,12 @@ MIT/X11 프로그램 라이선스에 따라 배포합니다. COPYING 또는 http
<message>
<location line="+10"/>
<source>&amp;Sending addresses...</source>
- <translation type="unfinished"/>
+ <translation>&amp;주소 보내는 중</translation>
</message>
<message>
<location line="+2"/>
<source>&amp;Receiving addresses...</source>
- <translation type="unfinished"/>
+ <translation>&amp; 주소 받는 중</translation>
</message>
<message>
<location line="+3"/>
@@ -623,6 +623,16 @@ MIT/X11 프로그램 라이선스에 따라 배포합니다. COPYING 또는 http
<translation><numerusform>주</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation>%1 그리고 %2</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation><numerusform>%n 년</numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -3002,7 +3012,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Amount removed from or added to balance.</source>
- <translation type="unfinished"/>
+ <translation>변경된 잔고.</translation>
</message>
</context>
<context>
@@ -3189,7 +3199,7 @@ Address: %4
<message>
<location filename="../walletframe.cpp" line="+26"/>
<source>No wallet has been loaded.</source>
- <translation type="unfinished"/>
+ <translation>지갑 불러오기가 안됩니다</translation>
</message>
</context>
<context>
@@ -3288,7 +3298,7 @@ Address: %4
<message>
<location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
- <translation type="unfinished"/>
+ <translation>&lt;port&gt;로 연결을 허용한다 (기본값: 8333 또는 테스트넷: 18333)</translation>
</message>
<message>
<location line="+5"/>
@@ -3308,12 +3318,12 @@ Address: %4
<message>
<location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation type="unfinished"/>
+ <translation>이상행동 네트워크 참여자의 연결을 차단시키기 위한 한계치 (기본값: 100)</translation>
</message>
<message>
<location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
- <translation type="unfinished"/>
+ <translation>이상행동을 하는 네트워크 참여자들을 다시 연결시키는데 걸리는 시간 (기본값: 86400초)</translation>
</message>
<message>
<location line="-36"/>
@@ -3413,7 +3423,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+5"/>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
- <translation type="unfinished"/>
+ <translation>Tor 서비스를 이용하여 네트워크에 참여하기 위해서 SOCKS5 프록시를 따로 사용함 (기본값: -proxy)</translation>
</message>
<message>
<location line="+3"/>
@@ -3433,7 +3443,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+3"/>
<source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
- <translation type="unfinished"/>
+ <translation>경고: 현재 비트코인 버전이 다른 네트워크 참여자들과 동일하지 않는 것 같습니다. 당신 또는 다른 참여자들이 동일한 비트코인 버전으로 업그레이드 할 필요가 있습니다.</translation>
</message>
<message>
<location line="+3"/>
diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts
index ae65eb1c66..c4d946e199 100644
--- a/src/qt/locale/bitcoin_la.ts
+++ b/src/qt/locale/bitcoin_la.ts
@@ -35,6 +35,12 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -616,6 +622,16 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation><numerusform>%n hebdomas</numerusform><numerusform>%n hebdomades</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 post</translation>
@@ -689,7 +705,7 @@ Inscriptio: %4
<translation>Cassidile &lt;b&gt;cifratum&lt;/b&gt; est et iam nunc &lt;b&gt;seratum&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Error fatalis accidit. Bitcoin nondum pergere tute potest, et exibit.</translation>
</message>
@@ -750,7 +766,7 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -765,7 +781,7 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Quantitas</translation>
</message>
@@ -916,7 +932,7 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1098,7 +1114,7 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Nucleus</translation>
</message>
@@ -1242,7 +1258,7 @@ Inscriptio: %4
<translation>&amp;Princeps</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Optionalis merces transactionum singulis kB quae adiuvat curare tuas transactiones processas esse celeriter. Plurimi transactiones 1kB sunt.</translation>
</message>
@@ -1252,7 +1268,7 @@ Inscriptio: %4
<translation>Solve &amp;mercedem transactionis</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Pelle Bitcoin per se postquam in systema inire.</translation>
</message>
@@ -1267,12 +1283,7 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Constitue magnitudinem databasis cache in megabytes (praedefinitum: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1287,7 +1298,12 @@ Inscriptio: %4
<translation>Constitue numerum filorum verificationis scriptorum (Maximum 16, 0 = auto, &lt;0 = tot corda libera erunt, praedefinitum: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1322,7 +1338,17 @@ Inscriptio: %4
<translation>&amp;Rete</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Aperi per se portam clientis Bitcoin in itineratore. Hoc tantum effectivum est si itineratrum tuum supportat UPnP et id activum est.</translation>
</message>
@@ -1437,17 +1463,17 @@ Inscriptio: %4
<translation>&amp;Cancella</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>praedefinitum</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Confirma optionum reconstituere</translation>
</message>
@@ -1487,18 +1513,13 @@ Inscriptio: %4
<translation>Monstrata informatio fortasse non recentissima est. Tuum cassidile per se synchronizat cum rete Bitcoin postquam conexio constabilita est, sed hoc actio nondum perfecta est.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Non confirmata:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Cassidile</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1507,7 +1528,12 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1655,6 +1681,11 @@ Inscriptio: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Insere inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1875,22 +1906,22 @@ Inscriptio: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Titulus:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1900,27 +1931,30 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1930,17 +1964,17 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1959,6 +1993,21 @@ Inscriptio: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Copia titulum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copia quantitatem</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2060,12 +2109,17 @@ Inscriptio: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Mitte Nummos</translation>
@@ -2141,7 +2195,7 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Mitte pluribus accipientibus simul</translation>
</message>
@@ -2151,7 +2205,7 @@ Inscriptio: %4
<translation>Adde &amp;Accipientem</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2161,12 +2215,12 @@ Inscriptio: %4
<translation>Vacuefac &amp;Omnia</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Pendendum:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Confirma actionem mittendi</translation>
</message>
@@ -2176,7 +2230,7 @@ Inscriptio: %4
<translation>&amp;Mitte</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Confirma mittendum nummorum</translation>
</message>
@@ -2189,12 +2243,7 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Insere inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2244,7 +2293,7 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Inscriptio accipientis non est valida, sodes reproba.</translation>
</message>
@@ -2279,12 +2328,12 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(nullus titulus)</translation>
</message>
@@ -2294,7 +2343,7 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2304,7 +2353,7 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2381,12 +2430,7 @@ Inscriptio: %4
<translation>Nuntius:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2396,7 +2440,12 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2412,11 +2461,6 @@ Inscriptio: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Insero inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2454,19 +2498,19 @@ Inscriptio: %4
<translation>Inscriptio qua signare nuntium (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Glutina inscriptionem ex latibulo</translation>
</message>
@@ -2507,12 +2551,12 @@ Inscriptio: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Vacuefac &amp;Omnia</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Verifica Nuntium</translation>
</message>
@@ -2527,7 +2571,7 @@ Inscriptio: %4
<translation>Inscriptio qua nuntius signatus est (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Verifica nuntium ut cures signatum esse cum specifica inscriptione Bitcoin</translation>
</message>
@@ -2542,43 +2586,37 @@ Inscriptio: %4
<translation>Reconstitue omnes campos verificandi nuntii</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Insere inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Clicca &quot;Signa Nuntium&quot; ut signatio generetur</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Insere signationem Bitcoin</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Inscriptio inserta non valida est.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Sodes inscriptionem proba et rursus conare.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Inserta inscriptio clavem non refert.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Cassidilis reserare cancellatum est.</translation>
</message>
@@ -2598,7 +2636,7 @@ Inscriptio: %4
<translation>Nuntius signatus.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Signatio decodificari non potuit.</translation>
</message>
@@ -2659,6 +2697,11 @@ Inscriptio: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/non conecto</translation>
</message>
@@ -2820,12 +2863,12 @@ Inscriptio: %4
<translation>, nondum prospere disseminatum est</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform>Aperi pro %n pluribus frustis</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>ignotum</translation>
</message>
@@ -2866,12 +2909,12 @@ Inscriptio: %4
<translation>Quantitas</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Aperi pro %n plure frusto</numerusform><numerusform>Aperi pro %n pluribus frustis</numerusform></translation>
</message>
@@ -2881,23 +2924,12 @@ Inscriptio: %4
<translation>Apertum donec %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Non conectum (%1 confirmationes)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Non confirmatum (%1 de %2 confirmationibus)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmatum (%1 confirmationes)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Hoc frustum non acceptum est ab ulla alia nodis et probabiliter non acceptum erit!</translation>
</message>
@@ -2907,7 +2939,27 @@ Inscriptio: %4
<translation>Generatum sed non acceptum</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Acceptum cum</translation>
</message>
@@ -2937,7 +2989,7 @@ Inscriptio: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Status transactionis. Supervola cum mure ut monstretur numerus confirmationum.</translation>
</message>
@@ -3203,12 +3255,12 @@ Inscriptio: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Usus:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Enumera mandata</translation>
</message>
@@ -3263,12 +3315,12 @@ Inscriptio: %4
<translation>Specifica tuam propriam publicam inscriptionem</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Limen pro disconectendo paria improba (praedefinitum: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Numerum secundorum prohibere ne paria improba reconectant (praedefinitum: 86400)</translation>
</message>
@@ -3288,17 +3340,17 @@ Inscriptio: %4
<translation>Accipe terminalis et JSON-RPC mandata.</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Operare infere sicut daemon et mandata accipe</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Utere rete experimentale</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect)</translation>
</message>
@@ -3439,6 +3491,11 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Conecte sole ad nodos specificatos (vel nodum specificatum)</translation>
</message>
@@ -3649,6 +3706,11 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3698,12 +3760,12 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importat frusta ab externa plica blk000??.dat</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3723,7 +3785,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Constitue numerum filorum verificationis scriptorum (Maximum 16, 0 = auto, &lt;0 = tot corda libera erunt, praedefinitum: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informatio</translation>
</message>
@@ -3793,7 +3855,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Specifica tempumfati conexionis in millisecundis (praedefinitum: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Systematis error:</translation>
</message>
@@ -3839,6 +3901,11 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versio</translation>
</message>
@@ -3848,32 +3915,32 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>wallet.dat corrupta, salvare abortum est</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Tessera pro conexionibus JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Permitte conexionibus JSON-RPC ex inscriptione specificata</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Mitte mandata nodo operanti in &lt;ip&gt; (praedefinitum: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Pelle mandatum quando optissimum frustum mutat (%s in mandato substituitur ab hash frusti)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Progredere cassidile ad formam recentissimam</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Constitue magnitudinem stagni clavium ad &lt;n&gt; (praedefinitum: 100)</translation>
</message>
@@ -3883,12 +3950,12 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Iterum perlege catenam frustorum propter absentes cassidilis transactiones</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Utere OpenSSL (https) pro conexionibus JSON-RPC</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Plica certificationis daemonis moderantis (praedefinitum: server.cert)</translation>
</message>
@@ -3898,7 +3965,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Clavis privata daemonis moderans (praedefinitum: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Hic nuntius auxilii</translation>
</message>
@@ -3908,12 +3975,12 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Non posse conglutinare ad %s in hoc computatro (conglutinare redidit errorem %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permitte quaerenda DNS pro -addnode, -seednode, et -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Legens inscriptiones...</translation>
</message>
@@ -3928,12 +3995,12 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Error legendi wallet.dat: Cassidili necesse est recentior versio Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Cassidili necesse erat rescribi: Repelle Bitcoin ut compleas</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Error legendi wallet.dat</translation>
</message>
@@ -3943,7 +4010,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Inscriptio -proxy non valida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Ignotum rete specificatum in -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3953,7 +4020,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Ignota -socks vicarii versio postulata: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Non posse resolvere -bind inscriptonem: &apos;%s&apos;</translation>
</message>
@@ -3963,7 +4030,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Non posse resolvere -externalip inscriptionem: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Quantitas non valida pro -paytxfee=&lt;quantitas&gt;: &apos;%s&apos;</translation>
</message>
@@ -3983,7 +4050,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Legens indicem frustorum...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Adice nodum cui conectere et conare sustinere conexionem apertam</translation>
</message>
@@ -3993,12 +4060,12 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Non posse conglutinare ad %s in hoc cumputatro. Bitcoin probabiliter iam operatur.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Legens cassidile...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Non posse cassidile regredi</translation>
</message>
@@ -4008,7 +4075,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Non posse scribere praedefinitam inscriptionem</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Iterum perlegens...</translation>
</message>
@@ -4018,17 +4085,17 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Completo lengendi</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Ut utaris optione %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index 4f818d1e96..05827bf82d 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -35,6 +35,12 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www.
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -616,6 +622,16 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www.
<translation><numerusform>%n savaitė</numerusform><numerusform>%n savaitės</numerusform><numerusform>%n savaičių</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -688,7 +704,7 @@ Adresas: %4</translation>
<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="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -749,7 +765,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -764,7 +780,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Suma</translation>
</message>
@@ -915,7 +931,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1097,7 +1113,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin branduolys</translation>
</message>
@@ -1241,7 +1257,7 @@ Adresas: %4</translation>
<translation>&amp;Pagrindinės</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1251,7 +1267,7 @@ Adresas: %4</translation>
<translation>&amp;Mokėti sandorio mokestį</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Automatiškai paleisti Bitkoin programą įjungus sistemą.</translation>
</message>
@@ -1266,12 +1282,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1286,7 +1297,12 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1321,7 +1337,17 @@ Adresas: %4</translation>
<translation>&amp;Tinklas</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Automatiškai atidaryti Bitcoin kliento prievadą maršrutizatoriuje. Tai veikia tik tada, kai jūsų maršrutizatorius palaiko UPnP ir ji įjungta.</translation>
</message>
@@ -1436,17 +1462,17 @@ Adresas: %4</translation>
<translation>&amp;Atšaukti</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>numatyta</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1486,19 +1512,14 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Nepatvirtinti:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Piniginė</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Patvirtinta:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1506,7 +1527,12 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1654,6 +1680,11 @@ Adresas: %4</translation>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1874,22 +1905,22 @@ Adresas: %4</translation>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>Ž&amp;ymė:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1899,27 +1930,30 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1929,17 +1963,17 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1958,6 +1992,21 @@ Adresas: %4</translation>
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopijuoti žymę</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopijuoti sumą</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2059,12 +2108,17 @@ Adresas: %4</translation>
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Siųsti monetas</translation>
@@ -2140,7 +2194,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Siųsti keliems gavėjams vienu metu</translation>
</message>
@@ -2150,7 +2204,7 @@ Adresas: %4</translation>
<translation>&amp;A Pridėti gavėją</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2160,12 +2214,12 @@ Adresas: %4</translation>
<translation>Išvalyti &amp;viską</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Balansas:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Patvirtinti siuntimo veiksmą</translation>
</message>
@@ -2175,7 +2229,7 @@ Adresas: %4</translation>
<translation>&amp;Siųsti</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Patvirtinti monetų siuntimą</translation>
</message>
@@ -2188,12 +2242,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2243,7 +2292,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Negaliojantis gavėjo adresas. Patikrinkite.</translation>
</message>
@@ -2278,12 +2327,12 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(nėra žymės)</translation>
</message>
@@ -2293,7 +2342,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2303,7 +2352,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2380,12 +2429,7 @@ Adresas: %4</translation>
<translation>Žinutė:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2395,7 +2439,12 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2411,11 +2460,6 @@ Adresas: %4</translation>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2453,19 +2497,19 @@ Adresas: %4</translation>
<translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Įvesti adresą iš mainų atminties</translation>
</message>
@@ -2506,12 +2550,12 @@ Adresas: %4</translation>
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Išvalyti &amp;viską</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Patikrinti žinutę</translation>
</message>
@@ -2526,7 +2570,7 @@ Adresas: %4</translation>
<translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Patikrinkite žinutę, jog įsitikintumėte, kad ją pasirašė nurodytas Bitcoin adresas</translation>
</message>
@@ -2541,43 +2585,37 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Spragtelėkite &quot;Registruotis žinutę&quot; tam, kad gauti parašą</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Įveskite Bitcoin parašą</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Įvestas adresas negalioja.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Prašom patikrinti adresą ir bandyti iš naujo.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Piniginės atrakinimas atšauktas.</translation>
</message>
@@ -2597,7 +2635,7 @@ Adresas: %4</translation>
<translation>Žinutė pasirašyta.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Nepavyko iškoduoti parašo.</translation>
</message>
@@ -2658,6 +2696,11 @@ Adresas: %4</translation>
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/neprisijungęs</translation>
</message>
@@ -2819,12 +2862,12 @@ Adresas: %4</translation>
<translation>, transliavimas dar nebuvo sėkmingas</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>nežinomas</translation>
</message>
@@ -2865,12 +2908,12 @@ Adresas: %4</translation>
<translation>Suma</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2880,23 +2923,12 @@ Adresas: %4</translation>
<translation>Atidaryta iki %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Atjungta (%1 patvirtinimai)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Nepatvirtintos (%1 iš %2 patvirtinimų)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Patvirtinta (%1 patvirtinimai)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Šis blokas negautas nė vienu iš mazgų ir matomai nepriimtas</translation>
</message>
@@ -2906,7 +2938,27 @@ Adresas: %4</translation>
<translation>Išgauta bet nepriimta</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Gauta su</translation>
</message>
@@ -2936,7 +2988,7 @@ Adresas: %4</translation>
<translation>nepasiekiama</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Sandorio būklė. Užvedus pelės žymeklį ant šios srities matysite patvirtinimų skaičių.</translation>
</message>
@@ -3202,12 +3254,12 @@ Adresas: %4</translation>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Naudojimas:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Komandų sąrašas</translation>
</message>
@@ -3262,12 +3314,12 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Atjungimo dėl netinkamo kolegų elgesio riba (pagal nutylėjimą: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Sekundžių kiekis eikiamas palaikyti ryšį dėl lygiarangių nestabilumo (pagal nutylėjimą: 86.400)</translation>
</message>
@@ -3287,17 +3339,17 @@ Adresas: %4</translation>
<translation>Priimti komandinę eilutę ir JSON-RPC komandas</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Dirbti fone kaip šešėlyje ir priimti komandas</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Naudoti testavimo tinklą</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3428,6 +3480,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Prisijungti tik prie nurodyto mazgo</translation>
</message>
@@ -3638,6 +3695,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Paleisti Bitcoin serverį</translation>
</message>
@@ -3687,12 +3749,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3712,7 +3774,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informacija</translation>
</message>
@@ -3782,7 +3844,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nustatyti sujungimo trukmę milisekundėmis (pagal nutylėjimą: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Sistemos klaida:</translation>
</message>
@@ -3828,6 +3890,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versija</translation>
</message>
@@ -3837,32 +3904,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Slaptažodis JSON-RPC sujungimams</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Leisti JSON-RPC tik iš nurodytų IP adresų</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Siųsti komandą mazgui dirbančiam &lt;ip&gt; (pagal nutylėjimą: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Atnaujinti piniginę į naujausią formatą</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Nustatyti rakto apimties dydį &lt;n&gt; (pagal nutylėjimą: 100)</translation>
</message>
@@ -3872,12 +3939,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ieškoti prarastų piniginės sandorių blokų grandinėje</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Naudoti OpenSSL (https) jungimuisi JSON-RPC </translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Serverio sertifikato failas (pagal nutylėjimą: server.cert)</translation>
</message>
@@ -3887,7 +3954,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Serverio privatus raktas (pagal nutylėjimą: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Pagelbos žinutė</translation>
</message>
@@ -3897,12 +3964,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nepavyko susieti šiame kompiuteryje prievado %s (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Leisti DNS paiešką sujungimui ir mazgo pridėjimui</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Užkraunami adresai...</translation>
</message>
@@ -3917,12 +3984,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation> wallet.dat pakrovimo klaida, wallet.dat reikalauja naujasnės Bitcoin versijos</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Piniginė turi būti prrašyta: įvykdymui perkraukite Bitcoin</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation> wallet.dat pakrovimo klaida</translation>
</message>
@@ -3932,7 +3999,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Neteisingas proxy adresas: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3942,7 +4009,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3952,7 +4019,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Neteisinga suma -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3972,7 +4039,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Įkeliamas blokų indeksas...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Pridėti mazgą prie sujungti su and attempt to keep the connection open</translation>
</message>
@@ -3982,12 +4049,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nepavyko susieti šiame kompiuteryje prievado %s. Bitcoin tikriausiai jau veikia.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Užkraunama piniginė...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3997,7 +4064,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Peržiūra</translation>
</message>
@@ -4007,17 +4074,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Įkėlimas baigtas</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Klaida</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts
index 48ac158b1e..6a0ac94adb 100644
--- a/src/qt/locale/bitcoin_lv_LV.ts
+++ b/src/qt/locale/bitcoin_lv_LV.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -685,7 +701,7 @@ Adrese: %4
<translation>Maciņš ir &lt;b&gt;šifrēts&lt;/b&gt; un pašlaik &lt;b&gt;slēgts&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -746,7 +762,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -761,7 +777,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Daudzums</translation>
</message>
@@ -912,7 +928,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1094,7 +1110,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1238,7 +1254,7 @@ Adrese: %4
<translation>&amp;Galvenais</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1248,7 +1264,7 @@ Adrese: %4
<translation>&amp;Maksāt par transakciju</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Automātiski sākt Bitcoin pēc pieteikšanās sistēmā.</translation>
</message>
@@ -1263,12 +1279,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Uzstādiet datu bāzes bufera izmēru megabaitos (pēc noklusēšanas: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1283,7 +1294,12 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1318,7 +1334,17 @@ Adrese: %4
<translation>&amp;Tīkls</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Uz rūtera automātiski atvērt Bitcoin klienta portu. Tas strādā tikai tad, ja rūteris atbalsta UPnP un tas ir ieslēgts.</translation>
</message>
@@ -1433,17 +1459,17 @@ Adrese: %4
<translation>&amp;Atcelt</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>pēc noklusēšanas</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1483,18 +1509,13 @@ Adrese: %4
<translation>Attēlotā informācija var būt novecojusi. Jūsu maciņš pēc savienojuma izveides automātiski sinhronizējas ar Bitcoin tīklu, taču šis process vēl nav beidzies.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Neapstiprinātas:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Maciņš</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1503,14 +1524,19 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
<source>Immature:</source>
- <translation type="unfinished"/>
+ <translation>Nenobriedušu:</translation>
</message>
<message>
<location line="+13"/>
@@ -1651,6 +1677,11 @@ Adrese: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1871,22 +1902,22 @@ Adrese: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Nosaukums:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1896,27 +1927,30 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1926,17 +1960,17 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1955,6 +1989,21 @@ Adrese: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopēt nosaukumu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopēt daudzumu</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2056,12 +2105,17 @@ Adrese: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Sūtīt bitkoinus</translation>
@@ -2137,7 +2191,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Sūtīt vairākiem saņēmējiem uzreiz</translation>
</message>
@@ -2147,7 +2201,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2157,12 +2211,12 @@ Adrese: %4
<translation>&amp;Notīrīt visu</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Bilance:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Apstiprināt nosūtīšanu</translation>
</message>
@@ -2172,7 +2226,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Apstiprināt bitkoinu sūtīšanu</translation>
</message>
@@ -2185,12 +2239,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2289,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2275,12 +2324,12 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(bez nosaukuma)</translation>
</message>
@@ -2290,7 +2339,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2300,7 +2349,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2377,12 +2426,7 @@ Adrese: %4
<translation>Ziņojums:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2392,7 +2436,12 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2408,11 +2457,6 @@ Adrese: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2450,19 +2494,19 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>ielīmēt adresi no starpliktuves</translation>
</message>
@@ -2503,12 +2547,12 @@ Adrese: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>&amp;Notīrīt visu</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2523,7 +2567,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2538,43 +2582,37 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2594,7 +2632,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2655,6 +2693,11 @@ Adrese: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2816,12 +2859,12 @@ Adrese: %4
<translation>, vēl nav veiksmīgi izziņots</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>nav zināms</translation>
</message>
@@ -2862,12 +2905,12 @@ Adrese: %4
<translation>Daudzums</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2877,23 +2920,12 @@ Adrese: %4
<translation>Atvērts līdz %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Nav pieslēgts (%1 apstiprinājumu)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Nav apstiprināts (%1 no %2 apstiprinājumu)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Apstiprināts (%1 apstiprinājumu)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Neviens cits mezgls šo bloku nav saņēmis un droši vien netiks akceptēts!</translation>
</message>
@@ -2903,7 +2935,27 @@ Adrese: %4
<translation>Ģenerēts, taču nav akceptēts</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Saņemts ar</translation>
</message>
@@ -2933,7 +2985,7 @@ Adrese: %4
<translation>(nav pieejams)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Transakcijas statuss. Turiet peli virs šī lauka, lai redzētu apstiprinājumu skaitu.</translation>
</message>
@@ -3134,7 +3186,7 @@ Adrese: %4
<message>
<location line="+8"/>
<source>to</source>
- <translation type="unfinished"/>
+ <translation>uz</translation>
</message>
</context>
<context>
@@ -3199,12 +3251,12 @@ Adrese: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Lietojums:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Komandu saraksts</translation>
</message>
@@ -3259,12 +3311,12 @@ Adrese: %4
<translation>Norādiet savu publisko adresi</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Slieksnis pārkāpējmezglu atvienošanai (pēc noklusēšanas: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Sekundes, cik ilgi atturēt pārkāpējmezglus no atkārtotas pievienošanās (pēc noklusēšanas: 86400)</translation>
</message>
@@ -3284,17 +3336,17 @@ Adrese: %4
<translation>Pieņemt komandrindas un JSON-RPC komandas</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Darbināt fonā kā servisu un pieņemt komandas</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Izmantot testa tīklu</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versija</translation>
</message>
@@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC savienojumu parole</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Atļaut JSON-RPC savienojumus no norādītās IP adreses</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Nosūtīt komandas mezglam, kas darbojas adresē &lt;ip&gt; (pēc noklusēšanas: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Izpildīt komandu, kad labāk atbilstošais bloks izmainās (%s cmd aizvieto ar bloka hešu)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Atjaunot maciņa formātu uz jaunāko</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Uzstādīt atslēgu bufera izmēru uz &lt;n&gt; (pēc noklusēšanas: 100)</translation>
</message>
@@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Atkārtoti skanēt bloku virkni, meklējot trūkstošās maciņa transakcijas</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>JSON-RPC savienojumiem izmantot OpenSSL (https)</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Servera sertifikāta fails (pēc noklusēšanas: server.cert)</translation>
</message>
@@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Servera privātā atslēga (pēc noklusēšanas: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Šis palīdzības paziņojums</translation>
</message>
@@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nevar pievienoties pie %s šajā datorā (pievienošanās atgrieza kļūdu %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Atļaut DNS uzmeklēšanu priekš -addnode, -seednode un -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Ielādē adreses...</translation>
</message>
@@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nevar ielādēt wallet.dat: maciņa atvēršanai nepieciešama jaunāka Bitcoin versija</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Bija nepieciešams pārstartēt maciņu: pabeigšanai pārstartējiet Bitcoin</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Kļūda ielādējot wallet.dat</translation>
</message>
@@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nederīga -proxy adrese: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>-onlynet komandā norādīts nepazīstams tīkls: &apos;%s&apos;</translation>
</message>
@@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Pieprasīta nezināma -socks proxy versija: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Nevar uzmeklēt -bind adresi: &apos;%s&apos;</translation>
</message>
@@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nevar atrisināt -externalip adresi: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Nederīgs daudzums priekš -paytxfree=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ielādē bloku indeksu...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Pievienot mezglu, kam pievienoties un turēt savienojumu atvērtu</translation>
</message>
@@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nevar pievienoties %s uz šī datora. Bitcoin droši vien jau darbojas.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Ielādē maciņu...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Nevar maciņa formātu padarīt vecāku</translation>
</message>
@@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nevar ierakstīt adresi pēc noklusēšanas</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Skanēju no jauna...</translation>
</message>
@@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ielāde pabeigta</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Izmantot opciju %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Kļūda</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_ms_MY.ts b/src/qt/locale/bitcoin_ms_MY.ts
index 8df9ea2a3d..cf915512bb 100644
--- a/src/qt/locale/bitcoin_ms_MY.ts
+++ b/src/qt/locale/bitcoin_ms_MY.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Baki</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation type="unfinished"/>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index 8f196a66c3..12333e3997 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -36,6 +36,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<source>The Bitcoin Core developers</source>
<translation>Bitcoin Core utviklerne</translation>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -339,7 +345,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<message>
<location line="-137"/>
<source>Node</source>
- <translation type="unfinished"/>
+ <translation>Node</translation>
</message>
<message>
<location line="+138"/>
@@ -568,7 +574,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<message>
<location line="+2"/>
<source>&amp;Command-line options</source>
- <translation type="unfinished"/>
+ <translation>&amp;Kommandolinjevalg</translation>
</message>
<message>
<location line="+1"/>
@@ -617,6 +623,16 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation><numerusform>%n uke</numerusform><numerusform>%n uker</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 bak</translation>
@@ -690,7 +706,7 @@ Adresse: %4
<translation>Lommeboken er &lt;b&gt;kryptert&lt;/b&gt; og for tiden &lt;b&gt;låst&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>En fatal feil har inntruffet. Det er ikke trygt å fortsette og Bitcoin må derfor avslutte.</translation>
</message>
@@ -751,7 +767,7 @@ Adresse: %4
<translation>Endring:</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation>Fjern alt valgt</translation>
</message>
@@ -766,7 +782,7 @@ Adresse: %4
<translation>Liste modus</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Beløp</translation>
</message>
@@ -834,7 +850,7 @@ Adresse: %4
<message>
<location line="+2"/>
<source>Copy fee</source>
- <translation type="unfinished"/>
+ <translation>Kopier gebyr</translation>
</message>
<message>
<location line="+1"/>
@@ -917,7 +933,7 @@ Adresse: %4
<translation>ingen</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation>Støv</translation>
</message>
@@ -1099,7 +1115,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Kjerne</translation>
</message>
@@ -1244,7 +1260,7 @@ Adresse: %4
<translation>&amp;Hoved</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Valgfritt transaksjonsgebyr per kB som sikrer at dine transaksjoner blir raskt prosessert. De fleste transaksjoner er 1 kB.</translation>
</message>
@@ -1254,7 +1270,7 @@ Adresse: %4
<translation>Betal transaksjons&amp;gebyr</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Start Bitcoin automatisk etter innlogging.</translation>
</message>
@@ -1269,12 +1285,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Sett størrelse på mellomlager for database i megabytes (standardverdi: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>MB</translation>
</message>
@@ -1289,14 +1300,19 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
- <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+37"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation>Koble til Bitcoin-nettverket gjennom en SOCKS proxy.</translation>
+ </message>
+ <message>
<location line="+3"/>
<source>&amp;Connect through SOCKS proxy (default proxy):</source>
- <translation type="unfinished"/>
+ <translation>&amp;Koble til gjennom SOCKS proxy (standardvalg proxy):</translation>
</message>
<message>
<location line="+34"/>
@@ -1324,7 +1340,17 @@ Adresse: %4
<translation>&amp;Nettverk</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Åpne automatisk Bitcoin klientporten på ruteren. Dette virker kun om din ruter støtter UPnP og dette er påslått.</translation>
</message>
@@ -1439,17 +1465,17 @@ Adresse: %4
<translation>&amp;Avbryt</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>standardverdi</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation>ingen</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Bekreft innstillings tilbakestilling</translation>
</message>
@@ -1457,7 +1483,7 @@ Adresse: %4
<location line="+1"/>
<location line="+29"/>
<source>Client restart required to activate changes.</source>
- <translation type="unfinished"/>
+ <translation>Omstart av klienten er nødvendig for å aktivere endringene.</translation>
</message>
<message>
<location line="-29"/>
@@ -1467,7 +1493,7 @@ Adresse: %4
<message>
<location line="+33"/>
<source>This change would require a client restart.</source>
- <translation type="unfinished"/>
+ <translation>Denne endringen krever omstart av klienten.</translation>
</message>
<message>
<location line="+34"/>
@@ -1489,19 +1515,14 @@ Adresse: %4
<translation>Informasjonen som vises kan være foreldet. Din lommebok synkroniseres automatisk med Bitcoin-nettverket etter at tilkobling er opprettet, men denne prosessen er ikke ferdig enda.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Ubekreftet</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Lommebok</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Bekreftet:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1509,7 +1530,12 @@ Adresse: %4
<translation>Din nåværende saldo</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Totalt antall ubekreftede transaksjoner som ikke teller med i saldo</translation>
</message>
@@ -1657,6 +1683,11 @@ Adresse: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Feil: Ugyldig kombinasjon av -regtest og -testnet.</translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Skriv inn en Bitcoin adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1877,22 +1908,22 @@ Adresse: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>&amp;Beløp:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Merkelapp:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>&amp;Melding:</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Gjenbruk en av de tidligere brukte mottaksadressene. Gjenbruk av adresser har sikkerhets og personverns utfordringer. Ikke bruk dette med unntak for å gjennopprette en betalingsforespørsel som ble gjort tidligere.</translation>
</message>
@@ -1902,27 +1933,30 @@ Adresse: %4
<translation>Gj&amp;enbruk en eksisterende mottaksadresse (ikke anbefalt)</translation>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Fjern alle felter fra formen.</translation>
</message>
@@ -1932,17 +1966,17 @@ Adresse: %4
<translation>Fjern</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
- <translation>Ette&amp;rspør betaling</translation>
+ <location line="+78"/>
+ <source>Requested payments history</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation type="unfinished"/>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>Ette&amp;rspør betaling</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Vis den valgte etterspørringen (gjør det samme som å dobbelklikke en oppføring)</translation>
</message>
@@ -1961,6 +1995,21 @@ Adresse: %4
<source>Remove</source>
<translation>Fjern</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopier merkelapp</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation>Kopier melding</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopiér beløp</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2062,12 +2111,17 @@ Adresse: %4
<source>(no message)</source>
<translation>(ingen melding)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation>(inget beløp)</translation>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Send Bitcoins</translation>
@@ -2143,7 +2197,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Send til flere enn én mottaker</translation>
</message>
@@ -2153,7 +2207,7 @@ Adresse: %4
<translation>&amp;Legg til Mottaker</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Fjern alle felter fra formen.</translation>
</message>
@@ -2163,12 +2217,12 @@ Adresse: %4
<translation>Fjern &amp;Alt</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Bekreft sending</translation>
</message>
@@ -2178,7 +2232,7 @@ Adresse: %4
<translation>S&amp;end</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Bekreft sending av bitcoins</translation>
</message>
@@ -2191,12 +2245,7 @@ Adresse: %4
<translation>%1 til %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Skriv inn en Bitcoin adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation>Kopier mengde</translation>
</message>
@@ -2208,7 +2257,7 @@ Adresse: %4
<message>
<location line="+1"/>
<source>Copy fee</source>
- <translation type="unfinished"/>
+ <translation>Kopier gebyr</translation>
</message>
<message>
<location line="+1"/>
@@ -2246,7 +2295,7 @@ Adresse: %4
<translation>eller</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Adresse for mottaker er ugyldig.</translation>
</message>
@@ -2281,22 +2330,22 @@ Adresse: %4
<translation>Transaksjonen ble avvist. Dette kan skje hvis noen av myntene i lommeboken allerede er brukt, f.eks. hvis du kopierte wallet.dat og mynter ble brukt i kopien uten å bli markert som brukt her.</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Advarsel: Ugyldig Bitcoin adresse</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(ingen merkelapp)</translation>
</message>
<message>
<location line="-11"/>
<source>Warning: Unknown change address</source>
- <translation type="unfinished"/>
+ <translation>Advarsel: Ukjent adresse for vekslepenger</translation>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Er du sikker på at du vil sende?</translation>
</message>
@@ -2306,7 +2355,7 @@ Adresse: %4
<translation>lagt til som transaksjonsgebyr</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>Betalingsforespørsel utgått</translation>
</message>
@@ -2383,12 +2432,7 @@ Adresse: %4
<translation>Melding:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation>Dette er en verifisert betalingsetterspørring</translation>
</message>
@@ -2398,7 +2442,12 @@ Adresse: %4
<translation>Skriv inn en merkelapp for denne adressen for å legge den til listen av brukte adresser</translation>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation>Dette er en uverifisert betalingsetterspørring</translation>
</message>
@@ -2412,12 +2461,7 @@ Adresse: %4
<location line="-498"/>
<location line="+536"/>
<source>Memo:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Skriv inn en Bitcoin adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <translation>Memo:</translation>
</message>
</context>
<context>
@@ -2430,7 +2474,7 @@ Adresse: %4
<message>
<location line="+1"/>
<source>Do not shut down the computer until this window disappears.</source>
- <translation type="unfinished"/>
+ <translation>Slå ikke av datamaskinen før dette vinduet forsvinner.</translation>
</message>
</context>
<context>
@@ -2456,19 +2500,19 @@ Adresse: %4
<translation>Adressen for signering av meldingen (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Velg tidligere brukt adresse</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Lim inn adresse fra utklippstavlen</translation>
</message>
@@ -2509,12 +2553,12 @@ Adresse: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Fjern &amp;Alt</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Verifiser Melding</translation>
</message>
@@ -2529,7 +2573,7 @@ Adresse: %4
<translation>Adressen meldingen var signert med (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Verifiser meldingen for å være sikker på at den ble signert av den angitte Bitcoin-adressen</translation>
</message>
@@ -2544,43 +2588,37 @@ Adresse: %4
<translation>Tilbakestill alle felter for meldingsverifikasjon</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Skriv inn en Bitcoin adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Klikk &quot;Signer Melding&quot; for å generere signatur</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Angi Bitcoin signatur</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Angitt adresse er ugyldig.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Vennligst sjekk adressen og prøv igjen.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Angitt adresse refererer ikke til en nøkkel.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Opplåsing av lommebok ble avbrutt.</translation>
</message>
@@ -2600,7 +2638,7 @@ Adresse: %4
<translation>Melding signert.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Signaturen kunne ikke dekodes.</translation>
</message>
@@ -2661,6 +2699,11 @@ Adresse: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/frakoblet</translation>
</message>
@@ -2822,12 +2865,12 @@ Adresse: %4
<translation>, har ikke blitt kringkastet uten problemer enda.</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Åpen for %n blokk til</numerusform><numerusform>Åpen for %n blokker til</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>ukjent</translation>
</message>
@@ -2868,12 +2911,12 @@ Adresse: %4
<translation>Beløp</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Åpen for %n blokk til</numerusform><numerusform>Åpen for %n blokker til</numerusform></translation>
</message>
@@ -2883,23 +2926,12 @@ Adresse: %4
<translation>Åpen til %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Frakoblet (%1 bekreftelser)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Ubekreftet (%1 av %2 bekreftelser)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Bekreftet (%1 bekreftelser)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Denne blokken har ikke blitt mottatt av noen andre noder og vil sannsynligvis ikke bli akseptert!</translation>
</message>
@@ -2909,7 +2941,27 @@ Adresse: %4
<translation>Generert men ikke akseptert</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Mottatt med</translation>
</message>
@@ -2939,7 +2991,7 @@ Adresse: %4
<translation>-</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Transaksjonsstatus. Hold muspekeren over dette feltet for å se antall bekreftelser.</translation>
</message>
@@ -3205,12 +3257,12 @@ Adresse: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Bruk:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>List opp kommandoer</translation>
</message>
@@ -3265,12 +3317,12 @@ Adresse: %4
<translation>Angi din egen offentlige adresse</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Grenseverdi for å koble fra noder med dårlig oppførsel (standardverdi: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Antall sekunder noder med dårlig oppførsel hindres fra å koble til på nytt (standardverdi: 86400)</translation>
</message>
@@ -3290,17 +3342,17 @@ Adresse: %4
<translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Kjør i bakgrunnen som daemon og ta imot kommandoer</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Bruk testnettverket</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect)</translation>
</message>
@@ -3411,7 +3463,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<message>
<location line="+3"/>
<source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
- <translation type="unfinished"/>
+ <translation>Advarsel: wallet.dat korrupt, data reddet! Original wallet.dat lagret som wallet.{timestamp}.bak i %s; hvis din saldo eller dine transaksjoner ikke er korrekte bør du gjenopprette fra en backup.</translation>
</message>
<message>
<location line="+9"/>
@@ -3440,6 +3492,11 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Koble kun til angitt(e) node(r)</translation>
</message>
@@ -3650,6 +3707,11 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Start Bitcoin tjener</translation>
</message>
@@ -3661,7 +3723,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<message>
<location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
- <translation type="unfinished"/>
+ <translation>Bruk (foreldet, bruk bitcoin-cli):</translation>
</message>
<message>
<location line="+7"/>
@@ -3686,7 +3748,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<message>
<location line="+2"/>
<source>Wallet options:</source>
- <translation type="unfinished"/>
+ <translation>Valg for lommebok:</translation>
</message>
<message>
<location line="+2"/>
@@ -3699,12 +3761,12 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Du må gjenoppbygge databasen med å bruke -reindex for å endre -txindex</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importerer blokker fra ekstern blk000?.dat fil</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3724,7 +3786,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informasjon</translation>
</message>
@@ -3756,7 +3818,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<message>
<location line="+2"/>
<source>Only accept block chain matching built-in checkpoints (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>Aksepter kun en blokkjede som passer med innebygde sjekkpunkter (standardvalg: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3794,7 +3856,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Angi tidsavbrudd for forbindelse i millisekunder (standardverdi: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Systemfeil:</translation>
</message>
@@ -3840,6 +3902,11 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versjon</translation>
</message>
@@ -3849,32 +3916,32 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>wallet.dat korrupt, bergning feilet</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Passord for JSON-RPC forbindelser</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Tillat JSON-RPC tilkoblinger fra angitt IP-adresse</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Send kommandoer til node på &lt;ip&gt; (standardverdi: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Eksekvér kommando når beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Oppgradér lommebok til nyeste format</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Angi størrelse på nøkkel-lager til &lt;n&gt; (standardverdi: 100)</translation>
</message>
@@ -3884,12 +3951,12 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Se gjennom blokk-kjeden etter manglende lommeboktransaksjoner</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Bruk OpenSSL (https) for JSON-RPC forbindelser</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Servers sertifikat (standardverdi: server.cert)</translation>
</message>
@@ -3899,7 +3966,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Servers private nøkkel (standardverdi: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Denne hjelpemeldingen</translation>
</message>
@@ -3909,12 +3976,12 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Kan ikke binde til %s på denne datamaskinen (bind returnerte feil %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Tillat DNS oppslag for -addnode, -seednode og -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Laster adresser...</translation>
</message>
@@ -3929,12 +3996,12 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Lommeboken måtte skrives om: start Bitcoin på nytt for å fullføre</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Feil ved lasting av wallet.dat</translation>
</message>
@@ -3944,7 +4011,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Ugyldig -proxy adresse: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Ukjent nettverk angitt i -onlynet &apos;%s&apos;</translation>
</message>
@@ -3954,7 +4021,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Ukjent -socks proxy versjon angitt: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kunne ikke slå opp -bind adresse: &apos;%s&apos;</translation>
</message>
@@ -3964,7 +4031,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Kunne ikke slå opp -externalip adresse: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Ugyldig beløp for -paytxfee=&lt;beløp&gt;: &apos;%s&apos;</translation>
</message>
@@ -3984,7 +4051,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Laster blokkindeks...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Legg til node for tilkobling og hold forbindelsen åpen</translation>
</message>
@@ -3994,12 +4061,12 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Kan ikke binde til %s på denne datamaskinen. Sannsynligvis kjører Bitcoin allerede.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Laster lommebok...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Kan ikke nedgradere lommebok</translation>
</message>
@@ -4009,7 +4076,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Kan ikke skrive standardadresse</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Leser gjennom...</translation>
</message>
@@ -4019,17 +4086,17 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Ferdig med lasting</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>For å bruke %s opsjonen</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Feil</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts
index 781b5c04a5..f971242412 100644
--- a/src/qt/locale/bitcoin_pam.ts
+++ b/src/qt/locale/bitcoin_pam.ts
@@ -34,6 +34,12 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -615,6 +621,16 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<translation><numerusform>%n dominggu</numerusform><numerusform>%n dominggu</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -688,7 +704,7 @@ Address: %4
<translation>Maka-&lt;b&gt;encrypt&lt;/b&gt; ya ing wallet at kasalukuyan yang maka-&lt;b&gt;locked&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Atin kamalian a milyari. Ali ne magsilbing sumulung pa ing Bitcoin at kailangan na ng tuknang.</translation>
</message>
@@ -749,7 +765,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -764,7 +780,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Alaga</translation>
</message>
@@ -915,7 +931,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1097,7 +1113,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Kapilubluban ning Bitcoin</translation>
</message>
@@ -1241,7 +1257,7 @@ Address: %4
<translation>&amp;Pun</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1251,7 +1267,7 @@ Address: %4
<translation>Mamayad &amp;bayad para king transaksion </translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Umpisan yang antimu ing Bitcoin kaibat mekapag-log in king sistema.</translation>
</message>
@@ -1266,12 +1282,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Ilage ya ing dagul o lati na ing database cache king megabytes (default: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1286,7 +1297,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1321,7 +1337,17 @@ Address: %4
<translation>&amp;Network</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Ibuklat yang antimanu ing Bitcoin client port king router. Gagana yamu ini istung ing router mu susuporta yang UPnP at magsilbi ya.</translation>
</message>
@@ -1436,17 +1462,17 @@ Address: %4
<translation>I-&amp;Cancel</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>default</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1486,19 +1512,14 @@ Address: %4
<translation>Ing makaltong impormasion mapalyaring luma ne. Ing kekang wallet otomatiku yang mag-synchronize keng Bitcoin network istung mekakonekta ne king network, oneng ing prosesung ini ali ya pa kumpletu.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Ali pa me-kumpirma:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Me-kumpirma:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1506,7 +1527,12 @@ Address: %4
<translation>Ing kekang kasalungsungan balanse a malyari mung gastusan</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Ing kabuuan dareng transaksion a kasalungsungan ali pa me-kumpirma, at kasalungsungan ali pa mebilang kareng kekang balanseng malyari mung gastusan</translation>
</message>
@@ -1654,6 +1680,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1874,22 +1905,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1899,27 +1930,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1929,17 +1963,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1958,6 +1992,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopyan ing label</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopyan ing alaga</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2059,12 +2108,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Magpadalang Barya</translation>
@@ -2140,7 +2194,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Misanang magpadala kareng alialiuang tumanggap</translation>
</message>
@@ -2150,7 +2204,7 @@ Address: %4
<translation>Maglage &amp;Tumanggap</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2160,12 +2214,12 @@ Address: %4
<translation>I-Clear &amp;Eganagana</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Balanse:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Kumpirman ing aksion king pamagpadala</translation>
</message>
@@ -2175,7 +2229,7 @@ Address: %4
<translation>Ipadala</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Kumpirman ing pamagpadalang barya</translation>
</message>
@@ -2188,12 +2242,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2243,7 +2292,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Ing address na ning tumanggap ali ya katanggap-tanggap, maliari pung pakilaue pasibayu.</translation>
</message>
@@ -2278,12 +2327,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(alang label)</translation>
</message>
@@ -2293,7 +2342,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2303,7 +2352,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2380,12 +2429,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2395,7 +2439,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2411,11 +2460,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2453,19 +2497,19 @@ Address: %4
<translation>Ing address ban a -pirman ya ing mensayi kayabe ning (e.g.1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Idikit ing address menibat clipboard</translation>
</message>
@@ -2506,12 +2550,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>I-Clear &amp;Eganagana</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Beripikan ing Mensayi</translation>
</message>
@@ -2526,7 +2570,7 @@ Address: %4
<translation>Ing address na ning mensayi nung nokarin me pirma ya ini (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Beripikan ing mensayi ban asiguradu a me pirma ya ini gamit ing mepiling Bitcoin address</translation>
</message>
@@ -2541,43 +2585,37 @@ Address: %4
<translation>Ibalik king dati reng ngan fields na ning pamag beripikang mensayi</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>I-click ing &quot;Pirman ing Mensayi&quot; ban agawa ya ing metung a pirma</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Ipalub ing pirma na ning Bitcoin</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Ing milub a address e ya katanggap-tanggap.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Maliaring pakilawe pasibayu ing address at pasibayuan ya iti.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Ing milub a address ali ya mag-refer king metung a key.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Me-kansela ya ing pamag-unlock king wallet.</translation>
</message>
@@ -2597,7 +2635,7 @@ Address: %4
<translation>Me-pirman ne ing mensayi.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Ing pirma ali ya bisang ma-decode.</translation>
</message>
@@ -2658,6 +2696,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/offline</translation>
</message>
@@ -2819,12 +2862,12 @@ Address: %4
<translation>, eya matagumpeng mibalita</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>e miya balu</translation>
</message>
@@ -2865,12 +2908,12 @@ Address: %4
<translation>Alaga</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2880,23 +2923,12 @@ Address: %4
<translation>Makabuklat anggang %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline(%1 kumpirmasion)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Ali pa me-kumpirma(%1 kareng %2 kumpirmasion)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Me-kumpirma(%1 kumpirmasion)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ing block a ini ali de atanggap deng aliwa pang nodes ania ali ya magsilbing tanggapan</translation>
</message>
@@ -2906,7 +2938,27 @@ Address: %4
<translation>Me-generate ya oneng ali ya metanggap</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Atanggap kayabe ning</translation>
</message>
@@ -2936,7 +2988,7 @@ Address: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Status ning Transaksion: Itapat me babo na ning field a ini ban ipakit dala reng bilang dareng me-kumpirma na</translation>
</message>
@@ -3202,12 +3254,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Pamanggamit:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Listahan dareng commands</translation>
</message>
@@ -3262,12 +3314,12 @@ Address: %4
<translation>Sabyan me ing kekang pampublikong address</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Threshold for disconnecting misbehaving peers (default: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation>
</message>
@@ -3287,17 +3339,17 @@ Address: %4
<translation>Tumanggap command line at JSON-RPC commands</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Gumana king gulut bilang daemon at tumanggap commands</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Gamitan ing test network</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Tumanggap koneksion menibat king kilwal (default: 1 if no -proxy or -connect)</translation>
</message>
@@ -3428,6 +3480,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Kumunekta mu king mepiling node(s)</translation>
</message>
@@ -3638,6 +3695,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3687,12 +3749,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3712,7 +3774,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>&amp;Impormasion</translation>
</message>
@@ -3782,7 +3844,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Kamalian ning sistema:</translation>
</message>
@@ -3828,6 +3890,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>bersion</translation>
</message>
@@ -3837,32 +3904,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Password para king JSON-RPC koneksion</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Payagan ya i JSON-RPC koneksion para king metung a IP address</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Magpadalang command king node a gagana king &lt;ip&gt;(default: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>I-execute ing command istung mialilan ya ing best block (%s in cmd is replaced by block hash)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>I-upgrade ing wallet king pekabayung porma</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>I-set ing key pool size king &lt;n&gt;(default: 100)</translation>
</message>
@@ -3872,12 +3939,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>I-scan pasibayu ing block chain para kareng mauaualang transaksion</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Gumamit OpenSSL(https) para king JSON-RPC koneksion</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Server certificate file (default: server.cert)</translation>
</message>
@@ -3887,7 +3954,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Server private key (default: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Ining saup a mensayi</translation>
</message>
@@ -3897,12 +3964,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ali ya magsilbing mag-bind keng %s kening kompyuter a ini (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Payagan ing pamaglawe DNS para king -addnode, -seednode and -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Lo-load da ne ing address...</translation>
</message>
@@ -3917,12 +3984,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Me-mali ya ing pamag-load na ning wallet.dat: Ing wallet mangailangan yang bayung bersion na ning Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Ing wallet mangailangan yang misulat pasibayu: Umpisan yang pasibayu ing Bitcoin ban ma-kumpleto ya</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Me-mali ya ing pamag-load king wallet.dat</translation>
</message>
@@ -3932,7 +3999,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ali katanggap-tanggap a -proxy addresss: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>E kilalang network ing mepili king -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3942,7 +4009,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>E kilalang -socks proxy version requested: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Eya me-resolve ing -bind address: &apos;%s&apos;</translation>
</message>
@@ -3952,7 +4019,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Eya me-resolve ing -externalip address: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Eya maliari ing alaga keng -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3972,7 +4039,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Lo-load dane ing block index...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Magdagdag a node ban kumunekta at subuknan apanatili yang makabuklat ing koneksion</translation>
</message>
@@ -3982,12 +4049,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Eya megsilbing idikit king %s na ning kompyuter a ini. Mapaliaring mamandar ne ing Bitcoin.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Lo-load dane ing wallet...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Ali ya magsilbing i-downgrade ing wallet</translation>
</message>
@@ -3997,7 +4064,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Eya misulat ing default address</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>I-scan deng pasibayu...</translation>
</message>
@@ -4007,17 +4074,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Yari ne ing pamag-load</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Para agamit ing %s a pimamilian</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Mali</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index 3627f33167..9a4f2fb48b 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -4,12 +4,12 @@
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
<source>About Bitcoin Core</source>
- <translation type="unfinished"/>
+ <translation>Sobre o Bitcoin Core</translation>
</message>
<message>
<location line="+39"/>
<source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
- <translation type="unfinished"/>
+ <translation>versão do &lt;b&gt;Bitcoin Core&lt;/b&gt;</translation>
</message>
<message>
<location line="+57"/>
@@ -34,7 +34,13 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<message>
<location line="+0"/>
<source>The Bitcoin Core developers</source>
- <translation type="unfinished"/>
+ <translation>Programadores do Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation>(%1-bit)</translation>
</message>
</context>
<context>
@@ -102,7 +108,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<message>
<location line="+1"/>
<source>Choose the address to receive coins with</source>
- <translation type="unfinished"/>
+ <translation>Escolha o endereço para receber moedas</translation>
</message>
<message>
<location line="+5"/>
@@ -127,7 +133,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<message>
<location line="+4"/>
<source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
- <translation type="unfinished"/>
+ <translation>Estes são os seus endereços Bitcoin para receber pagamentos. Recomenda-se a utilização de um novo endereço de recebimento para cada transação.</translation>
</message>
<message>
<location line="+7"/>
@@ -157,7 +163,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<message>
<location line="+1"/>
<source>There was an error trying to save the address list to %1.</source>
- <translation type="unfinished"/>
+ <translation>Ocorreu um erro ao tentar salvar a lista de endereço em %1.</translation>
</message>
</context>
<context>
@@ -339,7 +345,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<message>
<location line="-137"/>
<source>Node</source>
- <translation type="unfinished"/>
+ <translation>Nó</translation>
</message>
<message>
<location line="+138"/>
@@ -542,38 +548,38 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<message>
<location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
- <translation type="unfinished"/>
+ <translation>Solicitações de pagamentos (gera códigos QR e bitcoin: URIs)</translation>
</message>
<message>
<location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
- <translation type="unfinished"/>
+ <translation>&amp;A respeito do Bitcoin Core</translation>
</message>
<message>
<location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
- <translation type="unfinished"/>
+ <translation>Mostrar a lista de endereços de envio e etiquetas usadas</translation>
</message>
<message>
<location line="+2"/>
<source>Show the list of used receiving addresses and labels</source>
- <translation type="unfinished"/>
+ <translation>Mostrar a lista de endereços de recebimento usados ​​e etiquetas</translation>
</message>
<message>
<location line="+3"/>
<source>Open a bitcoin: URI or payment request</source>
- <translation type="unfinished"/>
+ <translation>Abrir um bitcoin: URI ou cobrança</translation>
</message>
<message>
<location line="+2"/>
<source>&amp;Command-line options</source>
- <translation type="unfinished"/>
+ <translation>Opções de linha de &amp;comando</translation>
</message>
<message>
<location line="+1"/>
<source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
- <translation type="unfinished"/>
+ <translation>Mostra a mensagem de ajuda do Bitcoin Core para pegar a lista com os comandos possíveis</translation>
</message>
<message>
<location line="+159"/>
@@ -617,6 +623,16 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation>%1 e %2</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 atrás</translation>
@@ -689,7 +705,7 @@ Endereço: %4</translation>
<translation>Carteira está &lt;b&gt;criptografada&lt;/b&gt; e atualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Um erro fatal ocorreu. Bitcoin não pode continuar em segurança e irá fechar.</translation>
</message>
@@ -707,7 +723,7 @@ Endereço: %4</translation>
<message>
<location filename="../forms/coincontroldialog.ui" line="+14"/>
<source>Coin Control Address Selection</source>
- <translation type="unfinished"/>
+ <translation>Coin Control Address Selection</translation>
</message>
<message>
<location line="+34"/>
@@ -717,7 +733,7 @@ Endereço: %4</translation>
<message>
<location line="+29"/>
<source>Bytes:</source>
- <translation type="unfinished"/>
+ <translation>Bytes:</translation>
</message>
<message>
<location line="+45"/>
@@ -750,22 +766,22 @@ Endereço: %4</translation>
<translation>trocar</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
- <translation type="unfinished"/>
+ <translation>(de)selecionar tudo</translation>
</message>
<message>
<location line="+13"/>
<source>Tree mode</source>
- <translation type="unfinished"/>
+ <translation>Modo árvore</translation>
</message>
<message>
<location line="+16"/>
<source>List mode</source>
- <translation type="unfinished"/>
+ <translation>Modo lista</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Quantidade</translation>
</message>
@@ -818,12 +834,12 @@ Endereço: %4</translation>
<message>
<location line="+1"/>
<source>Lock unspent</source>
- <translation type="unfinished"/>
+ <translation>Travar não gasto</translation>
</message>
<message>
<location line="+1"/>
<source>Unlock unspent</source>
- <translation type="unfinished"/>
+ <translation>Destravar não gasto</translation>
</message>
<message>
<location line="+22"/>
@@ -838,7 +854,7 @@ Endereço: %4</translation>
<message>
<location line="+1"/>
<source>Copy after fee</source>
- <translation type="unfinished"/>
+ <translation>Copia pós-taxa</translation>
</message>
<message>
<location line="+1"/>
@@ -848,67 +864,67 @@ Endereço: %4</translation>
<message>
<location line="+1"/>
<source>Copy priority</source>
- <translation type="unfinished"/>
+ <translation>Copia prioridade</translation>
</message>
<message>
<location line="+1"/>
<source>Copy low output</source>
- <translation type="unfinished"/>
+ <translation>Copia saída de pouco valor</translation>
</message>
<message>
<location line="+1"/>
<source>Copy change</source>
- <translation type="unfinished"/>
+ <translation>Copia alteração</translation>
</message>
<message>
<location line="+323"/>
<source>highest</source>
- <translation type="unfinished"/>
+ <translation>mais alta possível</translation>
</message>
<message>
<location line="+1"/>
<source>higher</source>
- <translation type="unfinished"/>
+ <translation>muito alta</translation>
</message>
<message>
<location line="+1"/>
<source>high</source>
- <translation type="unfinished"/>
+ <translation>alta</translation>
</message>
<message>
<location line="+1"/>
<source>medium-high</source>
- <translation type="unfinished"/>
+ <translation>média-alta</translation>
</message>
<message>
<location line="+1"/>
<source>medium</source>
- <translation type="unfinished"/>
+ <translation>média</translation>
</message>
<message>
<location line="+4"/>
<source>low-medium</source>
- <translation type="unfinished"/>
+ <translation>média-baixa</translation>
</message>
<message>
<location line="+1"/>
<source>low</source>
- <translation type="unfinished"/>
+ <translation>baixa</translation>
</message>
<message>
<location line="+1"/>
<source>lower</source>
- <translation type="unfinished"/>
+ <translation>muito baixa</translation>
</message>
<message>
<location line="+1"/>
<source>lowest</source>
- <translation type="unfinished"/>
+ <translation>a mais baixa possível</translation>
</message>
<message>
<location line="+11"/>
<source>(%1 locked)</source>
- <translation type="unfinished"/>
+ <translation>(%1 travado)</translation>
</message>
<message>
<location line="+31"/>
@@ -916,66 +932,66 @@ Endereço: %4</translation>
<translation>nenhum</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
- <translation type="unfinished"/>
+ <translation>Sujeira</translation>
</message>
<message>
<location line="+0"/>
<source>yes</source>
- <translation type="unfinished"/>
+ <translation>sim</translation>
</message>
<message>
<location line="+0"/>
<source>no</source>
- <translation type="unfinished"/>
+ <translation>não</translation>
</message>
<message>
<location line="+10"/>
<source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
- <translation type="unfinished"/>
+ <translation>Esse marcador fica vermelho se a transação ultrapassar 1000 bytes.</translation>
</message>
<message>
<location line="+1"/>
<location line="+5"/>
<source>This means a fee of at least %1 per kB is required.</source>
- <translation type="unfinished"/>
+ <translation>Isso significa que uma taxa de pelo menos %1 por kB é necessária.</translation>
</message>
<message>
<location line="-4"/>
<source>Can vary +/- 1 byte per input.</source>
- <translation type="unfinished"/>
+ <translation>Pode variar +/- 1 byte por entrada.</translation>
</message>
<message>
<location line="+2"/>
<source>Transactions with higher priority are more likely to get included into a block.</source>
- <translation type="unfinished"/>
+ <translation>Transações de alta prioridade são mais propensas a serem incluídas em um bloco.</translation>
</message>
<message>
<location line="+1"/>
<source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
- <translation type="unfinished"/>
+ <translation>Esse marcador fica vermelho se a prioridade for menor que &quot;média&quot;.</translation>
</message>
<message>
<location line="+3"/>
<source>This label turns red, if any recipient receives an amount smaller than %1.</source>
- <translation type="unfinished"/>
+ <translation>Esse marcador fica vermelho se qualquer destinatário receber uma quantia menor que %1</translation>
</message>
<message>
<location line="+1"/>
<location line="+4"/>
<source>This means a fee of at least %1 is required.</source>
- <translation type="unfinished"/>
+ <translation>Isso significa que uma taxa de pelo menos %1 é necessária.</translation>
</message>
<message>
<location line="-3"/>
<source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
- <translation type="unfinished"/>
+ <translation>Quantias abaixo de 0,546 multiplicado pela taxa mínima é mostrada como sujeira.</translation>
</message>
<message>
<location line="+2"/>
<source>This label turns red, if the change is smaller than %1.</source>
- <translation type="unfinished"/>
+ <translation>Esse marcador fica vermelho se o troco for menor que %1.</translation>
</message>
<message>
<location line="+43"/>
@@ -986,12 +1002,12 @@ Endereço: %4</translation>
<message>
<location line="-9"/>
<source>change from %1 (%2)</source>
- <translation type="unfinished"/>
+ <translation>troco de %1 (%2)</translation>
</message>
<message>
<location line="+1"/>
<source>(change)</source>
- <translation type="unfinished"/>
+ <translation>(troco)</translation>
</message>
</context>
<context>
@@ -1009,12 +1025,12 @@ Endereço: %4</translation>
<message>
<location line="+10"/>
<source>The label associated with this address list entry</source>
- <translation type="unfinished"/>
+ <translation>A etiqueta associada com esta lista de endereço de entrada</translation>
</message>
<message>
<location line="+17"/>
<source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
- <translation type="unfinished"/>
+ <translation>O endereço associado a esta lista de endereços de entrada. Isso só pode ser modificado para o envio de endereços.</translation>
</message>
<message>
<location line="-10"/>
@@ -1095,10 +1111,10 @@ Endereço: %4</translation>
<message>
<location filename="../forms/helpmessagedialog.ui" line="+19"/>
<source>Bitcoin Core - Command-line options</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin Core - Opções de linha de comando</translation>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Núcleo Bitcoin</translation>
</message>
@@ -1153,17 +1169,17 @@ Endereço: %4</translation>
<message>
<location line="+9"/>
<source>Welcome to Bitcoin Core.</source>
- <translation type="unfinished"/>
+ <translation>Bem vindo ao Bitcoin Core.</translation>
</message>
<message>
<location line="+26"/>
<source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
- <translation type="unfinished"/>
+ <translation>A primeira vez que o programa é aberto você pode escolher onde o Bitcoin Core vai guardar os dados.</translation>
</message>
<message>
<location line="+10"/>
<source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin Core vai fazer download e guardar uma cópia da longa e única cadeia de blocos do Bitcoin: Blockchain. Pelo menos %1 GB de dados serão armazenados nesse diretório e isso aumentará ao longo do tempo. Sua carteira também será armazenada nesse diretório.</translation>
</message>
<message>
<location line="+10"/>
@@ -1206,27 +1222,27 @@ Endereço: %4</translation>
<message>
<location filename="../forms/openuridialog.ui" line="+14"/>
<source>Open URI</source>
- <translation type="unfinished"/>
+ <translation>Abrir URI</translation>
</message>
<message>
<location line="+6"/>
<source>Open payment request from URI or file</source>
- <translation type="unfinished"/>
+ <translation>Cobrança aberta de URI ou arquivo</translation>
</message>
<message>
<location line="+9"/>
<source>URI:</source>
- <translation type="unfinished"/>
+ <translation>URI:</translation>
</message>
<message>
<location line="+11"/>
<source>Select payment request file</source>
- <translation type="unfinished"/>
+ <translation>Selecione o arquivo de cobrança</translation>
</message>
<message>
<location filename="../openuridialog.cpp" line="+47"/>
<source>Select payment request file to open</source>
- <translation type="unfinished"/>
+ <translation>Selecione o arquivo de cobrança para ser aberto</translation>
</message>
</context>
<context>
@@ -1242,7 +1258,7 @@ Endereço: %4</translation>
<translation>Principal</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Taxa de transação opcional por kB que ajuda a garantir que suas transações sejam processadas rapidamente. A maioria das transações são de 1 kB.</translation>
</message>
@@ -1252,7 +1268,7 @@ Endereço: %4</translation>
<translation>Pagar taxa de &amp;transação</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Iniciar Bitcoin automaticamente após se logar no sistema.</translation>
</message>
@@ -1264,22 +1280,17 @@ Endereço: %4</translation>
<message>
<location line="+9"/>
<source>Size of &amp;database cache</source>
- <translation type="unfinished"/>
+ <translation>Tamanho do banco de &amp;dados do cache</translation>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Definir o tamanho do cache do banco de dados em megabytes (padrão: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
<location line="+27"/>
<source>Number of script &amp;verification threads</source>
- <translation type="unfinished"/>
+ <translation>Número de threads do script de &amp;verificação</translation>
</message>
<message>
<location line="+13"/>
@@ -1287,24 +1298,29 @@ Endereço: %4</translation>
<translation>Defina o número de linhas de verificação (até 16, 0 = auto, &lt;0 = deixar muitos núcleos livres, padrão: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation>Ga&amp;star troco não confirmado (avançado)</translation>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
- <translation type="unfinished"/>
+ <translation>Conectado na rede do Bitcoin através de proxy SOCKS.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Connect through SOCKS proxy (default proxy):</source>
- <translation type="unfinished"/>
+ <translation>&amp;Conectado via proxy SOCKS (padrão proxy):</translation>
</message>
<message>
<location line="+34"/>
<source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
- <translation type="unfinished"/>
+ <translation>Endereço de IP do proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
</message>
<message>
<location line="+224"/>
<source>Active command-line options that override above options:</source>
- <translation type="unfinished"/>
+ <translation>Ativa as opções de linha de comando que sobrescreve as opções acima:</translation>
</message>
<message>
<location line="+43"/>
@@ -1322,7 +1338,17 @@ Endereço: %4</translation>
<translation>Rede</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation>C&amp;arteira</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation>Se você desabilitar o gasto de um troco não confirmado, o troco da transação não poderá ser utilizado até a transação ter pelo menos uma confirmação. Isso também afeta seu saldo computado.</translation>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Abrir as portas do cliente Bitcoin automaticamente no roteador. Isto só funcionará se seu roteador suportar UPnP e esta função estiver habilitada.</translation>
</message>
@@ -1419,12 +1445,12 @@ Endereço: %4</translation>
<message>
<location line="+7"/>
<source>Whether to show coin control features or not.</source>
- <translation type="unfinished"/>
+ <translation>Mostrar ou não opções de controle da moeda.</translation>
</message>
<message>
<location line="+3"/>
<source>Display coin &amp;control features (experts only)</source>
- <translation type="unfinished"/>
+ <translation>Mostrar opções de &amp;controle de moeda (avançado)</translation>
</message>
<message>
<location line="+136"/>
@@ -1437,17 +1463,17 @@ Endereço: %4</translation>
<translation>&amp;Cancelar</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>padrão</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation>nenhum</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Confirmar redefinição de opções</translation>
</message>
@@ -1455,17 +1481,17 @@ Endereço: %4</translation>
<location line="+1"/>
<location line="+29"/>
<source>Client restart required to activate changes.</source>
- <translation type="unfinished"/>
+ <translation>Reinicialização do aplicativo necessária para efetivar alterações.</translation>
</message>
<message>
<location line="-29"/>
<source>Client will be shutdown, do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation>O aplicativo vai desligar, deseja continuar?</translation>
</message>
<message>
<location line="+33"/>
<source>This change would require a client restart.</source>
- <translation type="unfinished"/>
+ <translation>Essa mudança requer uma reinicialização do aplicativo.</translation>
</message>
<message>
<location line="+34"/>
@@ -1487,19 +1513,14 @@ Endereço: %4</translation>
<translation>A informação mostrada pode estar desatualizada. Sua carteira sincroniza automaticamente com a rede Bitcoin depois que a conexão é estabelecida, mas este processo pode não estar completo ainda.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Não confirmadas:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Carteira</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Confirmado:</translation>
+ <source>Available:</source>
+ <translation>Disponível:</translation>
</message>
<message>
<location line="+16"/>
@@ -1507,7 +1528,12 @@ Endereço: %4</translation>
<translation>Seu saldo atual spendable</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation>Pendente:</translation>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Total de transações que ainda têm de ser confirmados, e ainda não contam para o equilíbrio spendable</translation>
</message>
@@ -1559,7 +1585,7 @@ Endereço: %4</translation>
<message>
<location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
- <translation type="unfinished"/>
+ <translation>Valor do pagamento solicitado de 1% é muito pequeno (Considerado poeira).</translation>
</message>
<message>
<location line="-221"/>
@@ -1579,37 +1605,37 @@ Endereço: %4</translation>
<message>
<location line="+58"/>
<source>Net manager warning</source>
- <translation type="unfinished"/>
+ <translation>Gerenciador de rede problemático</translation>
</message>
<message>
<location line="+1"/>
<source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
- <translation type="unfinished"/>
+ <translation>Seu proxy ativo não suporta SOCKS5, que é obrigatório para cobranças via proxy.</translation>
</message>
<message>
<location line="+52"/>
<source>Payment request fetch URL is invalid: %1</source>
- <translation type="unfinished"/>
+ <translation>URL de cobrança é inválida: %1</translation>
</message>
<message>
<location line="+27"/>
<source>Payment request file handling</source>
- <translation type="unfinished"/>
+ <translation>Manipulação de arquivo de cobrança</translation>
</message>
<message>
<location line="+1"/>
<source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
- <translation type="unfinished"/>
+ <translation>Arquivo de cobrança não pôde ser lido ou processado! Isso pode ter sido causado por um arquivo de cobrança inválido.</translation>
</message>
<message>
<location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
- <translation type="unfinished"/>
+ <translation>Cobrança não verificada para scripts de pagamento personalizados não é suportado.</translation>
</message>
<message>
<location line="+59"/>
<source>Refund from %1</source>
- <translation type="unfinished"/>
+ <translation>Reembolso de 1%</translation>
</message>
<message>
<location line="+43"/>
@@ -1619,7 +1645,7 @@ Endereço: %4</translation>
<message>
<location line="+24"/>
<source>Payment request can not be parsed or processed!</source>
- <translation type="unfinished"/>
+ <translation>Cobrança não pôde ser processada!</translation>
</message>
<message>
<location line="+11"/>
@@ -1681,7 +1707,7 @@ Endereço: %4</translation>
<message>
<location line="+0"/>
<source>PNG Image (*.png)</source>
- <translation type="unfinished"/>
+ <translation>PNG Imagem (*.png)</translation>
</message>
</context>
<context>
@@ -1719,7 +1745,7 @@ Endereço: %4</translation>
<message>
<location line="-10"/>
<source>Debug window</source>
- <translation type="unfinished"/>
+ <translation>Janela de debug</translation>
</message>
<message>
<location line="+25"/>
@@ -1844,37 +1870,37 @@ Endereço: %4</translation>
<message>
<location line="+122"/>
<source>%1 B</source>
- <translation type="unfinished"/>
+ <translation>1% B</translation>
</message>
<message>
<location line="+2"/>
<source>%1 KB</source>
- <translation type="unfinished"/>
+ <translation>1% KB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 MB</source>
- <translation type="unfinished"/>
+ <translation>%1 MB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 GB</source>
- <translation type="unfinished"/>
+ <translation>%1 GB</translation>
</message>
<message>
<location line="+7"/>
<source>%1 m</source>
- <translation type="unfinished"/>
+ <translation>%1 m</translation>
</message>
<message>
<location line="+5"/>
<source>%1 h</source>
- <translation type="unfinished"/>
+ <translation>%1 h</translation>
</message>
<message>
<location line="+2"/>
<source>%1 h %2 m</source>
- <translation type="unfinished"/>
+ <translation>%1 h %2 m</translation>
</message>
</context>
<context>
@@ -1897,40 +1923,40 @@ Endereço: %4</translation>
<message>
<location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
- <translation type="unfinished"/>
+ <translation>Reutilize um dos endereços de recebimento anteriormente utilizados. Reutilizar um endereço implica em problemas com segurança e privacidade. Não reutilize a menos que esteja refazendo uma cobrança já feita anteriormente.</translation>
</message>
<message>
<location line="+3"/>
<source>R&amp;euse an existing receiving address (not recommended)</source>
- <translation type="unfinished"/>
+ <translation>R&amp;eutilize um endereço de recebimento (não recomendado)</translation>
</message>
<message>
<location line="+14"/>
<location line="+23"/>
<source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
- <translation type="unfinished"/>
+ <translation>Uma mensagem opcional que será anexada na cobrança e será mostrada quando ela for aberta. Nota: A mensagem não será enviada com o pagamento pela rede Bitcoin.</translation>
</message>
<message>
<location line="-7"/>
<location line="+21"/>
<source>An optional label to associate with the new receiving address.</source>
- <translation type="unfinished"/>
+ <translation>Um marcador opcional para associar ao novo endereço de recebimento.</translation>
</message>
<message>
<location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
- <translation type="unfinished"/>
+ <translation>Use esse formulário para fazer cobranças. Todos os campos são &lt;b&gt;opcionais&lt;/b&gt;.</translation>
</message>
<message>
<location line="+23"/>
<location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
- <translation type="unfinished"/>
+ <translation>Uma quantia opcional para cobrar. Deixe vazio ou em branco se o pagador puder especificar a quantia.</translation>
</message>
<message>
<location line="+32"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>Limpa todos os campos do formulário.</translation>
</message>
<message>
<location line="+3"/>
@@ -1940,7 +1966,7 @@ Endereço: %4</translation>
<message>
<location line="+78"/>
<source>Requested payments history</source>
- <translation type="unfinished"/>
+ <translation>Histórico de cobranças</translation>
</message>
<message>
<location line="-98"/>
@@ -1950,22 +1976,22 @@ Endereço: %4</translation>
<message>
<location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
- <translation type="unfinished"/>
+ <translation>Mostra a cobrança selecionada (o mesmo que clicar duas vezes em um registro)</translation>
</message>
<message>
<location line="+3"/>
<source>Show</source>
- <translation type="unfinished"/>
+ <translation>Mostrar</translation>
</message>
<message>
<location line="+11"/>
<source>Remove the selected entries from the list</source>
- <translation type="unfinished"/>
+ <translation>Remove o registro selecionado da lista</translation>
</message>
<message>
<location line="+3"/>
<source>Remove</source>
- <translation type="unfinished"/>
+ <translation>Remover</translation>
</message>
<message>
<location filename="../receivecoinsdialog.cpp" line="+38"/>
@@ -1975,7 +2001,7 @@ Endereço: %4</translation>
<message>
<location line="+1"/>
<source>Copy message</source>
- <translation type="unfinished"/>
+ <translation>Copiar mensagem</translation>
</message>
<message>
<location line="+1"/>
@@ -2081,12 +2107,12 @@ Endereço: %4</translation>
<message>
<location line="+9"/>
<source>(no message)</source>
- <translation type="unfinished"/>
+ <translation>(sem mensagem)</translation>
</message>
<message>
<location line="+8"/>
<source>(no amount)</source>
- <translation type="unfinished"/>
+ <translation>(sem quantia especificada)</translation>
</message>
</context>
<context>
@@ -2101,22 +2127,22 @@ Endereço: %4</translation>
<message>
<location line="+76"/>
<source>Coin Control Features</source>
- <translation type="unfinished"/>
+ <translation>Opções de Controle da Moeda</translation>
</message>
<message>
<location line="+20"/>
<source>Inputs...</source>
- <translation type="unfinished"/>
+ <translation>Entradas...</translation>
</message>
<message>
<location line="+7"/>
<source>automatically selected</source>
- <translation type="unfinished"/>
+ <translation>automaticamente selecionado</translation>
</message>
<message>
<location line="+19"/>
<source>Insufficient funds!</source>
- <translation type="unfinished"/>
+ <translation>Saldo insuficiente!</translation>
</message>
<message>
<location line="+89"/>
@@ -2126,7 +2152,7 @@ Endereço: %4</translation>
<message>
<location line="+35"/>
<source>Bytes:</source>
- <translation type="unfinished"/>
+ <translation>Bytes:</translation>
</message>
<message>
<location line="+48"/>
@@ -2161,12 +2187,12 @@ Endereço: %4</translation>
<message>
<location line="+44"/>
<source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
- <translation type="unfinished"/>
+ <translation>Se isso estiver ativo e o endereço de troco estiver vazio ou inválido, o troco será enviado a um novo endereço gerado na hora.</translation>
</message>
<message>
<location line="+3"/>
<source>Custom change address</source>
- <translation type="unfinished"/>
+ <translation>Endereço específico de troco</translation>
</message>
<message>
<location line="+164"/>
@@ -2181,7 +2207,7 @@ Endereço: %4</translation>
<message>
<location line="-23"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>Limpar todos os campos do formulário.</translation>
</message>
<message>
<location line="+3"/>
@@ -2234,7 +2260,7 @@ Endereço: %4</translation>
<message>
<location line="+1"/>
<source>Copy after fee</source>
- <translation type="unfinished"/>
+ <translation>Copia pós-taxa</translation>
</message>
<message>
<location line="+1"/>
@@ -2244,22 +2270,22 @@ Endereço: %4</translation>
<message>
<location line="+1"/>
<source>Copy priority</source>
- <translation type="unfinished"/>
+ <translation>Copia prioridade</translation>
</message>
<message>
<location line="+1"/>
<source>Copy low output</source>
- <translation type="unfinished"/>
+ <translation>Copia saída de pouco valor</translation>
</message>
<message>
<location line="+1"/>
<source>Copy change</source>
- <translation type="unfinished"/>
+ <translation>Copia alteração</translation>
</message>
<message>
<location line="+170"/>
<source>Total Amount %1 (= %2)</source>
- <translation type="unfinished"/>
+ <translation>Quantidade Total %1 (= %2)</translation>
</message>
<message>
<location line="+2"/>
@@ -2294,17 +2320,17 @@ Endereço: %4</translation>
<message>
<location line="+3"/>
<source>Transaction creation failed!</source>
- <translation type="unfinished"/>
+ <translation>A criação de transação falhou!</translation>
</message>
<message>
<location line="+4"/>
<source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"/>
+ <translation>A transação foi rejeitada! Isso pode acontecer se alguns bitcoins na sua carteira já foram gastos em outro local, por exemplo se você tiver uma cópia do wallet.dat e os bitcoins tiverem sido gastos na cópia mas não marcados como gastos aqui ainda.</translation>
</message>
<message>
<location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Atenção: endereço de Bitcoin inválido</translation>
</message>
<message>
<location line="+20"/>
@@ -2314,7 +2340,7 @@ Endereço: %4</translation>
<message>
<location line="-11"/>
<source>Warning: Unknown change address</source>
- <translation type="unfinished"/>
+ <translation>Atenção: endereço de troco desconhecido</translation>
</message>
<message>
<location line="-367"/>
@@ -2369,12 +2395,12 @@ Endereço: %4</translation>
<message>
<location line="-50"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>Escolher endereço usado anteriormente</translation>
</message>
<message>
<location line="-40"/>
<source>This is a normal payment.</source>
- <translation type="unfinished"/>
+ <translation>Este é um pagamento normal.</translation>
</message>
<message>
<location line="+50"/>
@@ -2406,22 +2432,22 @@ Endereço: %4</translation>
<message>
<location line="+968"/>
<source>This is a verified payment request.</source>
- <translation type="unfinished"/>
+ <translation>Essa é cobrança verificada.</translation>
</message>
<message>
<location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
- <translation type="unfinished"/>
+ <translation>Digite um nome para este endereço para adicioná-lo no catálogo</translation>
</message>
<message>
<location line="+33"/>
<source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
+ <translation>A mensagem que foi anexada ao bitcoin: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Bitcoin.</translation>
</message>
<message>
<location line="+426"/>
<source>This is an unverified payment request.</source>
- <translation type="unfinished"/>
+ <translation>Essa é uma cobrança não verificada.</translation>
</message>
<message>
<location line="+18"/>
@@ -2441,7 +2467,7 @@ Endereço: %4</translation>
<message>
<location filename="../utilitydialog.cpp" line="+48"/>
<source>Bitcoin Core is shutting down...</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin Core está desligando...</translation>
</message>
<message>
<location line="+1"/>
@@ -2475,7 +2501,7 @@ Endereço: %4</translation>
<location line="+7"/>
<location line="+210"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>Escolha um endereço usado anteriormente</translation>
</message>
<message>
<location line="-200"/>
@@ -2646,7 +2672,7 @@ Endereço: %4</translation>
<message>
<location line="+2"/>
<source>The Bitcoin Core developers</source>
- <translation type="unfinished"/>
+ <translation>Programadores do Bitcoin Core</translation>
</message>
<message>
<location line="+1"/>
@@ -2659,7 +2685,7 @@ Endereço: %4</translation>
<message>
<location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
@@ -2671,6 +2697,11 @@ Endereço: %4</translation>
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation>em conflito</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/offline</translation>
</message>
@@ -2794,7 +2825,7 @@ Endereço: %4</translation>
<message>
<location line="+7"/>
<source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
- <translation type="unfinished"/>
+ <translation>Bitcoins recém minerados precisam aguardar %1 blocos antes de serem gastos. Quando o bloco foi gerado, ele foi disseminado pela rede para ser adicionado à cadeia de blocos: blockchain. Se ele falhar em ser inserido na cadeia, seu estado será modificado para &quot;não aceito&quot; e ele não poderá ser gasto. Isso pode acontecer eventualmente quando blocos são gerados quase que simultaneamente.</translation>
</message>
<message>
<location line="+8"/>
@@ -2832,12 +2863,12 @@ Endereço: %4</translation>
<translation>, ainda não foi propagada na rede com sucesso.</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Abrir para mais %n bloco</numerusform><numerusform>Abrir para mais %n blocos</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>desconhecido</translation>
</message>
@@ -2878,12 +2909,12 @@ Endereço: %4</translation>
<translation>Quantidade</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
- <translation type="unfinished"/>
+ <translation>Recém-criado (%1 confirmações, disponível somente após %2)</translation>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Abrir para mais %n bloco</numerusform><numerusform>Abrir para mais %n blocos</numerusform></translation>
</message>
@@ -2893,23 +2924,12 @@ Endereço: %4</translation>
<translation>Aberto até %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline (%1 confirmações)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Não confirmado (%1 of %2 confirmações)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmado (%1 confirmações)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Este bloco não foi recebido por nenhum outro participante da rede e provavelmente não será aceito!</translation>
</message>
@@ -2919,7 +2939,27 @@ Endereço: %4</translation>
<translation>Gerado mas não aceito</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation>Offline</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation>Não confirmado</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation>Confirmando (%1 de %2 confirmações recomendadas)</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation>Conflitou</translation>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Recebido por</translation>
</message>
@@ -2949,7 +2989,7 @@ Endereço: %4</translation>
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Status da transação. Passe o mouse sobre este campo para mostrar o número de confirmações.</translation>
</message>
@@ -3080,7 +3120,7 @@ Endereço: %4</translation>
<message>
<location line="+142"/>
<source>Export Transaction History</source>
- <translation type="unfinished"/>
+ <translation>Exportar Histórico de Transação</translation>
</message>
<message>
<location line="+19"/>
@@ -3090,7 +3130,7 @@ Endereço: %4</translation>
<message>
<location line="+0"/>
<source>There was an error trying to save the transaction history to %1.</source>
- <translation type="unfinished"/>
+ <translation>Ocorreu um erro ao tentar salvar o histórico de transação em %1.</translation>
</message>
<message>
<location line="+4"/>
@@ -3100,7 +3140,7 @@ Endereço: %4</translation>
<message>
<location line="+0"/>
<source>The transaction history was successfully saved to %1.</source>
- <translation type="unfinished"/>
+ <translation>O histórico de transação foi gravado com sucesso em %1.</translation>
</message>
<message>
<location line="-22"/>
@@ -3158,7 +3198,7 @@ Endereço: %4</translation>
<message>
<location filename="../walletframe.cpp" line="+26"/>
<source>No wallet has been loaded.</source>
- <translation type="unfinished"/>
+ <translation>Nenhuma carteira foi carregada.</translation>
</message>
</context>
<context>
@@ -3199,12 +3239,12 @@ Endereço: %4</translation>
<message>
<location line="+0"/>
<source>There was an error trying to save the wallet data to %1.</source>
- <translation type="unfinished"/>
+ <translation>Ocorreu um erro ao tentar salvar os dados da carteira em %1.</translation>
</message>
<message>
<location line="+4"/>
<source>The wallet data was successfully saved to %1.</source>
- <translation type="unfinished"/>
+ <translation>Os dados da carteira foram salvos com sucesso em %1.</translation>
</message>
<message>
<location line="+0"/>
@@ -3215,12 +3255,12 @@ Endereço: %4</translation>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Uso:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Lista de comandos</translation>
</message>
@@ -3275,12 +3315,12 @@ Endereço: %4</translation>
<translation>Especificar seu próprio endereço público</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Limite para desconectar peers mal comportados (padrão: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Número de segundos para impedir que peers mal comportados reconectem (padrão: 86400)</translation>
</message>
@@ -3300,17 +3340,17 @@ Endereço: %4</translation>
<translation>Aceitar linha de comando e comandos JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Rodar em segundo plano como serviço e aceitar comandos</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Usar rede de teste</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes)</translation>
</message>
@@ -3342,7 +3382,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+12"/>
<source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source>
- <translation type="unfinished"/>
+ <translation>Codificadores aceitos (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation>
</message>
<message>
<location line="+5"/>
@@ -3367,7 +3407,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+4"/>
<source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
- <translation type="unfinished"/>
+ <translation>Entra no modo de teste de regressão, que usa uma cadeia especial onde os blocos podem ser resolvidos instantaneamente.</translation>
</message>
<message>
<location line="+3"/>
@@ -3392,7 +3432,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+5"/>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
- <translation type="unfinished"/>
+ <translation>Use proxy SOCKS5 separado para alcançar nós via Tor hidden services (padrão: -proxy)</translation>
</message>
<message>
<location line="+3"/>
@@ -3427,7 +3467,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+9"/>
<source>&lt;category&gt; can be:</source>
- <translation type="unfinished"/>
+ <translation>&lt;category&gt; pode ser:</translation>
</message>
<message>
<location line="+6"/>
@@ -3437,12 +3477,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Bitcoin Core Daemon</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin Core Daemon</translation>
</message>
<message>
<location line="+1"/>
<source>Bitcoin RPC client version</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin RPC versão do cliente</translation>
</message>
<message>
<location line="+1"/>
@@ -3451,18 +3491,23 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation>Limpa a lista de transações da carteira (ferramenta de diagnóstico; implica -rescan)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Conectar apenas a nó(s) específico(s)</translation>
</message>
<message>
<location line="+1"/>
<source>Connect through SOCKS proxy</source>
- <translation type="unfinished"/>
+ <translation>Conecta através de proxy SOCKS</translation>
</message>
<message>
<location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
- <translation type="unfinished"/>
+ <translation>Conectar-se ao JSON-RPC em &lt;port&gt; (default: 8332 or testnet: 18332)</translation>
</message>
<message>
<location line="+2"/>
@@ -3477,7 +3522,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Do not load the wallet and disable wallet RPC calls</source>
- <translation type="unfinished"/>
+ <translation>Não carrega a carteira e desabilita as chamadas RPC para a carteira</translation>
</message>
<message>
<location line="+1"/>
@@ -3577,7 +3622,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Fee per kB to add to transactions you send</source>
- <translation type="unfinished"/>
+ <translation>Taxa por kB para adicionar às transações que você envia</translation>
</message>
<message>
<location line="+1"/>
@@ -3602,7 +3647,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>If &lt;category&gt; is not supplied, output all debugging information.</source>
- <translation type="unfinished"/>
+ <translation>Se &lt;category&gt; não for informada, logar toda informação de debug.</translation>
</message>
<message>
<location line="+2"/>
@@ -3612,7 +3657,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+3"/>
<source>Invalid -onion address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Endereço -onion inválido: &apos;%s&apos;</translation>
</message>
<message>
<location line="+15"/>
@@ -3622,7 +3667,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+5"/>
<source>Prepend debug output with timestamp (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>Adiciona timestamp como prefixo no debug (padrão: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3637,17 +3682,17 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+5"/>
<source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
- <translation type="unfinished"/>
+ <translation>Seleciona versão SOCKS para -proxy (4 ou 5, padrão: 5)</translation>
</message>
<message>
<location line="+1"/>
<source>Send command to Bitcoin server</source>
- <translation type="unfinished"/>
+ <translation>Enviar comando para um servidor Bitcoin</translation>
</message>
<message>
<location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
- <translation type="unfinished"/>
+ <translation>Define o tamanho máximo de cada bloco em bytes (padrão: %d)</translation>
</message>
<message>
<location line="+2"/>
@@ -3661,18 +3706,23 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation>Permite gastar troco não confirmado ao criar transações (padrão: 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Iniciar servidor Bitcoin</translation>
</message>
<message>
<location line="+3"/>
<source>This is intended for regression testing tools and app development.</source>
- <translation type="unfinished"/>
+ <translation>Isso é usado para testes de regressão e ferramentas de desenvolvimento.</translation>
</message>
<message>
<location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
- <translation type="unfinished"/>
+ <translation>Exemplo de uso (obsoleto, use bitcoin-cli):</translation>
</message>
<message>
<location line="+7"/>
@@ -3702,7 +3752,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
- <translation type="unfinished"/>
+ <translation>Atenção: Parâmetro obsoleto -debugnet foi ignorado, use -debug=net</translation>
</message>
<message>
<location line="+2"/>
@@ -3710,24 +3760,24 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Você precisa reconstruir o banco de dados utilizando-reindexar a mudar-txindex</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importar blocos de um arquivo externo blk000??.dat</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Executa o comando quando um alerta relevante é recebido ou vemos um longo garfo (% s em cmd é substituída pela mensagem)</translation>
</message>
<message>
<location line="+14"/>
<source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
- <translation type="unfinished"/>
+ <translation>Informação de saída de debug (padrão: 0, definir &lt;category&gt; é opcional)</translation>
</message>
<message>
<location line="+2"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
- <translation type="unfinished"/>
+ <translation>Define o tamanho máximo de alta-prioridade por taxa baixa nas transações em bytes (padrão: %d)</translation>
</message>
<message>
<location line="+2"/>
@@ -3735,7 +3785,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Defina o número de linhas de verificação (até 16, 0 = auto, &lt;0 = deixar muitos núcleos livres, padrão: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informação</translation>
</message>
@@ -3805,7 +3855,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Especifique o tempo limite (timeout) da conexão em milissegundos (padrão: 5000) </translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Erro de sistema:</translation>
</message>
@@ -3851,6 +3901,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation>Aniquilando todas as transações da carteira...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versão</translation>
</message>
@@ -3860,32 +3915,32 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>wallet.dat corrompido, recuperação falhou</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Senha para conexões JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Permitir conexões JSON-RPC de endereços IP específicos</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Enviar comando para nó rodando em &lt;ip&gt; (pardão: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Executar comando quando o melhor bloco mudar (%s no comando será substituído pelo hash do bloco)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Atualizar carteira para o formato mais recente</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Determinar tamanho do pool de endereços para &lt;n&gt; (padrão: 100)</translation>
</message>
@@ -3895,12 +3950,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Re-escanear blocos procurando por transações perdidas da carteira</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Usar OpenSSL (https) para conexões JSON-RPC</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Arquivo de certificado do servidor (padrão: server.cert)</translation>
</message>
@@ -3910,7 +3965,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Chave privada do servidor (padrão: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Esta mensagem de ajuda</translation>
</message>
@@ -3920,12 +3975,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Impossível vincular a %s neste computador (bind retornou erro %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permitir consultas DNS para -addnode, -seednode e -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Carregando endereços...</translation>
</message>
@@ -3940,12 +3995,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Erro ao carregar wallet.dat: Carteira requer uma versão mais nova do Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>A Carteira precisou ser reescrita: reinicie o Bitcoin para completar</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Erro ao carregar wallet.dat</translation>
</message>
@@ -3955,7 +4010,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Endereço -proxy inválido: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Rede desconhecida especificada em -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3965,7 +4020,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Versão desconhecida do proxy -socks requisitada: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Impossível encontrar o endereço -bind: &apos;%s&apos;</translation>
</message>
@@ -3975,7 +4030,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Impossível encontrar endereço -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Quantidade inválida para -paytxfee=&lt;quantidade&gt;: &apos;%s&apos;</translation>
</message>
@@ -3995,7 +4050,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Carregando índice de blocos...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Adicionar um nó com o qual se conectar e tentar manter a conexão ativa</translation>
</message>
@@ -4005,12 +4060,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Impossível vincular a %s neste computador. O Bitcoin provavelmente já está rodando.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Carregando carteira...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Não é possível fazer downgrade da carteira</translation>
</message>
@@ -4020,7 +4075,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Não foi possível escrever no endereço padrão</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Re-escaneando...</translation>
</message>
@@ -4030,17 +4085,17 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Carregamento terminado</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Para usar a opção %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index 0786b23f91..cdc65386c1 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -36,6 +36,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<source>The Bitcoin Core developers</source>
<translation>Os programadores Bitcoin</translation>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -157,7 +163,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<message>
<location line="+1"/>
<source>There was an error trying to save the address list to %1.</source>
- <translation type="unfinished"/>
+ <translation>Ocorreu um erro ao tentar guardar a lista de endereços em %1.</translation>
</message>
</context>
<context>
@@ -175,7 +181,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<message>
<location line="+36"/>
<source>(no label)</source>
- <translation>(Sem rótulo)</translation>
+ <translation>(sem rótulo)</translation>
</message>
</context>
<context>
@@ -568,12 +574,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<message>
<location line="+2"/>
<source>&amp;Command-line options</source>
- <translation type="unfinished"/>
+ <translation>Opções da linha de &amp;comandos</translation>
</message>
<message>
<location line="+1"/>
<source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
- <translation type="unfinished"/>
+ <translation>Mostrar a mensagem de ajuda do Bitcoin Core para obter uma lista com possíveis opções para a linha de comandos</translation>
</message>
<message>
<location line="+159"/>
@@ -617,6 +623,16 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 em atraso</translation>
@@ -690,7 +706,7 @@ Endereço: %4
<translation>A carteira está &lt;b&gt;encriptada&lt;/b&gt; e atualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ocorreu um erro fatal. O Bitcoin não pode continuar com segurança e irá fechar.</translation>
</message>
@@ -708,7 +724,7 @@ Endereço: %4
<message>
<location filename="../forms/coincontroldialog.ui" line="+14"/>
<source>Coin Control Address Selection</source>
- <translation>Controlo de selecção de endereço &quot;Coin&quot;.</translation>
+ <translation>Seleção de Endereço Coin Control</translation>
</message>
<message>
<location line="+34"/>
@@ -738,7 +754,7 @@ Endereço: %4
<message>
<location line="+32"/>
<source>Low Output:</source>
- <translation>Output Baixo:</translation>
+ <translation>Saída Baixa:</translation>
</message>
<message>
<location line="+48"/>
@@ -748,12 +764,12 @@ Endereço: %4
<message>
<location line="+32"/>
<source>Change:</source>
- <translation>Alteração:</translation>
+ <translation>Troco:</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
- <translation>(não)seleccionar todos</translation>
+ <translation>(des)seleccionar todos</translation>
</message>
<message>
<location line="+13"/>
@@ -766,7 +782,7 @@ Endereço: %4
<translation>Modo lista</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Quantia</translation>
</message>
@@ -819,12 +835,12 @@ Endereço: %4
<message>
<location line="+1"/>
<source>Lock unspent</source>
- <translation>Bloquear não-utilizados</translation>
+ <translation>Bloquear não gastos</translation>
</message>
<message>
<location line="+1"/>
<source>Unlock unspent</source>
- <translation>Desbloquear não-utilizados</translation>
+ <translation>Desbloquear não gastos</translation>
</message>
<message>
<location line="+22"/>
@@ -917,7 +933,7 @@ Endereço: %4
<translation>nenhum</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation>Lixo</translation>
</message>
@@ -955,7 +971,7 @@ Endereço: %4
<message>
<location line="+1"/>
<source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
- <translation type="unfinished"/>
+ <translation>Esta legenda fica vermelha se a prioridade for menor que &quot;médio&quot;.</translation>
</message>
<message>
<location line="+3"/>
@@ -1015,7 +1031,7 @@ Endereço: %4
<message>
<location line="+17"/>
<source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
- <translation>O endereço associado com a entrada do registo desta lista. Isto só pode ser modificado para os endereços de envio.</translation>
+ <translation>O endereço associado com o rótulo desta entrada. Isto só pode ser modificado para endereços de saída.</translation>
</message>
<message>
<location line="-10"/>
@@ -1078,7 +1094,7 @@ Endereço: %4
<message>
<location line="+2"/>
<source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
- <translation>O directório já existe. Adicione %1 se pretender criar um novo directório aqui.</translation>
+ <translation>A pasta já existe. Adicione %1 se pretender criar aqui uma nova pasta.</translation>
</message>
<message>
<location line="+3"/>
@@ -1096,10 +1112,10 @@ Endereço: %4
<message>
<location filename="../forms/helpmessagedialog.ui" line="+19"/>
<source>Bitcoin Core - Command-line options</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin Core - Opções da linha de comandos</translation>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Núcleo Bitcoin</translation>
</message>
@@ -1244,7 +1260,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Principal</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Taxa de transação opcional por KB que ajuda a assegurar que as suas transações serão processadas rapidamente. A maioria das transações tem 1 kB.</translation>
</message>
@@ -1254,7 +1270,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Pagar &amp;taxa de transação</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Começar o Bitcoin automaticamente ao iniciar sessão no sistema.</translation>
</message>
@@ -1269,19 +1285,14 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Tamanho dos temporários da &amp;base de dados</translation>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Definir o tamanho da cache de base de dados em megabytes (por defeito: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
<location line="+27"/>
<source>Number of script &amp;verification threads</source>
- <translation type="unfinished"/>
+ <translation>Número de processos de script e &amp;verificação</translation>
</message>
<message>
<location line="+13"/>
@@ -1289,19 +1300,24 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Defina o número de processos de verificação (até 16, 0 = automático, &lt;0 = disponibiliza esse número de núcleos livres, por defeito: 0)</translation>
</message>
<message>
- <location line="+58"/>
- <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+37"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation>Ligar à rede Bitcoin através de um proxy SOCKS.</translation>
+ </message>
+ <message>
<location line="+3"/>
<source>&amp;Connect through SOCKS proxy (default proxy):</source>
- <translation type="unfinished"/>
+ <translation>Ligar através de um proxy SO&amp;CKS (proxy por defeito):</translation>
</message>
<message>
<location line="+34"/>
<source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
- <translation type="unfinished"/>
+ <translation>Endereço IP do proxy (p.ex. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
</message>
<message>
<location line="+224"/>
@@ -1324,7 +1340,17 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Rede</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Abrir a porta do cliente bitcoin automaticamente no seu router. Isto penas funciona se o seu router suportar UPnP e este se encontrar ligado.</translation>
</message>
@@ -1439,17 +1465,17 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Cancelar</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>padrão</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation>nenhum</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Confirme a reposição de opções</translation>
</message>
@@ -1457,17 +1483,17 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<location line="+1"/>
<location line="+29"/>
<source>Client restart required to activate changes.</source>
- <translation type="unfinished"/>
+ <translation>Precisa reiniciar o cliente para ativar as mudanças.</translation>
</message>
<message>
<location line="-29"/>
<source>Client will be shutdown, do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation>O cliente será desligado, deseja proceder?</translation>
</message>
<message>
<location line="+33"/>
<source>This change would require a client restart.</source>
- <translation type="unfinished"/>
+ <translation>Esta mudança requer um reinício do cliente.</translation>
</message>
<message>
<location line="+34"/>
@@ -1489,19 +1515,14 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>A informação mostrada poderá estar desatualizada. A sua carteira sincroniza automaticamente com a rede Bitcoin depois de estabelecer ligação, mas este processo ainda não está completo.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Não confirmado:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Carteira</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Confirmado:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1509,7 +1530,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>O seu saldo disponível para gastar</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Total de transações ainda não confirmadas, e que não estão contabilizadas ainda no seu saldo actual</translation>
</message>
@@ -1581,7 +1607,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<message>
<location line="+58"/>
<source>Net manager warning</source>
- <translation type="unfinished"/>
+ <translation>Aviso do gestor de rede</translation>
</message>
<message>
<location line="+1"/>
@@ -1657,6 +1683,11 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Erro: Combinação inválida de -regtest e -testnet.</translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Introduza um endereço Bitcoin (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1721,7 +1752,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<message>
<location line="+25"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Geral</translation>
</message>
<message>
<location line="+53"/>
@@ -1741,7 +1772,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<message>
<location line="+7"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation>Nome</translation>
</message>
<message>
<location line="+23"/>
@@ -1877,24 +1908,24 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>&amp;Quantia:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>Rótu&amp;lo:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>&amp;Mensagem:</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
- <translation>Re-utilize uns dos anteriores endereços de recebimento. Reutilizar endereços pode levar a um risco de segurança e de privacidade. Não use isto a não ser que esteja a re-pedir uma solicitação de pagamento feito anteriormente.</translation>
+ <translation>Reutilize uns dos anteriores endereços de entrada. Reutilizar endereços pode levar a um risco de segurança e de privacidade. Não use isto a não ser que esteja a repetir uma requisição de pagamento feita anteriormente.</translation>
</message>
<message>
<location line="+3"/>
@@ -1902,27 +1933,30 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Reutilizar um endereço de recebimento existente (não recomendado)</translation>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
- <translation type="unfinished"/>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
+ <translation>Um rótulo opcional a associar ao novo endereço de recebimento.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
- <translation type="unfinished"/>
+ <translation>Utilize este formulário para solicitar pagamentos. Todos os campos são &lt;b&gt;opcionais&lt;/b&gt;.</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Limpar todos os campos do formulário.</translation>
</message>
@@ -1932,17 +1966,17 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Limpar</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
- <translation>&amp;Requisitar Pagamento</translation>
+ <location line="+78"/>
+ <source>Requested payments history</source>
+ <translation>Histórico de pagamentos requisitados</translation>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation type="unfinished"/>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>&amp;Requisitar Pagamento</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Mostrar o pedido seleccionado (Faz o mesmo que clicar 2 vezes numa entrada)</translation>
</message>
@@ -1961,6 +1995,21 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<source>Remove</source>
<translation>Remover</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Copiar rótulo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation>Copiar mensagem</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copiar quantia</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2062,12 +2111,17 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<source>(no message)</source>
<translation>(Sem mensagem)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation>(sem quantia)</translation>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Enviar Moedas</translation>
@@ -2143,7 +2197,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Personalização de endereço de alteração</translation>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Enviar para múltiplos destinatários de uma vez</translation>
</message>
@@ -2153,7 +2207,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Adicionar &amp;Destinatário</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Limpar todos os campos do formulário.</translation>
</message>
@@ -2163,12 +2217,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Limpar Tudo</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Confirme ação de envio</translation>
</message>
@@ -2178,7 +2232,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Enviar</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Confirme envio de moedas</translation>
</message>
@@ -2191,12 +2245,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>%1 para %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Introduza um endereço Bitcoin (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation>Copiar quantidade</translation>
</message>
@@ -2246,7 +2295,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>ou</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>O endereço de destino não é válido, por favor verifique.</translation>
</message>
@@ -2281,12 +2330,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Erro: A transação foi rejeitada. Isso poderá acontecer se algumas das moedas na sua carteira já tiverem sido gastas, se por exemplo tiver usado uma cópia do ficheiro wallet.dat e as moedas foram gastas na cópia mas não foram marcadas como gastas aqui.</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Aviso: Endereço Bitcoin inválido</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(Sem rótulo)</translation>
</message>
@@ -2296,7 +2345,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Aviso: Endereço de alteração desconhecido</translation>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Tem a certeza que deseja enviar?</translation>
</message>
@@ -2306,7 +2355,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>adicionados como taxa de transação</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>Pedido de pagamento expirou</translation>
</message>
@@ -2383,12 +2432,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Mensagem:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation>Este é um pedido de verificação de pagamento.</translation>
</message>
@@ -2398,7 +2442,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Escreva um rótulo para este endereço para o adicionar à sua lista de endereços usados</translation>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation>Este é um pedido de pagamento não-verificado.</translation>
</message>
@@ -2414,18 +2463,13 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<source>Memo:</source>
<translation>Memo:</translation>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Introduza um endereço Bitcoin (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
<message>
<location filename="../utilitydialog.cpp" line="+48"/>
<source>Bitcoin Core is shutting down...</source>
- <translation type="unfinished"/>
+ <translation>O Bitcoin Core está a encerrar...</translation>
</message>
<message>
<location line="+1"/>
@@ -2456,19 +2500,19 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>O endereço a utilizar para assinar a mensagem (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Escolher endereço usado previamente</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Cole endereço da área de transferência</translation>
</message>
@@ -2509,12 +2553,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Limpar &amp;Tudo</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Verificar Mensagem</translation>
</message>
@@ -2529,7 +2573,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>O endereço utilizado para assinar a mensagem (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Verifique a mensagem para assegurar que foi assinada com o endereço Bitcoin especificado</translation>
</message>
@@ -2544,43 +2588,37 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Repôr todos os campos de verificação de mensagem</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Introduza um endereço Bitcoin (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Clique &quot;Assinar mensagem&quot; para gerar a assinatura</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Introduza assinatura Bitcoin</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>O endereço introduzido é inválido. </translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Por favor verifique o endereço e tente de novo.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>O endereço introduzido não refere a chave alguma.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>O desbloqueio da carteira foi cancelado.</translation>
</message>
@@ -2600,7 +2638,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Mensagem assinada.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>A assinatura não pôde ser descodificada.</translation>
</message>
@@ -2661,6 +2699,11 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/desligado</translation>
</message>
@@ -2822,12 +2865,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>, ainda não foi transmitida com sucesso</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Aberta por mais %n bloco</numerusform><numerusform>Aberta por mais %n blocos</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>desconhecido</translation>
</message>
@@ -2868,12 +2911,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Quantia</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Aberta por mais %n bloco</numerusform><numerusform>Aberta por mais %n blocos</numerusform></translation>
</message>
@@ -2883,23 +2926,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Aberto até %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Desligado (%1 confirmação)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Não confirmada (%1 de %2 confirmações)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
- <translation>Confirmada (%1 confirmação)</translation>
+ <translation>Confirmada (%1 confirmações)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Este bloco não foi recebido por outros nós e provavelmente não será aceite pela rede!</translation>
</message>
@@ -2909,7 +2941,27 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Gerado mas não aceite</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Recebido com</translation>
</message>
@@ -2931,7 +2983,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<message>
<location line="+2"/>
<source>Mined</source>
- <translation>Minado</translation>
+ <translation>Minadas</translation>
</message>
<message>
<location line="+38"/>
@@ -2939,7 +2991,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>(n/d)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Estado da transação. Pairar por cima deste campo para mostrar o número de confirmações.</translation>
</message>
@@ -3205,12 +3257,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Utilização:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Listar comandos</translation>
</message>
@@ -3265,12 +3317,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Especifique o seu endereço público</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Tolerância para desligar nós mal-formados (por defeito: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Número de segundos a impedir que nós mal-formados se liguem de novo (por defeito: 86400)</translation>
</message>
@@ -3290,17 +3342,17 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Aceitar comandos da consola e JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Correr o processo como um daemon e aceitar comandos</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Utilizar a rede de testes - testnet</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation>
</message>
@@ -3357,7 +3409,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<message>
<location line="+4"/>
<source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
- <translation type="unfinished"/>
+ <translation>Entre no modo de regressão, que usa uma cadeia especial cujos blocos podem ser resolvidos instantaneamente.</translation>
</message>
<message>
<location line="+3"/>
@@ -3397,7 +3449,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<message>
<location line="+3"/>
<source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
- <translation>Aviso: A rede não parece estar completamente funcional! Parece que alguns bitcoiner&apos;s estão com dificuldades técnicas.</translation>
+ <translation>Aviso: A rede não parece estar completamente de acordo! Parece que alguns mineiros estão com dificuldades técnicas.</translation>
</message>
<message>
<location line="+3"/>
@@ -3441,6 +3493,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Apenas ligar ao(s) nó(s) especificado(s)</translation>
</message>
@@ -3597,7 +3654,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
- <translation>Incorrecto ou nenhum bloco de origem encontrado. Directório de dados errado para a rede?</translation>
+ <translation>Incorrecto ou nenhum bloco génesis encontrado. Pasta de dados errada para a rede?</translation>
</message>
<message>
<location line="+3"/>
@@ -3612,7 +3669,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<message>
<location line="+5"/>
<source>Prepend debug output with timestamp (default: 1)</source>
- <translation>Preceder output de depuração com marca-de-tempo (default: 1)</translation>
+ <translation>Preceder informação de depuração com selo temporal (por defeito: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3651,6 +3708,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Começar servidor Bitcoin</translation>
</message>
@@ -3687,7 +3749,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<message>
<location line="+2"/>
<source>Wallet options:</source>
- <translation type="unfinished"/>
+ <translation>Opções da carteira:</translation>
</message>
<message>
<location line="+2"/>
@@ -3700,12 +3762,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Necessita reconstruir as bases de dados usando -reindex para mudar -txindex</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importar blocos de um ficheiro blk000??.dat externo</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Executar comando quando um alerta relevante for recebido ou em caso de uma divisão longa da cadeia de blocos (no comando, %s é substituído pela mensagem)</translation>
</message>
@@ -3725,7 +3787,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Defina o número de processos de verificação (até 16, 0 = automático, &lt;0 = disponibiliza esse número de núcleos livres, por defeito: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Informação</translation>
</message>
@@ -3795,7 +3857,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Especificar tempo de espera da ligação em millisegundos (por defeito: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Erro de sistema:</translation>
</message>
@@ -3841,6 +3903,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>versão</translation>
</message>
@@ -3850,32 +3917,32 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>wallet.dat corrupta, recuperação falhou</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Palavra-passe para ligações JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Permitir ligações JSON-RPC do endereço IP especificado</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Enviar comandos para o nó a correr em &lt;ip&gt; (por defeito: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Executar comando quando mudar o melhor bloco (no comando, %s é substituído pela hash do bloco)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Atualize a carteira para o formato mais recente</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Definir o tamanho da memória de chaves para &lt;n&gt; (por defeito: 100)</translation>
</message>
@@ -3885,12 +3952,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Reexaminar a cadeia de blocos para transações em falta na carteira</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Usar OpenSSL (https) para ligações JSON-RPC</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Ficheiro de certificado do servidor (por defeito: server.cert)</translation>
</message>
@@ -3900,7 +3967,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Chave privada do servidor (por defeito: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Esta mensagem de ajuda</translation>
</message>
@@ -3910,12 +3977,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Incapaz de vincular a %s neste computador (vínculo retornou erro %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permitir procuras DNS para -addnode, -seednode e -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Carregar endereços...</translation>
</message>
@@ -3930,12 +3997,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Erro ao carregar wallet.dat: A Carteira requer uma versão mais recente do Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>A Carteira precisou ser reescrita: reinicie o Bitcoin para completar</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Erro ao carregar wallet.dat</translation>
</message>
@@ -3945,7 +4012,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Endereço -proxy inválido: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Rede desconhecida especificada em -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3955,7 +4022,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Versão desconhecida de proxy -socks requisitada: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Não conseguiu resolver endereço -bind: &apos;%s&apos;</translation>
</message>
@@ -3965,7 +4032,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Não conseguiu resolver endereço -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Quantia inválida para -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3985,7 +4052,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Carregar índice de blocos...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Adicione um nó ao qual se ligar e tentar manter a ligação aberta</translation>
</message>
@@ -3995,12 +4062,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Incapaz de vincular à porta %s neste computador. Provavelmente o Bitcoin já está a funcionar.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Carregar carteira...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Impossível mudar a carteira para uma versão anterior</translation>
</message>
@@ -4010,7 +4077,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Impossível escrever endereço por defeito</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Reexaminando...</translation>
</message>
@@ -4020,17 +4087,17 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Carregamento completo</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Para usar a opção %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts
index 22e0477ebe..205fa7244c 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -623,6 +623,16 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation><numerusform>%n săptămână</numerusform><numerusform>%n săptămâni</numerusform><numerusform>%n de săptămâni</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation>%1 si %2</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 în urmă</translation>
@@ -1276,7 +1286,7 @@ Adresa: %4
<message>
<location line="+16"/>
<source>MB</source>
- <translation type="unfinished"/>
+ <translation>MB</translation>
</message>
<message>
<location line="+27"/>
@@ -1296,7 +1306,7 @@ Adresa: %4
<message>
<location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
- <translation type="unfinished"/>
+ <translation>Conecteaza-te la reteaua Bitcoin printr-un proxy SOCKS</translation>
</message>
<message>
<location line="+3"/>
@@ -2311,17 +2321,17 @@ Adresa: %4
<message>
<location line="+3"/>
<source>Transaction creation failed!</source>
- <translation type="unfinished"/>
+ <translation>Creare de tranzactie nereusita!</translation>
</message>
<message>
<location line="+4"/>
<source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"/>
+ <translation>Tranzactia a fost respinsa! Acest lucru se poate intampla daca o parte din monedele tale din portofel au fost deja cheltuite, la fel ca si cum ai fi folosit o copie a wallet.dat si monedele au fost cheltuite in copie, dar nu au fost marcate si si cheltuite si aici.</translation>
</message>
<message>
<location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Atentie: Adresa Bitcoin invalida!</translation>
</message>
<message>
<location line="+20"/>
@@ -2331,7 +2341,7 @@ Adresa: %4
<message>
<location line="-11"/>
<source>Warning: Unknown change address</source>
- <translation type="unfinished"/>
+ <translation>Atentie: Schimbare de adresa necunoscuta</translation>
</message>
<message>
<location line="-367"/>
@@ -2423,7 +2433,7 @@ Adresa: %4
<message>
<location line="+968"/>
<source>This is a verified payment request.</source>
- <translation type="unfinished"/>
+ <translation>Aceasta este o cerere de plata verificata</translation>
</message>
<message>
<location line="-991"/>
@@ -2438,13 +2448,13 @@ Adresa: %4
<message>
<location line="+426"/>
<source>This is an unverified payment request.</source>
- <translation type="unfinished"/>
+ <translation>Aceasta este o cerere de plata neverificata</translation>
</message>
<message>
<location line="+18"/>
<location line="+532"/>
<source>Pay To:</source>
- <translation type="unfinished"/>
+ <translation>Plateste catre:</translation>
</message>
<message>
<location line="-498"/>
@@ -3358,7 +3368,18 @@ If the file does not exist, create it with owner-readable-only file permissions.
It is also recommended to set alertnotify so you are notified of problems;
for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
- <translation type="unfinished"/>
+ <translation>%s trebuie sa setezi o parola rpc in fisierul de configurare
+%s
+Este recomandat sa folosesti aceasta parola aleatorie:
+rpcuser=bitcoinrpc
+parola rpc=%s
+(nu este necesar ca sa iti amintesti aceasta parola)
+Numele de utilizator si parola NU trebuie sa fie la fel.
+Daca fisierul nu exista, creaza-l cu fisier de citit permis doar proprietarului.
+Este de asemenea recomandat sa setezi alerta de notificare ca sa primesti notificari ale problemelor;
+spre exemplu: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo.com
+
+</translation>
</message>
<message>
<location line="+12"/>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index dcb5a92e82..8df6ee4c88 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation>Разработчики Bitcoin Core</translation>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation>(%1-bit)</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -122,7 +128,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+7"/>
<source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
- <translation>Ваши адреса Bitcoin для отправки средств. Совет: проверьте сумму и адрес назначения перед переводом.</translation>
+ <translation>Это ваши адреса Bitcoin для отправки платежей. Всегда проверяйте количество и адрес получателя перед отправкой перевода.</translation>
</message>
<message>
<location line="+4"/>
@@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation><numerusform>%n неделя</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation>%1 и %2</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation><numerusform>%n год</numerusform><numerusform>%n лет</numerusform><numerusform>%n года</numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 позади</translation>
@@ -690,7 +706,7 @@ Address: %4
<translation>Бумажник &lt;b&gt;зашифрован&lt;/b&gt; и в настоящее время &lt;b&gt;заблокирован&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт.</translation>
</message>
@@ -751,7 +767,7 @@ Address: %4
<translation>Сдача:</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation>Отменить выбор всего</translation>
</message>
@@ -766,7 +782,7 @@ Address: %4
<translation>Режим списка</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Сумма</translation>
</message>
@@ -917,7 +933,7 @@ Address: %4
<translation>ничего</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation>Пыль</translation>
</message>
@@ -1099,7 +1115,7 @@ Address: %4
<translation>Bitcoin Core - опции командной строки</translation>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
</message>
@@ -1243,7 +1259,7 @@ Address: %4
<translation>&amp;Главная</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Необязательная комиссия за каждый КБ транзакции, которая ускоряет обработку Ваших транзакций. Большинство транзакций занимают 1КБ.</translation>
</message>
@@ -1253,7 +1269,7 @@ Address: %4
<translation>Заплатить ко&amp;миссию</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Автоматически запускать Bitcoin после входа в систему</translation>
</message>
@@ -1268,12 +1284,7 @@ Address: %4
<translation>Размер кэша &amp;БД</translation>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Установить размера кэша БД в мегабайтах (по умолчанию: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>МБ</translation>
</message>
@@ -1288,7 +1299,12 @@ Address: %4
<translation>Задать число потоков проверки сценария (вплоть до 16, 0=авто, &lt;0 = оставить столько ядер свободными, по умолчанию: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation>&amp;Тратить неподтвержденную сдачу(Только для продвинутых пользователей!)</translation>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation>Подключаться к сети Bitcoin через прокси SOCKS.</translation>
</message>
@@ -1323,7 +1339,17 @@ Address: %4
<translation>&amp;Сеть</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation>Б&amp;умажник</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation>При отключении траты неподтверждённой сдачи, сдача от транзакции не может быть использована до тех пор пока у этой транзакции не будет хотя бы одно подтверждение. Это также влияет как ваш баланс рассчитывается.</translation>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Автоматически открыть порт для Bitcoin-клиента на роутере. Работает только если Ваш роутер поддерживает UPnP, и данная функция включена.</translation>
</message>
@@ -1438,17 +1464,17 @@ Address: %4
<translation>&amp;Отмена</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>по умолчанию</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation>ничего</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Подтвердите сброс опций</translation>
</message>
@@ -1488,19 +1514,14 @@ Address: %4
<translation>Отображаемая информация может быть устаревшей. Ваш бумажник автоматически синхронизируется с сетью Bitcoin после подключения, но этот процесс пока не завершён.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Не подтверждено:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Бумажник</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Подтверждено</translation>
+ <source>Available:</source>
+ <translation>Доступно:</translation>
</message>
<message>
<location line="+16"/>
@@ -1508,7 +1529,12 @@ Address: %4
<translation>Ваш текущий расходный баланс</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation>В ожидании:</translation>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Общая сумма всех транзакций, которые до сих пор не подтверждены, и до сих пор не учитываются в расходном балансе</translation>
</message>
@@ -1656,6 +1682,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Ошибка: неверная комбинация -regtest и -testnet.</translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Введите Bitcoin-адрес (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1876,22 +1907,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>&amp;Сумма:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Метка:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>&amp;Сообщение</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Повторно использовать один из ранее использованных адресов. Повторное использование адресов несёт риски безопасности и приватности. Не используйте эту опцию, если вы не создаёте повторно ранее сделанный запрос платежа.</translation>
</message>
@@ -1901,27 +1932,30 @@ Address: %4
<translation>&amp;Повторно использовать существующий адрес получения (не рекомендуется)</translation>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
- <translation>Необязательная метка для нового адреса получения</translation>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation>Необязательное сообщение для запроса платежа, которое будет показано при открытии запроса. Заметьте: сообщение не будет отправлено вместе с платежом через сеть Bitcoin.</translation>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
- <translation>Необязательное сообщение для запроса платежа, которое будет показано при открытии запроса. Внимание: сообщение не будет отправлено вместе с платежом через сеть Bitcoin.</translation>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
+ <translation>Необязательная метка для нового адреса получения.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation>Заполните форму для запроса платежей. Все поля &lt;b&gt;необязательны&lt;/b&gt;.</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation>Необязательная сумма для запроса. Оставьте пустым или укажите ноль, чтобы запросить неопределённую сумму.</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Очистить все поля формы.</translation>
</message>
@@ -1931,17 +1965,17 @@ Address: %4
<translation>Очистить</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
- <translation>&amp;Запросить платёж</translation>
+ <location line="+78"/>
+ <source>Requested payments history</source>
+ <translation>История запрошенных платежей</translation>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation>Запрошенные платежи</translation>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>&amp;Запросить платёж</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Показать выбранный запрос (то же самое, что и двойной клик по записи)</translation>
</message>
@@ -1960,6 +1994,21 @@ Address: %4
<source>Remove</source>
<translation>Удалить</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Копировать метку</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation>Копировать сообщение</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Скопировать сумму</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2061,12 +2110,17 @@ Address: %4
<source>(no message)</source>
<translation>(нет сообщения)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation>(нет суммы)</translation>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Отправка</translation>
@@ -2142,7 +2196,7 @@ Address: %4
<translation>Свой адрес для сдачи</translation>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Отправить нескольким получателям одновременно</translation>
</message>
@@ -2152,7 +2206,7 @@ Address: %4
<translation>&amp;Добавить получателя</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Очистить все поля формы</translation>
</message>
@@ -2162,12 +2216,12 @@ Address: %4
<translation>Очистить &amp;всё</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Баланс:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Подтвердить отправку</translation>
</message>
@@ -2177,7 +2231,7 @@ Address: %4
<translation>&amp;Отправить</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Подтвердите отправку монет</translation>
</message>
@@ -2190,12 +2244,7 @@ Address: %4
<translation>С %1 на %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Введите адрес Bitcoin (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation>Копировать количество</translation>
</message>
@@ -2245,7 +2294,7 @@ Address: %4
<translation>или</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Адрес получателя неверный, пожалуйста, перепроверьте.</translation>
</message>
@@ -2280,12 +2329,12 @@ Address: %4
<translation>Транзакция была отклонена! Такое может произойти, если некоторые монеты уже были потрачены, например, если Вы используете одну копию бумажника (wallet.dat), а монеты были потрачены из другой копии, но не были отмечены как потраченные в этой.</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Внимание: неверный адрес Bitcoin</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>[нет метки]</translation>
</message>
@@ -2295,7 +2344,7 @@ Address: %4
<translation>Внимание: неизвестный адрес для сдачи</translation>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Вы уверены, что хотите отправить?</translation>
</message>
@@ -2305,7 +2354,7 @@ Address: %4
<translation>добавлено как комиссия</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>Запрос платежа просрочен</translation>
</message>
@@ -2382,12 +2431,7 @@ Address: %4
<translation>Сообщение:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation>Сообщение, прикреплённое к Bitcoin URI, которое будет сохранено вместе с транзакцией для вашего сведения. Внимание: это сообщение не будет отправлено через сеть Bitcoin.</translation>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation>Это проверенный запрос платежа.</translation>
</message>
@@ -2397,7 +2441,12 @@ Address: %4
<translation>Введите метку для этого адреса, чтобы добавить его в список использованных</translation>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>К bitcoin: URI было прикреплено сообщение, которое будет сохранено вместе с транзакцией для вашего сведения. Заметьте: сообщение не будет отправлено через сеть Bitcoin.</translation>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation>Это непроверенный запрос платежа.</translation>
</message>
@@ -2413,11 +2462,6 @@ Address: %4
<source>Memo:</source>
<translation>Заметка:</translation>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Введите Bitcoin-адрес (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2455,19 +2499,19 @@ Address: %4
<translation>Адрес, которым вы хотите подписать сообщение (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Выберите ранее использованный адрес</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Вставить адрес из буфера обмена</translation>
</message>
@@ -2508,12 +2552,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Очистить &amp;всё</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Проверить сообщение</translation>
</message>
@@ -2528,7 +2572,7 @@ Address: %4
<translation>Адрес, которым было подписано сообщение (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Проверить сообщение, чтобы убедиться, что оно было подписано указанным адресом Bitcoin</translation>
</message>
@@ -2543,43 +2587,37 @@ Address: %4
<translation>Сбросить все поля проверки сообщения</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Введите адрес Bitcoin (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Нажмите &quot;Подписать сообщение&quot; для создания подписи</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Введите подпись Bitcoin</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Введённый адрес неверен</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Пожалуйста, проверьте адрес и попробуйте ещё раз.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Введённый адрес не связан с ключом</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Разблокировка бумажника была отменена.</translation>
</message>
@@ -2599,7 +2637,7 @@ Address: %4
<translation>Сообщение подписано</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Подпись не может быть раскодирована.</translation>
</message>
@@ -2660,6 +2698,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation>в противоречии</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/отключен</translation>
</message>
@@ -2821,12 +2864,12 @@ Address: %4
<translation>, ещё не было успешно разослано</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>неизвестно</translation>
</message>
@@ -2867,12 +2910,12 @@ Address: %4
<translation>Сумма</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation>Незрелый (%1 подтверждений, будет доступен после %2)</translation>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation>
</message>
@@ -2882,23 +2925,12 @@ Address: %4
<translation>Открыто до %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Оффлайн (%1 подтверждений)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Не подтверждено (%1 из %2 подтверждений)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Подтверждено (%1 подтверждений)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Этот блок не был получен другими узлами и, возможно, не будет принят!</translation>
</message>
@@ -2908,7 +2940,27 @@ Address: %4
<translation>Сгенерированно, но не подтверждено</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation>Нет активных соединений с сетью</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation>Неподтверждено</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation>Подтверждено(%1 подтверждений, рекомендуется 2% подтверждений)</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation>В противоречии</translation>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Получено</translation>
</message>
@@ -2938,7 +2990,7 @@ Address: %4
<translation>[не доступно]</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Статус транзакции. Подведите курсор к нужному полю для того, чтобы увидеть количество подтверждений.</translation>
</message>
@@ -2989,7 +3041,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Last month</source>
- <translation>За последний месяц</translation>
+ <translation>В прошлом месяце</translation>
</message>
<message>
<location line="+1"/>
@@ -3204,12 +3256,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Использование:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Список команд
</translation>
@@ -3265,12 +3317,12 @@ Address: %4
<translation>Укажите ваш собственный публичный адрес</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Порог для отключения неправильно ведущих себя узлов (по умолчанию: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Число секунд блокирования неправильно ведущих себя узлов (по умолчанию: 86400)</translation>
</message>
@@ -3290,17 +3342,17 @@ Address: %4
<translation>Принимать командную строку и команды JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Запускаться в фоне как демон и принимать команды</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Использовать тестовую сеть</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Принимать подключения извне (по умолчанию: 1, если не используется -proxy или -connect)</translation>
</message>
@@ -3441,6 +3493,11 @@ rpcpassword=%s
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation>Очистить список транзакций кошелька (диагностический инструмент; включает в себя -rescan)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Подключаться только к указанному узлу(ам)</translation>
</message>
@@ -3651,6 +3708,11 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation>Тратить неподтвержденную сдачу при отправке транзакций (по умолчанию: 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Запустить Bitcoin сервер</translation>
</message>
@@ -3700,12 +3762,12 @@ rpcpassword=%s
<translation>Вам необходимо пересобрать базы данных с помощью -reindex, чтобы изменить -txindex</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Импортировать блоки из внешнего файла blk000??.dat</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Выполнить команду, когда приходит соответствующее сообщение о тревоге или наблюдается очень длинное расщепление цепи (%s в команде заменяется на сообщение)</translation>
</message>
@@ -3725,7 +3787,7 @@ rpcpassword=%s
<translation>Задать число потоков проверки сценария (вплоть до 16, 0=авто, &lt;0 = оставить столько ядер свободными, по умолчанию: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Информация</translation>
</message>
@@ -3796,7 +3858,7 @@ rpcpassword=%s
<translation>Тайм-аут соединения в миллисекундах (по умолчанию: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Системная ошибка:</translation>
</message>
@@ -3842,6 +3904,11 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation>Стираем все транзакции из кошелька...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>версия</translation>
</message>
@@ -3851,32 +3918,32 @@ rpcpassword=%s
<translation>wallet.dat повреждён, спасение данных не удалось</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Пароль для подключений JSON-RPC</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Разрешить подключения JSON-RPC с указанного IP</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Посылать команды узлу, запущенному на &lt;ip&gt; (по умолчанию: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Выполнить команду, когда появляется новый блок (%s в команде заменяется на хэш блока)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Обновить бумажник до последнего формата</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Установить размер запаса ключей в &lt;n&gt; (по умолчанию: 100)</translation>
</message>
@@ -3886,12 +3953,12 @@ rpcpassword=%s
<translation>Перепроверить цепь блоков на предмет отсутствующих в бумажнике транзакций</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Использовать OpenSSL (https) для подключений JSON-RPC</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Файл серверного сертификата (по умолчанию: server.cert)</translation>
</message>
@@ -3901,7 +3968,7 @@ rpcpassword=%s
<translation>Приватный ключ сервера (по умолчанию: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Эта справка</translation>
</message>
@@ -3911,12 +3978,12 @@ rpcpassword=%s
<translation>Невозможно привязаться к %s на этом компьютере (bind вернул ошибку %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Разрешить поиск в DNS для -addnode, -seednode и -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Загрузка адресов...</translation>
</message>
@@ -3931,12 +3998,12 @@ rpcpassword=%s
<translation>Ошибка загрузки wallet.dat: бумажник требует более новую версию Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Необходимо перезаписать бумажник, перезапустите Bitcoin для завершения операции.</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Ошибка при загрузке wallet.dat</translation>
</message>
@@ -3946,7 +4013,7 @@ rpcpassword=%s
<translation>Неверный адрес -proxy: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>В параметре -onlynet указана неизвестная сеть: &apos;%s&apos;</translation>
</message>
@@ -3956,7 +4023,7 @@ rpcpassword=%s
<translation>В параметре -socks запрошена неизвестная версия: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Не удаётся разрешить адрес в параметре -bind: &apos;%s&apos;</translation>
</message>
@@ -3966,7 +4033,7 @@ rpcpassword=%s
<translation>Не удаётся разрешить адрес в параметре -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Неверная сумма в параметре -paytxfee=&lt;кол-во&gt;: &apos;%s&apos;</translation>
</message>
@@ -3986,7 +4053,7 @@ rpcpassword=%s
<translation>Загрузка индекса блоков...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Добавить узел для подключения и пытаться поддерживать соединение открытым</translation>
</message>
@@ -3996,12 +4063,12 @@ rpcpassword=%s
<translation>Невозможно привязаться к %s на этом компьютере. Возможно, Bitcoin уже работает.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Загрузка бумажника...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Не удаётся понизить версию бумажника</translation>
</message>
@@ -4011,7 +4078,7 @@ rpcpassword=%s
<translation>Не удаётся записать адрес по умолчанию</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Сканирование...</translation>
</message>
@@ -4021,17 +4088,17 @@ rpcpassword=%s
<translation>Загрузка завершена</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Чтобы использовать опцию %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts
index 048b717163..828e9c3fe3 100644
--- a/src/qt/locale/bitcoin_sl_SI.ts
+++ b/src/qt/locale/bitcoin_sl_SI.ts
@@ -4,12 +4,12 @@
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
<source>About Bitcoin Core</source>
- <translation type="unfinished"/>
+ <translation>O jedru Bitcoina</translation>
</message>
<message>
<location line="+39"/>
<source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Jedro Bitcoina&lt;/b&gt; različica</translation>
</message>
<message>
<location line="+57"/>
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation>(%1-bitov)</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -47,7 +53,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>&amp;New</source>
- <translation type="unfinished"/>
+ <translation>&amp;Novo</translation>
</message>
<message>
<location line="+11"/>
@@ -57,12 +63,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>&amp;Copy</source>
- <translation type="unfinished"/>
+ <translation>&amp;Kopiraj</translation>
</message>
<message>
<location line="+52"/>
<source>C&amp;lose</source>
- <translation type="unfinished"/>
+ <translation>&amp;Zapri (close)</translation>
</message>
<message>
<location filename="../addressbookpage.cpp" line="+74"/>
@@ -82,7 +88,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>&amp;Export</source>
- <translation type="unfinished"/>
+ <translation>&amp;Izvozi</translation>
</message>
<message>
<location line="-27"/>
@@ -92,27 +98,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../addressbookpage.cpp" line="-30"/>
<source>Choose the address to send coins to</source>
- <translation type="unfinished"/>
+ <translation>Izberi naslov prejemnika kovancev</translation>
</message>
<message>
<location line="+1"/>
<source>Choose the address to receive coins with</source>
- <translation type="unfinished"/>
+ <translation>Izberi naslov pošiljatelja kovancev</translation>
</message>
<message>
<location line="+5"/>
<source>C&amp;hoose</source>
- <translation type="unfinished"/>
+ <translation>&amp;Izberi</translation>
</message>
<message>
<location line="+6"/>
<source>Sending addresses</source>
- <translation type="unfinished"/>
+ <translation>Pošiljati naslove</translation>
</message>
<message>
<location line="+1"/>
<source>Receiving addresses</source>
- <translation type="unfinished"/>
+ <translation>Prejemati naslovi</translation>
</message>
<message>
<location line="+7"/>
@@ -122,7 +128,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+4"/>
<source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
- <translation type="unfinished"/>
+ <translation>To so vaši Bitcoin naslovi za prejemanje plačil. Priporočljivo je uporabljati nov prejemni naslov za vsako izmed transakcij.</translation>
</message>
<message>
<location line="+7"/>
@@ -137,7 +143,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+194"/>
<source>Export Address List</source>
- <translation type="unfinished"/>
+ <translation>Izvozi seznam naslovov</translation>
</message>
<message>
<location line="+1"/>
@@ -147,7 +153,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+13"/>
<source>Exporting Failed</source>
- <translation type="unfinished"/>
+ <translation>Neuspešen izvoz</translation>
</message>
<message>
<location line="+1"/>
@@ -400,17 +406,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+10"/>
<source>&amp;Sending addresses...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Pošiljanje naslovov...</translation>
</message>
<message>
<location line="+2"/>
<source>&amp;Receiving addresses...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Prejemanje naslovov...</translation>
</message>
<message>
<location line="+3"/>
<source>Open &amp;URI...</source>
- <translation type="unfinished"/>
+ <translation>Odpri &amp;URI...</translation>
</message>
<message>
<location line="+325"/>
@@ -425,7 +431,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="-405"/>
<source>Send coins to a Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Pošlji kovance na Bitcoin naslov</translation>
</message>
<message>
<location line="+49"/>
@@ -470,23 +476,23 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+146"/>
<source>&amp;Send</source>
- <translation type="unfinished"/>
+ <translation>&amp;Pošlji</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Receive</source>
- <translation type="unfinished"/>
+ <translation>&amp;Sprejmi</translation>
</message>
<message>
<location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
- <translation type="unfinished"/>
+ <translation>&amp;Prikaži / Skrij</translation>
</message>
<message>
<location line="+1"/>
<source>Show or hide the main Window</source>
- <translation type="unfinished"/>
+ <translation>Prikaži ali skrij glavno okno</translation>
</message>
<message>
<location line="+3"/>
@@ -496,7 +502,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+7"/>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
- <translation type="unfinished"/>
+ <translation>Za dokaz, da ste lastniki sporočil, se podpišite z Bitcoin naslovom</translation>
</message>
<message>
<location line="+2"/>
@@ -543,22 +549,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
- <translation type="unfinished"/>
+ <translation>&amp;O jedru Bitcoina</translation>
</message>
<message>
<location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
- <translation type="unfinished"/>
+ <translation>Prikaži seznam uporabljenih naslovov za pošiljanje in oznak</translation>
</message>
<message>
<location line="+2"/>
<source>Show the list of used receiving addresses and labels</source>
- <translation type="unfinished"/>
+ <translation>Prikaži seznam uporabljenih sprejemnih naslovov in oznak</translation>
</message>
<message>
<location line="+3"/>
<source>Open a bitcoin: URI or payment request</source>
- <translation type="unfinished"/>
+ <translation>Odpri Bitcoin: URI ali zahteva o plačilu</translation>
</message>
<message>
<location line="+2"/>
@@ -599,22 +605,32 @@ This product includes software developed by the OpenSSL Project for use in the O
<message numerus="yes">
<location line="+23"/>
<source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n ura</numerusform><numerusform>%n uri</numerusform><numerusform>%n ure</numerusform><numerusform>%n ura</numerusform></translation>
</message>
<message numerus="yes">
<location line="+4"/>
<source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n dan</numerusform><numerusform>%n dneva</numerusform><numerusform>%n dnevi</numerusform><numerusform>%n dni</numerusform></translation>
</message>
<message numerus="yes">
<location line="+4"/>
<source>%n week(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n teden</numerusform><numerusform>%n tedna</numerusform><numerusform>%n tedni</numerusform><numerusform>%n tednov</numerusform></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation><numerusform>%n leto</numerusform><numerusform>%n leti</numerusform><numerusform>%n leta</numerusform><numerusform>%n let</numerusform></translation>
</message>
<message>
<location line="+4"/>
<source>%1 behind</source>
- <translation type="unfinished"/>
+ <translation>%1 odzadaj</translation>
</message>
<message>
<location line="+21"/>
@@ -624,7 +640,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+2"/>
<source>Transactions after this will not yet be visible.</source>
- <translation type="unfinished"/>
+ <translation>Transkacija za tem ne bo bila še na voljo.</translation>
</message>
<message>
<location line="+27"/>
@@ -639,7 +655,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>Informacije</translation>
</message>
<message>
<location line="-85"/>
@@ -685,7 +701,7 @@ Naslov: %4
<translation>Denarnica je &lt;b&gt;šifrirana&lt;/b&gt; in trenutno &lt;b&gt;zaklenjena&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -695,7 +711,7 @@ Naslov: %4
<message>
<location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
- <translation type="unfinished"/>
+ <translation>Omrežno Opozorilo</translation>
</message>
</context>
<context>
@@ -713,7 +729,7 @@ Naslov: %4
<message>
<location line="+29"/>
<source>Bytes:</source>
- <translation type="unfinished"/>
+ <translation>Biti:</translation>
</message>
<message>
<location line="+45"/>
@@ -723,12 +739,12 @@ Naslov: %4
<message>
<location line="+29"/>
<source>Priority:</source>
- <translation type="unfinished"/>
+ <translation>Prednostno mesto:</translation>
</message>
<message>
<location line="+45"/>
<source>Fee:</source>
- <translation type="unfinished"/>
+ <translation>Provizija:</translation>
</message>
<message>
<location line="+32"/>
@@ -746,7 +762,7 @@ Naslov: %4
<translation>Sprememba:</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -761,7 +777,7 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Količina</translation>
</message>
@@ -778,7 +794,7 @@ Naslov: %4
<message>
<location line="+5"/>
<source>Confirmations</source>
- <translation type="unfinished"/>
+ <translation>Potrdila</translation>
</message>
<message>
<location line="+3"/>
@@ -788,7 +804,7 @@ Naslov: %4
<message>
<location line="+5"/>
<source>Priority</source>
- <translation type="unfinished"/>
+ <translation>Prednostno mesto</translation>
</message>
<message>
<location filename="../coincontroldialog.cpp" line="+42"/>
@@ -809,7 +825,7 @@ Naslov: %4
<message>
<location line="-25"/>
<source>Copy transaction ID</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj ID transakcije</translation>
</message>
<message>
<location line="+1"/>
@@ -824,12 +840,12 @@ Naslov: %4
<message>
<location line="+22"/>
<source>Copy quantity</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj količino</translation>
</message>
<message>
<location line="+2"/>
<source>Copy fee</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj provizijo</translation>
</message>
<message>
<location line="+1"/>
@@ -839,12 +855,12 @@ Naslov: %4
<message>
<location line="+1"/>
<source>Copy bytes</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj bite</translation>
</message>
<message>
<location line="+1"/>
<source>Copy priority</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj prednostno mesto</translation>
</message>
<message>
<location line="+1"/>
@@ -859,52 +875,52 @@ Naslov: %4
<message>
<location line="+323"/>
<source>highest</source>
- <translation type="unfinished"/>
+ <translation>najvišja</translation>
</message>
<message>
<location line="+1"/>
<source>higher</source>
- <translation type="unfinished"/>
+ <translation>višja</translation>
</message>
<message>
<location line="+1"/>
<source>high</source>
- <translation type="unfinished"/>
+ <translation>visoka</translation>
</message>
<message>
<location line="+1"/>
<source>medium-high</source>
- <translation type="unfinished"/>
+ <translation>srednje visoka</translation>
</message>
<message>
<location line="+1"/>
<source>medium</source>
- <translation type="unfinished"/>
+ <translation>srednje</translation>
</message>
<message>
<location line="+4"/>
<source>low-medium</source>
- <translation type="unfinished"/>
+ <translation>srednje nizka</translation>
</message>
<message>
<location line="+1"/>
<source>low</source>
- <translation type="unfinished"/>
+ <translation>nizka</translation>
</message>
<message>
<location line="+1"/>
<source>lower</source>
- <translation type="unfinished"/>
+ <translation>nižja</translation>
</message>
<message>
<location line="+1"/>
<source>lowest</source>
- <translation type="unfinished"/>
+ <translation>najnižja</translation>
</message>
<message>
<location line="+11"/>
<source>(%1 locked)</source>
- <translation type="unfinished"/>
+ <translation>(%1 zaklenjeno)</translation>
</message>
<message>
<location line="+31"/>
@@ -912,9 +928,9 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
- <translation type="unfinished"/>
+ <translation>Prah</translation>
</message>
<message>
<location line="+0"/>
@@ -929,7 +945,7 @@ Naslov: %4
<message>
<location line="+10"/>
<source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
- <translation type="unfinished"/>
+ <translation>V primeru, da je velikost transakcije večja od 1000 bitov, se ta oznaka se obarva rdeče.</translation>
</message>
<message>
<location line="+1"/>
@@ -1005,7 +1021,7 @@ Naslov: %4
<message>
<location line="+10"/>
<source>The label associated with this address list entry</source>
- <translation type="unfinished"/>
+ <translation>Oznaka je povezana s tem vnosom seznama naslovov</translation>
</message>
<message>
<location line="+17"/>
@@ -1045,7 +1061,7 @@ Naslov: %4
<message>
<location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
- <translation type="unfinished"/>
+ <translation>Vnešeni naslov &quot;%1&quot; ni veljaven Bitcoin naslov.</translation>
</message>
<message>
<location line="+10"/>
@@ -1068,7 +1084,7 @@ Naslov: %4
<message>
<location line="+22"/>
<source>name</source>
- <translation type="unfinished"/>
+ <translation>ime</translation>
</message>
<message>
<location line="+2"/>
@@ -1094,7 +1110,7 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Jedro Bitcoina</translation>
</message>
@@ -1144,12 +1160,12 @@ Naslov: %4
<message>
<location filename="../forms/intro.ui" line="+14"/>
<source>Welcome</source>
- <translation type="unfinished"/>
+ <translation>Dobrodošli</translation>
</message>
<message>
<location line="+9"/>
<source>Welcome to Bitcoin Core.</source>
- <translation type="unfinished"/>
+ <translation>Dobrodošli v jedru Bitcoina</translation>
</message>
<message>
<location line="+26"/>
@@ -1189,7 +1205,7 @@ Naslov: %4
<message>
<location line="+9"/>
<source>GB of free space available</source>
- <translation type="unfinished"/>
+ <translation>GB prostora na voljo</translation>
</message>
<message>
<location line="+3"/>
@@ -1202,17 +1218,17 @@ Naslov: %4
<message>
<location filename="../forms/openuridialog.ui" line="+14"/>
<source>Open URI</source>
- <translation type="unfinished"/>
+ <translation>Odpri URl</translation>
</message>
<message>
<location line="+6"/>
<source>Open payment request from URI or file</source>
- <translation type="unfinished"/>
+ <translation>Odpri zahtevo o plačilo od ORI ali datoteke</translation>
</message>
<message>
<location line="+9"/>
<source>URI:</source>
- <translation type="unfinished"/>
+ <translation>URI:</translation>
</message>
<message>
<location line="+11"/>
@@ -1235,22 +1251,22 @@ Naslov: %4
<message>
<location line="+13"/>
<source>&amp;Main</source>
- <translation type="unfinished"/>
+ <translation>&amp;Glavno</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+15"/>
<source>Pay transaction &amp;fee</source>
- <translation type="unfinished"/>
+ <translation>Nakazilo plačila &amp; provizija</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
- <translation type="unfinished"/>
+ <translation>Po prijavi v sistem samodejno zaženite Bitcoin.</translation>
</message>
<message>
<location line="+3"/>
@@ -1263,14 +1279,9 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Nastavi pomnilnik podatkovne zbirke v megabajtih (privzeto: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
- <translation type="unfinished"/>
+ <translation>megabite</translation>
</message>
<message>
<location line="+27"/>
@@ -1283,7 +1294,12 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1318,7 +1334,17 @@ Naslov: %4
<translation>&amp;Omrežje</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation>&amp;Denarnica</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1433,17 +1459,17 @@ Naslov: %4
<translation>&amp;Prekini</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>privzeto</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1480,32 +1506,32 @@ Naslov: %4
<location line="+50"/>
<location line="+231"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
- <translation type="unfinished"/>
+ <translation>Prikazanim podatkom je lahko potekel rok. Vaša denarnica bo po vzpostavitvi povezave samodejno sinhronizirana z Bitcoin omrežjem, ampak ta proces še ni bil zaključen.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Nepotrjeno:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Denarnica</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation type="unfinished"/>
+ <source>Available:</source>
+ <translation>Razpoložljivost:</translation>
</message>
<message>
<location line="+16"/>
<source>Your current spendable balance</source>
+ <translation>Vaše trenutno razpoložljivo stanje</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Pending:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
- <translation type="unfinished"/>
+ <translation>Skupno število potrjenih transakcij, ki sicer niso bile prištete k razpoložljivem stanju</translation>
</message>
<message>
<location line="+16"/>
@@ -1525,7 +1551,7 @@ Naslov: %4
<message>
<location line="+16"/>
<source>Your current total balance</source>
- <translation type="unfinished"/>
+ <translation>Vaše trenutno skupno stanje</translation>
</message>
<message>
<location line="+71"/>
@@ -1565,7 +1591,7 @@ Naslov: %4
<location line="+18"/>
<location line="+16"/>
<source>Payment request error</source>
- <translation type="unfinished"/>
+ <translation>Napaka pri zahtevi plačila</translation>
</message>
<message>
<location line="-353"/>
@@ -1610,7 +1636,7 @@ Naslov: %4
<message>
<location line="+43"/>
<source>Error communicating with %1: %2</source>
- <translation type="unfinished"/>
+ <translation>Napaka pri povezavi z %1: %2</translation>
</message>
<message>
<location line="+24"/>
@@ -1620,17 +1646,17 @@ Naslov: %4
<message>
<location line="+11"/>
<source>Bad response from server %1</source>
- <translation type="unfinished"/>
+ <translation>Slab odziv strežnika %1</translation>
</message>
<message>
<location line="+33"/>
<source>Payment acknowledged</source>
- <translation type="unfinished"/>
+ <translation>Plačilo priznano</translation>
</message>
<message>
<location line="-11"/>
<source>Network request error</source>
- <translation type="unfinished"/>
+ <translation>Napaka omrežne zahteve</translation>
</message>
</context>
<context>
@@ -1644,12 +1670,17 @@ Naslov: %4
<message>
<location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
- <translation type="unfinished"/>
+ <translation>Napaka: Želena nahajališče datoteke &quot;%1&quot; ne obstaja.</translation>
</message>
<message>
<location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
- <translation type="unfinished"/>
+ <translation>Napaka: Neveljavna kombinacija -regtest and -testnet</translation>
+ </message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Vnesite bitcoin naslov (npr.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
</context>
<context>
@@ -1657,12 +1688,12 @@ Naslov: %4
<message>
<location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Shrani sliko...</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>&amp;Kopiraj sliko</translation>
</message>
<message>
<location line="+28"/>
@@ -1672,7 +1703,7 @@ Naslov: %4
<message>
<location line="+0"/>
<source>PNG Image (*.png)</source>
- <translation type="unfinished"/>
+ <translation>PNG slika (*.png)</translation>
</message>
</context>
<context>
@@ -1695,7 +1726,7 @@ Naslov: %4
<location line="+23"/>
<location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
- <translation type="unfinished"/>
+ <translation>Neznano</translation>
</message>
<message>
<location line="-223"/>
@@ -1775,17 +1806,17 @@ Naslov: %4
<message>
<location line="+72"/>
<source>&amp;Network Traffic</source>
- <translation type="unfinished"/>
+ <translation>&amp;Omrežni promet</translation>
</message>
<message>
<location line="+52"/>
<source>&amp;Clear</source>
- <translation type="unfinished"/>
+ <translation>&amp;Pošisti</translation>
</message>
<message>
<location line="+13"/>
<source>Totals</source>
- <translation type="unfinished"/>
+ <translation>Vsote</translation>
</message>
<message>
<location line="+64"/>
@@ -1830,63 +1861,63 @@ Naslov: %4
<message>
<location line="+1"/>
<source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
- <translation type="unfinished"/>
+ <translation>Vtipkaj &lt;b&gt;pomoč&lt;/b&gt; za vpogled v razpožljive ukaze.</translation>
</message>
<message>
<location line="+122"/>
<source>%1 B</source>
- <translation type="unfinished"/>
+ <translation>%1 bitov</translation>
</message>
<message>
<location line="+2"/>
<source>%1 KB</source>
- <translation type="unfinished"/>
+ <translation>%1 kilobitov</translation>
</message>
<message>
<location line="+2"/>
<source>%1 MB</source>
- <translation type="unfinished"/>
+ <translation>%1 megabitov</translation>
</message>
<message>
<location line="+2"/>
<source>%1 GB</source>
- <translation type="unfinished"/>
+ <translation>%1 gigabitov</translation>
</message>
<message>
<location line="+7"/>
<source>%1 m</source>
- <translation type="unfinished"/>
+ <translation>%1 minut</translation>
</message>
<message>
<location line="+5"/>
<source>%1 h</source>
- <translation type="unfinished"/>
+ <translation>%1 ur</translation>
</message>
<message>
<location line="+2"/>
<source>%1 h %2 m</source>
- <translation type="unfinished"/>
+ <translation>%1 ur %2 minut</translation>
</message>
</context>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Količina:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Oznaka:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Sporočilo:</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1896,47 +1927,50 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
- <translation type="unfinished"/>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
+ <translation>Pomožna oznaka je povezana z novim sprejemnim naslovom.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
<source>Clear</source>
- <translation type="unfinished"/>
+ <translation>Počisti</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation type="unfinished"/>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>&amp;Zahtevaj plačilo</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1955,28 +1989,43 @@ Naslov: %4
<source>Remove</source>
<translation>Odstrani</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopiraj oznako</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation>Kopiraj sporočilo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopiraj količino</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
<message>
<location filename="../forms/receiverequestdialog.ui" line="+29"/>
<source>QR Code</source>
- <translation type="unfinished"/>
+ <translation>QR Koda</translation>
</message>
<message>
<location line="+46"/>
<source>Copy &amp;URI</source>
- <translation type="unfinished"/>
+ <translation>Kopraj &amp;URl</translation>
</message>
<message>
<location line="+7"/>
<source>Copy &amp;Address</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj &amp;Naslov</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Shrani sliko..</translation>
</message>
<message>
<location filename="../receiverequestdialog.cpp" line="+56"/>
@@ -1986,7 +2035,7 @@ Naslov: %4
<message>
<location line="+6"/>
<source>Payment information</source>
- <translation type="unfinished"/>
+ <translation>Informacija o plačilu</translation>
</message>
<message>
<location line="+1"/>
@@ -2056,12 +2105,17 @@ Naslov: %4
<source>(no message)</source>
<translation>(ni sporočila)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation>(brez količine)</translation>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Pošlji kovance</translation>
@@ -2074,17 +2128,17 @@ Naslov: %4
<message>
<location line="+20"/>
<source>Inputs...</source>
- <translation type="unfinished"/>
+ <translation>Vnosi...</translation>
</message>
<message>
<location line="+7"/>
<source>automatically selected</source>
- <translation type="unfinished"/>
+ <translation>samodejno izbran</translation>
</message>
<message>
<location line="+19"/>
<source>Insufficient funds!</source>
- <translation type="unfinished"/>
+ <translation>Premalo sredstev!</translation>
</message>
<message>
<location line="+89"/>
@@ -2094,7 +2148,7 @@ Naslov: %4
<message>
<location line="+35"/>
<source>Bytes:</source>
- <translation type="unfinished"/>
+ <translation>Biti:</translation>
</message>
<message>
<location line="+48"/>
@@ -2104,12 +2158,12 @@ Naslov: %4
<message>
<location line="+32"/>
<source>Priority:</source>
- <translation type="unfinished"/>
+ <translation>Prednostno mesto:</translation>
</message>
<message>
<location line="+48"/>
<source>Fee:</source>
- <translation type="unfinished"/>
+ <translation>Provizija:</translation>
</message>
<message>
<location line="+32"/>
@@ -2137,7 +2191,7 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Pošlji več prejemnikom hkrati</translation>
</message>
@@ -2147,7 +2201,7 @@ Naslov: %4
<translation>Dodaj &amp;prejemnika</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2157,12 +2211,12 @@ Naslov: %4
<translation>Počisti &amp;vse</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Dobroimetje:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Potrdi odlivno dejanje</translation>
</message>
@@ -2172,7 +2226,7 @@ Naslov: %4
<translation>P&amp;ošlji</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Potrdi odliv kovancev </translation>
</message>
@@ -2185,14 +2239,9 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Vnesite bitcoin naslov (npr.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj količino</translation>
</message>
<message>
<location line="+1"/>
@@ -2202,7 +2251,7 @@ Naslov: %4
<message>
<location line="+1"/>
<source>Copy fee</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj provizijo</translation>
</message>
<message>
<location line="+1"/>
@@ -2212,12 +2261,12 @@ Naslov: %4
<message>
<location line="+1"/>
<source>Copy bytes</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj bite</translation>
</message>
<message>
<location line="+1"/>
<source>Copy priority</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj prednostno mesto</translation>
</message>
<message>
<location line="+1"/>
@@ -2240,7 +2289,7 @@ Naslov: %4
<translation>ali</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2262,7 +2311,7 @@ Naslov: %4
<message>
<location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
- <translation type="unfinished"/>
+ <translation>Najdena kopija naslova, možnost pošiljanja na vsakega izmed naslov le enkrat ob pošiljanju.</translation>
</message>
<message>
<location line="+3"/>
@@ -2275,12 +2324,12 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Opozorilo: Neveljaven Bitcoin naslov</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(ni oznake)</translation>
</message>
@@ -2290,24 +2339,24 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
- <translation type="unfinished"/>
+ <translation>Ali ste prepričani, da želite poslati?</translation>
</message>
<message>
<location line="+9"/>
<source>added as transaction fee</source>
- <translation type="unfinished"/>
+ <translation>dodano kot provizija transakcije</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
- <translation type="unfinished"/>
+ <translation>Zahteva plačila je potekla</translation>
</message>
<message>
<location line="+8"/>
<source>Invalid payment address %1</source>
- <translation type="unfinished"/>
+ <translation>Neveljaven naslov plačila %1</translation>
</message>
</context>
<context>
@@ -2342,7 +2391,7 @@ Naslov: %4
<message>
<location line="-50"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>Izberi zadnje uporabljen naslov</translation>
</message>
<message>
<location line="-40"/>
@@ -2377,22 +2426,22 @@ Naslov: %4
<translation>Sporočilo:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
+ <translation>Vnesite oznako za ta naslov, ki bo shranjena v seznam uporabljenih naslovov</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2408,11 +2457,6 @@ Naslov: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Vnesite bitcoin naslov (npr.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2424,7 +2468,7 @@ Naslov: %4
<message>
<location line="+1"/>
<source>Do not shut down the computer until this window disappears.</source>
- <translation type="unfinished"/>
+ <translation>Ne zaustavite računalnika dokler to okno ne izgine.</translation>
</message>
</context>
<context>
@@ -2450,19 +2494,19 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>Izberi zadnje uporabljen naslov</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Prilepi naslov iz odložišča</translation>
</message>
@@ -2479,7 +2523,7 @@ Naslov: %4
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>Podpis</translation>
</message>
<message>
<location line="+27"/>
@@ -2503,12 +2547,12 @@ Naslov: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Počisti &amp;vse </translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Preveri sporočilo</translation>
</message>
@@ -2523,14 +2567,14 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
<source>Verify &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>Preveri &amp;Sporočilo</translation>
</message>
<message>
<location line="+14"/>
@@ -2538,50 +2582,44 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Vnesite bitcoin naslov (npr.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
+ <translation>Kliknite &quot;Podpiši sporočilo&quot; za ustvaritev podpisa</translation>
</message>
<message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>Vnešeni naslov ni veljaven.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
- <translation type="unfinished"/>
+ <translation>Prosimo preverite naslov in poizkusite znova.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Odklepanje denarnice je bilo prekinjeno.</translation>
</message>
<message>
<location line="+8"/>
<source>Private key for the entered address is not available.</source>
- <translation type="unfinished"/>
+ <translation>Zasebni ključ vnešenega naslov ni na voljo.</translation>
</message>
<message>
<location line="+12"/>
@@ -2594,15 +2632,15 @@ Naslov: %4
<translation>Sporočilo podpisano.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
- <translation type="unfinished"/>
+ <translation>Ni bilo mogoče dešifrirati podpisa.</translation>
</message>
<message>
<location line="+0"/>
<location line="+13"/>
<source>Please check the signature and try again.</source>
- <translation type="unfinished"/>
+ <translation>Prosimo preverite podpis in poizkusite znova.</translation>
</message>
<message>
<location line="+0"/>
@@ -2655,6 +2693,11 @@ Naslov: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2697,20 +2740,20 @@ Naslov: %4
<location line="+5"/>
<location line="+17"/>
<source>From</source>
- <translation type="unfinished"/>
+ <translation>Pošiljatelj</translation>
</message>
<message>
<location line="+1"/>
<location line="+22"/>
<location line="+58"/>
<source>To</source>
- <translation type="unfinished"/>
+ <translation>Prejemnik</translation>
</message>
<message>
<location line="-77"/>
<location line="+2"/>
<source>own address</source>
- <translation type="unfinished"/>
+ <translation>lasten naslov</translation>
</message>
<message>
<location line="-2"/>
@@ -2734,7 +2777,7 @@ Naslov: %4
<message>
<location line="+2"/>
<source>not accepted</source>
- <translation type="unfinished"/>
+ <translation>ni bilo sprejeto</translation>
</message>
<message>
<location line="+44"/>
@@ -2747,12 +2790,12 @@ Naslov: %4
<message>
<location line="-62"/>
<source>Transaction fee</source>
- <translation type="unfinished"/>
+ <translation>Provizija transakcije</translation>
</message>
<message>
<location line="+16"/>
<source>Net amount</source>
- <translation type="unfinished"/>
+ <translation>Neto količina</translation>
</message>
<message>
<location line="+6"/>
@@ -2773,7 +2816,7 @@ Naslov: %4
<message>
<location line="+18"/>
<source>Merchant</source>
- <translation type="unfinished"/>
+ <translation>Trgovec</translation>
</message>
<message>
<location line="+7"/>
@@ -2793,7 +2836,7 @@ Naslov: %4
<message>
<location line="+3"/>
<source>Inputs</source>
- <translation type="unfinished"/>
+ <translation>Vnosi</translation>
</message>
<message>
<location line="+23"/>
@@ -2803,12 +2846,12 @@ Naslov: %4
<message>
<location line="+1"/>
<source>true</source>
- <translation type="unfinished"/>
+ <translation>pravilno</translation>
</message>
<message>
<location line="+0"/>
<source>false</source>
- <translation type="unfinished"/>
+ <translation>nepravilno</translation>
</message>
<message>
<location line="-232"/>
@@ -2816,12 +2859,12 @@ Naslov: %4
<translation>, še ni bila uspešno raznešena</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>neznano</translation>
</message>
@@ -2862,12 +2905,12 @@ Naslov: %4
<translation>Količina</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2877,23 +2920,12 @@ Naslov: %4
<translation>Odpri enoto %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Brez povezave (%1 potrdil)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Nepotrjeno (&amp;1 od %2 potrdil)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Potrjeno (%1 potrdil)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ta blok ni prejelo še nobeno vozlišče. Najverjetneje ne bo sprejet!</translation>
</message>
@@ -2903,7 +2935,27 @@ Naslov: %4
<translation>Generirano, toda ne sprejeto</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation>Nepotrjeno</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Prejeto z</translation>
</message>
@@ -2933,7 +2985,7 @@ Naslov: %4
<translation>(ni na voljo)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Stanje transakcije. Zapeljite z miško čez to polje za prikaz števila potrdil. </translation>
</message>
@@ -3049,7 +3101,7 @@ Naslov: %4
<message>
<location line="+1"/>
<source>Copy transaction ID</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj ID transakcije</translation>
</message>
<message>
<location line="+1"/>
@@ -3069,7 +3121,7 @@ Naslov: %4
<message>
<location line="+19"/>
<source>Exporting Failed</source>
- <translation type="unfinished"/>
+ <translation>Neuspešen izvoz</translation>
</message>
<message>
<location line="+0"/>
@@ -3079,12 +3131,12 @@ Naslov: %4
<message>
<location line="+4"/>
<source>Exporting Successful</source>
- <translation type="unfinished"/>
+ <translation>Uspešen izvoz</translation>
</message>
<message>
<location line="+0"/>
<source>The transaction history was successfully saved to %1.</source>
- <translation type="unfinished"/>
+ <translation>Zgodovina poteklih transakcij je bila uspešno shranjena na %1.</translation>
</message>
<message>
<location line="-22"/>
@@ -3158,7 +3210,7 @@ Naslov: %4
<message>
<location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
- <translation type="unfinished"/>
+ <translation>&amp;Izvozi</translation>
</message>
<message>
<location line="+1"/>
@@ -3168,43 +3220,43 @@ Naslov: %4
<message>
<location line="+181"/>
<source>Backup Wallet</source>
- <translation type="unfinished"/>
+ <translation>Napravi varnostno kopijo denarnice</translation>
</message>
<message>
<location line="+1"/>
<source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
+ <translation>Podatki denarnice (*.dat)</translation>
</message>
<message>
<location line="+6"/>
<source>Backup Failed</source>
- <translation type="unfinished"/>
+ <translation>Varnostna kopijo neuspešna</translation>
</message>
<message>
<location line="+0"/>
<source>There was an error trying to save the wallet data to %1.</source>
- <translation type="unfinished"/>
+ <translation>Prišlo je do napake pri shranjevanju podatkov denarnice na %1.</translation>
</message>
<message>
<location line="+4"/>
<source>The wallet data was successfully saved to %1.</source>
- <translation type="unfinished"/>
+ <translation>Podatki denarnice so bili uspešno shranjena na %1.</translation>
</message>
<message>
<location line="+0"/>
<source>Backup Successful</source>
- <translation type="unfinished"/>
+ <translation>Varnostna kopija uspešna</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Uporaba:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Prikaži ukaze</translation>
</message>
@@ -3256,15 +3308,15 @@ Naslov: %4
<message>
<location line="+84"/>
<source>Specify your own public address</source>
- <translation type="unfinished"/>
+ <translation>Določite vaš lasten javni naslov</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Prag za prekinitev povezav s slabimi odjemalci (privzeto: 1000)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3284,17 +3336,17 @@ Naslov: %4
<translation>Sprejmi ukaze iz ukazne vrstice in JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Teci v ozadju in sprejemaj ukaze</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Uporabi testno omrežje</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3346,22 +3398,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"/>
+ <translation>Napaka: Transakcija ni bila sprejeta! To se je morebiti zgodilo, ker so nekateri kovanci v vaši denarnici bili že porabljeni, na primer če ste uporabili kopijo wallet.dat in so tako kovanci bili porabljeni v kopiji, ostali pa označeni kot neporabljeni.</translation>
</message>
<message>
<location line="+4"/>
<source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
- <translation type="unfinished"/>
+ <translation>Napaka: Ta transakcija potrebuje povizijo, ki je najmanj %s zaradi svoje količine, kompliciranosti, ali zaradi uporabe prejetih sredstev.</translation>
</message>
<message>
<location line="+6"/>
<source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
- <translation type="unfinished"/>
+ <translation>Izvedi ukaz, ko bo transakcija denarnice se spremenila (V cmd je bil TxID zamenjan za %s)</translation>
</message>
<message>
<location line="+18"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
- <translation type="unfinished"/>
+ <translation>To je pred izdana poizkusna verzija - uporaba na lastno odgovornost - ne uporabljajte je za rudarstvo ali trgovske aplikacije</translation>
</message>
<message>
<location line="+5"/>
@@ -3391,7 +3443,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+3"/>
<source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
- <translation type="unfinished"/>
+ <translation>Opozorilo: napaka pri branju wallet.dat! Vsi ključi so bili pravilno prebrani, podatki o transakciji ali imenik vnešenih naslovov so morda izgubljeni ali nepravilni.</translation>
</message>
<message>
<location line="+3"/>
@@ -3401,7 +3453,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+9"/>
<source>&lt;category&gt; can be:</source>
- <translation type="unfinished"/>
+ <translation>&lt;kategorija&gt; je lahko:</translation>
</message>
<message>
<location line="+6"/>
@@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3481,17 +3538,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Error: Disk space is low!</source>
- <translation type="unfinished"/>
+ <translation>Opozorilo: Premalo prostora na disku!</translation>
</message>
<message>
<location line="+1"/>
<source>Error: Wallet locked, unable to create transaction!</source>
- <translation type="unfinished"/>
+ <translation>Opozorilo: Denarnica je zaklenjena, ni mogoče opraviti transkacijo! </translation>
</message>
<message>
<location line="+1"/>
<source>Error: system error: </source>
- <translation type="unfinished"/>
+ <translation>Napaka: sistemska napaka:</translation>
</message>
<message>
<location line="+1"/>
@@ -3531,12 +3588,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Failed to write file info</source>
- <translation type="unfinished"/>
+ <translation>Zapisovanje informacij o datoteki neuspešno</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write to coin database</source>
- <translation type="unfinished"/>
+ <translation>Neuspešno zapisovanje na bazi podatkov kovancev</translation>
</message>
<message>
<location line="+1"/>
@@ -3561,7 +3618,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Generate coins (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Ustvari kovance (privzeto: 0)</translation>
</message>
<message>
<location line="+2"/>
@@ -3616,7 +3673,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Send command to Bitcoin server</source>
- <translation type="unfinished"/>
+ <translation>Pošlji ukaz na Bitcoin strežnik</translation>
</message>
<message>
<location line="+7"/>
@@ -3635,10 +3692,15 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
- <source>Start Bitcoin server</source>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Start Bitcoin server</source>
+ <translation>Zaženi Bitcoin strežnik</translation>
+ </message>
+ <message>
<location line="+3"/>
<source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
@@ -3661,7 +3723,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Wait for RPC server to start</source>
- <translation type="unfinished"/>
+ <translation>Počakajte na zagon RPC strežnika</translation>
</message>
<message>
<location line="+1"/>
@@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3709,9 +3771,9 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>Informacije</translation>
</message>
<message>
<location line="+4"/>
@@ -3779,24 +3841,24 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
- <translation type="unfinished"/>
+ <translation>Sistemska napaka:</translation>
</message>
<message>
<location line="+5"/>
<source>Transaction amount too small</source>
- <translation type="unfinished"/>
+ <translation>Količina transakcije je pramajhna</translation>
</message>
<message>
<location line="+1"/>
<source>Transaction amounts must be positive</source>
- <translation type="unfinished"/>
+ <translation>Količina transkacije mora biti pozitivna</translation>
</message>
<message>
<location line="+1"/>
<source>Transaction too large</source>
- <translation type="unfinished"/>
+ <translation>Transkacija je prevelika</translation>
</message>
<message>
<location line="+8"/>
@@ -3825,41 +3887,46 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>različica</translation>
</message>
<message>
<location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
- <translation type="unfinished"/>
+ <translation>wallet.dat poškodovana, neuspešna obnova</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Geslo za JSON-RPC povezave</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Dovoli JSON-RPC povezave z določenega IP naslova</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Pošlji ukaze vozlišču na &lt;ip&gt; (privzet: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Posodobi denarnico v najnovejši zapis</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Nastavi velikost ključa bazena na &lt;n&gt; (privzeto: 100)</translation>
</message>
@@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ponovno preglej verigo blokov za manjkajoče transakcije denarnice</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Uporabi OpenSSL (https) za JSON-RPC povezave</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Datoteka potrdila strežnika (privzeta: server.cert)</translation>
</message>
@@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Zasebni ključ strežnika (privzet: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>To sporočilo pomoči</translation>
</message>
@@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Nalaganje naslovov ...</translation>
</message>
@@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Napaka pri nalaganju wallet.dat: denarnica zahteva novejšo različico Bitcoina</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Denarnica mora biti prepisana: ponovno zaženite Bitcoin za doknčanje</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Napaka pri nalaganju wallet.dat</translation>
</message>
@@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3949,19 +4016,19 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Invalid amount</source>
- <translation type="unfinished"/>
+ <translation>Neveljavna količina</translation>
</message>
<message>
<location line="-6"/>
<source>Insufficient funds</source>
- <translation type="unfinished"/>
+ <translation>Premalo sredstev</translation>
</message>
<message>
<location line="+10"/>
@@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nalaganje indeksa blokov ...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Dodaj vozlišče za povezavo nanj in skušaj le to obdržati odprto</translation>
</message>
@@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Nalaganje denarnice ...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Ne morem </translation>
</message>
@@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Ponovno pregledovanje ...</translation>
</message>
@@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nalaganje končano</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Napaka</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts
index c473d560e0..ecfec40cf6 100644
--- a/src/qt/locale/bitcoin_sq.ts
+++ b/src/qt/locale/bitcoin_sq.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation>Portofoli po &lt;b&gt; enkriptohet&lt;/b&gt; dhe është &lt;b&gt; i kyçur&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Sasia</translation>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>E pakonfirmuar:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Futni një adresë Bitkoini (p.sh. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Etiketë:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Dërgo Monedha</translation>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Dërgo marrësve të ndryshëm njëkohësisht</translation>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Balanca:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Konfirmo veprimin e dërgimit</translation>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>konfirmo dërgimin e monedhave</translation>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Futni një adresë Bitkoini (p.sh. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(pa etiketë)</translation>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Futni një adresë Bitkoini (p.sh. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Ngjit nga memorja e sistemit</translation>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Futni një adresë Bitkoini (p.sh. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation>, nuk është transmetuar me sukses deri tani</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>i/e panjohur</translation>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation>Sasia</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2873,23 +2916,12 @@ Address: %4
<translation>Hapur deri më %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Jashtë linje(%1 konfirmime)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>I/E pakonfirmuar(%1 nga %2 konfirmime)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>I/E konfirmuar(%1 konfirmime)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ky bllok është marrë nga ndonjë nyje dhe ka shumë mundësi të mos pranohet! </translation>
</message>
@@ -2899,7 +2931,27 @@ Address: %4
<translation>I krijuar por i papranuar</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Marrë me</translation>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation>(p/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts
index a3eb9b4fa3..ad64683cb7 100644
--- a/src/qt/locale/bitcoin_sr.ts
+++ b/src/qt/locale/bitcoin_sr.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation>Новчаник јс &lt;b&gt;шифрован&lt;/b&gt; и тренутно &lt;b&gt;закључан&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>iznos</translation>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Непотврђено:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>новчаник</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Етикета</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>kopiraj naziv</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>kopiraj iznos</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Слање новца</translation>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Потврди акцију слања</translation>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation>&amp;Пошаљи</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(без етикете)</translation>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation>Poruka:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation>, nije još uvek uspešno emitovan</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>nepoznato</translation>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation>iznos</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2873,23 +2916,12 @@ Address: %4
<translation>Otvoreno do %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline * van mreže (%1 potvrdjenih)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Nepotvrdjeno (%1 of %2 potvrdjenih)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Potvrdjena (%1 potvrdjenih)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ovaj blok nije primljen od ostalih čvorova (nodova) i verovatno neće biti prihvaćen!</translation>
</message>
@@ -2899,7 +2931,27 @@ Address: %4
<translation>Generisan ali nije prihvaćen</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Primljen sa</translation>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Status vaše transakcije. Predjite mišem preko ovog polja da bi ste videli broj konfirmacija</translation>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Korišćenje:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Listaj komande</translation>
</message>
@@ -3256,12 +3308,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3281,17 +3333,17 @@ Address: %4
<translation>Prihvati komandnu liniju i JSON-RPC komande</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Radi u pozadini kao daemon servis i prihvati komande</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Koristi testnu mrežu</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3422,6 +3474,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3632,6 +3689,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3681,12 +3743,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3706,7 +3768,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3776,7 +3838,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3822,6 +3884,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>верзија</translation>
</message>
@@ -3831,32 +3898,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Lozinka za JSON-RPC konekcije</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Dozvoli JSON-RPC konekcije sa posebne IP adrese</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Pošalji komande to nodu koji radi na &lt;ip&gt; (default: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Odredi veličinu zaštićenih ključeva na &lt;n&gt; (default: 100)</translation>
</message>
@@ -3866,12 +3933,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ponovo skeniraj lanac blokova za nedostajuće transakcije iz novčanika</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Koristi OpenSSL (https) za JSON-RPC konekcije</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3881,7 +3948,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>privatni ključ za Server (podrazumevan: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Ova poruka Pomoći</translation>
</message>
@@ -3891,12 +3958,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>učitavam adrese....</translation>
</message>
@@ -3911,12 +3978,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Грешка током учитавања wallet.dat: Новчанику је неопходна нова верзија Bitcoin-a.</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Грешка током учитавања wallet.dat </translation>
</message>
@@ -3926,7 +3993,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3936,7 +4003,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3946,7 +4013,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3966,7 +4033,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Učitavam blok indeksa...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3976,12 +4043,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Новчаник се учитава...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3991,7 +4058,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Ponovo skeniram...</translation>
</message>
@@ -4001,17 +4068,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Završeno učitavanje</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 5743f1b36e..128bfa7ad3 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -37,6 +37,12 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -618,6 +624,16 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation><numerusform>%n vecka</numerusform><numerusform>%n veckor</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 efter</translation>
@@ -691,7 +707,7 @@ Adress: %4
<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>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ett allvarligt fel har uppstått. Bitcoin kan inte längre köras säkert och kommer att avslutas.</translation>
</message>
@@ -752,7 +768,7 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -767,7 +783,7 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Mängd</translation>
</message>
@@ -918,7 +934,7 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1100,7 +1116,7 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Kärna</translation>
</message>
@@ -1244,7 +1260,7 @@ Adress: %4
<translation>&amp;Allmänt</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Valfri transaktionsavgift per kB som ser till att dina transaktioner behandlas snabbt. De flesta transaktioner är 1 kB.</translation>
</message>
@@ -1254,7 +1270,7 @@ Adress: %4
<translation>Betala överförings&amp;avgift</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Starta Bitcoin automatiskt efter inloggning.</translation>
</message>
@@ -1269,12 +1285,7 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Sätt databas cache storleken i megabyte (förvalt: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1289,7 +1300,12 @@ Adress: %4
<translation>Ange antalet skriptkontrolltrådar (upp till 16, 0 = auto, &lt;0 = lämna så många kärnor lediga, förval: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1324,7 +1340,17 @@ Adress: %4
<translation>&amp;Nätverk</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Öppna automatiskt Bitcoin-klientens port på routern. Detta fungerar endast om din router har UPnP aktiverat.</translation>
</message>
@@ -1439,17 +1465,17 @@ Adress: %4
<translation>&amp;Avbryt</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>standard</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Bekräfta att alternativen ska återställs</translation>
</message>
@@ -1489,19 +1515,14 @@ Adress: %4
<translation>Den visade informationen kan vara inaktuell. Plånboken synkroniseras automatiskt med Bitcoin-nätverket efter att anslutningen är upprättad, men denna process har inte slutförts ännu.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Obekräftade:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Plånbok</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Bekräftade:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1509,7 +1530,12 @@ Adress: %4
<translation>Ditt tillgängliga saldo</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Totalt antal transaktioner som ännu inte bekräftats, och som ännu inte räknas med i aktuellt saldo</translation>
</message>
@@ -1657,6 +1683,11 @@ Adress: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Ange en Bitcoin-adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1877,22 +1908,22 @@ Adress: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>%Belopp:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Etikett:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>&amp;Meddelande:</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1902,27 +1933,30 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1932,17 +1966,17 @@ Adress: %4
<translation>Rensa</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1961,6 +1995,21 @@ Adress: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Kopiera etikett</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopiera belopp</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2062,12 +2111,17 @@ Adress: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Skicka pengar</translation>
@@ -2143,7 +2197,7 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Skicka till flera mottagare samtidigt</translation>
</message>
@@ -2153,7 +2207,7 @@ Adress: %4
<translation>Lägg till &amp;mottagare</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2163,12 +2217,12 @@ Adress: %4
<translation>Rensa &amp;alla</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Balans:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Bekräfta sändordern</translation>
</message>
@@ -2178,7 +2232,7 @@ Adress: %4
<translation>&amp;Skicka</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Bekräfta skickade mynt</translation>
</message>
@@ -2191,12 +2245,7 @@ Adress: %4
<translation>%1 till %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Ange en Bitcoin-adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2246,7 +2295,7 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Mottagarens adress är inte giltig, vänligen kontrollera igen.</translation>
</message>
@@ -2281,12 +2330,12 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(Ingen etikett)</translation>
</message>
@@ -2296,7 +2345,7 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Är du säker på att du vill skicka?</translation>
</message>
@@ -2306,7 +2355,7 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2383,12 +2432,7 @@ Adress: %4
<translation>Meddelande:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2398,7 +2442,12 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2414,11 +2463,6 @@ Adress: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Ange en Bitcoin-adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2456,19 +2500,19 @@ Adress: %4
<translation>Adressen att signera meddelandet med (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Välj tidigare använda adresser</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Klistra in adress från Urklipp</translation>
</message>
@@ -2509,12 +2553,12 @@ Adress: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Rensa &amp;alla</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Verifiera Meddelande</translation>
</message>
@@ -2529,7 +2573,7 @@ Adress: %4
<translation>Adressen som meddelandet var signerat med (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Verifiera meddelandet för att vara säker på att den var signerad med den angivna Bitcoin-adressen</translation>
</message>
@@ -2544,43 +2588,37 @@ Adress: %4
<translation>Rensa alla fält</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Ange en Bitcoin-adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Klicka &quot;Signera Meddelande&quot; för att få en signatur</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Ange Bitcoin-signatur</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Den angivna adressen är ogiltig.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Vad god kontrollera adressen och försök igen.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Den angivna adressen refererar inte till en nyckel.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Upplåsningen av plånboken avbröts.</translation>
</message>
@@ -2600,7 +2638,7 @@ Adress: %4
<translation>Meddelandet är signerat.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Signaturen kunde inte avkodas.</translation>
</message>
@@ -2661,6 +2699,11 @@ Adress: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/nerkopplad</translation>
</message>
@@ -2822,12 +2865,12 @@ Adress: %4
<translation>, har inte lyckats skickas ännu</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Öppet för %n mer block</numerusform><numerusform>Öppet för %n mer block</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>okänd</translation>
</message>
@@ -2868,12 +2911,12 @@ Adress: %4
<translation>Mängd</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Öppet för %n mer block</numerusform><numerusform>Öppet för %n mer block</numerusform></translation>
</message>
@@ -2883,23 +2926,12 @@ Adress: %4
<translation>Öppet till %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Offline (%1 bekräftelser)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Obekräftad (%1 av %2 bekräftelser)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Bekräftad (%1 bekräftelser)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Det här blocket togs inte emot av några andra noder och kommer antagligen inte att bli godkänt.</translation>
</message>
@@ -2909,7 +2941,27 @@ Adress: %4
<translation>Genererad men inte accepterad</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Mottagen med</translation>
</message>
@@ -2939,7 +2991,7 @@ Adress: %4
<translation>(n/a)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Transaktionsstatus. Håll muspekaren över för att se antal bekräftelser.</translation>
</message>
@@ -3205,12 +3257,12 @@ Adress: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Användning:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Lista kommandon</translation>
</message>
@@ -3265,12 +3317,12 @@ Adress: %4
<translation>Ange din egen publika adress</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Tröskelvärde för att koppla ifrån klienter som missköter sig (förvalt: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Antal sekunder att hindra klienter som missköter sig från att ansluta (förvalt: 86400)</translation>
</message>
@@ -3290,17 +3342,17 @@ Adress: %4
<translation>Tillåt kommandon från kommandotolken och JSON-RPC-kommandon</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Kör i bakgrunden som tjänst och acceptera kommandon</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Använd testnätverket</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect)</translation>
</message>
@@ -3441,6 +3493,11 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Koppla enbart upp till den/de specificerade noden/noder</translation>
</message>
@@ -3651,6 +3708,11 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Starta Bitcoinserver</translation>
</message>
@@ -3700,12 +3762,12 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Du måste återskapa databasen med -reindex för att ändra -txindex</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importerar block från extern blk000??.dat fil</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Exekvera kommando när ett relevant meddelande är mottagen eller när vi ser en väldigt lång förgrening (%s i cmd är utbytt med ett meddelande)</translation>
</message>
@@ -3725,7 +3787,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Ange antalet skriptkontrolltrådar (upp till 16, 0 = auto, &lt;0 = lämna så många kärnor lediga, förval: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Information</translation>
</message>
@@ -3795,7 +3857,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Ange timeout för uppkoppling i millisekunder (förvalt: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Systemfel:</translation>
</message>
@@ -3841,6 +3903,11 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>version</translation>
</message>
@@ -3850,32 +3917,32 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>wallet.dat korrupt, räddning misslyckades</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Lösenord för JSON-RPC-anslutningar</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Tillåt JSON-RPC-anslutningar från specifika IP-adresser</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Skicka kommandon till klient på &lt;ip&gt; (förvalt: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Exekvera kommando när det bästa blocket ändras (%s i cmd är utbytt av blockhash)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Uppgradera plånboken till senaste formatet</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Sätt storleken på nyckelpoolen till &lt;n&gt; (förvalt: 100)</translation>
</message>
@@ -3885,12 +3952,12 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Sök i blockkedjan efter saknade plånboks transaktioner</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Använd OpenSSL (https) för JSON-RPC-anslutningar</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Serverns certifikatfil (förvalt: server.cert)</translation>
</message>
@@ -3900,7 +3967,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Serverns privata nyckel (förvalt: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Det här hjälp medelandet</translation>
</message>
@@ -3910,12 +3977,12 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Det går inte att binda till %s på den här datorn (bind returnerade felmeddelande %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Tillåt DNS-sökningar för -addnode, -seednode och -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Laddar adresser...</translation>
</message>
@@ -3930,12 +3997,12 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Fel vid inläsningen av wallet.dat: Plånboken kräver en senare version av Bitcoin</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Plånboken behöver skrivas om: Starta om Bitcoin för att färdigställa</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Fel vid inläsning av plånboksfilen wallet.dat</translation>
</message>
@@ -3945,7 +4012,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Ogiltig -proxy adress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Okänt nätverk som anges i -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3955,7 +4022,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Okänd -socks proxy version begärd: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kan inte matcha -bind adress: &apos;%s&apos;</translation>
</message>
@@ -3965,7 +4032,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Kan inte matcha -externalip adress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Ogiltigt belopp för -paytxfee=&lt;belopp&gt;:&apos;%s&apos;</translation>
</message>
@@ -3985,7 +4052,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Laddar blockindex...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Lägg till en nod att koppla upp mot och försök att hålla anslutningen öppen</translation>
</message>
@@ -3995,12 +4062,12 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Det går inte att binda till %s på den här datorn. Bitcoin är förmodligen redan igång.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Laddar plånbok...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Kan inte nedgradera plånboken</translation>
</message>
@@ -4010,7 +4077,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Kan inte skriva standardadress</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Söker igen...</translation>
</message>
@@ -4020,17 +4087,17 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Klar med laddning</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Att använda %s alternativet</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts
index 9ddaf0ead7..539f820256 100644
--- a/src/qt/locale/bitcoin_th_TH.ts
+++ b/src/qt/locale/bitcoin_th_TH.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(ไม่มีชื่อ)</translation>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index 9b17da2b0e..e0576e93d7 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation>Bitcoin Çekirdeği geliştiricileri</translation>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation> (%1-bit)</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation><numerusform>%n hafta</numerusform><numerusform>%n hafta</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>%1 geride</translation>
@@ -690,7 +706,7 @@ Adres: %4
<translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda &lt;b&gt;kilitlidir&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ciddi bir hata oluştu. Bitcoin artık güvenli bir şekilde işlemeye devam edemez ve kapanacaktır.</translation>
</message>
@@ -751,7 +767,7 @@ Adres: %4
<translation>Para üstü:</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation>tümünü seç(me)</translation>
</message>
@@ -766,7 +782,7 @@ Adres: %4
<translation>Liste kipi</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Meblağ</translation>
</message>
@@ -917,7 +933,7 @@ Adres: %4
<translation>boş</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation>Toz</translation>
</message>
@@ -1099,7 +1115,7 @@ Adres: %4
<translation>Bitcoin Çekirdeği - Komut satırı seçenekleri</translation>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Çekirdeği</translation>
</message>
@@ -1243,7 +1259,7 @@ Adres: %4
<translation>&amp;Esas ayarlar</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Muamelelerin hızlı işlenmesini garantilemeye yardım eden, seçime dayalı kB başı muamele ücreti. Muamelelerin çoğunluğunun boyutu 1 kB&apos;dir.</translation>
</message>
@@ -1253,7 +1269,7 @@ Adres: %4
<translation>Muamele ücreti &amp;öde</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Sistemde oturum açıldığında Bitcoin&apos;i otomatik olarak başlat.</translation>
</message>
@@ -1268,12 +1284,7 @@ Adres: %4
<translation>&amp;Veritabanı tamponunun boyutu</translation>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (varsayılan: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>MB</translation>
</message>
@@ -1288,7 +1299,12 @@ Adres: %4
<translation>Betik kontrolü iş parçacığı sayısını belirt (azami 16, 0 = otomatik, &lt;0 = bu sayıda çekirdeği boş bırak, varsayılan: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation>Doğrulanmamış para üstünü &amp;harca (sadece uzman kullanıcılar için)</translation>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation>Bitcoin şebekesine bir SOCKS vekil sunucusu vasıtasıyla bağlan.</translation>
</message>
@@ -1323,7 +1339,17 @@ Adres: %4
<translation>&amp;Şebeke</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation>&amp;Cüzdan</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation>Teyit edilmemiş para üstünü harcamayı devre dışı bırakırsanız, bir muamelenin para üstü bu muamele için en az bir teyit olana dek harcanamaz. Bu, aynı zamanda bakiyenizin nasıl hesaplandığını da etkiler.</translation>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Yönlendiricide Bitcoin istemci portlarını otomatik olarak açar. Bu, sadece yönlendiricinizin UPnP desteği bulunuyorsa ve etkinse çalışabilir.</translation>
</message>
@@ -1438,17 +1464,17 @@ Adres: %4
<translation>&amp;İptal</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>varsayılan</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation>boş</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Seçeneklerin sıfırlanmasını teyit et</translation>
</message>
@@ -1488,19 +1514,14 @@ Adres: %4
<translation>Görüntülenen veriler zaman aşımına uğramış olabilir. Bağlantı kurulduğunda cüzdanınız otomatik olarak şebeke ile eşleşir ancak bu işlem henüz tamamlanmamıştır.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Doğrulanmamış:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Cüzdan</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>Teyit edilmiş:</translation>
+ <source>Available:</source>
+ <translation>Mevcut:</translation>
</message>
<message>
<location line="+16"/>
@@ -1508,7 +1529,12 @@ Adres: %4
<translation>Güncel harcanabilir bakiyeniz</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation>Beklemede:</translation>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Henüz teyit edilmemiş ve harcanabilir bakiyeye eklenmemiş muamelelerin toplamı</translation>
</message>
@@ -1656,6 +1682,11 @@ Adres: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Hata: -regtest ve -testnet&apos;in geçersiz kombinasyonu.</translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Bitcoin adresi giriniz (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1876,22 +1907,22 @@ Adres: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>&amp;Meblağ:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Etiket:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>Me&amp;saj:</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Daha önce kullanılmış bir alım adresini kullan. Adresleri tekrar kullanmak güvenlik ve gizlilik sorunları doğurur. Bunu, daha önce yaptığınız bir talebi tekrar oluşturmak durumu dışında kullanmayınız.</translation>
</message>
@@ -1901,27 +1932,30 @@ Adres: %4
<translation>&amp;Hâlihazırda bulunan bir alım adresini kullan (önerilmez)</translation>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
- <translation>Yeni alım adresi ile ilişkili, seçiminize dayalı etiket</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+14"/>
+ <location line="+23"/>
<source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation>Talep açıldığında gösterilecek, isteğinize dayalı, ödeme talebi ile ilişkilendirilecek bir mesaj. Not: Bu mesaj ödeme ile birlikte Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
+ <translation>Yeni alım adresi ile ilişkili, seçiminize dayalı etiket.</translation>
+ </message>
+ <message>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation>Ödeme talep etmek için bu formu kullanın. Tüm alanlar &lt;b&gt;seçime dayalıdır&lt;/b&gt;.</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation>Seçiminize dayalı talep edilecek meblağ. Belli bir meblağ talep etmemek için bunu boş bırakın veya sıfır değerini kullanın.</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Formdaki tüm alanları temizle.</translation>
</message>
@@ -1931,17 +1965,17 @@ Adres: %4
<translation>Temizle</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
- <translation>Ödeme &amp;talep et</translation>
+ <location line="+78"/>
+ <source>Requested payments history</source>
+ <translation>Talep edilen ödemelerin tarihçesi</translation>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation>Talep edilen ödemeler</translation>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>Ödeme &amp;talep et</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Seçilen talebi göster (bir unsura çift tıklamakla aynı anlama gelir)</translation>
</message>
@@ -1960,6 +1994,21 @@ Adres: %4
<source>Remove</source>
<translation>Kaldır</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Etiketi kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation>Mesajı kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Meblağı kopyala</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2061,12 +2110,17 @@ Adres: %4
<source>(no message)</source>
<translation>(boş mesaj)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation>(boş meblağ)</translation>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Bitcoin yolla</translation>
@@ -2142,7 +2196,7 @@ Adres: %4
<translation>Özel para üstü adresi</translation>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Birçok alıcıya aynı anda gönder</translation>
</message>
@@ -2152,7 +2206,7 @@ Adres: %4
<translation>&amp;Alıcı ekle</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Formdaki tüm alanları temizle.</translation>
</message>
@@ -2162,12 +2216,12 @@ Adres: %4
<translation>Tümünü &amp;temizle</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Bakiye:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Yollama etkinliğini teyit ediniz</translation>
</message>
@@ -2177,7 +2231,7 @@ Adres: %4
<translation>G&amp;önder</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Gönderiyi teyit ediniz</translation>
</message>
@@ -2190,12 +2244,7 @@ Adres: %4
<translation>%1 öğesinden %2 unsuruna</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Bitcoin adresi giriniz (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation>Miktarı kopyala</translation>
</message>
@@ -2245,7 +2294,7 @@ Adres: %4
<translation>veya</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Alıcı adresi geçerli değildir, lütfen denetleyiniz.</translation>
</message>
@@ -2280,12 +2329,12 @@ Adres: %4
<translation>Muamele reddedildi! Cüzdanınızdaki madenî paraların bazıları zaten harcanmış olduğunda bu meydana gelebilir. Örneğin wallet.dat dosyasının bir kopyasını kullandıysanız ve kopyada para harcandığında ancak burada harcandığı işaretlenmediğinde.</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Uyarı: geçersiz Bitcoin adresi</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(boş etiket)</translation>
</message>
@@ -2295,7 +2344,7 @@ Adres: %4
<translation>Uyarı: geçersiz para üstü adresi</translation>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Göndermek istediğinizden emin misiniz?</translation>
</message>
@@ -2305,7 +2354,7 @@ Adres: %4
<translation>muamele ücreti olarak eklendi</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>Ödeme talebinin ömrü doldu</translation>
</message>
@@ -2382,12 +2431,7 @@ Adres: %4
<translation>Mesaj:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation>Bitcoin URI&apos;siyle ilişkili ve bilginiz için muameleyle saklanacak bir mesaj. Not: Bu mesaj Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation>Bu, teyit edilmiş bir ödeme talebidir.</translation>
</message>
@@ -2397,7 +2441,12 @@ Adres: %4
<translation>Kullanılmış adres listesine eklemek için bu adrese bir etiket girin</translation>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>Bitcoin: URI&apos;siyle ilişkili ve bilginiz için muameleyle saklanacak bir mesaj. Not: Bu mesaj Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation>Bu, teyit edilmemiş bir ödeme talebidir.</translation>
</message>
@@ -2413,11 +2462,6 @@ Adres: %4
<source>Memo:</source>
<translation>Not:</translation>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Bitcoin adresi giriniz (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2455,19 +2499,19 @@ Adres: %4
<translation>Mesajın imzalanmasında kullanılacak adres (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Önceden kullanılmış adres seç</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Panodan adres yapıştır</translation>
</message>
@@ -2508,12 +2552,12 @@ Adres: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Tümünü &amp;temizle</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>Mesaj &amp;kontrol et</translation>
</message>
@@ -2528,7 +2572,7 @@ Adres: %4
<translation>Mesajı imzalamak için kullanılmış olan adres (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Belirtilen Bitcoin adresi ile imzalandığını doğrulamak için mesajı kontrol et</translation>
</message>
@@ -2543,43 +2587,37 @@ Adres: %4
<translation>Tüm mesaj kontrolü alanlarını sıfırla</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Bitcoin adresi giriniz (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>İmzayı oluşturmak için &quot;Mesaj İmzala&quot; unsurunu tıklayın</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Bitcoin imzası gir</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Girilen adres geçersizdir.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Adresi kontrol edip tekrar deneyiniz.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Girilen adres herhangi bir anahtara işaret etmemektedir.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Cüzdan kilidinin açılması iptal edildi.</translation>
</message>
@@ -2599,7 +2637,7 @@ Adres: %4
<translation>Mesaj imzalandı.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>İmzanın kodu çözülemedi.</translation>
</message>
@@ -2660,6 +2698,11 @@ Adres: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation>çakışma</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/çevrim dışı</translation>
</message>
@@ -2821,12 +2864,12 @@ Adres: %4
<translation>, henüz başarılı bir şekilde yayınlanmadı</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>%n ilâve blok için açık</numerusform><numerusform>%n ilâve blok için açık</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>bilinmiyor</translation>
</message>
@@ -2867,12 +2910,12 @@ Adres: %4
<translation>Meblağ</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation>Olgunlaşmamış (%1 teyit, %2 teyit ardından kullanılabilir olacaktır)</translation>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>%n ilâve blok için açık</numerusform><numerusform>%n ilâve blok için açık</numerusform></translation>
</message>
@@ -2882,23 +2925,12 @@ Adres: %4
<translation>%1 değerine dek açık</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Çevrimdışı (%1 teyit)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Doğrulanmadı (%1 (toplam %2 üzerinden) teyit)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Doğrulandı (%1 teyit)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Bu blok başka hiçbir düğüm tarafından alınmamıştır ve muhtemelen kabul edilmeyecektir!</translation>
</message>
@@ -2908,7 +2940,27 @@ Adres: %4
<translation>Oluşturuldu ama kabul edilmedi</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation>Çevrim dışı</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation>Teyit edilmemiş</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation>Teyit ediliyor (tavsiye edilen %2 teyit üzerinden %1 doğrulama)</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation>Çakışma</translation>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Şununla alındı</translation>
</message>
@@ -2938,7 +2990,7 @@ Adres: %4
<translation>(mevcut değil)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Muamele durumu. Doğrulama sayısını görüntülemek için imleci bu alanda tutunuz.</translation>
</message>
@@ -3204,12 +3256,12 @@ Adres: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Kullanım:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Komutları listele</translation>
</message>
@@ -3264,12 +3316,12 @@ Adres: %4
<translation>Kendi genel adresinizi tanımlayın</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<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>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Aksaklık gösteren eşlerle yeni bağlantıları engelleme süresi, saniye olarak (varsayılan: 86400)</translation>
</message>
@@ -3289,17 +3341,17 @@ Adres: %4
<translation>Konut satırı ve JSON-RPC komutlarını kabul et</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Arka planda daemon (servis) olarak çalış ve komutları kabul et</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Deneme şebekesini kullan</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation>
</message>
@@ -3440,6 +3492,11 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation>Cüzdanın muamele listesini temizle (tanı aracı; -rescan ima eder)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Sadece belirtilen düğüme veya düğümlere bağlan</translation>
</message>
@@ -3650,6 +3707,11 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation>Gönderme muamelelerinde teyit edilmemiş para üstünü harca (varsayılan: 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Bitcoin sunucusunu başlat</translation>
</message>
@@ -3699,12 +3761,12 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>-txindex&apos;i değiştirmek için veritabanını -reindex kullanarak tekrar inşa etmeniz gerekmektedir</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Harici blk000??.dat dosyasından blokları içe aktarır</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>İlgili bir uyarı alındığında ya da gerçekten uzun bir çatallama gördüğümüzde komutu çalıştır (komuttaki %s mesaj ile değiştirilir)</translation>
</message>
@@ -3724,7 +3786,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Betik kontrolü iş parçacığı sayısını belirt (azami 16, 0 = otomatik, &lt;0 = bu sayıda çekirdeği boş bırak, varsayılan: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Bilgi</translation>
</message>
@@ -3794,7 +3856,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Bağlantı zaman aşım süresini milisaniye olarak belirt (varsayılan: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Sistem hatası:</translation>
</message>
@@ -3840,6 +3902,11 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation>Cüzdandaki tüm muameleler kaldırılıyor...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>sürüm</translation>
</message>
@@ -3849,32 +3916,32 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>wallet.dat bozuk, geri kazanım başarısız oldu</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC bağlantıları için parola</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Belirtilen İP adresinden JSON-RPC bağlantılarını kabul et</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Şu &lt;ip&gt; adresinde (varsayılan: 127.0.0.1) çalışan düğüme komut yolla</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>En iyi blok değiştiğinde komutu çalıştır (komut için %s parametresi blok hash değeri ile değiştirilecektir)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Cüzdanı en yeni biçime güncelle</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Anahtar alan boyutunu &lt;n&gt; değerine ayarla (varsayılan: 100)</translation>
</message>
@@ -3884,12 +3951,12 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Blok zincirini eksik cüzdan muameleleri için tekrar tara</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>JSON-RPC bağlantıları için OpenSSL (https) kullan</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Sunucu sertifika dosyası (varsayılan: server.cert)</translation>
</message>
@@ -3899,7 +3966,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Sunucu özel anahtarı (varsayılan: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Bu yardım mesajı</translation>
</message>
@@ -3909,12 +3976,12 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Bu bilgisayarda %s unsuruna bağlanılamadı. (bind şu hatayı iletti: %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>-addnode, -seednode ve -connect için DNS aramalarına izin ver</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Adresler yükleniyor...</translation>
</message>
@@ -3929,12 +3996,12 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<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>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Cüzdanın tekrar yazılması gerekiyordu: işlemi tamamlamak için Bitcoin&apos;i yeniden başlatınız</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>wallet.dat dosyasının yüklenmesinde hata oluştu</translation>
</message>
@@ -3944,7 +4011,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Geçersiz -proxy adresi: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>-onlynet için bilinmeyen bir şebeke belirtildi: &apos;%s&apos;</translation>
</message>
@@ -3954,7 +4021,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Bilinmeyen bir -socks vekil sürümü talep edildi: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>-bind adresi çözümlenemedi: &apos;%s&apos;</translation>
</message>
@@ -3964,7 +4031,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>-externalip adresi çözümlenemedi: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>-paytxfee=&lt;meblağ&gt; için geçersiz meblağ: &apos;%s&apos;</translation>
</message>
@@ -3984,7 +4051,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Blok indeksi yükleniyor...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Bağlanılacak düğüm ekle ve bağlantıyı zinde tutmaya çalış</translation>
</message>
@@ -3994,12 +4061,12 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Bu bilgisayarda %s unsuruna bağlanılamadı. Bitcoin muhtemelen hâlihazırda çalışmaktadır.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Cüzdan yükleniyor...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Cüzdan eski biçime geri alınamaz</translation>
</message>
@@ -4009,7 +4076,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Varsayılan adres yazılamadı</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Yeniden tarama...</translation>
</message>
@@ -4019,17 +4086,17 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Yükleme tamamlandı</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>%s seçeneğini kullanmak için</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Hata</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index a52245ea73..2ec9f7398b 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -690,7 +706,7 @@ Address: %4
<translation>&lt;b&gt;Зашифрований&lt;/b&gt; гаманець &lt;b&gt;заблоковано&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Сталася фатальна помилка. Bitcoin більше не може продовжувати безпечно і піде.</translation>
</message>
@@ -751,7 +767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -766,7 +782,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Кількість</translation>
</message>
@@ -917,7 +933,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1099,7 +1115,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Ядро</translation>
</message>
@@ -1243,7 +1259,7 @@ Address: %4
<translation>&amp;Головні</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>Оплата додаткових транзакцій за Кб, що допомагає переконатися, що ваші транзакції обробляються швидко. Велика частина операцій проводиться 1 Кб.</translation>
</message>
@@ -1253,7 +1269,7 @@ Address: %4
<translation>Заплатити комісі&amp;ю</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>Автоматично запускати гаманець при вході до системи.</translation>
</message>
@@ -1268,12 +1284,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>Встановити розмір кешу бази даних в мегабайтах (типово: 25)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1288,7 +1299,12 @@ Address: %4
<translation>Встановіть кількість перевірки скрипт потоків (до 16, 0 = авто, &lt;0 = залишити, що багато сердечники безкоштовно, за замовчуванням: 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1323,7 +1339,17 @@ Address: %4
<translation>&amp;Мережа</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Автоматично відкривати порт для клієнту біткоін на роутері. Працює лише якщо ваш роутер підтримує UPnP і ця функція увімкнена.</translation>
</message>
@@ -1438,17 +1464,17 @@ Address: %4
<translation>&amp;Скасувати</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>типово</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>Підтвердження скидання параметрів</translation>
</message>
@@ -1488,19 +1514,14 @@ Address: %4
<translation>Показана інформація вже може бути застарілою. Ваш гаманець буде автоматично синхронізовано з мережею Bitcoin після встановлення підключення, але цей процес ще не завершено.</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>Непідтверджені:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>Гаманець</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>підтверджено:</translation>
+ <source>Available:</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+16"/>
@@ -1508,7 +1529,12 @@ Address: %4
<translation>Ваш поточний баланс расходуемого</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Всього угод, які ще мають бути підтверджені, і до цих пір не враховуються в расходуемого балансу</translation>
</message>
@@ -1656,6 +1682,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1876,22 +1907,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>&amp;Кількість:</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>&amp;Мітка:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>&amp;Повідомлення:</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1901,27 +1932,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>Очистити всі поля в формі</translation>
</message>
@@ -1931,17 +1965,17 @@ Address: %4
<translation>Очистити</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1960,6 +1994,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>Скопіювати мітку</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Копіювати кількість</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2061,12 +2110,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Відправити</translation>
@@ -2142,7 +2196,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Відправити на декілька адрес</translation>
</message>
@@ -2152,7 +2206,7 @@ Address: %4
<translation>Дод&amp;ати одержувача</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>Очистити всі поля в формі</translation>
</message>
@@ -2162,12 +2216,12 @@ Address: %4
<translation>Очистити &amp;все</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Баланс:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Підтвердити відправлення</translation>
</message>
@@ -2177,7 +2231,7 @@ Address: %4
<translation>&amp;Відправити</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Підтвердіть відправлення</translation>
</message>
@@ -2190,12 +2244,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2245,7 +2294,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Адреса отримувача невірна, будь ласка перепровірте.</translation>
</message>
@@ -2280,12 +2329,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(немає назви)</translation>
</message>
@@ -2295,7 +2344,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>Ви впевнені, що хочете відправити?</translation>
</message>
@@ -2305,7 +2354,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2382,12 +2431,7 @@ Address: %4
<translation>Повідомлення:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2397,7 +2441,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2413,11 +2462,6 @@ Address: %4
<source>Memo:</source>
<translation>Нотатка:</translation>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2455,19 +2499,19 @@ Address: %4
<translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>Обрати ранiш використовувану адресу</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Вставити адресу</translation>
</message>
@@ -2508,12 +2552,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Очистити &amp;все</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>Перевірити повідомлення</translation>
</message>
@@ -2528,7 +2572,7 @@ Address: %4
<translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Перевірте повідомлення для впевненості, що воно підписано вказаною Bitcoin-адресою</translation>
</message>
@@ -2543,43 +2587,37 @@ Address: %4
<translation>Скинути всі поля перевірки повідомлення</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Натисніть кнопку «Підписати повідомлення», для отримання підпису</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Введіть сигнатуру Bitcoin</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>Введена нечинна адреса.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Будь ласка, перевірте адресу та спробуйте ще.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>Введений адреса не відноситься до ключа.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Розблокування Гаманець був скасований.</translation>
</message>
@@ -2599,7 +2637,7 @@ Address: %4
<translation>Повідомлення підписано.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>Підпис не можливо декодувати.</translation>
</message>
@@ -2660,6 +2698,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1/поза інтернетом</translation>
</message>
@@ -2821,12 +2864,12 @@ Address: %4
<translation>, ще не було успішно розіслано</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>невідомий</translation>
</message>
@@ -2867,12 +2910,12 @@ Address: %4
<translation>Кількість</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2882,23 +2925,12 @@ Address: %4
<translation>Відкрити до %1</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>Поза інтернетом (%1 підтверджень)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>Непідтверджено (%1 із %2 підтверджень)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Підтверджено (%1 підтверджень)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Цей блок не був отриманий жодними іншими вузлами і, ймовірно, не буде прийнятий!</translation>
</message>
@@ -2908,7 +2940,27 @@ Address: %4
<translation>Згенеровано, але не підтверджено</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>Отримано</translation>
</message>
@@ -2938,7 +2990,7 @@ Address: %4
<translation>(недоступно)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Статус транзакції. Наведіть вказівник на це поле, щоб показати кількість підтверджень.</translation>
</message>
@@ -3204,12 +3256,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>Використання:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>Список команд</translation>
</message>
@@ -3264,12 +3316,12 @@ Address: %4
<translation>Вкажіть вашу власну публічну адресу</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Поріг відключення неправильно під&apos;єднаних пірів (типово: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Максимальній розмір вхідного буферу на одне з&apos;єднання (типово: 86400)</translation>
</message>
@@ -3289,17 +3341,17 @@ Address: %4
<translation>Приймати команди із командного рядка та команди JSON-RPC</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Запустити в фоновому режимі (як демон) та приймати команди</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>Використовувати тестову мережу</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Приймати з&apos;єднання ззовні (за замовчуванням: 1, якщо ні-проксі або-з&apos;єднання)</translation>
</message>
@@ -3430,6 +3482,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>Підключитись лише до вказаного вузла</translation>
</message>
@@ -3640,6 +3697,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>Запустити сервер Біткойну</translation>
</message>
@@ -3689,12 +3751,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Імпорт блоків з зовнішнього файлу blk000??.dat</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3714,7 +3776,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Встановіть кількість перевірки скрипт потоків (до 16, 0 = авто, &lt;0 = залишити, що багато сердечники безкоштовно, за замовчуванням: 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>Інформація</translation>
</message>
@@ -3784,7 +3846,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Вказати тайм-аут підключення у мілісекундах (типово: 5000)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>Системна помилка: </translation>
</message>
@@ -3830,6 +3892,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>версія</translation>
</message>
@@ -3839,32 +3906,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>wallet.dat пошкоджено, відновлення не вдалося</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>Пароль для JSON-RPC-з&apos;єднань</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Дозволити JSON-RPC-з&apos;єднання з вказаної IP-адреси</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Відправляти команди на вузол, запущений на &lt;ip&gt; (типово: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Виконати команду, коли з&apos;явиться новий блок (%s в команді змінюється на хеш блоку)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>Модернізувати гаманець до останнього формату</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Встановити розмір пулу ключів &lt;n&gt; (типово: 100)</translation>
</message>
@@ -3874,12 +3941,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Пересканувати ланцюжок блоків, в пошуку втрачених транзакцій</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Використовувати OpenSSL (https) для JSON-RPC-з&apos;єднань</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Файл сертифіката сервера (типово: server.cert)</translation>
</message>
@@ -3889,7 +3956,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Закритий ключ сервера (типово: server.pem)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>Дана довідка</translation>
</message>
@@ -3899,12 +3966,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Неможливо прив&apos;язати до порту %s на цьому комп&apos;ютері (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Дозволити пошук в DNS для команд -addnode, -seednode та -connect</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>Завантаження адрес...</translation>
</message>
@@ -3919,12 +3986,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Помилка при завантаженні wallet.dat: Гаманець потребує новішої версії Біткоін-клієнта</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Потрібно перезаписати гаманець: перезапустіть Біткоін-клієнт для завершення</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>Помилка при завантаженні wallet.dat</translation>
</message>
@@ -3934,7 +4001,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Помилка в адресі проксі-сервера: «%s»</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Невідома мережа вказана в -onlynet: «%s»</translation>
</message>
@@ -3944,7 +4011,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>В параметрі -socks запитується невідома версія: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3954,7 +4021,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Помилка у величині комісії -paytxfee=&lt;amount&gt;: «%s»</translation>
</message>
@@ -3974,7 +4041,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Завантаження індексу блоків...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Додати вузол до підключення і лишити його відкритим</translation>
</message>
@@ -3984,12 +4051,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Неможливо прив&apos;язати до порту %s на цьому комп&apos;ютері. Можливо гаманець вже запущено.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>Завантаження гаманця...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>Не вдається понизити версію гаманця</translation>
</message>
@@ -3999,7 +4066,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Неможливо записати типову адресу</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>Сканування...</translation>
</message>
@@ -4009,17 +4076,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Завантаження завершене</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>Щоб використати опцію %s</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>Помилка</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_vi.ts b/src/qt/locale/bitcoin_vi.ts
index ee0c8caaaf..b667bb4a84 100644
--- a/src/qt/locale/bitcoin_vi.ts
+++ b/src/qt/locale/bitcoin_vi.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>Số lượng</translation>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(chưa có nhãn)</translation>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation>Số lượng</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_vi_VN.ts b/src/qt/locale/bitcoin_vi_VN.ts
index 4a5eb877ea..fd98a7fc32 100644
--- a/src/qt/locale/bitcoin_vi_VN.ts
+++ b/src/qt/locale/bitcoin_vi_VN.ts
@@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation type="unfinished"/>
@@ -681,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -742,7 +758,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation type="unfinished"/>
</message>
@@ -757,7 +773,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
@@ -908,7 +924,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -1090,7 +1106,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -1234,7 +1250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation type="unfinished"/>
</message>
@@ -1244,7 +1260,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation type="unfinished"/>
</message>
@@ -1259,12 +1275,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
@@ -1314,7 +1330,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation type="unfinished"/>
</message>
@@ -1429,17 +1455,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
@@ -1479,18 +1505,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
+ <source>Available:</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1499,7 +1520,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
@@ -1647,6 +1673,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1867,22 +1898,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1892,27 +1923,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1922,17 +1956,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1951,6 +1985,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2052,12 +2101,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
@@ -2133,7 +2187,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -2143,7 +2197,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -2153,12 +2207,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -2168,7 +2222,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2181,12 +2235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"/>
</message>
@@ -2236,7 +2285,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
@@ -2271,12 +2320,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation type="unfinished"/>
</message>
@@ -2286,7 +2335,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -2373,12 +2422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2388,7 +2432,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2404,11 +2453,6 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2446,19 +2490,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation type="unfinished"/>
</message>
@@ -2499,12 +2543,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation type="unfinished"/>
</message>
@@ -2519,7 +2563,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation type="unfinished"/>
</message>
@@ -2534,43 +2578,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation type="unfinished"/>
</message>
@@ -2590,7 +2628,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation type="unfinished"/>
</message>
@@ -2651,6 +2689,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation type="unfinished"/>
</message>
@@ -2812,12 +2855,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation type="unfinished"/>
</message>
@@ -2858,12 +2901,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2873,33 +2916,42 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
+ <location line="+12"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <source>Generated but not accepted</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <location line="+25"/>
- <source>Confirmed (%1 confirmations)</source>
+ <location line="-21"/>
+ <source>Offline</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-22"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Generated but not accepted</source>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2929,7 +2981,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation type="unfinished"/>
</message>
@@ -3195,12 +3247,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
@@ -3255,12 +3307,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
@@ -3280,17 +3332,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
@@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation type="unfinished"/>
</message>
@@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation type="unfinished"/>
</message>
@@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation type="unfinished"/>
</message>
@@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
@@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 4315045584..e45b9242a1 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>The Bitcoin Core developers</source>
<translation>Bitcoin Core 的开发者</translation>
</message>
+ <message>
+ <location line="+12"/>
+ <location line="+2"/>
+ <source> (%1-bit)</source>
+ <translation>(%1 -比特)</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -157,7 +163,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+1"/>
<source>There was an error trying to save the address list to %1.</source>
- <translation type="unfinished"/>
+ <translation>地址列表保存至 %1 时发生错误。</translation>
</message>
</context>
<context>
@@ -405,17 +411,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+10"/>
<source>&amp;Sending addresses...</source>
- <translation type="unfinished"/>
+ <translation>&amp;付款地址 </translation>
</message>
<message>
<location line="+2"/>
<source>&amp;Receiving addresses...</source>
- <translation type="unfinished"/>
+ <translation>&amp;收款地址</translation>
</message>
<message>
<location line="+3"/>
<source>Open &amp;URI...</source>
- <translation type="unfinished"/>
+ <translation>打开 &amp;URI...</translation>
</message>
<message>
<location line="+325"/>
@@ -568,12 +574,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+2"/>
<source>&amp;Command-line options</source>
- <translation type="unfinished"/>
+ <translation>&amp;命令行 选项</translation>
</message>
<message>
<location line="+1"/>
<source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
- <translation type="unfinished"/>
+ <translation>显示比特币核心 程序帮助信息,获取可用的命令行选项 </translation>
</message>
<message>
<location line="+159"/>
@@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation><numerusform>%n 周前</numerusform></translation>
</message>
<message>
+ <location line="+0"/>
+ <source>%1 and %2</source>
+ <translation>%1 和 %2</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+0"/>
+ <source>%n year(s)</source>
+ <translation><numerusform>%n 年</numerusform></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>%1 behind</source>
<translation>落后 %1 </translation>
@@ -659,7 +675,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+130"/>
<source>Sent transaction</source>
- <translation>发出交易</translation>
+ <translation>发送交易</translation>
</message>
<message>
<location line="+0"/>
@@ -690,7 +706,7 @@ Address: %4
<translation>钱包已被&lt;b&gt;加密&lt;/b&gt;,当前为&lt;b&gt;锁定&lt;/b&gt;状态</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+438"/>
+ <location filename="../bitcoin.cpp" line="+435"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>发生严重错误。</translation>
</message>
@@ -708,7 +724,7 @@ Address: %4
<message>
<location filename="../forms/coincontroldialog.ui" line="+14"/>
<source>Coin Control Address Selection</source>
- <translation type="unfinished"/>
+ <translation>选择交易源地址</translation>
</message>
<message>
<location line="+34"/>
@@ -738,12 +754,12 @@ Address: %4
<message>
<location line="+32"/>
<source>Low Output:</source>
- <translation type="unfinished"/>
+ <translation>低输出</translation>
</message>
<message>
<location line="+48"/>
<source>After Fee:</source>
- <translation type="unfinished"/>
+ <translation>加上交易费用后:</translation>
</message>
<message>
<location line="+32"/>
@@ -751,7 +767,7 @@ Address: %4
<translation>变更 : </translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+56"/>
<source>(un)select all</source>
<translation>(不)全选</translation>
</message>
@@ -766,7 +782,7 @@ Address: %4
<translation>列表模式</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+53"/>
<source>Amount</source>
<translation>金额</translation>
</message>
@@ -819,27 +835,27 @@ Address: %4
<message>
<location line="+1"/>
<source>Lock unspent</source>
- <translation type="unfinished"/>
+ <translation>锁定未花费</translation>
</message>
<message>
<location line="+1"/>
<source>Unlock unspent</source>
- <translation type="unfinished"/>
+ <translation>解锁未花费</translation>
</message>
<message>
<location line="+22"/>
<source>Copy quantity</source>
- <translation type="unfinished"/>
+ <translation>复制金额</translation>
</message>
<message>
<location line="+2"/>
<source>Copy fee</source>
- <translation type="unfinished"/>
+ <translation>复制交易费</translation>
</message>
<message>
<location line="+1"/>
<source>Copy after fee</source>
- <translation type="unfinished"/>
+ <translation>复制含交易费的金额</translation>
</message>
<message>
<location line="+1"/>
@@ -854,12 +870,12 @@ Address: %4
<message>
<location line="+1"/>
<source>Copy low output</source>
- <translation type="unfinished"/>
+ <translation>复制低输出</translation>
</message>
<message>
<location line="+1"/>
<source>Copy change</source>
- <translation type="unfinished"/>
+ <translation>复制零钱</translation>
</message>
<message>
<location line="+323"/>
@@ -909,7 +925,7 @@ Address: %4
<message>
<location line="+11"/>
<source>(%1 locked)</source>
- <translation type="unfinished"/>
+ <translation>(%1 锁定)</translation>
</message>
<message>
<location line="+31"/>
@@ -917,9 +933,9 @@ Address: %4
<translation>无</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+141"/>
<source>Dust</source>
- <translation type="unfinished"/>
+ <translation>尘埃交易</translation>
</message>
<message>
<location line="+0"/>
@@ -934,49 +950,49 @@ Address: %4
<message>
<location line="+10"/>
<source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
- <translation type="unfinished"/>
+ <translation>如果这笔交易大于1000字节,标签会变成红色。</translation>
</message>
<message>
<location line="+1"/>
<location line="+5"/>
<source>This means a fee of at least %1 per kB is required.</source>
- <translation type="unfinished"/>
+ <translation>这意味着将对交易收取 %1/千字节 的交易费。</translation>
</message>
<message>
<location line="-4"/>
<source>Can vary +/- 1 byte per input.</source>
- <translation type="unfinished"/>
+ <translation>每笔输入可能会有 正负1字节的偏差。</translation>
</message>
<message>
<location line="+2"/>
<source>Transactions with higher priority are more likely to get included into a block.</source>
- <translation type="unfinished"/>
+ <translation>交易的优先级越高,被矿工收入数据块的速度也越快。</translation>
</message>
<message>
<location line="+1"/>
<source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
- <translation type="unfinished"/>
+ <translation>如果优先级小于&quot;中位数&quot; ,标签将变成红色。</translation>
</message>
<message>
<location line="+3"/>
<source>This label turns red, if any recipient receives an amount smaller than %1.</source>
- <translation type="unfinished"/>
+ <translation>如果收款地址收到小于%1的比特币,标签将变成红色。</translation>
</message>
<message>
<location line="+1"/>
<location line="+4"/>
<source>This means a fee of at least %1 is required.</source>
- <translation type="unfinished"/>
+ <translation>这意味着至少需要 %1的交易费。</translation>
</message>
<message>
<location line="-3"/>
<source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
- <translation type="unfinished"/>
+ <translation>小于最小转发交易费的0.546倍的 转账金额将被视为 尘埃交易。</translation>
</message>
<message>
<location line="+2"/>
<source>This label turns red, if the change is smaller than %1.</source>
- <translation type="unfinished"/>
+ <translation>如果零钱小于 %1,标签将变成红色。</translation>
</message>
<message>
<location line="+43"/>
@@ -987,12 +1003,12 @@ Address: %4
<message>
<location line="-9"/>
<source>change from %1 (%2)</source>
- <translation type="unfinished"/>
+ <translation>来自%1的零钱 (%2)</translation>
</message>
<message>
<location line="+1"/>
<source>(change)</source>
- <translation type="unfinished"/>
+ <translation>(零钱)</translation>
</message>
</context>
<context>
@@ -1096,10 +1112,10 @@ Address: %4
<message>
<location filename="../forms/helpmessagedialog.ui" line="+19"/>
<source>Bitcoin Core - Command-line options</source>
- <translation type="unfinished"/>
+ <translation>比特币核心程序 - 命令行选项</translation>
</message>
<message>
- <location filename="../utilitydialog.cpp" line="+38"/>
+ <location filename="../utilitydialog.cpp" line="+24"/>
<source>Bitcoin Core</source>
<translation>比特币核心</translation>
</message>
@@ -1155,17 +1171,17 @@ Address: %4
<message>
<location line="+9"/>
<source>Welcome to Bitcoin Core.</source>
- <translation type="unfinished"/>
+ <translation>欢迎使用 比特币核心 程序。</translation>
</message>
<message>
<location line="+26"/>
<source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
- <translation type="unfinished"/>
+ <translation>由于这是第一次运行 比特币核心 程序,您可以选择数据存储目录。</translation>
</message>
<message>
<location line="+10"/>
<source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation type="unfinished"/>
+ <translation>比特币核心 程序会下载储存一份数据块链(blockchain)。至少需要 %1 GB的存储空间,随着时间推移会需要更多的存储空间。钱包文件也储存在该目录。</translation>
</message>
<message>
<location line="+10"/>
@@ -1208,27 +1224,27 @@ Address: %4
<message>
<location filename="../forms/openuridialog.ui" line="+14"/>
<source>Open URI</source>
- <translation type="unfinished"/>
+ <translation>打开 URI</translation>
</message>
<message>
<location line="+6"/>
<source>Open payment request from URI or file</source>
- <translation type="unfinished"/>
+ <translation>打开来自URI或文件的付款请求 </translation>
</message>
<message>
<location line="+9"/>
<source>URI:</source>
- <translation type="unfinished"/>
+ <translation>URI: </translation>
</message>
<message>
<location line="+11"/>
<source>Select payment request file</source>
- <translation type="unfinished"/>
+ <translation>选择付款请求文件 </translation>
</message>
<message>
<location filename="../openuridialog.cpp" line="+47"/>
<source>Select payment request file to open</source>
- <translation type="unfinished"/>
+ <translation>选择需要打开的付款请求文件 </translation>
</message>
</context>
<context>
@@ -1244,7 +1260,7 @@ Address: %4
<translation>主要(&amp;M)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+122"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
<translation>可选的每 kB 交易费,这有助于您的交易被更快的处理。大多数交易都是 1 kB。</translation>
</message>
@@ -1254,7 +1270,7 @@ Address: %4
<translation>支付交易费用(&amp;F)</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="-131"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
<translation>登录系统后自动开启比特币客户端</translation>
</message>
@@ -1269,19 +1285,14 @@ Address: %4
<translation>数据库缓存大小(&amp;D)</translation>
</message>
<message>
- <location line="+13"/>
- <source>Set database cache size in megabytes (default: 25)</source>
- <translation>设置数据库缓冲区大小 (缺省: 25MB)</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+16"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
<location line="+27"/>
<source>Number of script &amp;verification threads</source>
- <translation type="unfinished"/>
+ <translation>脚本&amp;验证 进程数 </translation>
</message>
<message>
<location line="+13"/>
@@ -1289,7 +1300,12 @@ Address: %4
<translation>设置脚本验证线程数量(最多16,0 = 自动,&lt;0 = 留下许多空闲核心,默认为 0)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+107"/>
+ <source>&amp;Spend unconfirmed change (experts only)</source>
+ <translation>&amp;使用未确认的零钱 (仅限专家使用) </translation>
+ </message>
+ <message>
+ <location line="+37"/>
<source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation>通过 SOCKS 代理连接到比特币网络。</translation>
</message>
@@ -1306,7 +1322,7 @@ Address: %4
<message>
<location line="+224"/>
<source>Active command-line options that override above options:</source>
- <translation type="unfinished"/>
+ <translation>有效的命令行参数覆盖上述选项:</translation>
</message>
<message>
<location line="+43"/>
@@ -1324,7 +1340,17 @@ Address: %4
<translation>网络(&amp;N)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-86"/>
+ <source>W&amp;allet</source>
+ <translation>&amp;钱包</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+ <translation>如果禁用未确认的零钱,则零钱至少需要1个确认才能使用。同时账户余额显示会受到影响。</translation>
+ </message>
+ <message>
+ <location line="+40"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>自动在路由器中打开比特币端口。只有当您的路由器开启了 UPnP 选项时此功能才有效。</translation>
</message>
@@ -1421,12 +1447,12 @@ Address: %4
<message>
<location line="+7"/>
<source>Whether to show coin control features or not.</source>
- <translation type="unfinished"/>
+ <translation>是否需要交易源地址控制功能。</translation>
</message>
<message>
<location line="+3"/>
<source>Display coin &amp;control features (experts only)</source>
- <translation type="unfinished"/>
+ <translation>使用交易源地址控制功能 (仅限专家使用) </translation>
</message>
<message>
<location line="+136"/>
@@ -1439,17 +1465,17 @@ Address: %4
<translation>取消(&amp;C)</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+67"/>
+ <location filename="../optionsdialog.cpp" line="+70"/>
<source>default</source>
<translation>默认</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+58"/>
<source>none</source>
<translation>无</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+78"/>
<source>Confirm options reset</source>
<translation>确认恢复缺省设置</translation>
</message>
@@ -1489,19 +1515,14 @@ Address: %4
<translation>现在显示的消息可能是过期的. 在连接上比特币网络节点后,您的钱包将自动与网络同步,但是这个过程还没有完成。</translation>
</message>
<message>
- <location line="-155"/>
- <source>Unconfirmed:</source>
- <translation>未确认:</translation>
- </message>
- <message>
- <location line="-83"/>
+ <location line="-238"/>
<source>Wallet</source>
<translation>钱包</translation>
</message>
<message>
<location line="+51"/>
- <source>Confirmed:</source>
- <translation>已确认:</translation>
+ <source>Available:</source>
+ <translation>可使用的余额:</translation>
</message>
<message>
<location line="+16"/>
@@ -1509,7 +1530,12 @@ Address: %4
<translation>您当前可使用的余额</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+16"/>
+ <source>Pending:</source>
+ <translation>等待中的余额:</translation>
+ </message>
+ <message>
+ <location line="+16"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>尚未确认的交易总额,未计入当前余额</translation>
</message>
@@ -1591,22 +1617,22 @@ Address: %4
<message>
<location line="+52"/>
<source>Payment request fetch URL is invalid: %1</source>
- <translation type="unfinished"/>
+ <translation>付款请求URI链接非法: %1</translation>
</message>
<message>
<location line="+27"/>
<source>Payment request file handling</source>
- <translation type="unfinished"/>
+ <translation>付款请求文件处理 </translation>
</message>
<message>
<location line="+1"/>
<source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
- <translation type="unfinished"/>
+ <translation>付款请求文件不能读取或无法识别!这可能是个不合格的付款请求文件。</translation>
</message>
<message>
<location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
- <translation type="unfinished"/>
+ <translation>不支持到自定义付款脚本的未验证付款请求。</translation>
</message>
<message>
<location line="+59"/>
@@ -1657,6 +1683,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>错误:无效的 -regtest 与 -testnet 结合体。</translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>请输入比特币地址(例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1678,7 +1709,7 @@ Address: %4
<message>
<location line="+0"/>
<source>PNG Image (*.png)</source>
- <translation type="unfinished"/>
+ <translation>PNG图片(*.png)</translation>
</message>
</context>
<context>
@@ -1716,7 +1747,7 @@ Address: %4
<message>
<location line="-10"/>
<source>Debug window</source>
- <translation type="unfinished"/>
+ <translation>调试窗口</translation>
</message>
<message>
<location line="+25"/>
@@ -1877,22 +1908,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation>总额(&amp;A):</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation>标签(&amp;L):</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation>消息(&amp;M):</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>重复使用以前用过的接收地址。重用地址有安全和隐私方面的隐患。除非是为重复生成同一项支付请求,否则请不要这样做。</translation>
</message>
@@ -1902,27 +1933,30 @@ Address: %4
<translation>重用现有的接收地址(不推荐)</translation>
</message>
<message>
- <location line="+27"/>
- <source>An optional label to associate with the new receiving address</source>
- <translation>与新接收地址相关的标签,可选</translation>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation>可在付款请求上备注一条信息,在打开付款请求时可以看到。注意:该消息不是通过比特币网络传送。</translation>
</message>
<message>
- <location line="+7"/>
- <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
- <translation type="unfinished"/>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
+ <translation>可为新建的收款地址添加一个标签。</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-7"/>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation>使用此表单要求付款。所有字段都是&lt;b&gt;可选&lt;/b&gt;。</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+23"/>
+ <location line="+22"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation>可选的请求金额。留空或填零为不要求具体金额。</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation>清空此表单的所有字段。</translation>
</message>
@@ -1932,35 +1966,50 @@ Address: %4
<translation>清除</translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
- <translation>请求付款(&amp;R)</translation>
+ <location line="+78"/>
+ <source>Requested payments history</source>
+ <translation>请求付款的历史</translation>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
- <translation>已请求支付</translation>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
+ <translation>请求付款(&amp;R)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
- <translation type="unfinished"/>
+ <translation>显示选中的请求 (双击也可以显示)</translation>
</message>
<message>
<location line="+3"/>
<source>Show</source>
- <translation type="unfinished"/>
+ <translation>显示</translation>
</message>
<message>
<location line="+11"/>
<source>Remove the selected entries from the list</source>
- <translation type="unfinished"/>
+ <translation>从列表中移除选中的条目</translation>
</message>
<message>
<location line="+3"/>
<source>Remove</source>
<translation>移除</translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation>复制标签</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation>复制消息 </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>复制金额</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2062,12 +2111,17 @@ Address: %4
<source>(no message)</source>
<translation>(无消息)</translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation>(无金额) </translation>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>发送货币</translation>
@@ -2075,7 +2129,7 @@ Address: %4
<message>
<location line="+76"/>
<source>Coin Control Features</source>
- <translation type="unfinished"/>
+ <translation>交易源地址控制功能</translation>
</message>
<message>
<location line="+20"/>
@@ -2120,12 +2174,12 @@ Address: %4
<message>
<location line="+32"/>
<source>Low Output:</source>
- <translation type="unfinished"/>
+ <translation>低输出</translation>
</message>
<message>
<location line="+48"/>
<source>After Fee:</source>
- <translation type="unfinished"/>
+ <translation>加上交易费用后:</translation>
</message>
<message>
<location line="+32"/>
@@ -2135,15 +2189,15 @@ Address: %4
<message>
<location line="+44"/>
<source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
- <translation type="unfinished"/>
+ <translation>如果激活该选项,但是零钱地址用光或者非法,将会新生成零钱地址,转入零钱。</translation>
</message>
<message>
<location line="+3"/>
<source>Custom change address</source>
- <translation type="unfinished"/>
+ <translation>自定义零钱地址</translation>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>一次发送给多个接收者</translation>
</message>
@@ -2153,7 +2207,7 @@ Address: %4
<translation>添加收款人(&amp;R)</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation>清除此表单的所有字段。</translation>
</message>
@@ -2163,12 +2217,12 @@ Address: %4
<translation>清除所有(&amp;A)</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>余额:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>确认并发送货币</translation>
</message>
@@ -2178,7 +2232,7 @@ Address: %4
<translation>发送(&amp;E)</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>确认发送货币</translation>
</message>
@@ -2191,14 +2245,9 @@ Address: %4
<translation>%1 到 %2</translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>请输入比特币地址(例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
- <translation type="unfinished"/>
+ <translation>复制金额</translation>
</message>
<message>
<location line="+1"/>
@@ -2208,12 +2257,12 @@ Address: %4
<message>
<location line="+1"/>
<source>Copy fee</source>
- <translation type="unfinished"/>
+ <translation>复制交易费</translation>
</message>
<message>
<location line="+1"/>
<source>Copy after fee</source>
- <translation type="unfinished"/>
+ <translation>复制含交易费的金额</translation>
</message>
<message>
<location line="+1"/>
@@ -2228,12 +2277,12 @@ Address: %4
<message>
<location line="+1"/>
<source>Copy low output</source>
- <translation type="unfinished"/>
+ <translation>复制低输出</translation>
</message>
<message>
<location line="+1"/>
<source>Copy change</source>
- <translation type="unfinished"/>
+ <translation>复制零钱</translation>
</message>
<message>
<location line="+170"/>
@@ -2246,7 +2295,7 @@ Address: %4
<translation>或</translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>收款人地址不合法,请检查。</translation>
</message>
@@ -2278,15 +2327,15 @@ Address: %4
<message>
<location line="+4"/>
<source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"/>
+ <translation>错误:该交易被拒绝!发生这种错误的原因可能是:钱包中的比特币已经被用掉,有可能您复制了wallet.dat钱包文件,然后用复制的钱包文件支付了比特币,但是这个钱包文件中没有记录。</translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>警告:无效的比特币地址</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation>(没有标签)</translation>
</message>
@@ -2296,7 +2345,7 @@ Address: %4
<translation>警告:未知的更改地址</translation>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation>您确定要发出吗?</translation>
</message>
@@ -2306,7 +2355,7 @@ Address: %4
<translation>已添加交易费</translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation>支付请求已过期</translation>
</message>
@@ -2383,12 +2432,7 @@ Address: %4
<translation>消息:</translation>
</message>
<message>
- <location line="+10"/>
- <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+958"/>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation>这是个有效的支付请求。</translation>
</message>
@@ -2398,7 +2442,12 @@ Address: %4
<translation>请为此地址输入一个标签以将它加入用过的地址列表</translation>
</message>
<message>
- <location line="+459"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>bitcoin:URI 附带的备注信息,将会和交易一起存储,备查。 注意:该消息不会通过比特币网络传输。</translation>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation>这是个非有效的支付请求。</translation>
</message>
@@ -2414,11 +2463,6 @@ Address: %4
<source>Memo:</source>
<translation>便条:</translation>
</message>
- <message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>请输入比特币地址(例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
</context>
<context>
<name>ShutdownWindow</name>
@@ -2456,19 +2500,19 @@ Address: %4
<translation>用于签名消息的地址(例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation>选择以前用过的地址</translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>从剪贴板粘贴地址</translation>
</message>
@@ -2509,12 +2553,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>清除所有(&amp;A)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>验证消息(&amp;V)</translation>
</message>
@@ -2529,7 +2573,7 @@ Address: %4
<translation>用于签名消息的地址(例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>验证消息,确保消息是由指定的比特币地址签名过的。</translation>
</message>
@@ -2544,43 +2588,37 @@ Address: %4
<translation>清空所有验证消息栏</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>请输入比特币地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>单击“签名消息“产生签名。</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>输入比特币签名</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>输入的地址非法。</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>请检查地址后重试。</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>输入的地址没有关联的公私钥对。</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>钱包解锁动作取消。</translation>
</message>
@@ -2600,7 +2638,7 @@ Address: %4
<translation>消息已签名。</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>签名无法解码。</translation>
</message>
@@ -2661,6 +2699,11 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <source>conflicted</source>
+ <translation>发现冲突</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>%1/offline</source>
<translation>%1 / 离线</translation>
</message>
@@ -2822,12 +2865,12 @@ Address: %4
<translation>,未被成功广播</translation>
</message>
<message numerus="yes">
- <location line="-35"/>
+ <location line="-37"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Open for %n more block</numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>unknown</source>
<translation>未知</translation>
</message>
@@ -2868,12 +2911,12 @@ Address: %4
<translation>数量</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+78"/>
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation>未成熟 (%1 个确认,将在 %2 个后可用)</translation>
</message>
<message numerus="yes">
- <location line="+16"/>
+ <location line="-21"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Open for %n more block</numerusform></translation>
</message>
@@ -2883,23 +2926,12 @@ Address: %4
<translation>至 %1 个数据块时开启</translation>
</message>
<message>
- <location line="+3"/>
- <source>Offline (%1 confirmations)</source>
- <translation>离线 (%1 个确认项)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>未确认 (%1 / %2 条确认信息)</translation>
- </message>
- <message>
- <location line="-22"/>
- <location line="+25"/>
+ <location line="+12"/>
<source>Confirmed (%1 confirmations)</source>
<translation>已确认 (%1 条确认信息)</translation>
</message>
<message>
- <location line="-22"/>
+ <location line="+9"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>此数据块未被任何其他节点接收,可能不被接受!</translation>
</message>
@@ -2909,7 +2941,27 @@ Address: %4
<translation>已生成但未被接受</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="-21"/>
+ <source>Offline</source>
+ <translation>掉线</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed</source>
+ <translation>未确认的 </translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirming (%1 of %2 recommended confirmations)</source>
+ <translation>确认中 (推荐 %2个确认,已经有 %1个确认)</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Conflicted</source>
+ <translation>冲突的</translation>
+ </message>
+ <message>
+ <location line="+51"/>
<source>Received with</source>
<translation>接收于</translation>
</message>
@@ -2939,7 +2991,7 @@ Address: %4
<translation>(不可用)</translation>
</message>
<message>
- <location line="+199"/>
+ <location line="+190"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>交易状态。 鼠标移到此区域可显示确认项数量。</translation>
</message>
@@ -3189,12 +3241,12 @@ Address: %4
<message>
<location line="+0"/>
<source>There was an error trying to save the wallet data to %1.</source>
- <translation type="unfinished"/>
+ <translation>尝试保存钱包数据至 %1 时发生错误。</translation>
</message>
<message>
<location line="+4"/>
<source>The wallet data was successfully saved to %1.</source>
- <translation type="unfinished"/>
+ <translation>钱包数据成功保存至 %1 。</translation>
</message>
<message>
<location line="+0"/>
@@ -3205,12 +3257,12 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+221"/>
+ <location filename="../bitcoinstrings.cpp" line="+223"/>
<source>Usage:</source>
<translation>使用:</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-55"/>
<source>List commands</source>
<translation>列出命令
</translation>
@@ -3271,12 +3323,12 @@ Address: %4
<translation>指定您的公共地址</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>断开行为不端对端阀值(缺省: 100)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-150"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Number of seconds to keep misbehaving peers from reconnecting (缺省: 86400)</translation>
</message>
@@ -3297,20 +3349,20 @@ Address: %4
</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>在后台运行并接受命令
</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+40"/>
<source>Use the test network</source>
<translation>使用测试网络
</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1)</translation>
</message>
@@ -3392,7 +3444,7 @@ rpcpassword=%s
<message>
<location line="+5"/>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
- <translation type="unfinished"/>
+ <translation>连接至 Tor隐藏服务器时 使用不同的SOCKS5代理 (缺省: -proxy) </translation>
</message>
<message>
<location line="+3"/>
@@ -3427,7 +3479,7 @@ rpcpassword=%s
<message>
<location line="+9"/>
<source>&lt;category&gt; can be:</source>
- <translation type="unfinished"/>
+ <translation>&lt;category&gt; 可能是:</translation>
</message>
<message>
<location line="+6"/>
@@ -3437,7 +3489,7 @@ rpcpassword=%s
<message>
<location line="+1"/>
<source>Bitcoin Core Daemon</source>
- <translation type="unfinished"/>
+ <translation>比特币核心 守护程序</translation>
</message>
<message>
<location line="+1"/>
@@ -3451,13 +3503,18 @@ rpcpassword=%s
</message>
<message>
<location line="+5"/>
+ <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+ <translation>清除钱包中的交易记录 (诊断用,意味着需要重新扫描 -rescan)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect only to the specified node(s)</source>
<translation>仅连接到指定节点</translation>
</message>
<message>
<location line="+1"/>
<source>Connect through SOCKS proxy</source>
- <translation type="unfinished"/>
+ <translation>通过Socks代理连接:</translation>
</message>
<message>
<location line="+1"/>
@@ -3602,7 +3659,7 @@ rpcpassword=%s
<message>
<location line="+1"/>
<source>If &lt;category&gt; is not supplied, output all debugging information.</source>
- <translation type="unfinished"/>
+ <translation>如果&lt;category&gt;未提供,将输出所有调试信息。</translation>
</message>
<message>
<location line="+2"/>
@@ -3622,7 +3679,7 @@ rpcpassword=%s
<message>
<location line="+5"/>
<source>Prepend debug output with timestamp (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>调试信息输出时,前面加上时间戳 (缺省: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3661,6 +3718,11 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+ <translation>付款时允许使用未确认的零钱 (缺省: 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Start Bitcoin server</source>
<translation>启动比特币服务器</translation>
</message>
@@ -3710,12 +3772,12 @@ rpcpassword=%s
<translation>您需要将 -reindex 改为 -txindex 以重建数据库</translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-80"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>从blk000??.dat文件导入数据块</translation>
</message>
<message>
- <location line="-105"/>
+ <location line="-106"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>当收到相关提醒或者我们看到一个长分叉时执行命令(%s 将替换为消息)</translation>
</message>
@@ -3727,7 +3789,7 @@ rpcpassword=%s
<message>
<location line="+2"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
- <translation type="unfinished"/>
+ <translation>设置 高优先级/低交易费 交易的最大字节 (缺省: %d)</translation>
</message>
<message>
<location line="+2"/>
@@ -3735,7 +3797,7 @@ rpcpassword=%s
<translation>设置脚本验证线程数量(最多16,0 = 自动,&lt;0 = 留下许多空闲核心,默认为 0)</translation>
</message>
<message>
- <location line="+89"/>
+ <location line="+90"/>
<source>Information</source>
<translation>信息</translation>
</message>
@@ -3805,7 +3867,7 @@ rpcpassword=%s
<translation>设置连接超时时间(缺省:5000毫秒)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>System error: </source>
<translation>系统错误:</translation>
</message>
@@ -3851,6 +3913,11 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Zapping all transactions from wallet...</source>
+ <translation>Zapping all transactions from wallet...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>version</source>
<translation>版本</translation>
</message>
@@ -3860,33 +3927,33 @@ rpcpassword=%s
<translation>钱包文件wallet.dat损坏,抢救备份失败</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-60"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC 连接密码
</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-71"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>允许从指定IP接受到的 JSON-RPC 连接</translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>向IP地址为 &lt;ip&gt; 的节点发送指令 (缺省: 127.0.0.1)</translation>
</message>
<message>
- <location line="-132"/>
+ <location line="-133"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>当最佳数据块变化时执行命令 (命令行中的 %s 会被替换成数据块哈希值)</translation>
</message>
<message>
- <location line="+161"/>
+ <location line="+163"/>
<source>Upgrade wallet to latest format</source>
<translation>将钱包升级到最新的格式</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-25"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>设置密钥池大小为 &lt;n&gt; (缺省: 100)
</translation>
@@ -3897,12 +3964,12 @@ rpcpassword=%s
<translation>重新扫描区块链以查找遗漏的钱包交易</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+39"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>为 JSON-RPC 连接使用 OpenSSL (https) 连接</translation>
</message>
<message>
- <location line="-30"/>
+ <location line="-31"/>
<source>Server certificate file (default: server.cert)</source>
<translation>服务器证书 (默认为 server.cert)
</translation>
@@ -3914,7 +3981,7 @@ rpcpassword=%s
</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>This help message</source>
<translation>本帮助信息
</translation>
@@ -3925,12 +3992,12 @@ rpcpassword=%s
<translation>无法绑定本机端口 %s (返回错误消息 %d, %s)</translation>
</message>
<message>
- <location line="-107"/>
+ <location line="-109"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>使用 -addnode, -seednode 和 -connect 选项时允许查询DNS</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading addresses...</source>
<translation>正在加载地址簿...</translation>
</message>
@@ -3945,12 +4012,12 @@ rpcpassword=%s
<translation>wallet.dat 钱包文件加载错误:请升级到最新版Bitcoin客户端</translation>
</message>
<message>
- <location line="+98"/>
+ <location line="+99"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>钱包文件需要被重写:请退出并重新启动Bitcoin客户端</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Error loading wallet.dat</source>
<translation>wallet.dat 钱包文件加载出错</translation>
</message>
@@ -3960,7 +4027,7 @@ rpcpassword=%s
<translation>无效的代理地址:%s</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>-onlynet 指定的是未知网络:%s</translation>
</message>
@@ -3970,7 +4037,7 @@ rpcpassword=%s
<translation>被指定的是未知socks代理版本: %i</translation>
</message>
<message>
- <location line="-101"/>
+ <location line="-103"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>无法解析 -bind 端口地址: &apos;%s&apos;</translation>
</message>
@@ -3980,7 +4047,7 @@ rpcpassword=%s
<translation>无法解析 -externalip 地址: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>非法金额 -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -4000,7 +4067,7 @@ rpcpassword=%s
<translation>正在加载数据块索引...</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>添加节点并与其保持连接</translation>
</message>
@@ -4010,12 +4077,12 @@ rpcpassword=%s
<translation>无法在本机绑定 %s 端口。比特币客户端软件可能已经在运行。</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+96"/>
<source>Loading wallet...</source>
<translation>正在加载钱包...</translation>
</message>
<message>
- <location line="-56"/>
+ <location line="-57"/>
<source>Cannot downgrade wallet</source>
<translation>无法降级钱包</translation>
</message>
@@ -4025,7 +4092,7 @@ rpcpassword=%s
<translation>无法写入默认地址</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+68"/>
<source>Rescanning...</source>
<translation>正在重新扫描...</translation>
</message>
@@ -4035,17 +4102,17 @@ rpcpassword=%s
<translation>加载完成</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+86"/>
<source>To use the %s option</source>
<translation>使用 %s 选项</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-78"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-36"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>