Skip to content

Commit 6f03c45

Browse files
fanquakefanquake
committed
Merge bitcoin/bitcoin#28383: Update translations for 26.0 soft translation string freeze
162ce4e qt: Update translation source file (Hennadii Stepanov) 19520bf qt: Bump Transifex slug for 26.x (Hennadii Stepanov) 69821b2 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 26.0 on 2023-09-01 as it's [planned](bitcoin/bitcoin#27758). The previous similar PR: bitcoin/bitcoin#27169. ACKs for top commit: stickies-v: ACK 162ce4e jarolrod: ACK 162ce4e Tree-SHA512: a810c727e5c9fb3ffe4ff88ca7c5484178c483b38adb4b67758fb1f3e75b0d0ffb755fdc43de3fa59607f45833ec3594d87649fd6f0a40ed8a249ee5fa6979dd
2 parents df98a12 + 162ce4e commit 6f03c45

File tree

113 files changed

+155336
-91848
lines changed

Some content is hidden

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

113 files changed

+155336
-91848
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-025x]
4+
[o:bitcoin:p:bitcoin:r:qt-translation-026x]
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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,20 @@ QT_TS = \
22
qt/locale/bitcoin_am.ts \
33
qt/locale/bitcoin_ar.ts \
44
qt/locale/bitcoin_az.ts \
5+
qt/locale/[email protected] \
56
qt/locale/bitcoin_be.ts \
67
qt/locale/bitcoin_bg.ts \
78
qt/locale/bitcoin_bn.ts \
9+
qt/locale/bitcoin_br.ts \
810
qt/locale/bitcoin_bs.ts \
911
qt/locale/bitcoin_ca.ts \
12+
qt/locale/bitcoin_cmn.ts \
1013
qt/locale/bitcoin_cs.ts \
1114
qt/locale/bitcoin_cy.ts \
1215
qt/locale/bitcoin_da.ts \
1316
qt/locale/bitcoin_de.ts \
17+
qt/locale/bitcoin_de_AT.ts \
18+
qt/locale/bitcoin_de_CH.ts \
1419
qt/locale/bitcoin_el.ts \
1520
qt/locale/bitcoin_en.ts \
1621
qt/locale/bitcoin_eo.ts \
@@ -19,20 +24,26 @@ QT_TS = \
1924
qt/locale/bitcoin_es_CO.ts \
2025
qt/locale/bitcoin_es_DO.ts \
2126
qt/locale/bitcoin_es_MX.ts \
27+
qt/locale/bitcoin_es_SV.ts \
2228
qt/locale/bitcoin_es_VE.ts \
2329
qt/locale/bitcoin_et.ts \
2430
qt/locale/bitcoin_eu.ts \
2531
qt/locale/bitcoin_fa.ts \
2632
qt/locale/bitcoin_fi.ts \
2733
qt/locale/bitcoin_fil.ts \
2834
qt/locale/bitcoin_fr.ts \
35+
qt/locale/bitcoin_fr_CM.ts \
36+
qt/locale/bitcoin_fr_LU.ts \
2937
qt/locale/bitcoin_ga.ts \
38+
qt/locale/bitcoin_ga_IE.ts \
3039
qt/locale/bitcoin_gd.ts \
3140
qt/locale/bitcoin_gl.ts \
3241
qt/locale/bitcoin_gl_ES.ts \
3342
qt/locale/bitcoin_gu.ts \
3443
qt/locale/bitcoin_ha.ts \
44+
qt/locale/bitcoin_hak.ts \
3545
qt/locale/bitcoin_he.ts \
46+
qt/locale/bitcoin_hi.ts \
3647
qt/locale/bitcoin_hr.ts \
3748
qt/locale/bitcoin_hu.ts \
3849
qt/locale/bitcoin_id.ts \
@@ -43,16 +54,19 @@ QT_TS = \
4354
qt/locale/bitcoin_kk.ts \
4455
qt/locale/bitcoin_kl.ts \
4556
qt/locale/bitcoin_km.ts \
57+
qt/locale/bitcoin_kn.ts \
4658
qt/locale/bitcoin_ko.ts \
4759
qt/locale/bitcoin_ku.ts \
4860
qt/locale/bitcoin_ku_IQ.ts \
4961
qt/locale/bitcoin_ky.ts \
5062
qt/locale/bitcoin_la.ts \
5163
qt/locale/bitcoin_lt.ts \
5264
qt/locale/bitcoin_lv.ts \
65+
qt/locale/bitcoin_mg.ts \
5366
qt/locale/bitcoin_mk.ts \
5467
qt/locale/bitcoin_ml.ts \
5568
qt/locale/bitcoin_mn.ts \
69+
qt/locale/bitcoin_mr.ts \
5670
qt/locale/bitcoin_mr_IN.ts \
5771
qt/locale/bitcoin_ms.ts \
5872
qt/locale/bitcoin_my.ts \
@@ -64,6 +78,7 @@ QT_TS = \
6478
qt/locale/bitcoin_pam.ts \
6579
qt/locale/bitcoin_pl.ts \
6680
qt/locale/bitcoin_pt.ts \
81+
qt/locale/[email protected] \
6782
qt/locale/bitcoin_pt_BR.ts \
6883
qt/locale/bitcoin_ro.ts \
6984
qt/locale/bitcoin_ru.ts \
@@ -72,8 +87,10 @@ QT_TS = \
7287
qt/locale/bitcoin_sk.ts \
7388
qt/locale/bitcoin_sl.ts \
7489
qt/locale/bitcoin_sn.ts \
90+
qt/locale/bitcoin_so.ts \
7591
qt/locale/bitcoin_sq.ts \
7692
qt/locale/bitcoin_sr.ts \
93+
qt/locale/[email protected] \
7794
qt/locale/[email protected] \
7895
qt/locale/bitcoin_sv.ts \
7996
qt/locale/bitcoin_sw.ts \
@@ -92,7 +109,9 @@ QT_TS = \
92109
qt/locale/[email protected] \
93110
qt/locale/bitcoin_vi.ts \
94111
qt/locale/bitcoin_yo.ts \
112+
qt/locale/bitcoin_yue.ts \
95113
qt/locale/bitcoin_zh-Hans.ts \
114+
qt/locale/bitcoin_zh-Hant.ts \
96115
qt/locale/bitcoin_zh.ts \
97116
qt/locale/bitcoin_zh_CN.ts \
98117
qt/locale/bitcoin_zh_HK.ts \

‎src/qt/bitcoin_locale.qrc‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,20 @@
33
<file alias="am">locale/bitcoin_am.qm</file>
44
<file alias="ar">locale/bitcoin_ar.qm</file>
55
<file alias="az">locale/bitcoin_az.qm</file>
6+
<file alias="az@latin">locale/[email protected]</file>
67
<file alias="be">locale/bitcoin_be.qm</file>
78
<file alias="bg">locale/bitcoin_bg.qm</file>
89
<file alias="bn">locale/bitcoin_bn.qm</file>
10+
<file alias="br">locale/bitcoin_br.qm</file>
911
<file alias="bs">locale/bitcoin_bs.qm</file>
1012
<file alias="ca">locale/bitcoin_ca.qm</file>
13+
<file alias="cmn">locale/bitcoin_cmn.qm</file>
1114
<file alias="cs">locale/bitcoin_cs.qm</file>
1215
<file alias="cy">locale/bitcoin_cy.qm</file>
1316
<file alias="da">locale/bitcoin_da.qm</file>
1417
<file alias="de">locale/bitcoin_de.qm</file>
18+
<file alias="de_AT">locale/bitcoin_de_AT.qm</file>
19+
<file alias="de_CH">locale/bitcoin_de_CH.qm</file>
1520
<file alias="el">locale/bitcoin_el.qm</file>
1621
<file alias="en">locale/bitcoin_en.qm</file>
1722
<file alias="eo">locale/bitcoin_eo.qm</file>
@@ -20,20 +25,26 @@
2025
<file alias="es_CO">locale/bitcoin_es_CO.qm</file>
2126
<file alias="es_DO">locale/bitcoin_es_DO.qm</file>
2227
<file alias="es_MX">locale/bitcoin_es_MX.qm</file>
28+
<file alias="es_SV">locale/bitcoin_es_SV.qm</file>
2329
<file alias="es_VE">locale/bitcoin_es_VE.qm</file>
2430
<file alias="et">locale/bitcoin_et.qm</file>
2531
<file alias="eu">locale/bitcoin_eu.qm</file>
2632
<file alias="fa">locale/bitcoin_fa.qm</file>
2733
<file alias="fi">locale/bitcoin_fi.qm</file>
2834
<file alias="fil">locale/bitcoin_fil.qm</file>
2935
<file alias="fr">locale/bitcoin_fr.qm</file>
36+
<file alias="fr_CM">locale/bitcoin_fr_CM.qm</file>
37+
<file alias="fr_LU">locale/bitcoin_fr_LU.qm</file>
3038
<file alias="ga">locale/bitcoin_ga.qm</file>
39+
<file alias="ga_IE">locale/bitcoin_ga_IE.qm</file>
3140
<file alias="gd">locale/bitcoin_gd.qm</file>
3241
<file alias="gl">locale/bitcoin_gl.qm</file>
3342
<file alias="gl_ES">locale/bitcoin_gl_ES.qm</file>
3443
<file alias="gu">locale/bitcoin_gu.qm</file>
3544
<file alias="ha">locale/bitcoin_ha.qm</file>
45+
<file alias="hak">locale/bitcoin_hak.qm</file>
3646
<file alias="he">locale/bitcoin_he.qm</file>
47+
<file alias="hi">locale/bitcoin_hi.qm</file>
3748
<file alias="hr">locale/bitcoin_hr.qm</file>
3849
<file alias="hu">locale/bitcoin_hu.qm</file>
3950
<file alias="id">locale/bitcoin_id.qm</file>
@@ -44,16 +55,19 @@
4455
<file alias="kk">locale/bitcoin_kk.qm</file>
4556
<file alias="kl">locale/bitcoin_kl.qm</file>
4657
<file alias="km">locale/bitcoin_km.qm</file>
58+
<file alias="kn">locale/bitcoin_kn.qm</file>
4759
<file alias="ko">locale/bitcoin_ko.qm</file>
4860
<file alias="ku">locale/bitcoin_ku.qm</file>
4961
<file alias="ku_IQ">locale/bitcoin_ku_IQ.qm</file>
5062
<file alias="ky">locale/bitcoin_ky.qm</file>
5163
<file alias="la">locale/bitcoin_la.qm</file>
5264
<file alias="lt">locale/bitcoin_lt.qm</file>
5365
<file alias="lv">locale/bitcoin_lv.qm</file>
66+
<file alias="mg">locale/bitcoin_mg.qm</file>
5467
<file alias="mk">locale/bitcoin_mk.qm</file>
5568
<file alias="ml">locale/bitcoin_ml.qm</file>
5669
<file alias="mn">locale/bitcoin_mn.qm</file>
70+
<file alias="mr">locale/bitcoin_mr.qm</file>
5771
<file alias="mr_IN">locale/bitcoin_mr_IN.qm</file>
5872
<file alias="ms">locale/bitcoin_ms.qm</file>
5973
<file alias="my">locale/bitcoin_my.qm</file>
@@ -65,6 +79,7 @@
6579
<file alias="pam">locale/bitcoin_pam.qm</file>
6680
<file alias="pl">locale/bitcoin_pl.qm</file>
6781
<file alias="pt">locale/bitcoin_pt.qm</file>
82+
<file alias="pt@qtfiletype">locale/[email protected]</file>
6883
<file alias="pt_BR">locale/bitcoin_pt_BR.qm</file>
6984
<file alias="ro">locale/bitcoin_ro.qm</file>
7085
<file alias="ru">locale/bitcoin_ru.qm</file>
@@ -73,8 +88,10 @@
7388
<file alias="sk">locale/bitcoin_sk.qm</file>
7489
<file alias="sl">locale/bitcoin_sl.qm</file>
7590
<file alias="sn">locale/bitcoin_sn.qm</file>
91+
<file alias="so">locale/bitcoin_so.qm</file>
7692
<file alias="sq">locale/bitcoin_sq.qm</file>
7793
<file alias="sr">locale/bitcoin_sr.qm</file>
94+
<file alias="sr@ijekavianlatin">locale/[email protected]</file>
7895
<file alias="sr@latin">locale/[email protected]</file>
7996
<file alias="sv">locale/bitcoin_sv.qm</file>
8097
<file alias="sw">locale/bitcoin_sw.qm</file>
@@ -93,7 +110,9 @@
93110
<file alias="uz@Latn">locale/[email protected]</file>
94111
<file alias="vi">locale/bitcoin_vi.qm</file>
95112
<file alias="yo">locale/bitcoin_yo.qm</file>
113+
<file alias="yue">locale/bitcoin_yue.qm</file>
96114
<file alias="zh-Hans">locale/bitcoin_zh-Hans.qm</file>
115+
<file alias="zh-Hant">locale/bitcoin_zh-Hant.qm</file>
97116
<file alias="zh">locale/bitcoin_zh.qm</file>
98117
<file alias="zh_CN">locale/bitcoin_zh_CN.qm</file>
99118
<file alias="zh_HK">locale/bitcoin_zh_HK.qm</file>

‎src/qt/bitcoinstrings.cpp‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,15 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
2121
"resetting the chain height from %d to %d. On the next restart, the node will "
2222
"resume syncing from %d without using any snapshot data. Please report this "
2323
"incident to %s, including how you obtained the snapshot. The invalid "
24-
"snapshot chainstate has been left on disk in case it is helpful in "
25-
"diagnosing the issue that caused this error."),
24+
"snapshot chainstate will be left on disk in case it is helpful in diagnosing "
25+
"the issue that caused this error."),
2626
QT_TRANSLATE_NOOP("bitcoin-core", ""
2727
"%s is set very high! Fees this large could be paid on a single transaction."),
2828
QT_TRANSLATE_NOOP("bitcoin-core", ""
2929
"%s request to listen on port %u. This port is considered \"bad\" and thus it "
3030
"is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for "
3131
"details and a full list."),
3232
QT_TRANSLATE_NOOP("bitcoin-core", ""
33-
"-reindex-chainstate option is not compatible with -blockfilterindex. Please "
34-
"temporarily disable blockfilterindex while using -reindex-chainstate, or "
35-
"replace -reindex-chainstate with -reindex to fully rebuild all indexes."),
36-
QT_TRANSLATE_NOOP("bitcoin-core", ""
37-
"-reindex-chainstate option is not compatible with -coinstatsindex. Please "
38-
"temporarily disable coinstatsindex while using -reindex-chainstate, or "
39-
"replace -reindex-chainstate with -reindex to fully rebuild all indexes."),
40-
QT_TRANSLATE_NOOP("bitcoin-core", ""
41-
"-reindex-chainstate option is not compatible with -txindex. Please "
42-
"temporarily disable txindex while using -reindex-chainstate, or replace -"
43-
"reindex-chainstate with -reindex to fully rebuild all indexes."),
44-
QT_TRANSLATE_NOOP("bitcoin-core", ""
4533
"Cannot downgrade wallet from version %i to version %i. Wallet version "
4634
"unchanged."),
4735
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -69,7 +57,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
6957
"successfully after node sync reaches height %s"),
7058
QT_TRANSLATE_NOOP("bitcoin-core", ""
7159
"Error reading %s! All keys read correctly, but transaction data or address "
72-
"book entries might be missing or incorrect."),
60+
"metadata may be missing or incorrect."),
7361
QT_TRANSLATE_NOOP("bitcoin-core", ""
7462
"Error reading %s! Transaction data may be missing or incorrect. Rescanning "
7563
"wallet."),
@@ -153,6 +141,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
153141
"Prune: last wallet synchronisation goes beyond pruned data. You need to -"
154142
"reindex (download the whole blockchain again in case of pruned node)"),
155143
QT_TRANSLATE_NOOP("bitcoin-core", ""
144+
"Rename of '%s' -> '%s' failed. You should resolve this by manually moving or "
145+
"deleting the invalid snapshot directory %s, otherwise you will encounter the "
146+
"same error again on the next startup."),
147+
QT_TRANSLATE_NOOP("bitcoin-core", ""
156148
"SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is "
157149
"supported"),
158150
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -219,8 +211,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
219211
"The wallet might had been created on a newer version.\n"
220212
"Please try running the latest software version.\n"),
221213
QT_TRANSLATE_NOOP("bitcoin-core", ""
222-
"Unsupported category-specific logging level -loglevel=%s. Expected -"
223-
"loglevel=<category>:<loglevel>. Valid categories: %s. Valid loglevels: %s."),
214+
"Unsupported category-specific logging level %1$s=%2$s. Expected "
215+
"%1$s=<category>:<loglevel>. Valid categories: %3$s. Valid loglevels: %4$s."),
224216
QT_TRANSLATE_NOOP("bitcoin-core", ""
225217
"Unsupported chainstate database format found. Please restart with -reindex-"
226218
"chainstate. This will rebuild the chainstate database."),
@@ -229,6 +221,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
229221
"support for creating and opening legacy wallets will be removed in the "
230222
"future."),
231223
QT_TRANSLATE_NOOP("bitcoin-core", ""
224+
"Wallet loaded successfully. The legacy wallet type is being deprecated and "
225+
"support for creating and opening legacy wallets will be removed in the "
226+
"future. Legacy wallets can be migrated to a descriptor wallet with "
227+
"migratewallet."),
228+
QT_TRANSLATE_NOOP("bitcoin-core", ""
232229
"Warning: Dumpfile wallet format \"%s\" does not match command line specified "
233230
"format \"%s\"."),
234231
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -300,6 +297,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to remove watchonly address boo
300297
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unable to write record to new wallet"),
301298
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."),
302299
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to rescan the wallet during initialization"),
300+
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to start indexes, shutting down.."),
303301
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to verify database"),
304302
QT_TRANSLATE_NOOP("bitcoin-core", "Fee rate (%s) is lower than the minimum fee rate setting (%s)"),
305303
QT_TRANSLATE_NOOP("bitcoin-core", "Ignoring duplicate -wallet %s."),
@@ -381,10 +379,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unknown address type '%s'"),
381379
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown change type '%s'"),
382380
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"),
383381
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown new rules activated (versionbit %i)"),
384-
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported global logging level -loglevel=%s. Valid values: %s."),
382+
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported global logging level %s=%s. Valid values: %s."),
385383
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported logging category %s=%s."),
386384
QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."),
387385
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks…"),
388386
QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet(s)…"),
389387
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart %s to complete"),
388+
QT_TRANSLATE_NOOP("bitcoin-core", "acceptstalefeeestimates is not supported on %s chain."),
390389
};

0 commit comments

Comments
 (0)