Skip to content

Commit cbaaaf4

Browse files
authored
Merge pull request #661 from kdmukai/0.8.5-rc1_fixes
Minor 0.8.5-rc1 fixes, syncing translations and screenshots repos
2 parents be465a3 + 568534d commit cbaaaf4

File tree

6 files changed

+18
-13
lines changed

6 files changed

+18
-13
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[submodule "src/seedsigner/resources/seedsigner-translations"]
22
path = src/seedsigner/resources/seedsigner-translations
33
url = https://github.com/SeedSigner/seedsigner-translations.git
4-
branch = 0.8.5-rc1
4+
branch = dev
55
[submodule "seedsigner-screenshots"]
66
path = seedsigner-screenshots
77
url = https://github.com/SeedSigner/seedsigner-screenshots.git

l10n/messages.pot

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Translations template for seedsigner.
2-
# Copyright (C) 2024 ORGANIZATION
2+
# Copyright (C) 2025 ORGANIZATION
33
# This file is distributed under the same license as the seedsigner project.
4-
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
4+
# FIRST AUTHOR <EMAIL@ADDRESS>, 2025.
55
#
66
#, fuzzy
77
msgid ""
88
msgstr ""
99
"Project-Id-Version: seedsigner 0.8.5-rc1\n"
1010
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
11-
"POT-Creation-Date: 2024-12-30 13:43-0600\n"
11+
"POT-Creation-Date: 2025-01-15 10:45-0600\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -539,11 +539,12 @@ msgstr ""
539539
msgid "Build Final Word"
540540
msgstr ""
541541

542-
#. Number of BIP-39 seed words, and the entropy -- in bits, contained within.
542+
#. Final word calc. `mnemonic_length` = 12 or 24. `num_bits` = 7 or 3 (bits of
543+
#. entropy in final word).
543544
#: src/seedsigner/gui/screens/tools_screens.py
544545
msgid ""
545-
"The {}th word is built from {} more entropy bits plus auto-calculated "
546-
"checksum."
546+
"The {mnemonic_length}th word is built from {num_bits} more entropy bits "
547+
"plus auto-calculated checksum."
547548
msgstr ""
548549

549550
#. current coin-flip number vs total flips (e.g. flip 3 of 4)
@@ -766,6 +767,10 @@ msgstr ""
766767
msgid "BIP-85 child seeds"
767768
msgstr ""
768769

770+
#: src/seedsigner/models/settings_definition.py
771+
msgid "Electrum seeds"
772+
msgstr ""
773+
769774
#: src/seedsigner/models/settings_definition.py
770775
msgid "Native Segwit only"
771776
msgstr ""

seedsigner-screenshots

src/seedsigner/gui/screens/tools_screens.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ def __post_init__(self):
183183
super().__post_init__()
184184

185185
self.components.append(TextArea(
186-
# TRANSLATOR_NOTE: Number of BIP-39 seed words, and the entropy -- in bits, contained within.
187-
text=_("The {}th word is built from {} more entropy bits plus auto-calculated checksum.").format(self.mnemonic_length, self.num_entropy_bits),
186+
# TRANSLATOR_NOTE: Final word calc. `mnemonic_length` = 12 or 24. `num_bits` = 7 or 3 (bits of entropy in final word).
187+
text=_("The {mnemonic_length}th word is built from {num_bits} more entropy bits plus auto-calculated checksum.").format(mnemonic_length=self.mnemonic_length, num_bits=self.num_entropy_bits),
188188
screen_y=self.top_nav.height + int(GUIConstants.COMPONENT_PADDING/2),
189189
))
190190

@@ -454,7 +454,7 @@ def __post_init__(self):
454454
self.components.append(IconTextLine(
455455
# TRANSLATOR_NOTE: a label for a BIP-380-ish Output Descriptor
456456
label_text=_("Wallet descriptor"),
457-
value_text=self.wallet_descriptor_display_name,
457+
value_text=self.wallet_descriptor_display_name, # TODO: English text from embit (e.g. "1 / 2 multisig"); make l10 friendly
458458
is_text_centered=True,
459459
screen_x=GUIConstants.EDGE_PADDING,
460460
screen_y=self.top_nav.height + GUIConstants.COMPONENT_PADDING,

src/seedsigner/models/settings_definition.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ class SettingsDefinition:
504504
SettingsEntry(category=SettingsConstants.CATEGORY__FEATURES,
505505
attr_name=SettingsConstants.SETTING__ELECTRUM_SEEDS,
506506
abbreviated_name="electrum",
507-
display_name="Electrum seeds",
507+
display_name=_mft("Electrum seeds"),
508508
help_text=_mft("Native Segwit only"),
509509
visibility=SettingsConstants.VISIBILITY__ADVANCED,
510510
default_value=SettingsConstants.OPTION__DISABLED),

0 commit comments

Comments
 (0)