Skip to content

Commit df8a7d3

Browse files
committed
qt: Pre-0.18 split-off translations update
- Update transifex slug - Mention update of MSVC build in `doc/translation_process.md` - Do a `make translate` to update English translations - Pull current translations from transifex
1 parent ebc6542 commit df8a7d3

Some content is hidden

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

56 files changed

+12782
-1165
lines changed

.tx/config

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

4-
[bitcoin.qt-translation-017x]
4+
[bitcoin.qt-translation-018x]
55
file_filter = src/qt/locale/bitcoin_<lang>.ts
66
source_file = src/qt/locale/bitcoin_en.ts
77
source_lang = en

build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj

+25-4
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161
<None Include="..\..\src\qt\locale\bitcoin_af_ZA.ts">
6262
<DeploymentContent>true</DeploymentContent>
6363
</None>
64+
<None Include="..\..\src\qt\locale\bitcoin_am.ts">
65+
<DeploymentContent>true</DeploymentContent>
66+
</None>
6467
<None Include="..\..\src\qt\locale\bitcoin_ar.ts">
6568
<DeploymentContent>true</DeploymentContent>
6669
</None>
@@ -73,10 +76,10 @@
7376
<None Include="..\..\src\qt\locale\bitcoin_bg_BG.ts">
7477
<DeploymentContent>true</DeploymentContent>
7578
</None>
76-
<None Include="..\..\src\qt\locale\bitcoin_ca%40valencia.ts">
79+
<None Include="..\..\src\qt\locale\bitcoin_ca.ts">
7780
<DeploymentContent>true</DeploymentContent>
7881
</None>
79-
<None Include="..\..\src\qt\locale\bitcoin_ca.ts">
82+
<None Include="..\..\src\qt\locale\bitcoin_ca%40valencia.ts">
8083
<DeploymentContent>true</DeploymentContent>
8184
</None>
8285
<None Include="..\..\src\qt\locale\bitcoin_ca_ES.ts">
@@ -178,9 +181,15 @@
178181
<None Include="..\..\src\qt\locale\bitcoin_hu.ts">
179182
<DeploymentContent>true</DeploymentContent>
180183
</None>
184+
<None Include="..\..\src\qt\locale\bitcoin_id.ts">
185+
<DeploymentContent>true</DeploymentContent>
186+
</None>
181187
<None Include="..\..\src\qt\locale\bitcoin_id_ID.ts">
182188
<DeploymentContent>true</DeploymentContent>
183189
</None>
190+
<None Include="..\..\src\qt\locale\bitcoin_is.ts">
191+
<DeploymentContent>true</DeploymentContent>
192+
</None>
184193
<None Include="..\..\src\qt\locale\bitcoin_it.ts">
185194
<DeploymentContent>true</DeploymentContent>
186195
</None>
@@ -196,6 +205,9 @@
196205
<None Include="..\..\src\qt\locale\bitcoin_kk_KZ.ts">
197206
<DeploymentContent>true</DeploymentContent>
198207
</None>
208+
<None Include="..\..\src\qt\locale\bitcoin_ko.ts">
209+
<DeploymentContent>true</DeploymentContent>
210+
</None>
199211
<None Include="..\..\src\qt\locale\bitcoin_ko_KR.ts">
200212
<DeploymentContent>true</DeploymentContent>
201213
</None>
@@ -217,6 +229,9 @@
217229
<None Include="..\..\src\qt\locale\bitcoin_mk_MK.ts">
218230
<DeploymentContent>true</DeploymentContent>
219231
</None>
232+
<None Include="..\..\src\qt\locale\bitcoin_ml.ts">
233+
<DeploymentContent>true</DeploymentContent>
234+
</None>
220235
<None Include="..\..\src\qt\locale\bitcoin_mn.ts">
221236
<DeploymentContent>true</DeploymentContent>
222237
</None>
@@ -262,18 +277,24 @@
262277
<None Include="..\..\src\qt\locale\bitcoin_sl_SI.ts">
263278
<DeploymentContent>true</DeploymentContent>
264279
</None>
265-
<None Include="..\..\src\qt\locale\bitcoin_sq.ts">
280+
<None Include="..\..\src\qt\locale\bitcoin_sn.ts">
266281
<DeploymentContent>true</DeploymentContent>
267282
</None>
268-
<None Include="..\..\src\qt\locale\bitcoin_sr%40latin.ts">
283+
<None Include="..\..\src\qt\locale\bitcoin_sq.ts">
269284
<DeploymentContent>true</DeploymentContent>
270285
</None>
271286
<None Include="..\..\src\qt\locale\bitcoin_sr.ts">
272287
<DeploymentContent>true</DeploymentContent>
273288
</None>
289+
<None Include="..\..\src\qt\locale\bitcoin_sr%40latin.ts">
290+
<DeploymentContent>true</DeploymentContent>
291+
</None>
274292
<None Include="..\..\src\qt\locale\bitcoin_sv.ts">
275293
<DeploymentContent>true</DeploymentContent>
276294
</None>
295+
<None Include="..\..\src\qt\locale\bitcoin_szl.ts">
296+
<DeploymentContent>true</DeploymentContent>
297+
</None>
277298
<None Include="..\..\src\qt\locale\bitcoin_ta.ts">
278299
<DeploymentContent>true</DeploymentContent>
279300
</None>

doc/translation_process.md

+15-5
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,21 @@ The Transifex Bitcoin project config file is included as part of the repo. It ca
6868
To assist in updating translations, we have created a script to help.
6969

7070
1. `python contrib/devtools/update-translations.py`
71-
2. Update `src/qt/bitcoin_locale.qrc` manually or via
72-
`ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(bitcoin_\(.*\)\).ts/<file alias="\2">locale\/\1.qm<\/file>/'`
73-
3. Update `src/Makefile.qt.include` manually or via
74-
`ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(bitcoin_\(.*\)\).ts/ qt\/locale\/\1.ts \\/'`
75-
4. `git add` new translations from `src/qt/locale/`
71+
2. `git add` new translations from `src/qt/locale/`
72+
3. Update `src/qt/bitcoin_locale.qrc` manually or via
73+
```bash
74+
git ls-files src/qt/locale/*ts|xargs -n1 basename|sed 's/\(bitcoin_\(.*\)\).ts/<file alias="\2">locale\/\1.qm<\/file>/'
75+
```
76+
4. Update `src/Makefile.qt.include` manually or via
77+
```bash
78+
git ls-files src/qt/locale/*ts|xargs -n1 basename|sed 's/\(bitcoin_\(.*\)\).ts/ qt\/locale\/\1.ts \\/'
79+
```
80+
5. Update `build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj` or via
81+
```bash
82+
git ls-files src/qt/locale/*ts|xargs -n1 basename |
83+
sed 's/@/%40/' |
84+
sed 's/\(bitcoin_\(.*\)\).ts/ <None Include="..\\..\\src\\qt\\locale\\\1.ts">\n <DeploymentContent>true<\/DeploymentContent>\n <\/None>/'
85+
```
7686

7787
**Do not directly download translations** one by one from the Transifex website, as we do a few post-processing steps before committing the translations.
7888

src/qt/bitcoinstrings.cpp

+4-19
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
3030
"Distributed under the MIT software license, see the accompanying file %s or "
3131
"%s"),
3232
QT_TRANSLATE_NOOP("bitcoin-core", ""
33-
"Error loading %s: You can't enable HD on an already existing non-HD wallet"),
34-
QT_TRANSLATE_NOOP("bitcoin-core", ""
3533
"Error reading %s! All keys read correctly, but transaction data or address "
3634
"book entries might be missing or incorrect."),
3735
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -40,12 +38,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
4038
"Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -"
4139
"fallbackfee."),
4240
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", ""
4941
"Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay "
5042
"fee of %s to prevent stuck transactions)"),
5143
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -91,12 +83,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
9183
"Unable to rewind the database to a pre-fork state. You will need to "
9284
"redownload the blockchain"),
9385
QT_TRANSLATE_NOOP("bitcoin-core", ""
94-
"Unsupported argument -socks found. Setting SOCKS version isn't possible "
95-
"anymore, only SOCKS5 proxies are supported."),
96-
QT_TRANSLATE_NOOP("bitcoin-core", ""
97-
"Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/"
98-
"or -whitelistforcerelay."),
99-
QT_TRANSLATE_NOOP("bitcoin-core", ""
10086
"Warning: Private keys detected in wallet {%s} with disabled private keys"),
10187
QT_TRANSLATE_NOOP("bitcoin-core", ""
10288
"Warning: The network does not appear to fully agree! Some miners appear to "
@@ -122,25 +108,25 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"),
122108
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -%s address: '%s'"),
123109
QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write to data directory '%s'; check permissions."),
124110
QT_TRANSLATE_NOOP("bitcoin-core", "Change index out of range"),
111+
QT_TRANSLATE_NOOP("bitcoin-core", "Config setting for %s only applied on %s network when in [%s] section."),
125112
QT_TRANSLATE_NOOP("bitcoin-core", "Copyright (C) %i-%i"),
126113
QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"),
127114
QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"),
128115
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
129-
QT_TRANSLATE_NOOP("bitcoin-core", "Error creating %s: You can't create non-HD wallets with this version."),
130116
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"),
131117
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"),
132118
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s"),
133119
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Private keys can only be disabled during creation"),
134120
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet corrupted"),
135121
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet requires newer version of %s"),
136-
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: You can't disable HD on an already existing HD wallet"),
137122
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
138123
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet %s. Duplicate -wallet filename specified."),
139124
QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
140125
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
141126
QT_TRANSLATE_NOOP("bitcoin-core", "Error upgrading chainstate database"),
142127
QT_TRANSLATE_NOOP("bitcoin-core", "Error"),
143128
QT_TRANSLATE_NOOP("bitcoin-core", "Error: A fatal internal error occurred, see debug.log for details"),
129+
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low for %s"),
144130
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"),
145131
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."),
146132
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to rescan the wallet during initialization"),
@@ -170,13 +156,15 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Reducing -maxconnections from %d to %d, becau
170156
QT_TRANSLATE_NOOP("bitcoin-core", "Replaying blocks..."),
171157
QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."),
172158
QT_TRANSLATE_NOOP("bitcoin-core", "Rewinding blocks..."),
159+
QT_TRANSLATE_NOOP("bitcoin-core", "Section [%s] is not recognized."),
173160
QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"),
174161
QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" does not exist"),
175162
QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is a relative path"),
176163
QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is not a directory"),
177164
QT_TRANSLATE_NOOP("bitcoin-core", "Specified blocks directory \"%s\" does not exist."),
178165
QT_TRANSLATE_NOOP("bitcoin-core", "Starting network threads..."),
179166
QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."),
167+
QT_TRANSLATE_NOOP("bitcoin-core", "The specified config file %s does not exist\n"),
180168
QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"),
181169
QT_TRANSLATE_NOOP("bitcoin-core", "The wallet will avoid paying less than the minimum relay fee."),
182170
QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."),
@@ -195,9 +183,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unable to generate initial keys"),
195183
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to generate keys"),
196184
QT_TRANSLATE_NOOP("bitcoin-core", "Unable to start HTTP server. See debug log for details."),
197185
QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"),
198-
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -benchmark ignored, use -debug=bench."),
199-
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -debugnet ignored, use -debug=net."),
200-
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -tor found, use -onion."),
201186
QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported logging category %s=%s."),
202187
QT_TRANSLATE_NOOP("bitcoin-core", "Upgrading UTXO database"),
203188
QT_TRANSLATE_NOOP("bitcoin-core", "Upgrading txindex database"),

0 commit comments

Comments
 (0)