Skip to content

Commit 0471aee

Browse files
committed
Merge bitcoin/bitcoin#29397: release: Update translations for v27.0 soft translation string freeze
71927b2 qt: Update translation source file (Hennadii Stepanov) 4d0b0bf qt: Bump Transifex slug for 27.x (Hennadii Stepanov) 42cbf56 qt: Translation updates from Transifex (Hennadii Stepanov) Pull request description: This PR follows our [Release Process](https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md). Required to open Transifex translations for v27.0 as it's scheduled in bitcoin/bitcoin#29028. The previous similar PR: bitcoin/bitcoin#28383. ACKs for top commit: jarolrod: ACK 71927b2 johnny9: ACK 71927b2 Tree-SHA512: 9492ffc39518fc4e519cdf9bc558b1f17325b27f17e3bfba0c11e54af13c2d98ca08d9bad51880d0b577f855f95fd0c4bd8e35570336f16a5b154597737f3943
2 parents 835948d + 71927b2 commit 0471aee

File tree

127 files changed

+28643
-14646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+28643
-14646
lines changed

.tx/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[o:bitcoin:p:bitcoin:r:qt-translation-026x]
4+
[o:bitcoin:p:bitcoin:r:qt-translation-027x]
55
file_filter = src/qt/locale/bitcoin_<lang>.xlf
66
source_file = src/qt/locale/bitcoin_en.xlf
77
source_lang = en

src/Makefile.qt_locale.include

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
QT_TS = \
2+
qt/locale/bitcoin_af.ts \
23
qt/locale/bitcoin_am.ts \
3-
qt/locale/bitcoin_ar.ts \
44
qt/locale/bitcoin_az.ts \
55
qt/locale/bitcoin_az@latin.ts \
66
qt/locale/bitcoin_be.ts \
@@ -31,6 +31,7 @@ QT_TS = \
3131
qt/locale/bitcoin_fa.ts \
3232
qt/locale/bitcoin_fi.ts \
3333
qt/locale/bitcoin_fil.ts \
34+
qt/locale/bitcoin_fo.ts \
3435
qt/locale/bitcoin_fr.ts \
3536
qt/locale/bitcoin_fr_CM.ts \
3637
qt/locale/bitcoin_fr_LU.ts \
@@ -52,6 +53,7 @@ QT_TS = \
5253
qt/locale/bitcoin_ja.ts \
5354
qt/locale/bitcoin_ka.ts \
5455
qt/locale/bitcoin_kk.ts \
56+
qt/locale/bitcoin_kk@latin.ts \
5557
qt/locale/bitcoin_kl.ts \
5658
qt/locale/bitcoin_km.ts \
5759
qt/locale/bitcoin_kn.ts \
@@ -60,15 +62,18 @@ QT_TS = \
6062
qt/locale/bitcoin_ku_IQ.ts \
6163
qt/locale/bitcoin_ky.ts \
6264
qt/locale/bitcoin_la.ts \
65+
qt/locale/bitcoin_lb.ts \
6366
qt/locale/bitcoin_lt.ts \
6467
qt/locale/bitcoin_lv.ts \
6568
qt/locale/bitcoin_mg.ts \
69+
qt/locale/bitcoin_mi.ts \
6670
qt/locale/bitcoin_mk.ts \
6771
qt/locale/bitcoin_ml.ts \
6872
qt/locale/bitcoin_mn.ts \
6973
qt/locale/bitcoin_mr.ts \
7074
qt/locale/bitcoin_mr_IN.ts \
7175
qt/locale/bitcoin_ms.ts \
76+
qt/locale/bitcoin_mt.ts \
7277
qt/locale/bitcoin_my.ts \
7378
qt/locale/bitcoin_nb.ts \
7479
qt/locale/bitcoin_ne.ts \
@@ -78,11 +83,12 @@ QT_TS = \
7883
qt/locale/bitcoin_pam.ts \
7984
qt/locale/bitcoin_pl.ts \
8085
qt/locale/bitcoin_pt.ts \
81-
qt/locale/bitcoin_pt@qtfiletype.ts \
8286
qt/locale/bitcoin_pt_BR.ts \
8387
qt/locale/bitcoin_ro.ts \
8488
qt/locale/bitcoin_ru.ts \
89+
qt/locale/bitcoin_ru_RU.ts \
8590
qt/locale/bitcoin_sc.ts \
91+
qt/locale/bitcoin_sd.ts \
8692
qt/locale/bitcoin_si.ts \
8793
qt/locale/bitcoin_sk.ts \
8894
qt/locale/bitcoin_sl.ts \

src/qt/bitcoin_locale.qrc

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE RCC><RCC version="1.0">
22
<qresource prefix="/translations">
3+
<file alias="af">locale/bitcoin_af.qm</file>
34
<file alias="am">locale/bitcoin_am.qm</file>
4-
<file alias="ar">locale/bitcoin_ar.qm</file>
55
<file alias="az">locale/bitcoin_az.qm</file>
66
<file alias="az@latin">locale/bitcoin_az@latin.qm</file>
77
<file alias="be">locale/bitcoin_be.qm</file>
@@ -32,6 +32,7 @@
3232
<file alias="fa">locale/bitcoin_fa.qm</file>
3333
<file alias="fi">locale/bitcoin_fi.qm</file>
3434
<file alias="fil">locale/bitcoin_fil.qm</file>
35+
<file alias="fo">locale/bitcoin_fo.qm</file>
3536
<file alias="fr">locale/bitcoin_fr.qm</file>
3637
<file alias="fr_CM">locale/bitcoin_fr_CM.qm</file>
3738
<file alias="fr_LU">locale/bitcoin_fr_LU.qm</file>
@@ -53,6 +54,7 @@
5354
<file alias="ja">locale/bitcoin_ja.qm</file>
5455
<file alias="ka">locale/bitcoin_ka.qm</file>
5556
<file alias="kk">locale/bitcoin_kk.qm</file>
57+
<file alias="kk@latin">locale/bitcoin_kk@latin.qm</file>
5658
<file alias="kl">locale/bitcoin_kl.qm</file>
5759
<file alias="km">locale/bitcoin_km.qm</file>
5860
<file alias="kn">locale/bitcoin_kn.qm</file>
@@ -61,15 +63,18 @@
6163
<file alias="ku_IQ">locale/bitcoin_ku_IQ.qm</file>
6264
<file alias="ky">locale/bitcoin_ky.qm</file>
6365
<file alias="la">locale/bitcoin_la.qm</file>
66+
<file alias="lb">locale/bitcoin_lb.qm</file>
6467
<file alias="lt">locale/bitcoin_lt.qm</file>
6568
<file alias="lv">locale/bitcoin_lv.qm</file>
6669
<file alias="mg">locale/bitcoin_mg.qm</file>
70+
<file alias="mi">locale/bitcoin_mi.qm</file>
6771
<file alias="mk">locale/bitcoin_mk.qm</file>
6872
<file alias="ml">locale/bitcoin_ml.qm</file>
6973
<file alias="mn">locale/bitcoin_mn.qm</file>
7074
<file alias="mr">locale/bitcoin_mr.qm</file>
7175
<file alias="mr_IN">locale/bitcoin_mr_IN.qm</file>
7276
<file alias="ms">locale/bitcoin_ms.qm</file>
77+
<file alias="mt">locale/bitcoin_mt.qm</file>
7378
<file alias="my">locale/bitcoin_my.qm</file>
7479
<file alias="nb">locale/bitcoin_nb.qm</file>
7580
<file alias="ne">locale/bitcoin_ne.qm</file>
@@ -79,11 +84,12 @@
7984
<file alias="pam">locale/bitcoin_pam.qm</file>
8085
<file alias="pl">locale/bitcoin_pl.qm</file>
8186
<file alias="pt">locale/bitcoin_pt.qm</file>
82-
<file alias="pt@qtfiletype">locale/bitcoin_pt@qtfiletype.qm</file>
8387
<file alias="pt_BR">locale/bitcoin_pt_BR.qm</file>
8488
<file alias="ro">locale/bitcoin_ro.qm</file>
8589
<file alias="ru">locale/bitcoin_ru.qm</file>
90+
<file alias="ru_RU">locale/bitcoin_ru_RU.qm</file>
8691
<file alias="sc">locale/bitcoin_sc.qm</file>
92+
<file alias="sd">locale/bitcoin_sd.qm</file>
8793
<file alias="si">locale/bitcoin_si.qm</file>
8894
<file alias="sk">locale/bitcoin_sk.qm</file>
8995
<file alias="sl">locale/bitcoin_sl.qm</file>

src/qt/bitcoinstrings.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error reading configuration file: %s"),
271271
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
272272
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading next record from wallet database"),
273273
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Cannot extract destination from the generated scriptpubkey"),
274-
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not add watchonly tx to watchonly wallet"),
274+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not add watchonly tx %s to watchonly wallet"),
275275
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Could not delete watchonly transactions"),
276276
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Couldn't create cursor into database"),
277277
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low for %s"),
@@ -289,8 +289,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to begin reading all records in
289289
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to make a backup of your wallet"),
290290
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to parse version %u as a uint32_t"),
291291
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to read all records in the database"),
292+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to read wallet's best block locator record"),
292293
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to remove watchonly address book data"),
293294
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write record to new wallet"),
295+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write solvable wallet best block locator record"),
296+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write watchonly wallet best block locator record"),
294297
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."),
295298
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to rescan the wallet during initialization"),
296299
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to start indexes, shutting down.."),
@@ -355,7 +358,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "This is the transaction fee you will pay if y
355358
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"),
356359
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must not be negative"),
357360
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction change output index out of range"),
358-
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction has too long of a mempool chain"),
359361
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction must have at least one recipient"),
360362
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction needs a change address, but we can't generate it."),
361363
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"),
@@ -380,6 +382,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported logging category %s=%s."),
380382
QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."),
381383
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks…"),
382384
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet(s)…"),
385+
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet file creation failed: %s"),
383386
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart %s to complete"),
384387
QT_TRANSLATE_NOOP("bitcoin-core", "acceptstalefeeestimates is not supported on %s chain."),
385388
};

0 commit comments

Comments
 (0)