Skip to content

Commit b0d3e9b

Browse files
committed
qt: Translations update before 0.17 branch
Make sure that translations are synchronized with transifex before the branch-off point to minimize the difference and prevent duplicate work. Tree-SHA512: 41e71eaf14094606fd90011d035c551a635d5a715f865a49841dbe2b54a76b7fbf59a7918f86e5fd80a717e2934a9613fe463391fd01848d0a01e5c4e7e7fef0
1 parent 0df7a6c commit b0d3e9b

File tree

10 files changed

+445
-33
lines changed

10 files changed

+445
-33
lines changed

src/qt/bitcoinstrings.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
4040
"Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -"
4141
"fallbackfee."),
4242
QT_TRANSLATE_NOOP("bitcoin-core", ""
43+
"Group outputs by address, selecting all or none, instead of selecting on a "
44+
"per-output basis. Privacy is improved as an address is only used once "
45+
"(unless someone sends to it after spending from it), but may result in "
46+
"slightly higher fees as suboptimal coin selection may result due to the "
47+
"added limitation (default: %u)"),
48+
QT_TRANSLATE_NOOP("bitcoin-core", ""
4349
"Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay "
4450
"fee of %s to prevent stuck transactions)"),
4551
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -168,7 +174,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"),
168174
QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" does not exist"),
169175
QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is a relative path"),
170176
QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is not a directory"),
171-
QT_TRANSLATE_NOOP("bitcoin-core", "Specified blocks directory \"%s\" does not exist.\n"),
177+
QT_TRANSLATE_NOOP("bitcoin-core", "Specified blocks directory \"%s\" does not exist."),
172178
QT_TRANSLATE_NOOP("bitcoin-core", "Starting network threads..."),
173179
QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."),
174180
QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"),

src/qt/locale/bitcoin_el_GR.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,10 @@
441441
<source>Indexing blocks on disk...</source>
442442
<translation>Φόρτωση ευρετηρίου μπλοκ στον σκληρο δισκο...</translation>
443443
</message>
444+
<message>
445+
<source>Processing blocks on disk...</source>
446+
<translation>Φόρτωση ευρετηρίου μπλοκ στον σκληρο δισκο...</translation>
447+
</message>
444448
<message>
445449
<source>%1 behind</source>
446450
<translation>%1 πίσω</translation>

src/qt/locale/bitcoin_en.ts

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@
959959
<translation type="unfinished"></translation>
960960
</message>
961961
<message>
962-
<location line="+71"/>
962+
<location line="+75"/>
963963
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
964964
<translation type="unfinished"></translation>
965965
</message>
@@ -1524,7 +1524,7 @@
15241524
<translation>default</translation>
15251525
</message>
15261526
<message>
1527-
<location line="+52"/>
1527+
<location line="+56"/>
15281528
<source>none</source>
15291529
<translation type="unfinished"></translation>
15301530
</message>
@@ -1842,12 +1842,12 @@
18421842
<translation type="unfinished">Amount</translation>
18431843
</message>
18441844
<message>
1845-
<location filename="../guiutil.cpp" line="+124"/>
1845+
<location filename="../guiutil.cpp" line="+115"/>
18461846
<source>Enter a Bitcoin address (e.g. %1)</source>
18471847
<translation type="unfinished"></translation>
18481848
</message>
18491849
<message>
1850-
<location line="+722"/>
1850+
<location line="+686"/>
18511851
<source>%1 d</source>
18521852
<translation type="unfinished"></translation>
18531853
</message>
@@ -1957,7 +1957,7 @@
19571957
<translation type="unfinished"></translation>
19581958
</message>
19591959
<message>
1960-
<location filename="../bitcoin.cpp" line="+193"/>
1960+
<location filename="../bitcoin.cpp" line="+192"/>
19611961
<source>%1 didn&apos;t yet exit safely...</source>
19621962
<translation type="unfinished"></translation>
19631963
</message>
@@ -1970,12 +1970,12 @@
19701970
<context>
19711971
<name>QObject::QObject</name>
19721972
<message>
1973-
<location filename="../bitcoin.cpp" line="-118"/>
1973+
<location filename="../bitcoin.cpp" line="-117"/>
19741974
<source>Error parsing command line arguments: %1.</source>
19751975
<translation type="unfinished"></translation>
19761976
</message>
19771977
<message>
1978-
<location line="+39"/>
1978+
<location line="+38"/>
19791979
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
19801980
<translation type="unfinished"></translation>
19811981
</message>
@@ -3155,7 +3155,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
31553155
<context>
31563156
<name>ShutdownWindow</name>
31573157
<message>
3158-
<location filename="../utilitydialog.cpp" line="+84"/>
3158+
<location filename="../utilitydialog.cpp" line="+83"/>
31593159
<source>%1 is shutting down...</source>
31603160
<translation type="unfinished"></translation>
31613161
</message>
@@ -4066,7 +4066,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
40664066
<translation type="unfinished"></translation>
40674067
</message>
40684068
<message>
4069-
<location line="+22"/>
4069+
<location line="+28"/>
40704070
<source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
40714071
<translation type="unfinished"></translation>
40724072
</message>
@@ -4096,7 +4096,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
40964096
<translation type="unfinished"></translation>
40974097
</message>
40984098
<message>
4099-
<location line="-178"/>
4099+
<location line="-184"/>
41004100
<source>Bitcoin Core</source>
41014101
<translation type="unfinished">Bitcoin Core</translation>
41024102
</message>
@@ -4121,7 +4121,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
41214121
<translation type="unfinished"></translation>
41224122
</message>
41234123
<message>
4124-
<location line="+11"/>
4124+
<location line="+8"/>
4125+
<source>Group outputs by address, selecting all or none, instead of selecting on a per-output basis. Privacy is improved as an address is only used once (unless someone sends to it after spending from it), but may result in slightly higher fees as suboptimal coin selection may result due to the added limitation (default: %u)</source>
4126+
<translation type="unfinished"></translation>
4127+
</message>
4128+
<message>
4129+
<location line="+9"/>
41254130
<source>Please check that your computer&apos;s date and time are correct! If your clock is wrong, %s will not work properly.</source>
41264131
<translation type="unfinished"></translation>
41274132
</message>
@@ -4296,7 +4301,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
42964301
<translation type="unfinished"></translation>
42974302
</message>
42984303
<message>
4299-
<location line="+47"/>
4304+
<location line="+21"/>
4305+
<source>Specified blocks directory &quot;%s&quot; does not exist.</source>
4306+
<translation type="unfinished"></translation>
4307+
</message>
4308+
<message>
4309+
<location line="+26"/>
43004310
<source>Upgrading txindex database</source>
43014311
<translation type="unfinished"></translation>
43024312
</message>
@@ -4396,12 +4406,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
43964406
<translation type="unfinished"></translation>
43974407
</message>
43984408
<message>
4399-
<location line="-165"/>
4409+
<location line="-171"/>
44004410
<source>Error: Listening for incoming connections failed (listen returned error %s)</source>
44014411
<translation type="unfinished"></translation>
44024412
</message>
44034413
<message>
4404-
<location line="+5"/>
4414+
<location line="+11"/>
44054415
<source>Invalid amount for -maxtxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
44064416
<translation type="unfinished"></translation>
44074417
</message>
@@ -4486,13 +4496,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
44864496
<translation type="unfinished"></translation>
44874497
</message>
44884498
<message>
4489-
<location line="+1"/>
4490-
<source>Specified blocks directory &quot;%s&quot; does not exist.
4491-
</source>
4492-
<translation type="unfinished"></translation>
4493-
</message>
4494-
<message>
4495-
<location line="+3"/>
4499+
<location line="+4"/>
44964500
<source>The transaction amount is too small to pay the fee</source>
44974501
<translation type="unfinished"></translation>
44984502
</message>
@@ -4552,7 +4556,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
45524556
<translation type="unfinished"></translation>
45534557
</message>
45544558
<message>
4555-
<location line="-191"/>
4559+
<location line="-197"/>
45564560
<source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
45574561
<translation type="unfinished"></translation>
45584562
</message>
@@ -4562,7 +4566,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
45624566
<translation type="unfinished"></translation>
45634567
</message>
45644568
<message>
4565-
<location line="+40"/>
4569+
<location line="+46"/>
45664570
<source>This is the transaction fee you may pay when fee estimates are not available.</source>
45674571
<translation type="unfinished"></translation>
45684572
</message>
@@ -4657,7 +4661,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
46574661
<translation>Insufficient funds</translation>
46584662
</message>
46594663
<message>
4660-
<location line="-128"/>
4664+
<location line="-134"/>
46614665
<source>Can&apos;t generate a change-address key. Private keys are disabled for this wallet.</source>
46624666
<translation type="unfinished"></translation>
46634667
</message>
@@ -4672,7 +4676,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of &quot;100 satos
46724676
<translation type="unfinished"></translation>
46734677
</message>
46744678
<message>
4675-
<location line="+54"/>
4679+
<location line="+60"/>
46764680
<source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
46774681
<translation type="unfinished"></translation>
46784682
</message>

src/qt/locale/bitcoin_fr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3623,7 +3623,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 satoshis par
36233623
</message>
36243624
<message>
36253625
<source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source>
3626-
<translation>Impossible de mettre à niveau un porte-monnaie divisé non-HD pour prendre en charge la réserve de clés antérieure à la division. Veuillez utiliser -upgradewallet=169900 ou -upgradewallet sans indiquer de version.</translation>
3626+
<translation>Impossible de mettre à niveau un porte-monnaie divisé non-HD sans mettre à niveau pour prendre en charge la réserve de clés antérieure à la division. Veuillez utiliser -upgradewallet=169900 ou -upgradewallet sans indiquer de version.</translation>
36273627
</message>
36283628
<message>
36293629
<source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>

src/qt/locale/bitcoin_he.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2154,6 +2154,10 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
21542154
<source>Enable Replace-By-Fee</source>
21552155
<translation>אפשר ״החלפה-על ידי עמלה״</translation>
21562156
</message>
2157+
<message>
2158+
<source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source>
2159+
<translation>באמצעות עמלה-ניתנת-לשינוי (BIP-125) תוכלו להגדיל עמלת עסקה גם לאחר שליחתה. ללא אפשרות זו, עמלה גבוהה יותר יכולה להיות מומלצת כדי להקטין את הסיכון בעיכוב אישור העסקה.</translation>
2160+
</message>
21572161
<message>
21582162
<source>Clear &amp;All</source>
21592163
<translation>&amp;ניקוי הכול</translation>
@@ -2210,6 +2214,10 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
22102214
<source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source>
22112215
<translation>תוכלו להגדיל את העמלה מאוחר יותר (איתות Replace-By-Fee, BIP-125).</translation>
22122216
</message>
2217+
<message>
2218+
<source>Please, review your transaction.</source>
2219+
<translation>אנא עברו שוב על העסקה שלכם.</translation>
2220+
</message>
22132221
<message>
22142222
<source>Transaction fee</source>
22152223
<translation>עמלת העברה</translation>

0 commit comments

Comments
 (0)