Skip to content

Commit ec66d06

Browse files
laanwjlaanwj
committed
Merge #9735: devtools: Handle Qt formatting characters edge-case in update-translations.py
7179e7c qt: Periodic translations update (Wladimir J. van der Laan) 5e903a5 devtools: Handle Qt formatting characters edge-case in update-translations.py (Wladimir J. van der Laan)
2 parents d978c41 + 7179e7c commit ec66d06

File tree

9 files changed

+1520
-224
lines changed

9 files changed

+1520
-224
lines changed

‎contrib/devtools/update-translations.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ def split_format_specifiers(specifiers):
6565
else:
6666
other.append(s)
6767

68+
# If both numeric format specifiers and "others" are used, assume we're dealing
69+
# with a Qt-formatted message. In the case of Qt formatting (see https://doc.qt.io/qt-5/qstring.html#arg)
70+
# only numeric formats are replaced at all. This means "(percentage: %1%)" is valid, without needing
71+
# any kind of escaping that would be necessary for strprintf. Without this, this function
72+
# would wrongly detect '%)' as a printf format specifier.
73+
if numeric:
74+
other = []
75+
6876
# numeric (Qt) can be present in any order, others (strprintf) must be in specified order
6977
return set(numeric),other
7078

‎src/qt/locale/bitcoin_cs.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,10 @@
329329
<source>Click to enable network activity again.</source>
330330
<translation>Kliknutím opět umožníš spojení do sítě.</translation>
331331
</message>
332+
<message>
333+
<source>Syncing Headers (%1%)...</source>
334+
<translation>Synchronizuji záhlaví bloků (%1 %)…</translation>
335+
</message>
332336
<message>
333337
<source>Reindexing blocks on disk...</source>
334338
<translation>Vytvářím nový index bloků na disku...</translation>
@@ -481,6 +485,10 @@
481485
<source>%1 client</source>
482486
<translation>%1 klient</translation>
483487
</message>
488+
<message>
489+
<source>Connecting to peers...</source>
490+
<translation>Připojuji se…</translation>
491+
</message>
484492
<message>
485493
<source>Catching up...</source>
486494
<translation>Stahuji...</translation>
@@ -3089,6 +3097,14 @@
30893097
<source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
30903098
<translation>Spustit příkaz, když se objeví transakce týkající se peněženky (%s se v příkazu nahradí za TxID)</translation>
30913099
</message>
3100+
<message>
3101+
<source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
3102+
<translation>Počet extra transakcí, které se mají držet v paměti pro účely rekonstrukce kompaktních bloků (výchozí: %u)</translation>
3103+
</message>
3104+
<message>
3105+
<source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
3106+
<translation>Pokud je tenhle blok v řetězci, tak předpokládat, že on i jeho následníci jsou platní, a potenciálně přeskočit ověřování jejich skriptů (0 = ověřovat vše, výchozí: %s, testnet: %s)</translation>
3107+
</message>
30923108
<message>
30933109
<source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
30943110
<translation>Maximální povolené seřizování času mediánem časů protějšků. Místní vnímání času může být ovlivněno protějšky, a to dopředu nebo dozadu až o toto množství. (výchozí: %u vteřin)</translation>
@@ -3105,6 +3121,14 @@
31053121
<source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
31063122
<translation>Prosíme, zapoj se nebo přispěj, pokud ti %s přijde užitečný. Více informací o programu je na %s.</translation>
31073123
</message>
3124+
<message>
3125+
<source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
3126+
<translation>Omezit nároky na úložný prostor prořezáváním (mazáním) starých bloků. Tato volba také umožní použít RPC volání pruneblockchain ke smazání konkrétních bloků a dále automatické prořezávání starých bloků, pokud je zadána cílová velikost souborů s bloky v MiB. Tento režim není slučitelný s -txindex ani -rescan. Upozornění: opětovná změna tohoto nastavení bude vyžadovat nové stažení celého řetězce bloků. (výchozí: 0 = bloky neprořezávat, 1 = povolit ruční prořezávání skrze RPC, &gt;%u = automatické prořezávání bloků tak, aby byla udržena cílová velikost souborů s bloky, v MiB)</translation>
3127+
</message>
3128+
<message>
3129+
<source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
3130+
<translation>Nastavit nejnižší akceptovatelný poplatek (v %s/kB) pro transakce, které mají být zahrnuty do nových bloků. (výchozí: %s)</translation>
3131+
</message>
31083132
<message>
31093133
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
31103134
<translation>Nastavení počtu vláken pro verifikaci skriptů (%u až %d, 0 = automaticky, &lt;0 = nechat daný počet jader volný, výchozí: %d)</translation>

‎src/qt/locale/bitcoin_en.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@
10831083
<translation>Use a custom data directory:</translation>
10841084
</message>
10851085
<message>
1086-
<location filename="../intro.cpp" line="+89"/>
1086+
<location filename="../intro.cpp" line="+94"/>
10871087
<source>Error: Specified data directory &quot;%1&quot; cannot be created.</source>
10881088
<translation type="unfinished"></translation>
10891089
</message>

‎src/qt/locale/bitcoin_et.ts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,10 @@
214214
</context>
215215
<context>
216216
<name>BanTableModel</name>
217+
<message>
218+
<source>IP/Netmask</source>
219+
<translation>IP/Võrgumask</translation>
220+
</message>
217221
</context>
218222
<context>
219223
<name>BitcoinGUI</name>
@@ -787,6 +791,10 @@
787791
<source>&amp;Window</source>
788792
<translation>&amp;Aken</translation>
789793
</message>
794+
<message>
795+
<source>Hide tray icon</source>
796+
<translation>Peida tegumiriba ikoon</translation>
797+
</message>
790798
<message>
791799
<source>Show only a tray icon after minimizing the window.</source>
792800
<translation>Minimeeri systray alale.</translation>
@@ -903,10 +911,30 @@
903911
<source>N/A</source>
904912
<translation>N/A</translation>
905913
</message>
914+
<message>
915+
<source>%1 ms</source>
916+
<translation>%1 ms</translation>
917+
</message>
918+
<message numerus="yes">
919+
<source>%n hour(s)</source>
920+
<translation><numerusform>%n tund</numerusform><numerusform>%n tundi</numerusform></translation>
921+
</message>
922+
<message numerus="yes">
923+
<source>%n day(s)</source>
924+
<translation><numerusform>%n päev</numerusform><numerusform>%n päeva</numerusform></translation>
925+
</message>
926+
<message numerus="yes">
927+
<source>%n week(s)</source>
928+
<translation><numerusform>%n nädal</numerusform><numerusform>%n nädalat</numerusform></translation>
929+
</message>
906930
<message>
907931
<source>%1 and %2</source>
908932
<translation>%1 ja %2</translation>
909933
</message>
934+
<message numerus="yes">
935+
<source>%n year(s)</source>
936+
<translation><numerusform>%n aasta</numerusform><numerusform>%n aastat</numerusform></translation>
937+
</message>
910938
</context>
911939
<context>
912940
<name>QObject::QObject</name>

‎src/qt/locale/bitcoin_fr.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,10 @@
329329
<source>Click to enable network activity again.</source>
330330
<translation>Cliquer pour réactiver l'activité réseau.</translation>
331331
</message>
332+
<message>
333+
<source>Syncing Headers (%1%)...</source>
334+
<translation>Synchronisation des en-têtes (%1)...</translation>
335+
</message>
332336
<message>
333337
<source>Reindexing blocks on disk...</source>
334338
<translation>Réindexation des blocs sur le disque...</translation>

‎src/qt/locale/bitcoin_it.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -702,10 +702,6 @@
702702
<source>Error</source>
703703
<translation>Errore</translation>
704704
</message>
705-
<message numerus="yes">
706-
<source>%n GB of free space available</source>
707-
<translation><numerusform>GB di spazio libero disponibile</numerusform><numerusform>%n GB di spazio disponibile</numerusform></translation>
708-
</message>
709705
<message numerus="yes">
710706
<source>(of %n GB needed)</source>
711707
<translation><numerusform>(di %nGB richiesti)</numerusform><numerusform>(%n GB richiesti)</numerusform></translation>

‎src/qt/locale/bitcoin_pt_BR.ts

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</message>
2424
<message>
2525
<source>C&amp;lose</source>
26-
<translation>Fechar</translation>
26+
<translation>&amp;Fechar</translation>
2727
</message>
2828
<message>
2929
<source>Delete the currently selected address from the list</source>
@@ -39,7 +39,7 @@
3939
</message>
4040
<message>
4141
<source>&amp;Delete</source>
42-
<translation>&amp;Excluir</translation>
42+
<translation>E&amp;xcluir</translation>
4343
</message>
4444
<message>
4545
<source>Choose the address to send coins to</source>
@@ -102,15 +102,15 @@
102102
<name>AddressTableModel</name>
103103
<message>
104104
<source>Label</source>
105-
<translation>Rótuo</translation>
105+
<translation>Rótulo</translation>
106106
</message>
107107
<message>
108108
<source>Address</source>
109109
<translation>Endereço</translation>
110110
</message>
111111
<message>
112112
<source>(no label)</source>
113-
<translation>(sem rótuo)</translation>
113+
<translation>(sem rótulo)</translation>
114114
</message>
115115
</context>
116116
<context>
@@ -231,7 +231,7 @@
231231
<name>BitcoinGUI</name>
232232
<message>
233233
<source>Sign &amp;message...</source>
234-
<translation>&amp;Assinar mensagem...</translation>
234+
<translation>Assinar &amp;mensagem...</translation>
235235
</message>
236236
<message>
237237
<source>Synchronizing with network...</source>
@@ -375,7 +375,7 @@
375375
</message>
376376
<message>
377377
<source>&amp;Show / Hide</source>
378-
<translation>&amp;Exibir/Ocultar</translation>
378+
<translation>&amp;Exibir / Ocultar</translation>
379379
</message>
380380
<message>
381381
<source>Show or hide the main Window</source>
@@ -479,7 +479,7 @@
479479
</message>
480480
<message>
481481
<source>%1 client</source>
482-
<translation>%1</translation>
482+
<translation>%1 cliente</translation>
483483
</message>
484484
<message>
485485
<source>Connecting to peers...</source>
@@ -688,7 +688,7 @@
688688
</message>
689689
<message>
690690
<source>(no label)</source>
691-
<translation>(sem rótuo)</translation>
691+
<translation>(sem rótulo)</translation>
692692
</message>
693693
<message>
694694
<source>change from %1 (%2)</source>
@@ -1360,6 +1360,10 @@
13601360
<source>Node/Service</source>
13611361
<translation>Nó/Serviço</translation>
13621362
</message>
1363+
<message>
1364+
<source>NodeId</source>
1365+
<translation>ID do nó</translation>
1366+
</message>
13631367
<message>
13641368
<source>Ping</source>
13651369
<translation>Ping</translation>
@@ -1900,7 +1904,7 @@
19001904
</message>
19011905
<message>
19021906
<source>Label</source>
1903-
<translation>Rótuo</translation>
1907+
<translation>Rótulo</translation>
19041908
</message>
19051909
<message>
19061910
<source>Message</source>
@@ -1923,15 +1927,15 @@
19231927
</message>
19241928
<message>
19251929
<source>Label</source>
1926-
<translation>Rótuo</translation>
1930+
<translation>Rótulo</translation>
19271931
</message>
19281932
<message>
19291933
<source>Message</source>
19301934
<translation>Mensagem</translation>
19311935
</message>
19321936
<message>
19331937
<source>(no label)</source>
1934-
<translation>(sem rótuo)</translation>
1938+
<translation>(sem rótulo)</translation>
19351939
</message>
19361940
<message>
19371941
<source>(no message)</source>
@@ -2210,7 +2214,7 @@
22102214
</message>
22112215
<message>
22122216
<source>(no label)</source>
2213-
<translation>(sem rótuo)</translation>
2217+
<translation>(sem rótulo)</translation>
22142218
</message>
22152219
</context>
22162220
<context>
@@ -2665,7 +2669,7 @@
26652669
</message>
26662670
<message>
26672671
<source>Label</source>
2668-
<translation>Rótuo</translation>
2672+
<translation>Rótulo</translation>
26692673
</message>
26702674
<message numerus="yes">
26712675
<source>Open for %n more block(s)</source>
@@ -2741,7 +2745,7 @@
27412745
</message>
27422746
<message>
27432747
<source>(no label)</source>
2744-
<translation>(sem rótuo)</translation>
2748+
<translation>(sem rótulo)</translation>
27452749
</message>
27462750
<message>
27472751
<source>Transaction status. Hover over this field to show number of confirmations.</source>
@@ -2888,7 +2892,7 @@
28882892
</message>
28892893
<message>
28902894
<source>Label</source>
2891-
<translation>Rótuo</translation>
2895+
<translation>Rótulo</translation>
28922896
</message>
28932897
<message>
28942898
<source>Address</source>
@@ -3797,6 +3801,10 @@
37973801
<source>Relay non-P2SH multisig (default: %u)</source>
37983802
<translation>Retransmitir P2SH não multisig (padrão: %u)</translation>
37993803
</message>
3804+
<message>
3805+
<source>Send transactions with full-RBF opt-in enabled (default: %u)</source>
3806+
<translation>Ativar opção full-RBF nas transações enviadas (padrão: %u)</translation>
3807+
</message>
38003808
<message>
38013809
<source>Set key pool size to &lt;n&gt; (default: %u)</source>
38023810
<translation>Defina o tamanho da chave para piscina&lt;n&gt; (padrão: %u)</translation>
@@ -3819,7 +3827,7 @@
38193827
</message>
38203828
<message>
38213829
<source>Specify pid file (default: %s)</source>
3822-
<translation>Especificar aqrquivo pid (padrão: %s)</translation>
3830+
<translation>Especificar arquivo pid (padrão: %s)</translation>
38233831
</message>
38243832
<message>
38253833
<source>Spend unconfirmed change when sending transactions (default: %u)</source>

0 commit comments

Comments
 (0)