Skip to content

Commit

Permalink
Merge pull request #661 from kdmukai/0.8.5-rc1_fixes
Browse files Browse the repository at this point in the history
Minor 0.8.5-rc1 fixes, syncing translations and screenshots repos
  • Loading branch information
newtonick authored Jan 19, 2025
2 parents be465a3 + 568534d commit cbaaaf4
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "src/seedsigner/resources/seedsigner-translations"]
path = src/seedsigner/resources/seedsigner-translations
url = https://github.com/SeedSigner/seedsigner-translations.git
branch = 0.8.5-rc1
branch = dev
[submodule "seedsigner-screenshots"]
path = seedsigner-screenshots
url = https://github.com/SeedSigner/seedsigner-screenshots.git
Expand Down
17 changes: 11 additions & 6 deletions l10n/messages.pot
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Translations template for seedsigner.
# Copyright (C) 2024 ORGANIZATION
# Copyright (C) 2025 ORGANIZATION
# This file is distributed under the same license as the seedsigner project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2025.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: seedsigner 0.8.5-rc1\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-12-30 13:43-0600\n"
"POT-Creation-Date: 2025-01-15 10:45-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -539,11 +539,12 @@ msgstr ""
msgid "Build Final Word"
msgstr ""

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

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

#: src/seedsigner/models/settings_definition.py
msgid "Electrum seeds"
msgstr ""

#: src/seedsigner/models/settings_definition.py
msgid "Native Segwit only"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion seedsigner-screenshots
Submodule seedsigner-screenshots updated 96 files
+ en/main_menu_views/OpeningSplashView.png
+ en/main_menu_views/OpeningSplashView_no_partner_logos.png
+ en/seed_views/AddressVerificationSuccessView.png
+ en/seed_views/SeedAddPassphraseView.png
+ en/seed_views/SeedAddressVerificationSuccessView.png
+ en/seed_views/SeedSelectSeedView.png
+ en/settings_views/ToolsAddressExplorerAddressListView.png
+ es/main_menu_views/MainMenuView.png
+ es/main_menu_views/MainMenuView_RemoveSDCardToast.png
+ es/main_menu_views/MainMenuView_SDCardStateChangeToast_inserted.png
+ es/main_menu_views/MainMenuView_SDCardStateChangeToast_removed.png
+ es/main_menu_views/OpeningSplashView.png
+ es/main_menu_views/OpeningSplashView_no_partner_logos.png
+ es/main_menu_views/PowerOptionsView.png
+ es/main_menu_views/RestartView.png
+ es/misc_error_views/ErrorView.png
+ es/misc_error_views/NotYetImplementedView.png
+ es/misc_error_views/OptionDisabledView.png
+ es/misc_error_views/UnhandledExceptionView.png
+ es/psbt_views/PSBTAddressDetailsView.png
+ es/psbt_views/PSBTAddressVerificationFailedView_multisig_change.png
+ es/psbt_views/PSBTAddressVerificationFailedView_multisig_selftransfer.png
+ es/psbt_views/PSBTAddressVerificationFailedView_singlesig_change.png
+ es/psbt_views/PSBTAddressVerificationFailedView_singlesig_selftransfer.png
+ es/psbt_views/PSBTNoChangeWarningView.png
+ es/psbt_views/PSBTOpReturnView_raw_hex_data.png
+ es/psbt_views/PSBTOpReturnView_text.png
+ es/psbt_views/PSBTOverviewView.png
+ es/psbt_views/PSBTOverviewView_op_return.png
+ es/psbt_views/PSBTSelectSeedView.png
+ es/psbt_views/PSBTSigningErrorView.png
+ es/psbt_views/PSBTUnsupportedScriptTypeWarningView.png
+ es/seed_views/AddressVerificationSigTypeView.png
+ es/seed_views/AddressVerificationSuccessView.png
+ es/seed_views/LoadMultisigWalletDescriptorView.png
+ es/seed_views/LoadSeedView.png
+ es/seed_views/SeedAddPassphraseExitDialogView.png
+ es/seed_views/SeedAddPassphraseView.png
+ es/seed_views/SeedAddPassphraseView_lowercase.png
+ es/seed_views/SeedAddPassphraseView_symbols_1.png
+ es/seed_views/SeedAddPassphraseView_symbols_2.png
+ es/seed_views/SeedAddPassphraseView_uppercase.png
+ es/seed_views/SeedAddressVerificationSuccessView.png
+ es/seed_views/SeedBIP85ApplicationModeView.png
+ es/seed_views/SeedBIP85InvalidChildIndexView.png
+ es/seed_views/SeedBackupView.png
+ es/seed_views/SeedDiscardView.png
+ es/seed_views/SeedElectrumMnemonicStartView.png
+ es/seed_views/SeedExportXpubSigTypeView.png
+ es/seed_views/SeedExportXpubWarningView.png
+ es/seed_views/SeedFinalizeView.png
+ es/seed_views/SeedMnemonicEntryView.png
+ es/seed_views/SeedMnemonicInvalidView.png
+ es/seed_views/SeedOptionsView.png
+ es/seed_views/SeedReviewPassphraseView.png
+ es/seed_views/SeedSelectSeedView.png
+ es/seed_views/SeedSelectSeedView_address_verification.png
+ es/seed_views/SeedSelectSeedView_sign_message.png
+ es/seed_views/SeedSignMessageConfirmAddressView.png
+ es/seed_views/SeedTranscribeSeedQRConfirmQRPromptView.png
+ es/seed_views/SeedTranscribeSeedQRFormatView.png
+ es/seed_views/SeedTranscribeSeedQRWarningView.png
+ es/seed_views/SeedTranscribeSeedQRWholeQRView_12_Compact.png
+ es/seed_views/SeedTranscribeSeedQRWholeQRView_12_Standard.png
+ es/seed_views/SeedTranscribeSeedQRWholeQRView_24_Compact.png
+ es/seed_views/SeedTranscribeSeedQRWholeQRView_24_Standard.png
+ es/seed_views/SeedWordsBackupTestMistakeView.png
+ es/seed_views/SeedWordsBackupTestPromptView.png
+ es/seed_views/SeedWordsBackupTestSuccessView.png
+ es/seed_views/SeedWordsView.png
+ es/seed_views/SeedWordsView_2.png
+ es/seed_views/SeedWordsWarningView.png
+ es/seed_views/SeedsMenuView.png
+ es/settings_views/IOTestView.png
+ es/settings_views/SettingsEntryUpdateSelectionView_bip85_child_seeds.png
+ es/settings_views/SettingsEntryUpdateSelectionView_camera_rotation.png
+ es/settings_views/SettingsEntryUpdateSelectionView_denomination.png
+ es/settings_views/SettingsEntryUpdateSelectionView_electrum_seeds.png
+ es/settings_views/SettingsEntryUpdateSelectionView_persistent_settings.png
+ es/settings_views/SettingsEntryUpdateSelectionView_qr_brightness_tips.png
+ es/settings_views/SettingsEntryUpdateSelectionView_qr_density.png
+ es/settings_views/SettingsEntryUpdateSelectionView_sig_types.png
+ es/settings_views/SettingsEntryUpdateSelectionView_xpub_details.png
+ es/settings_views/SettingsIngestSettingsQRView_not_persistent.png
+ es/settings_views/SettingsIngestSettingsQRView_persistent.png
+ es/settings_views/SettingsMenuView.png
+ es/settings_views/SettingsMenuView__Advanced.png
+ es/settings_views/ToolsAddressExplorerAddressListView.png
+ es/tools_views/ToolsAddressExplorerAddressTypeView.png
+ es/tools_views/ToolsAddressExplorerSelectSourceView.png
+ es/tools_views/ToolsCalcFinalWordDoneView.png
+ es/tools_views/ToolsCalcFinalWordFinalizePromptView.png
+ es/tools_views/ToolsCalcFinalWordNumWordsView.png
+ es/tools_views/ToolsDiceEntropyMnemonicLengthView.png
+ es/tools_views/ToolsImageEntropyMnemonicLengthView.png
+ es/tools_views/ToolsMenuView.png
6 changes: 3 additions & 3 deletions src/seedsigner/gui/screens/tools_screens.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ def __post_init__(self):
super().__post_init__()

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

Expand Down Expand Up @@ -454,7 +454,7 @@ def __post_init__(self):
self.components.append(IconTextLine(
# TRANSLATOR_NOTE: a label for a BIP-380-ish Output Descriptor
label_text=_("Wallet descriptor"),
value_text=self.wallet_descriptor_display_name,
value_text=self.wallet_descriptor_display_name, # TODO: English text from embit (e.g. "1 / 2 multisig"); make l10 friendly
is_text_centered=True,
screen_x=GUIConstants.EDGE_PADDING,
screen_y=self.top_nav.height + GUIConstants.COMPONENT_PADDING,
Expand Down
2 changes: 1 addition & 1 deletion src/seedsigner/models/settings_definition.py
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ class SettingsDefinition:
SettingsEntry(category=SettingsConstants.CATEGORY__FEATURES,
attr_name=SettingsConstants.SETTING__ELECTRUM_SEEDS,
abbreviated_name="electrum",
display_name="Electrum seeds",
display_name=_mft("Electrum seeds"),
help_text=_mft("Native Segwit only"),
visibility=SettingsConstants.VISIBILITY__ADVANCED,
default_value=SettingsConstants.OPTION__DISABLED),
Expand Down

0 comments on commit cbaaaf4

Please sign in to comment.