derivepassphrase.git

@@ -7,8 +7,8 @@ msgid ""

 msgstr ""

 "Project-Id-Version: derivepassphrase 0.5a1.dev1\n"

 "Report-Msgid-Bugs-To: software@the13thletter.info\n"

-"POT-Creation-Date: 2025-03-16 13:30+0100\n"

-"PO-Revision-Date: 2025-03-16 13:30+0100\n"

+"POT-Creation-Date: 2025-03-16 23:12+0100\n"

+"PO-Revision-Date: 2025-03-16 23:12+0100\n"

 "Last-Translator: AUTHOR <someone@example.com>\n"

 "Language: en\n"

 "Language-Team: English\n"

@@ -45,6 +45,13 @@ msgctxt "Label :: Error message :: Metavar"

 msgid "service-specific settings"

 msgstr ""

+#. TRANSLATORS: This value is used as the {key} metavar for Label.PASSPHRASE_NOT_NORMALIZED if the passphrase was entered interactively.

+#. 

+#. Message-ID: Label.SETTINGS_ORIGIN_INTERACTIVE

+msgctxt "Label :: Error message :: Metavar"

+msgid "interactive input"

+msgstr ""

+

 #. TRANSLATORS: Message-ID: Label.CONFIGURATION_EPILOG

 msgctxt "Label :: Help text :: Explanation"

 msgid "Use $VISUAL or $EDITOR to configure the spawned editor."

@@ -122,7 +129,7 @@ msgstr ""

 #. 

 #. Message-ID: Label.DERIVEPASSPHRASE_VAULT_NOTES_LEGACY_INSTRUCTION_TEXT

 msgctxt "Label :: Help text :: Explanation"

-msgid "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."

+msgid "INSERT NOTES HERE"

 msgstr ""

 #. TRANSLATORS: The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.

@@ -347,8 +354,9 @@ msgstr ""

 #. TRANSLATORS: The corresponding option is displayed as "--print-notes-before / --print-notes-after", so you may want to hint that the default (after) is the second of those options.

 #. 

 #. Message-ID: Label.DERIVEPASSPHRASE_VAULT_PRINT_NOTES_BEFORE_HELP_TEXT

+#, python-brace-format

 msgctxt "Label :: Help text :: One-line description"

-msgid "Print the service notes (if any) before or after (default) the existing configuration."

+msgid "Print the notes for {service_metavar} (if any) before or after (default) the derived passphrase."

 msgstr ""

 #. TRANSLATORS: The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.

@@ -356,7 +364,7 @@ msgstr ""

 #. Message-ID: Label.DERIVEPASSPHRASE_VAULT_REPEAT_HELP_TEXT

 #, python-brace-format

 msgctxt "Label :: Help text :: One-line description"

-msgid "Forbid any run of {metavar} identical characters."

+msgid "Restrict runs of identical characters to at most {metavar} characters."

 msgstr ""

 #. TRANSLATORS: The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.

@@ -379,7 +387,7 @@ msgstr ""

 #. 

 #. Message-ID: Label.DERIVEPASSPHRASE_VAULT_UNSET_HELP_TEXT

 msgctxt "Label :: Help text :: One-line description"

-msgid "With --config, also unsets the given setting.  May be specified multiple times."

+msgid "With --config, also unset the given setting.  May be specified multiple times."

 msgstr ""

 #. TRANSLATORS: The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.

@@ -757,7 +765,7 @@ msgctxt "Debug message"

 msgid "Buffer: {contents}\n"

 "\n"

 "IV: {iv}\n"

-"Payload: {payload}\n"

+"Payload (ciphertext): {payload}\n"

 "MAC: {mac}"

 msgstr ""

@@ -794,7 +802,7 @@ msgstr ""

 #. 

 #. Message-ID: InfoMsgTemplate.ASSEMBLING_CONFIG_STRUCTURE

 msgctxt "Info message"

-msgid "Assembling config structure"

+msgid "Assembling config structure."

 msgstr ""

 #. TRANSLATORS: "fmt" is a string such as "v0.2" or "storeroom", indicating the format which we tried to load the vault configuration as.

@@ -809,7 +817,7 @@ msgstr ""

 #. 

 #. Message-ID: InfoMsgTemplate.CHECKING_CONFIG_STRUCTURE_CONSISTENCY

 msgctxt "Info message"

-msgid "Checking config structure consistency"

+msgid "Checking config structure consistency."

 msgstr ""

 #. TRANSLATORS: This message is emitted by the vault configuration exporter for "storeroom"-type configuration directories.  The system stores entries in different "buckets" of a hash table.  We parse the directory bucket by bucket.  All buckets are numbered in hexadecimal, and typically there are 32 buckets, so 2-digit hex numbers.

@@ -817,14 +825,14 @@ msgstr ""

 #. Message-ID: InfoMsgTemplate.DECRYPTING_BUCKET

 #, python-brace-format

 msgctxt "Info message"

-msgid "Decrypting bucket {bucket_number}"

+msgid "Decrypting bucket {bucket_number}."

 msgstr ""

 #. TRANSLATORS: This message is emitted by the vault configuration exporter for "storeroom"-type configuration directories.  `.keys` is a filename, from which data about the master keys for this configuration are loaded.

 #. 

 #. Message-ID: InfoMsgTemplate.PARSING_MASTER_KEYS_DATA

 msgctxt "Info message"

-msgid "Parsing master keys data from .keys"

+msgid "Parsing master keys data from `.keys`."

 msgstr ""

 #. TRANSLATORS: This message immediately follows an error message about a missing library that needs to be installed.  The Python Package Index (PyPI) supports declaring sets of optional dependencies as "extras", so users installing from PyPI can request reinstallation with a named "extra" being enabled.  This would then let the installer take care of the missing libraries automatically, hence this suggestion to PyPI users.

@@ -845,24 +853,24 @@ msgstr ""

 #. TRANSLATORS: Message-ID: InfoMsgTemplate.VAULT_NATIVE_CHECKING_MAC

 msgctxt "Info message"

-msgid "Checking MAC"

+msgid "Checking MAC."

 msgstr ""

 #. TRANSLATORS: Message-ID: InfoMsgTemplate.VAULT_NATIVE_DECRYPTING_CONTENTS

 msgctxt "Info message"

-msgid "Decrypting contents"

+msgid "Decrypting contents."

 msgstr ""

 #. TRANSLATORS: Message-ID: InfoMsgTemplate.VAULT_NATIVE_DERIVING_KEYS

 msgctxt "Info message"

-msgid "Deriving an encryption and signing key"

+msgid "Deriving an encryption and signing key."

 msgstr ""

 #. TRANSLATORS: This message is emitted by the vault configuration exporter for "native"-type configuration directories.  "IV" means "initialization vector", and "MAC" means "message authentication code".  They are specifically cryptographic terms, as is "payload".  The acronyms "IV" and "MAC" are assumed to be well-known to the English target audience, or at least discoverable by them; they *are* asking for debug output, after all.  Please use your judgement as to whether to translate these terms or not, expanded or not.

 #. 

 #. Message-ID: InfoMsgTemplate.VAULT_NATIVE_PARSING_IV_PAYLOAD_MAC

 msgctxt "Info message"

-msgid "Parsing IV, payload and MAC from the file contents"

+msgid "Parsing IV, payload and MAC from the file contents."

 msgstr ""

 #. TRANSLATORS: Message-ID: WarnMsgTemplate.EDITING_NOTES_BUT_NOT_STORING_CONFIG

@@ -909,7 +917,7 @@ msgctxt "Warning message"

 msgid "A backup copy of the old notes was saved to {filename!r}.  This is a safeguard against editing mistakes, because the vault(1)-compatible legacy editor interface does not allow aborting mid-edit, and because the notes were actually changed."

 msgstr ""

-#. TRANSLATORS: The key is a (vault) configuration key, in JSONPath syntax, typically "$.global" for the global passphrase or "$.services.service_name" or "$.services["service with spaces"]" for the services "service_name" and "service with spaces", respectively.  The form is one of the four Unicode normalization forms: NFC, NFD, NFKC, NFKD.  The asterisks are not special.  Please feel free to substitute any other appropriate way to mark up emphasis of the word "displays".

+#. TRANSLATORS: The key is a (vault) configuration key, in JSONPath syntax, typically "$.global" for the global passphrase or "$.services.service_name" or "$.services["service with spaces"]" for the services "service_name" and "service with spaces", respectively.  Alternatively, it may be the value of Label.SETTINGS_ORIGIN_INTERACTIVE if the passphrase was entered interactively.  The form is one of the four Unicode normalization forms: NFC, NFD, NFKC, NFKD.  The asterisks are not special.  Please feel free to substitute any other appropriate way to mark up emphasis of the word "displays".

 #. 

 #. Message-ID: WarnMsgTemplate.PASSPHRASE_NOT_NORMALIZED

 #, python-brace-format

@@ -705,11 +705,11 @@ class ORIGIN(enum.Enum):

     """The origin of a setting, if not from the user configuration file.

     Attributes:

-        INTERACTIVE (str): interactive input

+        INTERACTIVE (_msg.Label): interactive input

     """

-    INTERACTIVE = 'interactive input'

+    INTERACTIVE = _msg.Label.SETTINGS_ORIGIN_INTERACTIVE

     """"""

@@ -765,7 +765,9 @@ def check_for_misleading_passphrase(

         raise AssertionError(msg)

     logger = logging.getLogger(PROG_NAME)

     formatted_key = (

-        key.value if isinstance(key, ORIGIN) else _types.json_path(key)

+        str(_msg.TranslatedString(key.value))

+        if isinstance(key, ORIGIN)

+        else _types.json_path(key)

     )

     if 'phrase' in value:

         phrase = value['phrase']

@@ -679,6 +679,14 @@ class Label(enum.Enum):

         'service-specific settings',

     )

     """"""

+    SETTINGS_ORIGIN_INTERACTIVE = commented(

+        'This value is used as the {key} metavar for '

+        'Label.PASSPHRASE_NOT_NORMALIZED if the passphrase was '

+        'entered interactively.',

+    )(

+        'Label :: Error message :: Metavar',

+        'interactive input',

+    )

     CONFIGURATION_EPILOG = commented(

         '',

     )(

@@ -808,9 +816,7 @@ class Label(enum.Enum):

         'obviously recognize as placeholder text.)'

     )(

         'Label :: Help text :: Explanation',

-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, '

-        'sed do eiusmod tempor incididunt ut labore '

-        'et dolore magna aliqua.',

+        'INSERT NOTES HERE',

     )

     """"""

     PASSPHRASE_GENERATION_EPILOG = commented(

@@ -1101,15 +1107,17 @@ class Label(enum.Enum):

         'hint that the default (after) is the second of those options.',

     )(

         'Label :: Help text :: One-line description',

-        'Print the service notes (if any) before or after (default) '

-        'the existing configuration.',

+        'Print the notes for {service_metavar} (if any) before or '

+        'after (default) the derived passphrase.',

+        flags='python-brace-format',

     )

     """"""

     DERIVEPASSPHRASE_VAULT_REPEAT_HELP_TEXT = commented(

         'The metavar is Label.PASSPHRASE_GENERATION_METAVAR_NUMBER.',

     )(

         'Label :: Help text :: One-line description',

-        'Forbid any run of {metavar} identical characters.',

+        'Restrict runs of identical characters to at most {metavar} '

+        'characters.',

         flags='python-brace-format',

     )

     """"""

@@ -1138,7 +1146,7 @@ class Label(enum.Enum):

         '"--config" for this option to have any effect.',

     )(

         'Label :: Help text :: One-line description',

-        'With --config, also unsets the given setting.  '

+        'With --config, also unset the given setting.  '

         'May be specified multiple times.',

     )

     """"""

@@ -1709,7 +1717,7 @@ Buffer: {contents}

   \b

   IV: {iv}

-  Payload: {payload}

+  Payload (ciphertext): {payload}

   MAC: {mac}

 """,

         flags='python-brace-format',

@@ -1775,7 +1783,7 @@ class InfoMsgTemplate(enum.Enum):

         'build it on-the-fly), hence the term "assembling".',

     )(

         'Info message',

-        'Assembling config structure',

+        'Assembling config structure.',

     )

     """"""

     CANNOT_LOAD_AS_VAULT_CONFIG = commented(

@@ -1796,7 +1804,7 @@ class InfoMsgTemplate(enum.Enum):

         'assembled structure is internally consistent.',

     )(

         'Info message',

-        'Checking config structure consistency',

+        'Checking config structure consistency.',

     )

     """"""

     DECRYPTING_BUCKET = commented(

@@ -1808,7 +1816,7 @@ class InfoMsgTemplate(enum.Enum):

         '32 buckets, so 2-digit hex numbers.',

     )(

         'Info message',

-        'Decrypting bucket {bucket_number}',

+        'Decrypting bucket {bucket_number}.',

         flags='python-brace-format',

     )

     """"""

@@ -1819,7 +1827,7 @@ class InfoMsgTemplate(enum.Enum):

         'for this configuration are loaded.',

     )(

         'Info message',

-        'Parsing master keys data from .keys',

+        'Parsing master keys data from `.keys`.',

     )

     """"""

     PIP_INSTALL_EXTRA = commented(

@@ -1850,21 +1858,21 @@ class InfoMsgTemplate(enum.Enum):

         '',

     )(

         'Info message',

-        'Checking MAC',

+        'Checking MAC.',

     )

     """"""

     VAULT_NATIVE_DECRYPTING_CONTENTS = commented(

         '',

     )(

         'Info message',

-        'Decrypting contents',

+        'Decrypting contents.',

     )

     """"""

     VAULT_NATIVE_DERIVING_KEYS = commented(

         '',

     )(

         'Info message',

-        'Deriving an encryption and signing key',

+        'Deriving an encryption and signing key.',

     )

     """"""

     VAULT_NATIVE_PARSING_IV_PAYLOAD_MAC = commented(

@@ -1880,7 +1888,7 @@ class InfoMsgTemplate(enum.Enum):

         'or not, expanded or not.',

     )(

         'Info message',

-        'Parsing IV, payload and MAC from the file contents',

+        'Parsing IV, payload and MAC from the file contents.',

     )

     """"""

@@ -1950,6 +1958,9 @@ class WarnMsgTemplate(enum.Enum):

         '"$.services.service_name" or "$.services["service with spaces"]" '

         'for the services "service_name" and "service with spaces", '

         'respectively.  '

+        'Alternatively, it may be the value of '

+        'Label.SETTINGS_ORIGIN_INTERACTIVE if the passphrase was '

+        'entered interactively.  '

         'The form is one of the four Unicode normalization forms: '

         'NFC, NFD, NFKC, NFKD.  '

         'The asterisks are not special.  '

@@ -1746,7 +1746,10 @@ class _VaultContext:  # noqa: PLR0904

     'print_notes_before',

     default=False,

     help=_msg.TranslatedString(

-        _msg.Label.DERIVEPASSPHRASE_VAULT_PRINT_NOTES_BEFORE_HELP_TEXT

+        _msg.Label.DERIVEPASSPHRASE_VAULT_PRINT_NOTES_BEFORE_HELP_TEXT,

+        service_metavar=_msg.TranslatedString(

+            _msg.Label.VAULT_METAVAR_SERVICE

+        ),

     ),

     cls=cli_machinery.CompatibilityOption,

 )