Skip to content

Commit 9e45ef1

Browse files
committed
Merge #8234: qt: Periodic transifex update
4cbe05b qt: Periodic transifex update (Wladimir J. van der Laan)
2 parents 760a6c7 + 4cbe05b commit 9e45ef1

Some content is hidden

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

69 files changed

+11761
-2714
lines changed

src/Makefile.qt.include

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ EXTRA_LIBRARIES += qt/libbitcoinqt.a
33

44
# bitcoin qt core #
55
QT_TS = \
6+
qt/locale/bitcoin_af.ts \
67
qt/locale/bitcoin_af_ZA.ts \
78
qt/locale/bitcoin_ar.ts \
89
qt/locale/bitcoin_be_BY.ts \
@@ -22,7 +23,10 @@ QT_TS = \
2223
qt/locale/bitcoin_en_GB.ts \
2324
qt/locale/bitcoin_en.ts \
2425
qt/locale/bitcoin_eo.ts \
26+
qt/locale/bitcoin_es_419.ts \
27+
qt/locale/bitcoin_es_AR.ts \
2528
qt/locale/bitcoin_es_CL.ts \
29+
qt/locale/bitcoin_es_CO.ts \
2630
qt/locale/bitcoin_es_DO.ts \
2731
qt/locale/bitcoin_es_ES.ts \
2832
qt/locale/bitcoin_es_MX.ts \
@@ -33,6 +37,7 @@ QT_TS = \
3337
qt/locale/bitcoin_eu_ES.ts \
3438
qt/locale/bitcoin_fa_IR.ts \
3539
qt/locale/bitcoin_fa.ts \
40+
qt/locale/bitcoin_fil.ts \
3641
qt/locale/bitcoin_fi.ts \
3742
qt/locale/bitcoin_fr_CA.ts \
3843
qt/locale/bitcoin_fr_FR.ts \
@@ -43,6 +48,7 @@ QT_TS = \
4348
qt/locale/bitcoin_hr.ts \
4449
qt/locale/bitcoin_hu.ts \
4550
qt/locale/bitcoin_id_ID.ts \
51+
qt/locale/bitcoin_it_IT.ts \
4652
qt/locale/bitcoin_it.ts \
4753
qt/locale/bitcoin_ja.ts \
4854
qt/locale/bitcoin_ka.ts \
@@ -62,22 +68,27 @@ QT_TS = \
6268
qt/locale/bitcoin_pt_BR.ts \
6369
qt/locale/bitcoin_pt_PT.ts \
6470
qt/locale/bitcoin_ro_RO.ts \
71+
qt/locale/bitcoin_ro.ts \
6572
qt/locale/bitcoin_ru_RU.ts \
6673
qt/locale/bitcoin_ru.ts \
6774
qt/locale/bitcoin_sk.ts \
6875
qt/locale/bitcoin_sl_SI.ts \
6976
qt/locale/bitcoin_sq.ts \
77+
qt/locale/[email protected] \
7078
qt/locale/bitcoin_sr.ts \
7179
qt/locale/bitcoin_sv.ts \
80+
qt/locale/bitcoin_ta.ts \
7281
qt/locale/bitcoin_th_TH.ts \
7382
qt/locale/bitcoin_tr_TR.ts \
7483
qt/locale/bitcoin_tr.ts \
7584
qt/locale/bitcoin_uk.ts \
7685
qt/locale/bitcoin_ur_PK.ts \
7786
qt/locale/[email protected] \
87+
qt/locale/[email protected] \
7888
qt/locale/bitcoin_vi.ts \
7989
qt/locale/bitcoin_vi_VN.ts \
8090
qt/locale/bitcoin_zh_CN.ts \
91+
qt/locale/bitcoin_zh_HK.ts \
8192
qt/locale/bitcoin_zh.ts \
8293
qt/locale/bitcoin_zh_TW.ts
8394

src/qt/bitcoin_locale.qrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!DOCTYPE RCC><RCC version="1.0">
22
<qresource prefix="/translations">
3+
<file alias="af">locale/bitcoin_af.qm</file>
34
<file alias="af_ZA">locale/bitcoin_af_ZA.qm</file>
45
<file alias="ar">locale/bitcoin_ar.qm</file>
56
<file alias="be_BY">locale/bitcoin_be_BY.qm</file>
@@ -19,7 +20,10 @@
1920
<file alias="en_GB">locale/bitcoin_en_GB.qm</file>
2021
<file alias="en">locale/bitcoin_en.qm</file>
2122
<file alias="eo">locale/bitcoin_eo.qm</file>
23+
<file alias="es_419">locale/bitcoin_es_419.qm</file>
24+
<file alias="es_AR">locale/bitcoin_es_AR.qm</file>
2225
<file alias="es_CL">locale/bitcoin_es_CL.qm</file>
26+
<file alias="es_CO">locale/bitcoin_es_CO.qm</file>
2327
<file alias="es_DO">locale/bitcoin_es_DO.qm</file>
2428
<file alias="es_ES">locale/bitcoin_es_ES.qm</file>
2529
<file alias="es_MX">locale/bitcoin_es_MX.qm</file>
@@ -30,6 +34,7 @@
3034
<file alias="eu_ES">locale/bitcoin_eu_ES.qm</file>
3135
<file alias="fa_IR">locale/bitcoin_fa_IR.qm</file>
3236
<file alias="fa">locale/bitcoin_fa.qm</file>
37+
<file alias="fil">locale/bitcoin_fil.qm</file>
3338
<file alias="fi">locale/bitcoin_fi.qm</file>
3439
<file alias="fr_CA">locale/bitcoin_fr_CA.qm</file>
3540
<file alias="fr_FR">locale/bitcoin_fr_FR.qm</file>
@@ -40,6 +45,7 @@
4045
<file alias="hr">locale/bitcoin_hr.qm</file>
4146
<file alias="hu">locale/bitcoin_hu.qm</file>
4247
<file alias="id_ID">locale/bitcoin_id_ID.qm</file>
48+
<file alias="it_IT">locale/bitcoin_it_IT.qm</file>
4349
<file alias="it">locale/bitcoin_it.qm</file>
4450
<file alias="ja">locale/bitcoin_ja.qm</file>
4551
<file alias="ka">locale/bitcoin_ka.qm</file>
@@ -59,22 +65,27 @@
5965
<file alias="pt_BR">locale/bitcoin_pt_BR.qm</file>
6066
<file alias="pt_PT">locale/bitcoin_pt_PT.qm</file>
6167
<file alias="ro_RO">locale/bitcoin_ro_RO.qm</file>
68+
<file alias="ro">locale/bitcoin_ro.qm</file>
6269
<file alias="ru_RU">locale/bitcoin_ru_RU.qm</file>
6370
<file alias="ru">locale/bitcoin_ru.qm</file>
6471
<file alias="sk">locale/bitcoin_sk.qm</file>
6572
<file alias="sl_SI">locale/bitcoin_sl_SI.qm</file>
6673
<file alias="sq">locale/bitcoin_sq.qm</file>
74+
<file alias="sr@latin">locale/[email protected]</file>
6775
<file alias="sr">locale/bitcoin_sr.qm</file>
6876
<file alias="sv">locale/bitcoin_sv.qm</file>
77+
<file alias="ta">locale/bitcoin_ta.qm</file>
6978
<file alias="th_TH">locale/bitcoin_th_TH.qm</file>
7079
<file alias="tr_TR">locale/bitcoin_tr_TR.qm</file>
7180
<file alias="tr">locale/bitcoin_tr.qm</file>
7281
<file alias="uk">locale/bitcoin_uk.qm</file>
7382
<file alias="ur_PK">locale/bitcoin_ur_PK.qm</file>
7483
<file alias="uz@Cyrl">locale/[email protected]</file>
84+
<file alias="uz@Latn">locale/[email protected]</file>
7585
<file alias="vi">locale/bitcoin_vi.qm</file>
7686
<file alias="vi_VN">locale/bitcoin_vi_VN.qm</file>
7787
<file alias="zh_CN">locale/bitcoin_zh_CN.qm</file>
88+
<file alias="zh_HK">locale/bitcoin_zh_HK.qm</file>
7889
<file alias="zh">locale/bitcoin_zh.qm</file>
7990
<file alias="zh_TW">locale/bitcoin_zh_TW.qm</file>
8091
</qresource>

src/qt/bitcoinstrings.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
6060
QT_TRANSLATE_NOOP("bitcoin-core", ""
6161
"Do not keep transactions in the mempool longer than <n> hours (default: %u)"),
6262
QT_TRANSLATE_NOOP("bitcoin-core", ""
63+
"Error loading %s: You can't enable HD on a already existing non-HD wallet"),
64+
QT_TRANSLATE_NOOP("bitcoin-core", ""
6365
"Error reading %s! All keys read correctly, but transaction data or address "
6466
"book entries might be missing or incorrect."),
6567
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -114,6 +116,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
114116
"Please check that your computer's date and time are correct! If your clock "
115117
"is wrong, %s will not work properly."),
116118
QT_TRANSLATE_NOOP("bitcoin-core", ""
119+
"Please contribute if you find %s useful. Visit %s for further information "
120+
"about the software."),
121+
QT_TRANSLATE_NOOP("bitcoin-core", ""
117122
"Prune configured below the minimum of %d MiB. Please use a higher number."),
118123
QT_TRANSLATE_NOOP("bitcoin-core", ""
119124
"Prune: last wallet synchronisation goes beyond pruned data. You need to -"
@@ -168,6 +173,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
168173
QT_TRANSLATE_NOOP("bitcoin-core", ""
169174
"Use UPnP to map the listening port (default: 1 when listening and no -proxy)"),
170175
QT_TRANSLATE_NOOP("bitcoin-core", ""
176+
"Use hierarchical deterministic key generation (HD) after bip32. Only has "
177+
"effect during wallet creation/first start"),
178+
QT_TRANSLATE_NOOP("bitcoin-core", ""
171179
"Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: "
172180
"%s)"),
173181
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -243,6 +251,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environmen
243251
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s"),
244252
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet corrupted"),
245253
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet requires newer version of %s"),
254+
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: You can't disable HD on a already existing HD wallet"),
246255
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
247256
QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
248257
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
@@ -317,6 +326,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: %s)"),
317326
QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"),
318327
QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"),
319328
QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: %u)"),
329+
QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."),
320330
QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"),
321331
QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."),
322332
QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: %u)"),

0 commit comments

Comments
 (0)