diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1b60dac..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/oscap-anaconda-addon-0.2.tar.gz -/oscap-anaconda-addon-0.3.tar.gz -/oscap-anaconda-addon-0.4.tar.gz -/oscap-anaconda-addon-0.5.tar.gz -/oscap-anaconda-addon-0.6.tar.gz -/oscap-anaconda-addon-0.7.tar.gz -/oscap-anaconda-addon-1.0.tar.gz -/oscap-anaconda-addon-2.0.0.tar.gz -/addon-dbus-data.zip diff --git a/README.md b/README.md new file mode 100644 index 0000000..24b9ea2 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Package Not Available +This package is not available on CentOS Stream 10. +It may be available on another branch. \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a5ce976 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +oscap-anaconda-addon package is retired on branch c10s for CS-2551 \ No newline at end of file diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 648918d..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/lang.patch b/lang.patch deleted file mode 100644 index 6a63c54..0000000 --- a/lang.patch +++ /dev/null @@ -1,8040 +0,0 @@ -diff -U3 -N -r a/po/ca.po b/po/ca.po ---- a/po/ca.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/ca.po 2023-07-19 13:47:28.583054415 +0200 -@@ -9,7 +9,7 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" - "PO-Revision-Date: 2015-09-29 07:31-0400\n" - "Last-Translator: Robert Antoni Buj Gelonch \n" - "Language-Team: Catalan (http://www.transifex.com/projects/p/oscap-anaconda-" -@@ -21,12 +21,12 @@ - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Zanata 4.6.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" - msgstr "" - --#: ../org_fedora_oscap/content_discovery.py:167 -+#: ../org_fedora_oscap/content_discovery.py:189 - #, fuzzy, python-brace-format - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "" -@@ -45,7 +45,7 @@ - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -54,7 +54,7 @@ - msgstr "" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -63,33 +63,33 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "" - "assegureu-vos de crear una contrasenya amb una mida mínima de %d caràcters" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "" - "no es pot comprovar la mida de la contrasenya de root (la contrasenya està " - "xifrada)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "el paquet «%s» s'ha afegit a la llista dels paquets instal·lats" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -97,67 +97,59 @@ - "installation." - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "el paquet «%s» s'ha afegit a la llista dels paquets exclosos" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 -+#: ../org_fedora_oscap/service/installation.py:41 - #, fuzzy - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "The integrity check of the security content failed." -@@ -165,63 +157,85 @@ - "Ha fallat la comprovació de la integritat del contingut. No es pot utilitzar " - "el contingut." - --#: ../org_fedora_oscap/ks/oscap.py:404 -+#: ../org_fedora_oscap/service/installation.py:46 - #, fuzzy - #| msgid "Error fetching and loading content" - msgid "There was an error fetching and loading the security content:\n" - msgstr "S'ha produït un error en capturar i carregar el contingut" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:462 -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "" -+ -+#: ../org_fedora_oscap/service/installation.py:148 - #, fuzzy - #| msgid "Misconfiguration detected" - msgid "Wrong configuration detected!" - msgstr "S'ha detectat una configuració errònia" - -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+ - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "" -+#, fuzzy -+#| msgid "_Select profile" -+msgid "_Security Profile" -+msgstr "_Selecciona el perfil" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "No està llest" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "S'estan obtenint les dades del contingut" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+#, fuzzy -+#| msgid "Fetching content data" -+msgid "Fetch complete, analyzing data." -+msgstr "S'estan obtenint les dades del contingut" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "No s'ha seleccionat cap perfil" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Sense regles per a la fase de pre-instal·lació" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "" - "S'ha proporcionat un context no vàlid. Si us plau, introduïu un URL diferent." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" - "L'URL del contingut no és vàlid o no està admès, si us plau, introduïu-ne un " - "altre diferent." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "" - "L'obtenció del contingut ha fallat. Si us plau, introduïu un URL diferent." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -229,20 +243,20 @@ - "S'ha detectat un error de xarxa quan es capturaven les dades. Reviseu que la " - "xarxa estigui configurada i que aquesta estigui funcionant." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - "Ha fallat la comprovació de la integritat del contingut. No es pot utilitzar " - "el contingut." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" - "L'extracció del contingut ha fallat (%s). Si us plau, introduïu un URL " - "diferent." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -251,54 +265,58 @@ - "El perfil amb l'id. «%s» no està definit en el contingut. Seleccioneu un " - "perfil diferent, si us plau" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+#, fuzzy -+#| msgid "Not applying security policy" -+msgid "Not applying security profile" - msgstr "Sense aplicar la política de seguretat" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr "" - "A continuació introduïu el contingut del flux de dades o l'URL de l'arxiu:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "No s'ha trobat cap contingut. Si us plau, a continuació introduïu el " - "contingut del flux de dades o l'URL de l'arxiu:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "S'ha produït un error en capturar i carregar el contingut" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "No s'ha trobat cap contingut" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "S'ha detectat una configuració errònia" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Advertències que van aparèixer" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Tot està bé" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "L'URL no és vàlid o no està admès" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "S'està obtenint el contingut..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" -+#, fuzzy -+#| msgid "SECURITY POLICY" -+msgid "SECURITY PROFILE" - msgstr "POLÍTICA DE SEGURETAT" - - #: tmp/oscap.glade.h:2 -diff -U3 -N -r a/po/cs.po b/po/cs.po ---- a/po/cs.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/cs.po 2023-07-19 13:47:28.583054415 +0200 -@@ -12,11 +12,11 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" --"PO-Revision-Date: 2021-07-02 15:11+0000\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2021-07-13 13:04+0000\n" - "Last-Translator: Matěj Týč \n" --"Language-Team: Czech \n" -+"Language-Team: Czech \n" - "Language: cs\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -24,29 +24,29 @@ - "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - "X-Generator: Weblate 4.7.1\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" --msgstr "" -+msgstr "Nelze rozbalit archiv jako soubor zip: {exc}" - --#: ../org_fedora_oscap/content_discovery.py:167 --#, fuzzy, python-brace-format --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/content_discovery.py:189 -+#, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" --msgstr "Test integrity dat neprošel. Nelze použít tato data." -+msgstr "" -+"Test integrity dat neprošel - nesouhlasí kontrolní součet {hash_obj.name}" - - #: ../org_fedora_oscap/data_fetch.py:117 - msgid "Network connection needed to fetch data." --msgstr "" -+msgstr "Ke stažení dat je třeba být připojen k síti." - - #: ../org_fedora_oscap/data_fetch.py:262 - #, python-brace-format - msgid "" - "Failed to fetch data - the request returned HTTP error code {return_code}" --msgstr "" -+msgstr "Nezdařilo se stažení dat - HTTP požadavek skončil chybou {return_code}" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -58,24 +58,24 @@ - "bezpečnostním profilem" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" - msgstr "parametr '%(mount_option)s' přidán pro přípojný bod %(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "ujistěte se, že heslo bude mít minimální délku %d znaků" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "nelze zkontrolovat délku hesla uživatele root (heslo je šifrováno)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -84,13 +84,13 @@ - "heslo uživatele root je příliš krátké, je vyžadováno delší heslo s nejméně " - "%d znaky" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "balík '%s' byl přidán do seznamu instalovaných balíků" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -100,125 +100,133 @@ - "balík '{package}' byl přidán do seznamu vyřazených balíků, ale výběr " - "softwaru zvoleného k intsalaci se bez něho neobejde." - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "balík '%s' byl přidán do seznamu vyloučených balíků" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump bude při spuštění zakázán" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump bude při spuštění povolen" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "Firewall bude při spuštění zakázán" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "Firewall bude při spuštění povolen" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "služba '%s' byla přidána na seznam služeb k přidání do firewallu" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "port '%s' byl přidán na seznam portů k přidání do firewallu" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "důvěra '%s' byla přidána na seznam důvěr k přidání do firewallu" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" - msgstr "služba '%s' byla přidána na seznam služeb k odebrání z firewallu" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 --#, fuzzy --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." --msgstr "Test integrity dat neprošel. Nelze použít tato data." -+msgstr "Test integrity dat neprošel." - --#: ../org_fedora_oscap/ks/oscap.py:404 --#, fuzzy --#| msgid "Error fetching and loading content" -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" --msgstr "Chyba při získávání a načítání dat" -+msgstr "Chyba při získávání a načítání dat:\n" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." --msgstr "" -+msgstr "Došlo k nečekanému problému s daty." - --#: ../org_fedora_oscap/ks/oscap.py:462 --#, fuzzy --#| msgid "Misconfiguration detected" -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "Instalaci byste měli ukončit." -+ -+#: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" --msgstr "Detekována nesprávná konfigurace" -+msgstr "Detekována nesprávná konfigurace!" -+ -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" - - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" -+#, fuzzy -+#| msgid "_Security Policy" -+msgid "_Security Profile" - msgstr "_Politika zabezpečení" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "Není připraven" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Načítají se data" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+#, fuzzy -+#| msgid "Fetching content data" -+msgid "Fetch complete, analyzing data." -+msgstr "Načítají se data" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Není vybrán žádný profil" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Žádná pravidla pro předinstalační fázi" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Nevalidní data. Zadejte jiné URL, prosím." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "Nevalidní nebo nepodporované datové URL, zadejte prosím jiné." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Načítání dat selhalo. Zadejte jiné URL, prosím." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -226,68 +234,72 @@ - "Během získávání dat se vyskytla chyba sítě. Zkontrolujte prosím, že je síť " - "nastavena a funkční." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "Test integrity dat neprošel. Nelze použít tato data." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Rozbalování dat selhalo (%s). Zadejte jiné URL, prosím." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " - "please" - msgstr "Profil s ID '%s' není definován v datech. Vyberte prosím jiný profil" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+#, fuzzy -+#| msgid "Not applying security policy" -+msgid "Not applying security profile" - msgstr "Neaplikovat bezpečnostní politiku" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr " nebo zadejte URL data streamu, případně archivu:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Nenalezen žádný zdroj dat. Prosím uveďte URL k data streamu nebo archivu:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Chyba při získávání a načítání dat" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Žádná data k dispozici" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Detekována nesprávná konfigurace" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Varování" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Vše v pořádku" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "Nevalidní nebo nepodporované URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Načítám data..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" -+#, fuzzy -+#| msgid "SECURITY POLICY" -+msgid "SECURITY PROFILE" - msgstr "POLITIKA ZABEZPEČENÍ" - - #: tmp/oscap.glade.h:2 -@@ -334,6 +346,9 @@ - msgid "_Fetch" - msgstr "_Načíst" - -+#~ msgid "Do you wish to continue anyway?" -+#~ msgstr "Přejete si přesto pokračovat?" -+ - #~ msgid "" - #~ "There was an error fetching and loading the security content:\n" - #~ "%s\n" -diff -U3 -N -r a/po/de.po b/po/de.po ---- a/po/de.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/de.po 2023-07-19 13:47:28.583054415 +0200 -@@ -3,23 +3,24 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" --"PO-Revision-Date: 2019-08-30 10:55-0400\n" --"Last-Translator: Ludek Janda \n" --"Language-Team: German\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2022-12-24 15:19+0000\n" -+"Last-Translator: Ettore Atalan \n" -+"Language-Team: German \n" - "Language: de\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=2; plural=(n != 1)\n" --"X-Generator: Zanata 4.6.2\n" -+"Plural-Forms: nplurals=2; plural=n != 1;\n" -+"X-Generator: Weblate 4.15\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" - msgstr "" - --#: ../org_fedora_oscap/content_discovery.py:167 -+#: ../org_fedora_oscap/content_discovery.py:189 - #, fuzzy, python-brace-format - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "" -@@ -30,7 +31,7 @@ - - #: ../org_fedora_oscap/data_fetch.py:117 - msgid "Network connection needed to fetch data." --msgstr "" -+msgstr "Zum Abrufen der Daten ist eine Netzwerkverbindung erforderlich." - - #: ../org_fedora_oscap/data_fetch.py:262 - #, python-brace-format -@@ -38,7 +39,7 @@ - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -50,7 +51,7 @@ - "Installation mit einem Sicherheitsprofil erfolgen kann" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -59,21 +60,21 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "" - "Stellen Sie sicher, dass Sie ein Kennwort mit einer Mindestlänge von " - "erstellen %d Zeichen" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "" - "Länge des Root-Passworts kann nicht geprüft werden (Passwort wird " - "verschlüsselt)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -82,13 +83,13 @@ - "Das root-Passwort ist zu kurz, ein längeres mit mindestens %d Zeichen sind " - "erforderlich" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "Paket \"%s'wurde der Liste der zu installierenden Pakete hinzugefügt" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -96,30 +97,30 @@ - "installation." - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "Paket \"%s'wurde der Liste der ausgeschlossenen Pakete hinzugefügt" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump wird beim Start deaktiviert" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump wird beim Start aktiviert" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "Die Firewall wird beim Start deaktiviert" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "Die Firewall wird beim Start aktiviert" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " -@@ -128,8 +129,8 @@ - "Bedienung '%s'wurde der Liste der Dienste hinzugefügt, die zur Firewall " - "hinzugefügt werden sollen" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" -@@ -137,8 +138,8 @@ - "Hafen '%s'wurde der Liste der Ports hinzugefügt, die der Firewall " - "hinzugefügt werden sollen" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -146,8 +147,8 @@ - "vertrauen '%s'wurde der Liste der Vertrauensstellungen hinzugefügt, die der " - "Firewall hinzugefügt werden sollen" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -156,15 +157,7 @@ - "Bedienung '%s'wurde der Liste der Dienste hinzugefügt, die aus der Firewall " - "entfernt werden sollen" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 -+#: ../org_fedora_oscap/service/installation.py:41 - #, fuzzy - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "The integrity check of the security content failed." -@@ -172,62 +165,84 @@ - "Die Integritätsprüfung des Inhalts ist fehlgeschlagen. Der Inhalt kann nicht " - "verwendet werden." - --#: ../org_fedora_oscap/ks/oscap.py:404 -+#: ../org_fedora_oscap/service/installation.py:46 - #, fuzzy - #| msgid "Error fetching and loading content" - msgid "There was an error fetching and loading the security content:\n" - msgstr "Fehler beim Abrufen und Laden von Inhalten" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:462 -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "" -+ -+#: ../org_fedora_oscap/service/installation.py:148 - #, fuzzy - #| msgid "Misconfiguration detected" - msgid "Wrong configuration detected!" - msgstr "Fehlkonfiguration erkannt" - -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+ - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "_Sicherheitspolitik" -+#, fuzzy -+#| msgid "_Security Policy" -+msgid "_Security Profile" -+msgstr "_Sicherheitsrichtlinie" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "Nicht bereit" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Inhaltsdaten abrufen" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+#, fuzzy -+#| msgid "Fetching content data" -+msgid "Fetch complete, analyzing data." -+msgstr "Inhaltsdaten abrufen" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Kein Profil ausgewählt" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Keine Regeln für die Vorinstallationsphase" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Ungültiger Inhalt bereitgestellt Bitte geben Sie eine andere URL ein." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" - "Ungültige oder nicht unterstützte Inhalts-URL. Bitte geben Sie eine andere " - "URL ein." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "" - "Inhalt konnte nicht abgerufen werden. Bitte geben Sie eine andere URL ein." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -235,20 +250,20 @@ - "Beim Abrufen von Daten ist ein Netzwerkfehler aufgetreten. Bitte überprüfen " - "Sie, ob das Netzwerk eingerichtet ist und funktioniert." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - "Die Integritätsprüfung des Inhalts ist fehlgeschlagen. Der Inhalt kann nicht " - "verwendet werden." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" - "Inhalt konnte nicht extrahiert werden (%s). Bitte geben Sie eine andere URL " - "ein." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -257,54 +272,58 @@ - "Profil mit ID '%s'im Inhalt nicht definiert. Bitte wählen Sie ein anderes " - "Profil" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+#, fuzzy -+#| msgid "Not applying security policy" -+msgid "Not applying security profile" - msgstr "Keine Sicherheitsrichtlinie anwenden" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr " oder geben Sie den Datenstrominhalt oder die Archiv-URL unten ein:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Kein Inhalt gefunden Bitte geben Sie den Datenstrom-Inhalt oder die Archiv-" - "URL unten ein:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Fehler beim Abrufen und Laden von Inhalten" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Kein Inhalt gefunden" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Fehlkonfiguration erkannt" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Warnungen erschienen" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Alles okay" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "Ungültige oder nicht unterstützte URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Inhalt wird abgerufen ..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" --msgstr "SICHERHEITSPOLITIK" -+#, fuzzy -+#| msgid "SECURITY POLICY" -+msgid "SECURITY PROFILE" -+msgstr "SICHERHEITSRICHTLINIE" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" -@@ -327,12 +346,10 @@ - msgstr "Wählen Sie unten ein Profil:" - - #: tmp/oscap.glade.h:7 --#, fuzzy - msgid "Profile" - msgstr "Profil" - - #: tmp/oscap.glade.h:8 --#, fuzzy - msgid "Selected" - msgstr "Ausgewählt" - -diff -U3 -N -r a/po/es.po b/po/es.po ---- a/po/es.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/es.po 2023-07-19 13:47:28.583054415 +0200 -@@ -13,7 +13,7 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" - "PO-Revision-Date: 2021-02-23 18:40+0000\n" - "Last-Translator: Emilio Herrera \n" - "Language-Team: Spanish \n" --"Language-Team: Finnish \n" -+"Language-Team: Finnish \n" - "Language: fi\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=n != 1;\n" --"X-Generator: Weblate 4.6.2\n" -+"X-Generator: Weblate 4.14.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" --msgstr "" -+msgstr "Virhe purettaessa arkistoa zip-tiedostona: {exc}" - --#: ../org_fedora_oscap/content_discovery.py:167 --#, fuzzy, python-brace-format --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/content_discovery.py:189 -+#, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" --msgstr "Sisällön eheyden tarkistus epäonnistui. Sisältöä ei voi käyttää." -+msgstr "" -+"Sisällön eheyden tarkistus epäonnistui. - {hash_obj.name} tarkiste ei ollut " -+"oikein" - - #: ../org_fedora_oscap/data_fetch.py:117 - msgid "Network connection needed to fetch data." --msgstr "" -+msgstr "Verkkoyhteys tarvitaan tiedonhakua varten." - - #: ../org_fedora_oscap/data_fetch.py:262 - #, python-brace-format - msgid "" - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" -+"Tietojen noutaminen epäonnistui - pyyntö palautti HTTP-virhekoodin " -+"{return_code}" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -52,24 +55,25 @@ - "turvallisuusprofiilin kanssa" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" --msgstr "Liitoskohta '%(mount_option)s' lisätty liitoskohtaan %(mount_point)s" -+msgstr "" -+"Liitosvaihtoehto '%(mount_option)s' lisätty liitospisteeseen %(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "Salasana luodessa, varmista, että siinä on vähintään %d merkkiä" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "ei voi tarkistaa rootin salasanan pituutta (salasana on salattu)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -78,13 +82,13 @@ - "rootin salasana on liian lyhyt, tarvitaan pidempi salasana, jossa on " - "vähintään %d merkkiä" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "paketti '%s' on lisätty asennettavien pakettien luetteloon" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -94,53 +98,53 @@ - "paketti '{package}' on lisätty poissuljettujen pakettien luetteloon, mutta " - "sitä ei voida poistaa nykyisestä ohjelmistovalinnasta rikkomatta asennusta." - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "paketti '%s' on lisätty poissuljettujen pakettien luetteloon" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump poistetaan käytöstä käynnistettäessä" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump otetaan käyttöön käynnistyksen yhteydessä" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "Palomuuri poistetaan käytöstä käynnistyksen yhteydessä" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "Palomuuri otetaan käyttöön käynnistyksen yhteydessä" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "palvelu '%s' on lisätty palomuuriin lisättävien palvelujen luetteloon" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "portti '%s' on lisätty palomuuriin lisättävien porttien luetteloon" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "" - "luottamus '%s' on lisätty palomuuriin lisättävien luotettavuuksien luetteloon" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -148,73 +152,78 @@ - msgstr "" - "palvelu '%s' on lisätty palomuurista poistettavien palvelujen luetteloon" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 --#, fuzzy --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." --msgstr "Sisällön eheyden tarkistus epäonnistui. Sisältöä ei voi käyttää." -+msgstr "Sisällön tietoturvasisällön eheyden tarkistus epäonnistui." - --#: ../org_fedora_oscap/ks/oscap.py:404 --#, fuzzy --#| msgid "Error fetching and loading content" -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" --msgstr "Virhe sisällön noutamisessa ja lataamisessa" -+msgstr "Sattui virhe tietoturvasisällön noutamisessa ja lataamisessa:\n" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." --msgstr "" -+msgstr "Toimitetun sisällön kohdalla oli odottamaton ongelma." -+ -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "Asennus pitäisi keskeyttää." - --#: ../org_fedora_oscap/ks/oscap.py:462 --#, fuzzy --#| msgid "Misconfiguration detected" -+#: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" --msgstr "Virheellinen määritys havaittu" -+msgstr "Virheellinen määritys havaittu!" -+ -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "Olet käyttänyt useampaa kuin yhtä oscap-lisäosaa kickstartissa. " -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+"Olet määrittänyt oscap-lisäosan käyttämällä osiota {used_section_header}. " - - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "_Turvallisuuskäytäntö" -+msgid "_Security Profile" -+msgstr "_Turvallisuusprofiili" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "Ei valmis" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Haetaan sisältötietoja" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+msgid "Fetch complete, analyzing data." -+msgstr "Haku valmis, analysoidaan tietoja." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Ei profiilia valittuna" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Ei sääntöjä asennusta edeltävää vaihetta varten" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Virheellinen sisältö annettuna. Syötä toinen URL." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "Virheellinen tai ei-tuettu sisällön URL. Syötä toinen." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Sisällön noutaminen epäonnistui. Syötä toinen URL." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -222,16 +231,16 @@ - "Verkkovirhe kohdattu tietoja noudettaessa. Tarkista, että verkko on " - "määritetty ja toimii." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "Sisällön eheyden tarkistus epäonnistui. Sisältöä ei voi käyttää." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Sisällön (%s) purkaminen epäonnistui. Syötä toinen URL." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -240,52 +249,52 @@ - "Profiilia, jonka tunnus on '%s', ei ole määritelty sisällössä. Valitse " - "toinen profiili" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" --msgstr "Ei sovelleta turvallisuuskäytäntöä" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" -+msgstr "Ei sovelleta turvallisuusprofiilia" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr " tai syötä tietovirran sisältö tai arkiston URL alle:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "Sisältöä ei löytynyt. Syötä tietovirran sisältö tai arkiston URL alle:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Virhe sisällön noutamisessa ja lataamisessa" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Sisältöä ei löytynyt" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Virheellinen määritys havaittu" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Varoitukset ilmestyivät" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Kaikki hyvin" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "Virheellinen tai tuettu URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Noudetaan sisältöä ..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" --msgstr "TURVALLISUUSKÄYTÄNTÖ" -+msgid "SECURITY PROFILE" -+msgstr "TURVALLISUUSPROFIILI" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" -@@ -331,6 +340,9 @@ - msgid "_Fetch" - msgstr "_Nouda" - -+#~ msgid "Do you wish to continue anyway?" -+#~ msgstr "Haluatko silti jatkaa?" -+ - #~ msgid "" - #~ "There was an error fetching and loading the security content:\n" - #~ "%s\n" -diff -U3 -N -r a/po/fr.po b/po/fr.po ---- a/po/fr.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/fr.po 2023-07-19 13:47:28.583054415 +0200 -@@ -12,43 +12,44 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" --"PO-Revision-Date: 2020-06-26 04:26-0400\n" --"Last-Translator: Copied by Zanata \n" --"Language-Team: French (http://www.transifex.com/projects/p/oscap-anaconda-" --"addon/language/fr/)\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2022-05-07 06:18+0000\n" -+"Last-Translator: Transtats \n" -+"Language-Team: French \n" - "Language: fr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=2; plural=(n > 1);\n" --"X-Generator: Zanata 4.6.2\n" -+"Plural-Forms: nplurals=2; plural=n > 1;\n" -+"X-Generator: Weblate 4.12.1\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" --msgstr "" -+msgstr "Erreur d'extraction de l'archive en tant que fichier zip : {exc}" - --#: ../org_fedora_oscap/content_discovery.py:167 --#, fuzzy, python-brace-format --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/content_discovery.py:189 -+#, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" - msgstr "" --"Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le " --"contenu." -+"Le contrôle d'intégrité du contenu a échoué - le hachage de {hash_obj.name} " -+"ne correspond pas" - - #: ../org_fedora_oscap/data_fetch.py:117 - msgid "Network connection needed to fetch data." --msgstr "" -+msgstr "Connexion réseau nécessaire pour récupérer les données." - - #: ../org_fedora_oscap/data_fetch.py:262 - #, python-brace-format - msgid "" - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" -+"Impossible de récupérer les données - la demande a renvoyé un code d'erreur " -+"HTTP {return_code}" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -60,7 +61,7 @@ - "avoir lieu avec un profil de sécurité" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -69,21 +70,21 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "" - "assurez-vous de créer un mot de passe d'une longueur minimale de %d " - "caractères" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "" - "impossible de vérifier la longueur du mot de passe de root (mot de passe " - "chiffré)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -92,13 +93,13 @@ - "le mot de passe de root est trop court, une longueur d'au moins %d " - "caractères est requise" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "le paquet « %s » a été ajouté à la liste des paquets à installer" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -109,30 +110,30 @@ - "pas être retiré de la sélection actuelle des logiciels sans interrompre " - "l'installation." - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "le paquet « %s » a été ajouté à la liste des paquets à exclure" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump va être désactivé au démarrage" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump va être activé au démarrage" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "Le pare-feu va être désactivé au démarrage" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "Le pare-feu va être activé au démarrage" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " -@@ -140,22 +141,22 @@ - msgstr "" - "service « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "port « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "trust « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -163,78 +164,85 @@ - msgstr "" - "service « %s » a été ajouté à la liste des paquets à retirer du pare-feu" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 --#, fuzzy --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." --msgstr "" --"Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le " --"contenu." -+msgstr "La vérification de l'intégrité du contenu sécurité a échoué." - --#: ../org_fedora_oscap/ks/oscap.py:404 --#, fuzzy --#| msgid "Error fetching and loading content" -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" --msgstr "Erreur d'extraction et de chargement du contenu" -+msgstr "" -+"Une erreur s'est produite lors de la récupération et du chargement du " -+"contenu sécurité :\n" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." --msgstr "" -+msgstr "Il y a eu un problème inattendu avec le contenu fourni." -+ -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "L'installation doit être interrompue." - --#: ../org_fedora_oscap/ks/oscap.py:462 --#, fuzzy --#| msgid "Misconfiguration detected" -+#: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" --msgstr "Mauvaise configuration détectée" -+msgstr "Mauvaise configuration détectée !" -+ -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+"Vous avez utilisé plus d’un add-on dans les sections oscap de kickstart " -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+"Vous avez configuré l'add-on oscap en utilisant la section " -+"'{used_section_header}'. " - - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "_Politique de sécurité" -+msgid "_Security Profile" -+msgstr "_Profil de sécurité" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "Pas prêt" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Récupération des données de contenu" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+msgid "Fetch complete, analyzing data." -+msgstr "Récupérer des données complètes et analytiques." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Aucun profil sélectionné" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Aucune règle pour la phase de pré-installation" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Contenu fourni invalide. Merci de saisir une URL différente." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" - "URL de contenu non prise en charge ou non valide, veuillez saisir une URL " - "différente." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "" - "Échec de la récupération du contenu. Merci de saisir une URL différente." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -242,19 +250,19 @@ - "Erreur de réseau lors de l'extraction des données. Veuillez vérifier que le " - "réseau ait été installé et fonctionne correctement." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - "Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le " - "contenu." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" - "Impossible d'extraire le contenu (%s). Merci de saisir une URL différente." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -263,55 +271,55 @@ - "Le profil ayant pour ID « %s »n'est pas défini dans le contenu. Sélectionner " - "un autre profil, s'il vous plaît" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" --msgstr "N'applique pas la politique de sécurité" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" -+msgstr "N'applique pas le profil de sécurité" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr "" - " ou saisir un flux de données de contenu ou l'URL d'une archive ci-dessous :" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Contenu introuvable. Merci de saisir un flux de données de contenu ou l'URL " - "d'une archive ci-dessous :" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Erreur d'extraction et de chargement du contenu" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Contenu introuvable" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Mauvaise configuration détectée" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Des avertissements sont apparus" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Tout est OK" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "URL invalide ou non prise en charge" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Récupération du contenu..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" --msgstr "POLITIQUE DE SÉCURITÉ" -+msgid "SECURITY PROFILE" -+msgstr "PROFIL DE SÉCURITÉ" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" -@@ -357,6 +365,9 @@ - msgid "_Fetch" - msgstr "_Récupérer" - -+#~ msgid "Do you wish to continue anyway?" -+#~ msgstr "Voulez-vous malgré tout continuer ?" -+ - #~ msgid "" - #~ "There was an error fetching and loading the security content:\n" - #~ "%s\n" -diff -U3 -N -r a/po/hr.po b/po/hr.po ---- a/po/hr.po 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/hr.po 2023-07-19 13:47:28.583054415 +0200 -@@ -0,0 +1,342 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2021-10-20 19:05+0000\n" -+"Last-Translator: Gogo Gogsi \n" -+"Language-Team: Croatian \n" -+"Language: hr\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -+"X-Generator: Weblate 4.8\n" -+ -+#: ../org_fedora_oscap/common.py:358 -+#, python-brace-format -+msgid "Error extracting archive as a zipfile: {exc}" -+msgstr "Greška raspakiravanja arhive kao zip datoteke: {exc}" -+ -+#: ../org_fedora_oscap/content_discovery.py:189 -+#, python-brace-format -+msgid "" -+"Integrity check of the content failed - {hash_obj.name} hash didn't match" -+msgstr "" -+"Neuspjela provjera cjelovitosti sadržaja - {hash_obj.name} vrijednost " -+"provjere se ne podudara" -+ -+#: ../org_fedora_oscap/data_fetch.py:117 -+msgid "Network connection needed to fetch data." -+msgstr "Mrežno povezivanje je potrebno za preuzimanje podataka." -+ -+#: ../org_fedora_oscap/data_fetch.py:262 -+#, python-brace-format -+msgid "" -+"Failed to fetch data - the request returned HTTP error code {return_code}" -+msgstr "" -+"Neuspjelo preuzimanje podataka - Zahtjev je vratio HTTP kôd geške " -+"{return_code}" -+ -+#: ../org_fedora_oscap/rule_handling.py:441 -+#, python-brace-format -+msgid "" -+"{0} must be on a separate partition or logical volume and has to be created " -+"in the partitioning layout before installation can occur with a security " -+"profile" -+msgstr "" -+"{0} mora biti na zasebnoj particiji ili logičkom uređaju i mora biti stvoren " -+"u particijskom rasporedu prije instalacije sa sigurnosnim profilom" -+ -+#. template for the message -+#: ../org_fedora_oscap/rule_handling.py:452 -+#, python-format -+msgid "" -+"mount option '%(mount_option)s' added for the mount point %(mount_point)s" -+msgstr "" -+"mogućnost montiranja '%(mount_option)s' je dodana za točku montiranja " -+"%(mount_point)s" -+ -+#. root password was not set -+#: ../org_fedora_oscap/rule_handling.py:560 -+#, python-format -+msgid "make sure to create password with minimal length of %d characters" -+msgstr "pobrinite se da stvorite lozinku s najmanje %d znakova" -+ -+#: ../org_fedora_oscap/rule_handling.py:567 -+msgid "cannot check root password length (password is crypted)" -+msgstr "nemoguća provjera duljine korijenske lozinke (lozinka je šifrirana)" -+ -+#. too short -+#: ../org_fedora_oscap/rule_handling.py:573 -+#, python-format -+msgid "" -+"root password is too short, a longer one with at least %d characters is " -+"required" -+msgstr "" -+"korijenska lozinka je prekrataka, potrebna je dulja s najmanje %d znakova" -+ -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 -+#, python-format -+msgid "package '%s' has been added to the list of to be installed packages" -+msgstr "paket '%s' je dodan na popis paketa za instaliranje" -+ -+#: ../org_fedora_oscap/rule_handling.py:737 -+#, python-brace-format -+msgid "" -+"package '{package}' has been added to the list of excluded packages, but it " -+"can't be removed from the current software selection without breaking the " -+"installation." -+msgstr "" -+"paket '{package}' je dodan na popis izuzetih paketa, ali se može ukloniti iz " -+"trenutnog odabira softvera bez slamanja instalacije." -+ -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 -+#, python-format -+msgid "package '%s' has been added to the list of excluded packages" -+msgstr "paket '%s' je dodan na popis izuzetih paketa od instalacije" -+ -+#: ../org_fedora_oscap/rule_handling.py:866 -+msgid "Kdump will be disabled on startup" -+msgstr "Kdump biti će onemogućen pri pokretanju" -+ -+#: ../org_fedora_oscap/rule_handling.py:868 -+msgid "Kdump will be enabled on startup" -+msgstr "Kdump biti će omogućen pri pokretanju" -+ -+#: ../org_fedora_oscap/rule_handling.py:1026 -+msgid "Firewall will be disabled on startup" -+msgstr "Vatrozid će biti onemogućen pri pokretanju" -+ -+#: ../org_fedora_oscap/rule_handling.py:1033 -+msgid "Firewall will be enabled on startup" -+msgstr "Vatrozid će biti omogućen pri pokretanju" -+ -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 -+#, python-format -+msgid "" -+"service '%s' has been added to the list of services to be added to the " -+"firewall" -+msgstr "usluga '%s' je dodana na popis usluga koji će biti dodan u vatrozid" -+ -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 -+#, python-format -+msgid "" -+"port '%s' has been added to the list of ports to be added to the firewall" -+msgstr "ulaz '%s' je dodan na popis ulaza koji će biti dodan u vatrozid" -+ -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 -+#, python-format -+msgid "" -+"trust '%s' has been added to the list of trusts to be added to the firewall" -+msgstr "" -+"povjerenje '%s' je dodano na popis povjerenja koji će biti dodan u vatrozid" -+ -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 -+#, python-format -+msgid "" -+"service '%s' has been added to the list of services to be removed from the " -+"firewall" -+msgstr "" -+"usluga '%s' je dodana na popis usluga koji će biti uklonjen iz vatrozida" -+ -+#: ../org_fedora_oscap/service/installation.py:41 -+msgid "The integrity check of the security content failed." -+msgstr "Neuspjela provjera cjelovitosti sigurnosnog sadržaja." -+ -+#: ../org_fedora_oscap/service/installation.py:46 -+msgid "There was an error fetching and loading the security content:\n" -+msgstr "Došlo je do greške preuzimanja i učitavanja sigurnosnog sadržaja:\n" -+ -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+msgid "There was an unexpected problem with the supplied content." -+msgstr "Došlo je do neočekivanog problema s isporučenim sadržajem." -+ -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "Instalacija bi se trebala prekinuti." -+ -+#: ../org_fedora_oscap/service/installation.py:148 -+msgid "Wrong configuration detected!" -+msgstr "Pogrešno podešavanje je otkriveno!" -+ -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "Koristili ste više od jednog odjeljka oscap dodatka u kickstartu. " -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+"Podesili ste oscap dodatak koristeći '{used_section_header}' odjeljak. " -+ -+#. title of the spoke (will be displayed on the hub) -+#: ../org_fedora_oscap/gui/spokes/oscap.py:201 -+msgid "_Security Profile" -+msgstr "_Sigurnosni profil" -+ -+#. the first status provided -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 -+msgid "Not ready" -+msgstr "Nije spremno" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 -+msgid "Fetching content data" -+msgstr "Preuzimanje sadržaja podataka" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+msgid "Fetch complete, analyzing data." -+msgstr "Preuzimanje je završeno, analiza podataka." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 -+msgid "No profile selected" -+msgstr "Nema odabranog profila" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 -+msgid "No rules for the pre-installation phase" -+msgstr "Nema pravila za predinstalacijsku fazu" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+msgid "Invalid content provided. Enter a different URL, please." -+msgstr "Nevaljani sadržaj je naveden. Upišite drugi URL." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+msgid "Invalid or unsupported content URL, please enter a different one." -+msgstr "Nevaljani ili nepodržani URL sadržaja, upišite drugi." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+msgid "Failed to fetch content. Enter a different URL, please." -+msgstr "Neuspjelo preuzimanje sadržaja. Upišite drugi URL." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 -+msgid "" -+"Network error encountered when fetching data. Please check that network is " -+"setup and working." -+msgstr "" -+"Došlo je do mrežne greške pri preuzimanju podataka. Provjerite je li mreža " -+"postavljena i radi li." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+msgid "The integrity check of the content failed. Cannot use the content." -+msgstr "" -+"Neuspjela provjera cjelovitosti sadržaja. Sadržaj se ne može koristiti." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 -+#, python-format -+msgid "Failed to extract content (%s). Enter a different URL, please." -+msgstr "Neuspjelo izdvajanje sadržaja (%s). Upišite drugi URL." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 -+#, python-format -+msgid "" -+"Profile with ID '%s' not defined in the content. Select a different profile, " -+"please" -+msgstr "Profil sa '%s' ID-jem nije određen u sadržaju. Odaberite drugi profil" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" -+msgstr "Sigurnosni profil se ne primijenjuje" -+ -+#. TRANSLATORS: the other choice if SCAP Security Guide is also -+#. available -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 -+msgid " or enter data stream content or archive URL below:" -+msgstr " ili upišite sadržaj toka podataka ili URL arhive ispod:" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 -+msgid "" -+"No content found. Please enter data stream content or archive URL below:" -+msgstr "" -+"Nema pronađenog sadržaja. Upišite sadržaj toka podataka ili URL arhive ispod:" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 -+msgid "Error fetching and loading content" -+msgstr "Greška preuzimanja i učitavanja sadržaja" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 -+msgid "No content found" -+msgstr "Nema pronađenog sadržaja" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 -+msgid "Misconfiguration detected" -+msgstr "Otkriveno je pogrešno podešavanje" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 -+msgid "Warnings appeared" -+msgstr "Pojavila su se upozorenja" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 -+msgid "Everything okay" -+msgstr "Sve je uredu" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 -+msgid "Invalid or unsupported URL" -+msgstr "Nevaljani ili nepodržani URL" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 -+msgid "Fetching content..." -+msgstr "Preuzimanje sadržaja..." -+ -+#: tmp/oscap.glade.h:1 -+msgid "SECURITY PROFILE" -+msgstr "SIGURNOSNI PROFIL" -+ -+#: tmp/oscap.glade.h:2 -+msgid "_Change content" -+msgstr "_Promijeni sadržaj" -+ -+#: tmp/oscap.glade.h:3 -+msgid "Apply security policy:" -+msgstr "Primijeni sigurnosna pravila:" -+ -+#: tmp/oscap.glade.h:4 -+msgid "Data stream:" -+msgstr "Tok podataka:" -+ -+#: tmp/oscap.glade.h:5 -+msgid "Checklist:" -+msgstr "Spisak:" -+ -+#: tmp/oscap.glade.h:6 -+msgid "Choose profile below:" -+msgstr "Odaberite profil ispod:" -+ -+#: tmp/oscap.glade.h:7 -+msgid "Profile" -+msgstr "Profil" -+ -+#: tmp/oscap.glade.h:8 -+msgid "Selected" -+msgstr "Odabrano" -+ -+#: tmp/oscap.glade.h:9 -+msgid "_Select profile" -+msgstr "_Odaberi profil" -+ -+#: tmp/oscap.glade.h:10 -+msgid "Changes that were done or need to be done:" -+msgstr "Promjene koje su učinjene ili se trebaju učiniti:" -+ -+#: tmp/oscap.glade.h:11 -+msgid "_Use SCAP Security Guide" -+msgstr "_Koristi SCAP sigurnosni vodič" -+ -+#: tmp/oscap.glade.h:13 -+msgid "_Fetch" -+msgstr "_Preuzmi" -diff -U3 -N -r a/po/hu.po b/po/hu.po ---- a/po/hu.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/hu.po 2023-07-19 13:47:28.583054415 +0200 -@@ -11,24 +11,24 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" --"PO-Revision-Date: 2020-03-29 01:40-0400\n" --"Last-Translator: Teknős Ferenc \n" --"Language-Team: Hungarian (http://www.transifex.com/projects/p/oscap-anaconda-" --"addon/language/hu/)\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2023-05-10 12:20+0000\n" -+"Last-Translator: Dankaházi (ifj.) István \n" -+"Language-Team: Hungarian \n" - "Language: hu\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Zanata 4.6.2\n" -+"Plural-Forms: nplurals=2; plural=n != 1;\n" -+"X-Generator: Weblate 4.15.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" - msgstr "" - --#: ../org_fedora_oscap/content_discovery.py:167 -+#: ../org_fedora_oscap/content_discovery.py:189 - #, fuzzy, python-brace-format - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "" -@@ -47,7 +47,7 @@ - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -59,7 +59,7 @@ - "biztonsági profilon" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -68,17 +68,17 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "bizonyosodjon meg arról, hogy %d karakter hosszúságú jelszót ad meg" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "root jelszó hosszúsága nem ellenőrzhető (jelszó titkosított)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -86,13 +86,13 @@ - msgstr "" - "root jelszó túl rövid, de hosszabbnak kell lennie legalább %d karakterrel" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "'%s' csomag hozzáadásra került a telepítendő csomagok listájához" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -100,47 +100,47 @@ - "installation." - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "'%s' csomag hozzáadásra került az eltávolítandó csomagok listájához" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "A Kdump indításkor le lesz tiltva" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "A Kdump indításkor engedélyezve lesz" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "A tűzfal indításkor le lesz tiltva" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "A tűzfal engedélyezve lesz az indításkor" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "" --"szolgáltatás \"%s\" lett hozzáadva a tűzfalhoz hozzáadandó szolgáltatások " -+"\"%s\" szolgáltatás lett hozzáadva a tűzfalhoz hozzáadandó szolgáltatások " - "listájához" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" --msgstr "port \"%s\" lett hozzáadva a tűzfalhoz hozzáadandó portok listájához" -+msgstr "\"%s\" port lett hozzáadva a tűzfalhoz hozzáadandó portok listájához" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -148,8 +148,8 @@ - "a \"%s\" szolgáltatás hozzá lett adva a tűzfalhoz hozzáadandó megbízhatók " - "listájához" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -158,15 +158,7 @@ - "szolgáltatás \"%s\" lett hozzáadva a tűzfalról eltávolítandó szolgáltatások " - "listájához" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 -+#: ../org_fedora_oscap/service/installation.py:41 - #, fuzzy - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "The integrity check of the security content failed." -@@ -174,60 +166,81 @@ - "Nem sikerült a tartalom integritásának ellenőrzése. A tartalom nem " - "használható." - --#: ../org_fedora_oscap/ks/oscap.py:404 -+#: ../org_fedora_oscap/service/installation.py:46 - #, fuzzy - #| msgid "Error fetching and loading content" - msgid "There was an error fetching and loading the security content:\n" - msgstr "Hiba történt a tartalom lekérése és betöltése során" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:462 -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "" -+ -+#: ../org_fedora_oscap/service/installation.py:148 - #, fuzzy - #| msgid "Misconfiguration detected" - msgid "Wrong configuration detected!" - msgstr "Helytelen beállítások észlelve" - -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+ - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" -+#, fuzzy -+#| msgid "_Security Policy" -+msgid "_Security Profile" - msgstr "_Biztonsági házirend" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "Nincs még kész" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Adatok letöltése" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+#, fuzzy -+#| msgid "Fetching content data" -+msgid "Fetch complete, analyzing data." -+msgstr "Adatok letöltése" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Nincs profil kiválasztva" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Nincsenek szabályok felállítva az előkészítési fázishoz" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Helytelen tartalom került megadásra. Kérem, adjon meg egy másik URL-t." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." --msgstr "" --"Érvénytelen vagy nem támogatott tartalom URL, kérjük, írjon be másikat." -+msgstr "Érvénytelen vagy nem támogatott URL tartalom, kérjük, írjon be másikat." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Tartalom letöltése sikertelen. Kérem, adjon meg másik URL-t." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -235,18 +248,18 @@ - "Hálózati hiba történt az adatok lekérésekor. Ellenőrizze, hogy a hálózat " - "beállítása és működése megfelelő." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - "Nem sikerült a tartalom integritásának ellenőrzése. A tartalom nem " - "használható." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Tartalom kibontása sikertelen (%s). Kérem, adjon meg másik URL-t." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -255,53 +268,57 @@ - "A (z) \"%s\" azonosítójú profil nem szerepel a tartalomban. Kérem válasszon " - "másik profilt" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+#, fuzzy -+#| msgid "Not applying security policy" -+msgid "Not applying security profile" - msgstr "Nem alkalmazható a biztonsági házirend" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" --msgstr "vagy adjon meg adathalmazt, vagy archiv URL-t alább:" -+msgstr " vagy adjon meg adathalmazt, vagy archiv URL-t alább:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Tartalom nem található. Kérem adjon meg egy adathalmazt, vagy archív URL-t " - "alább:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Hiba történt a tartalom lekérése és betöltése során" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Tartalom nem található" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Helytelen beállítások észlelve" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Figyelmeztetések jelentek meg" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Minden rendben" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "Rossz vagy nem támogatott URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Tartalom letöltése..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" -+#, fuzzy -+#| msgid "SECURITY POLICY" -+msgid "SECURITY PROFILE" - msgstr "BIZTONSÁGI HÁZIREND" - - #: tmp/oscap.glade.h:2 -diff -U3 -N -r a/po/it.po b/po/it.po ---- a/po/it.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/it.po 2023-07-19 13:47:28.583054415 +0200 -@@ -4,7 +4,7 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" - "PO-Revision-Date: 2020-11-19 21:35+0000\n" - "Last-Translator: Silvio Berger \n" - "Language-Team: Italian \n" --"Language-Team: Japanese \n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2022-11-02 07:19+0000\n" -+"Last-Translator: Ludek Janda \n" -+"Language-Team: Japanese \n" - "Language: ja\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Weblate 4.5.3\n" -+"X-Generator: Weblate 4.14.1\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" --msgstr "" -+msgstr "アーカイブを zip ファイルとして抽出する際にエラーが発生しました: {exc}" - --#: ../org_fedora_oscap/content_discovery.py:167 --#, fuzzy, python-brace-format --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/content_discovery.py:189 -+#, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" --msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。" -+msgstr "コンテンツの整合性チェックに失敗しました。{hash_obj.name} " -+"ハッシュが一致しませんでした" - - #: ../org_fedora_oscap/data_fetch.py:117 - msgid "Network connection needed to fetch data." --msgstr "" -+msgstr "データの取得に必要なネットワーク接続。" - - #: ../org_fedora_oscap/data_fetch.py:262 - #, python-brace-format - msgid "" - "Failed to fetch data - the request returned HTTP error code {return_code}" --msgstr "" -+msgstr "データの取得に失敗しました。返された HTTP エラーコード {return_code}" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " - "in the partitioning layout before installation can occur with a security " - "profile" - msgstr "" --"{0} は、別のパーティションもしくは論理ボリューム上になければなりません。ま" --"た、セキュリティープロファイルがインストールされる前にパーティションレイアウ" --"トに作成されなければなりません" -+"{0} は、別のパーティションもしくは論理ボリューム上になければなりません。また" -+"、セキュリティープロファイルがインストールされる前にパーティションレイアウト" -+"に作成されなければなりません" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" --msgstr "" --"マウントオプション '%(mount_option)s' が、マウントポイント %(mount_point)s に" --"追加されました" -+msgstr "マウントオプション '%(mount_option)s' が、マウントポイント %(mount_point)s " -+"に追加されました" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "%d 文字以上のパスワードを作成してください" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "root パスワードの長さを確認できません (パスワードは暗号化済み)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "root のパスワードが短すぎます。%d 文字以上にする必要があります" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "パッケージ '%s' が、インストール予定パッケージ一覧に追加されました" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " - "can't be removed from the current software selection without breaking the " - "installation." - msgstr "" --"パッケージ ' {package}' が除外パッケージのリストに追加されましたが、インス" --"トールを中断せずに現在のソフトウェアの選択から削除することはできません。" -+"パッケージ ' {package}' が除外パッケージのリストに追加されましたが、インスト" -+"ールを中断せずに現在のソフトウェアの選択から削除することはできません。" - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "パッケージ '%s' が、除外パッケージ一覧に追加されました" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump は起動時に無効になります" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump は起動時に有効になります" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "ファイアウォールは起動時に無効になります" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "ファイアウォールは起動時に有効になります" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" --msgstr "" --"サービス '%s' が、ファイアウォールに追加予定のサービス一覧に追加されました" -+msgstr "サービス '%s' が、ファイアウォールに追加予定のサービス一覧に追加されました" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "ポート '%s' が、ファイアウォールに追加予定のポート一覧に追加されました" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" --msgstr "" --"トラスト '%s' が、ファイアウォールに追加予定のトラスト一覧に追加されました" -+msgstr "トラスト '%s' が、ファイアウォールに追加予定のトラスト一覧に追加されました" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" --msgstr "" --"サービス '%s' が、ファイアウォールから削除予定のサービス一覧に追加されました" -+msgstr "サービス '%s' が、ファイアウォールから削除予定のサービス一覧に追加されました" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 --#, fuzzy --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." --msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。" -+msgstr "セキュリティーコンテンツの整合性チェックに失敗しました。" - --#: ../org_fedora_oscap/ks/oscap.py:404 --#, fuzzy --#| msgid "Error fetching and loading content" -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" --msgstr "コンテンツの取得およびロードのエラー" -+msgstr "セキュリティーコンテンツの取得およびロード時にエラーが発生しました:\n" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." --msgstr "" -+msgstr "指定のコンテンツで予期しない問題が発生しました。" - --#: ../org_fedora_oscap/ks/oscap.py:462 --#, fuzzy --#| msgid "Misconfiguration detected" -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "インストールを中止する必要があります。" -+ -+#: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" --msgstr "設定ミスが検出されました" -+msgstr "設定が正しく検出されました！" -+ -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "キックスタートで複数の oscap アドオンセクションを使用しました。 " -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "'{used_section_header}' セクションを使用して oscap アドオンを設定しました。 " - - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "セキュリティーポリシ" -+msgid "_Security Profile" -+msgstr "セキュリティープロファイル(_S)" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "準備ができていません" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "コンテンツデータの取得中" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+msgid "Fetch complete, analyzing data." -+msgstr "データの取得が完了し、データを分析中です。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "選択されたプロファイルはありません" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "プレインストールフェーズのルールがありません" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "無効なコンテンツが入力されました。別の URL を入力してください。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." --msgstr "" --"コンテンツ URL が無効またはサポートされていません。別の URL を入力していませ" --"ん。" -+msgstr "コンテンツ URL が無効またはサポートされていません。別の URL " -+"を入力していません。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "コンテンツの取得に失敗しました。別の URL を入力してください。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." --msgstr "" --"データの取得時にネットワークエラーが発生しました。ネットワークが設定されてお" -+msgstr "データの取得時にネットワークエラーが発生しました。ネットワークが設定されてお" - "り、動作していることを確認してください。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "コンテンツ (%s) の抽出に失敗しました。別の URL を入力してください。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " - "please" --msgstr "" --"コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイル" --"を選択してください" -+msgstr "コンテンツで ID が '%s' " -+"のプロファイルが定義されていません。別のプロファイルを選択してください" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" --msgstr "セキュリティーポリシーを適用しない" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" -+msgstr "セキュリティープロファイルを適用しません" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" --msgstr "" --" または、以下にデータストリームコンテンツもしくはアーカイブの URL を入力しま" --"す:" -+msgstr " または、以下にデータストリームコンテンツもしくはアーカイブの URL " -+"を入力します:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" --msgstr "" --"コンテンツが見つかりませんでした。以下にデータストリームコンテンツもしくは" --"アーカイブの URL を入力してください:" -+msgstr "コンテンツが見つかりませんでした。" -+"以下にデータストリームコンテンツもしくはアーカイブの URL を入力してください:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "コンテンツの取得およびロードのエラー" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "コンテンツが見つかりませんでした" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "設定ミスが検出されました" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "警告が表示されました" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "すべて OK" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "無効またはサポートされていない URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "コンテンツの取得中..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" --msgstr "セキュリティーポリシー" -+msgid "SECURITY PROFILE" -+msgstr "セキュリティープロファイル" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" -@@ -339,6 +334,9 @@ - msgid "_Fetch" - msgstr "取得(_F)" - -+#~ msgid "Do you wish to continue anyway?" -+#~ msgstr "それでも続行しますか?" -+ - #~ msgid "" - #~ "There was an error fetching and loading the security content:\n" - #~ "%s\n" -diff -U3 -N -r a/po/ko.po b/po/ko.po ---- a/po/ko.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/ko.po 2023-07-19 13:47:28.583054415 +0200 -@@ -5,41 +5,41 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" --"PO-Revision-Date: 2021-04-02 07:02+0000\n" --"Last-Translator: simmon \n" --"Language-Team: Korean \n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2022-05-14 13:18+0000\n" -+"Last-Translator: 김인수 \n" -+"Language-Team: Korean \n" - "Language: ko\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Weblate 4.5.3\n" -+"X-Generator: Weblate 4.12.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" --msgstr "" -+msgstr "zipfile로 압축 해제 중 오류가 발생하였습니다: {exc}" - --#: ../org_fedora_oscap/content_discovery.py:167 --#, fuzzy, python-brace-format --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/content_discovery.py:189 -+#, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" --msgstr "내용 무결성 검사에 실패했습니다. 내용을 사용 할 수 없습니다." -+msgstr "내용 무결성 검사에 실패 - {hash_obj.name} 해쉬가 일치하지 않습니다" - - #: ../org_fedora_oscap/data_fetch.py:117 - msgid "Network connection needed to fetch data." --msgstr "" -+msgstr "자료를 가져올 때에 네트워크 연결이 필요합니다." - - #: ../org_fedora_oscap/data_fetch.py:262 - #, python-brace-format - msgid "" - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" -+"자료 가져오기에 실패 - 요청은 HTTP 오류 코드 {return_code}를 반환했습니다" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -50,7 +50,7 @@ - "에 파티션 레이아웃을 만들어야 합니다" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -58,158 +58,162 @@ - "적재 지점 %(mount_point)s의 적재 옵션 '%(mount_option)s'가 추가되었습니다" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "최소 %d자 이상으로 비밀번호를 만들어야 합니다" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "root 비밀번호 길이를 확인 할 수 없습니다 (비밀번호가 암호화됩니다)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "root 비밀번호가 너무 짧습니다. 최소 %d자 이어야 합니다" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "꾸러미(package) '%s'가 설치할 꾸러미(packages) 목록에 추가되었습니다" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " - "can't be removed from the current software selection without breaking the " - "installation." - msgstr "" --"꾸러미 '{package}'가 제외된 꾸러미 목록에 추가되었지만 설치를 중단하지 않고 " --"현재 소프트웨어 선택에서 제거할 수 없습니다." -+"꾸러미 '{package}'가 제외된 꾸러미 목록에 추가되었지만, 설치를 중단하지 않고 " -+"현재 소프트웨어 선택에서 제거 할 수 없습니다." - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "꾸러미(package) '%s'가 제외된 꾸러미(package) 목록에 추가되었습니다" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "시작시 Kdump가 비활성화됩니다" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "시작시 Kdump가 활성화됩니다" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "시작시 방화벽이 비활성화됩니다" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "시작시 방화벽이 활성화됩니다" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "서비스 '%s'가 방화벽에 추가 할 서비스 목록에 추가되었습니다" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "포트 '%s'가 방화벽에 추가할 포트 목록에 추가되었습니다" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "신뢰 '%s가 방화벽에 추가할 신뢰 목록에 추가되었습니다" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" - msgstr "서비스 '%s'가 방화벽에서 제거할 서비스 목록에 추가되었습니다" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 --#, fuzzy --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." --msgstr "내용 무결성 검사에 실패했습니다. 내용을 사용 할 수 없습니다." -+msgstr "보안 내용의 무결성 검사가 실패했습니다." - --#: ../org_fedora_oscap/ks/oscap.py:404 --#, fuzzy --#| msgid "Error fetching and loading content" -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" --msgstr "내용 가져오기와 적재 오류" -+msgstr "가져오기와 보안 내용 적재 중에 오류가 발생하였습니다:\n" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." --msgstr "" -+msgstr "제시된 내용에 예상치 못한 문제가 있습니다." - --#: ../org_fedora_oscap/ks/oscap.py:462 --#, fuzzy --#| msgid "Misconfiguration detected" -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "설치가 중지되었습니다." -+ -+#: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" --msgstr "설정 오류가 감지되었습니다" -+msgstr "잘못된 구성이 감지되었습니다!" -+ -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "킥스타트에서 하나 이상의 oscap 추가 부분을 사용했습니다. " -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "'{used_section_header}' 부분을 사용하여 oscap 추가를 구성했습니다. " - - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "_보안 정책" -+msgid "_Security Profile" -+msgstr "_보안 프로파일" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "준비되지 않음" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "내용 자료를 가져오는 중" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+msgid "Fetch complete, analyzing data." -+msgstr "가져오기 완료, 자료를 분석 중." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "프로파일이 선택되지 않았습니다" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "사전 설치 단계의 규칙이 없습니다" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "잘못된 내용이 입력되었습니다. 다른 URL을 입력하십시오." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "유효하지 않거나 지원되지 않는 내용 URL입니다. 다른 URL을 입력하십시오." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "내용을 가져오지 못했습니다. 다른 URL을 입력하세요." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -217,16 +221,16 @@ - "내용을 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는" - "지 확인하십시오." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "내용 무결성 검사에 실패했습니다. 내용을 사용 할 수 없습니다." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "내용 (%s)를 가져오지 못했습니다. 다른 URL을 입력하십시오." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -234,54 +238,54 @@ - msgstr "" - "ID '%s'가 프로파일에 정의되어 있지 않습니다. 다른 프로파일을 선택하세요" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" --msgstr "보안 정책을 적용하지 않음" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" -+msgstr "보안 프로파일을 적용하지 않음" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr " 자료 스트림 내용을 입력하거나 아래 URL 저장소:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "내용이 없습니다. 자료 스트림 내용을를 입력하거나 또는 아래 URL을 저장소를 입" - "력하세요:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "내용 가져오기와 적재 오류" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "내용을 찾을 수 없음" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "설정 오류가 감지되었습니다" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "경고가 표시되었습니다" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "모든 것이 정상입니다" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "유효하지 않거나 지원되지 않는 URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "컨텐츠 가져오는 중..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" --msgstr "보안 정책" -+msgid "SECURITY PROFILE" -+msgstr "보안 프로파일" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" -@@ -329,6 +333,9 @@ - msgid "_Fetch" - msgstr "가져오기(_F)" - -+#~ msgid "Do you wish to continue anyway?" -+#~ msgstr "계속 진행 할까요?" -+ - #~ msgid "" - #~ "There was an error fetching and loading the security content:\n" - #~ "%s\n" -diff -U3 -N -r a/po/oscap-anaconda-addon.pot b/po/oscap-anaconda-addon.pot ---- a/po/oscap-anaconda-addon.pot 2021-07-02 15:52:56.000000000 +0200 -+++ b/po/oscap-anaconda-addon.pot 2023-07-19 13:47:28.585054421 +0200 -@@ -8,7 +8,7 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"POT-Creation-Date: 2021-08-20 17:44+0200\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -22,10 +22,11 @@ - msgid "Error extracting archive as a zipfile: {exc}" - msgstr "" - --#: ../org_fedora_oscap/content_discovery.py:189 -+#: ../org_fedora_oscap/content_discovery.py:190 - #, python-brace-format - msgid "" --"Integrity check of the content failed - {hash_obj.name} hash didn't match" -+"OSCAP Addon: Integrity check of the content failed - {hash_obj.name} hash " -+"didn't match" - msgstr "" - - #: ../org_fedora_oscap/data_fetch.py:117 -@@ -137,23 +138,32 @@ - "firewall" - msgstr "" - -+#: ../org_fedora_oscap/ks/oscap.py:375 -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "" -+ -+#: ../org_fedora_oscap/ks/oscap.py:376 -+msgid "Do you wish to continue anyway?" -+msgstr "" -+ -+#: ../org_fedora_oscap/ks/oscap.py:399 - #: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." - msgstr "" - -+#: ../org_fedora_oscap/ks/oscap.py:403 - #: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" - msgstr "" - -+#: ../org_fedora_oscap/ks/oscap.py:408 - #: ../org_fedora_oscap/service/installation.py:51 --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:803 - msgid "There was an unexpected problem with the supplied content." - msgstr "" - --#: ../org_fedora_oscap/service/installation.py:56 --msgid "The installation should be aborted." --msgstr "" -- -+#: ../org_fedora_oscap/ks/oscap.py:461 - #: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" - msgstr "" -@@ -178,97 +188,97 @@ - msgid "Not ready" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:393 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:403 - msgid "Fetching content data" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:441 - msgid "Fetch complete, analyzing data." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:643 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:653 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1077 - msgid "No profile selected" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:648 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:658 - msgid "No rules for the pre-installation phase" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:811 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:819 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:827 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:835 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:844 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:842 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:852 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:860 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:870 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " - "please" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:889 - msgid "Not applying security profile" - msgstr "" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:921 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:926 - msgid " or enter data stream content or archive URL below:" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:930 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 - msgid "Error fetching and loading content" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1074 - msgid "No content found" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1085 - msgid "Misconfiguration detected" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1091 - msgid "Warnings appeared" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1093 - msgid "Everything okay" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1177 - msgid "Invalid or unsupported URL" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1183 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "" - -diff -U3 -N -r a/po/pl.po b/po/pl.po ---- a/po/pl.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/pl.po 2023-07-19 13:47:28.583054415 +0200 -@@ -25,43 +25,45 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" --"PO-Revision-Date: 2020-09-07 11:29+0000\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2022-05-04 20:18+0000\n" - "Last-Translator: Piotr Drąg \n" --"Language-Team: Polish \n" -+"Language-Team: Polish \n" - "Language: pl\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " - "|| n%100>=20) ? 1 : 2;\n" --"X-Generator: Weblate 4.2.2\n" -+"X-Generator: Weblate 4.12.1\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" --msgstr "" -+msgstr "Błąd podczas rozpakowywania archiwum jako pliku ZIP: {exc}" - --#: ../org_fedora_oscap/content_discovery.py:167 --#, fuzzy, python-brace-format --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/content_discovery.py:189 -+#, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" - msgstr "" --"Sprawdzenie integralności treści się nie powiodło. Nie można użyć treści." -+"Sprawdzenie integralności treści się nie powiodło — suma {hash_obj.name} się " -+"nie zgadza" - - #: ../org_fedora_oscap/data_fetch.py:117 - msgid "Network connection needed to fetch data." --msgstr "" -+msgstr "Do pobrania danych wymagane jest połączenie sieciowe." - - #: ../org_fedora_oscap/data_fetch.py:262 - #, python-brace-format - msgid "" - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" -+"Pobranie danych się nie powiodło — żądanie zwróciło kod błędu HTTP " -+"{return_code}" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -73,7 +75,7 @@ - "za pomocą profilu bezpieczeństwa" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -82,17 +84,17 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "proszę się upewnić, że tworzone hasło ma co najmniej %d znaków" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "nie można sprawdzić długości hasła roota (hasło jest zaszyfrowane)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -100,13 +102,13 @@ - msgstr "" - "hasło roota jest za krótkie, wymagane jest dłuższe z co najmniej %d znakami" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "dodano pakiet „%s” do listy pakietów do zainstalowania" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -117,126 +119,130 @@ - "może zostać usunięty z obecnego wyboru oprogramowania bez uszkodzenia " - "instalacji." - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "dodano pakiet „%s” do listy wykluczonych pakietów" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump będzie wyłączone podczas uruchamiania" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump będzie włączone podczas uruchamiania" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "Zapora sieciowa będzie wyłączona podczas uruchamiania" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "Zapora sieciowa będzie włączona podczas uruchamiania" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "dodano usługę „%s” do listy usług do dodania do zapory sieciowej" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "dodano port „%s” do listy portów do dodania do zapory sieciowej" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "dodano zaufanie „%s” do listy zaufań do dodania do zapory sieciowej" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" - msgstr "dodano usługę „%s” do listy usług do usunięcia z zapory sieciowej" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 --#, fuzzy --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." --msgstr "" --"Sprawdzenie integralności treści się nie powiodło. Nie można użyć treści." -+msgstr "Sprawdzenie integralności treści bezpieczeństwa się nie powiodło." - --#: ../org_fedora_oscap/ks/oscap.py:404 --#, fuzzy --#| msgid "Error fetching and loading content" -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" --msgstr "Błąd podczas pobierania i wczytywania treści" -+msgstr "" -+"Wystąpił błąd podczas pobierania i wczytywania treści bezpieczeństwa:\n" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." --msgstr "" -+msgstr "Wystąpił nieoczekiwany problem z dostarczoną treścią." -+ -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "Instalacja powinna zostać przerwana." - --#: ../org_fedora_oscap/ks/oscap.py:462 --#, fuzzy --#| msgid "Misconfiguration detected" -+#: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" --msgstr "Wykryto błędną konfigurację" -+msgstr "Wykryto błędną konfigurację." -+ -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "W pliku kickstart użyto więcej niż jedną sekcję dodatku OSCAP. " -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "Skonfigurowano dodatek OSCAP za pomocą sekcji „{used_section_header}”. " - - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "_Zasady bezpieczeństwa" -+msgid "_Security Profile" -+msgstr "_Profil bezpieczeństwa" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "Niegotowe" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Pobieranie danych treści" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+msgid "Fetch complete, analyzing data." -+msgstr "Ukończono pobieranie, analizowanie danych." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Nie wybrano profilu" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Brak reguł dla fazy przedinstalacyjnej" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Podano nieprawidłową treść. Proszę podać inny adres URL." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "Nieprawidłowy lub nieobsługiwany adres URL treści, proszę wybrać inny." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Pobranie treści się nie powiodło. Proszę podać inny adres URL." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -244,17 +250,17 @@ - "Wystąpił błąd sieci podczas pobierania danych. Proszę sprawdzić, czy sieć " - "została ustawiona i działa poprawnie." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - "Sprawdzenie integralności treści się nie powiodło. Nie można użyć treści." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Wydobycie treści się nie powiodło (%s). Proszę podać inny adres URL." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -263,55 +269,55 @@ - "W treści nie określono profilu o identyfikatorze „%s”. Proszę wybrać inny " - "profil" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" --msgstr "Bez zastosowywania zasad bezpieczeństwa" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" -+msgstr "Bez zastosowywania profilu bezpieczeństwa" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr "" - " albo podać treść strumienia danych lub podać adres URL archiwum poniżej:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Nie odnaleziono treści. Proszę podać treść strumienia danych lub adres URL " - "archiwum poniżej:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Błąd podczas pobierania i wczytywania treści" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Nie odnaleziono treści" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Wykryto błędną konfigurację" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Pojawiły się ostrzeżenia" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Wszystko jest w porządku" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "Nieprawidłowy lub nieobsługiwany adres URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Pobieranie treści…" - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" --msgstr "ZASADY BEZPIECZEŃSTWA" -+msgid "SECURITY PROFILE" -+msgstr "PROFIL BEZPIECZEŃSTWA" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" -@@ -357,6 +363,9 @@ - msgid "_Fetch" - msgstr "_Pobierz" - -+#~ msgid "Do you wish to continue anyway?" -+#~ msgstr "Kontynuować mimo to?" -+ - #~ msgid "" - #~ "There was an error fetching and loading the security content:\n" - #~ "%s\n" -diff -U3 -N -r a/po/pt_BR.po b/po/pt_BR.po ---- a/po/pt_BR.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/pt_BR.po 2023-07-19 13:47:28.583054415 +0200 -@@ -11,7 +11,7 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" - "PO-Revision-Date: 2021-06-07 19:04+0000\n" - "Last-Translator: Rafael Fontenelle \n" - "Language-Team: Portuguese (Brazil) 1;\n" - "X-Generator: Weblate 4.6.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" - msgstr "" - --#: ../org_fedora_oscap/content_discovery.py:167 -+#: ../org_fedora_oscap/content_discovery.py:189 - #, fuzzy, python-brace-format - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "" -@@ -47,7 +47,7 @@ - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -59,7 +59,7 @@ - "um perfil de segurança" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -68,19 +68,19 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "" - "certifique-se de criar uma senha com comprimento mínimo de %d caracteres" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "" - "Não é possível verificar o comprimento da senha do root (senha criptografada)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -89,13 +89,13 @@ - "A senha root é muito curta, uma mais longa com pelo menos %d caracteres são " - "obrigatórios" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "pacote '%s' foi adicionado à lista de pacotes a serem instalados" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -105,30 +105,30 @@ - "o pacote '{package}' foi adicionado à lista de pacotes excluídos, mas não " - "pode ser removido da seleção de software atual sem interromper a instalação." - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "pacote '%s' foi adicionado a lista de pacotes a serem excluídos" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "O Kdump será desativado na inicialização" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "O Kdump será ativado na inicialização" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "Firewall será desativado na inicialização" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "Firewall será ativado na inicialização" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " -@@ -137,16 +137,16 @@ - "serviço '%s'foi adicionado à lista de serviços a serem adicionados ao " - "firewall" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "" - "port '%s'foi adicionado à lista de portas a serem adicionadas ao firewall" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -154,8 +154,8 @@ - "Confiar em '%s'foi adicionado à lista de relações de confiança a serem " - "adicionadas ao firewall" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -163,15 +163,7 @@ - msgstr "" - "serviço '%s'foi adicionado à lista de serviços a serem removidos do firewall" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 -+#: ../org_fedora_oscap/service/installation.py:41 - #, fuzzy - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "The integrity check of the security content failed." -@@ -179,60 +171,82 @@ - "A verificação de integridade do conteúdo falhou. Não é possível usar o " - "conteúdo." - --#: ../org_fedora_oscap/ks/oscap.py:404 -+#: ../org_fedora_oscap/service/installation.py:46 - #, fuzzy - #| msgid "Error fetching and loading content" - msgid "There was an error fetching and loading the security content:\n" - msgstr "Erro ao buscar e carregar o conteúdo" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:462 -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "" -+ -+#: ../org_fedora_oscap/service/installation.py:148 - #, fuzzy - #| msgid "Misconfiguration detected" - msgid "Wrong configuration detected!" - msgstr "Misconfiguration detectado" - -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+ - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" -+#, fuzzy -+#| msgid "_Security Policy" -+msgid "_Security Profile" - msgstr "Política de _segurança" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "Ainda não esta pronto" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Buscando dados de conteúdo" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+#, fuzzy -+#| msgid "Fetching content data" -+msgid "Fetch complete, analyzing data." -+msgstr "Buscando dados de conteúdo" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Nenhum perfil selecionado" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Não há regras para a fase de pré-instalação" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Conteúdo fornecido é inválido. Digite uma URL diferente, por favor." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" - "URL do conteúdo inválido ou não suportado, entre com um outro diferente." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Falha ao buscar conteúdo. Digite uma URL diferente, por favor." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -240,18 +254,18 @@ - "Foi encontrado um erro na rede ao buscar dados. Verifique se a rede está " - "configurada e funcionando." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - "A verificação de integridade do conteúdo falhou. Não é possível usar o " - "conteúdo." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Falha ao extrair o conteúdo (%s). Digite uma URL diferente, por favor." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -260,53 +274,57 @@ - "Perfil com ID '%s' não definido no conteúdo. Selecione um perfil diferente, " - "por favor" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+#, fuzzy -+#| msgid "Not applying security policy" -+msgid "Not applying security profile" - msgstr "Não aplicar a política de segurança" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr " ou inserir conteúdo de fluxo de dados ou arquivo de URL abaixo:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Nenhum conteúdo encontrado. Por favor entre com conteúdo de fluxo de dados " - "ou arquivo de URL abaixo:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Erro ao buscar e carregar o conteúdo" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Nenhum conteúdo encontrado" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Misconfiguration detectado" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Advertências surgidas" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Tudo bem" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "URL inválida ou não suportada" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Buscando conteúdo..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" -+#, fuzzy -+#| msgid "SECURITY POLICY" -+msgid "SECURITY PROFILE" - msgstr "POLÍTICA DE SEGURANÇA" - - #: tmp/oscap.glade.h:2 -diff -U3 -N -r a/po/pt.po b/po/pt.po ---- a/po/pt.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/pt.po 2023-07-19 13:47:28.583054415 +0200 -@@ -3,7 +3,7 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" - "PO-Revision-Date: 2015-09-12 01:40-0400\n" - "Last-Translator: Manuela Silva \n" - "Language-Team: Portuguese\n" -@@ -14,12 +14,12 @@ - "Plural-Forms: nplurals=2; plural=(n != 1)\n" - "X-Generator: Zanata 4.6.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" - msgstr "" - --#: ../org_fedora_oscap/content_discovery.py:167 -+#: ../org_fedora_oscap/content_discovery.py:189 - #, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" -@@ -35,7 +35,7 @@ - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -44,37 +44,37 @@ - msgstr "" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" - msgstr "" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -82,189 +82,203 @@ - "installation." - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:404 -+#: ../org_fedora_oscap/service/installation.py:46 - #, fuzzy - #| msgid "Error fetching and loading content" - msgid "There was an error fetching and loading the security content:\n" - msgstr "Erro ao obter e carregar o conteúdo" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:462 -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "" -+ -+#: ../org_fedora_oscap/service/installation.py:148 - #, fuzzy - #| msgid "Misconfiguration detected" - msgid "Wrong configuration detected!" - msgstr "Detetada má configuração" - -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+ - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" -+msgid "_Security Profile" - msgstr "" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "A obter dados de conteúdo" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+#, fuzzy -+#| msgid "Fetching content data" -+msgid "Fetch complete, analyzing data." -+msgstr "A obter dados de conteúdo" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Nenhum perfil selecionado" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " - "please" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" - msgstr "" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Erro ao obter e carregar o conteúdo" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Nenhum conteúdo encontrado" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Detetada má configuração" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Está tudo bem" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "O obter o conteúdo..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" -+#, fuzzy -+#| msgid "SECURITY POLICY" -+msgid "SECURITY PROFILE" - msgstr "POLÍTICA DE SEGURANÇA" - - #: tmp/oscap.glade.h:2 -diff -U3 -N -r a/po/ru.po b/po/ru.po ---- a/po/ru.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/ru.po 2023-07-19 13:47:28.583054415 +0200 -@@ -3,7 +3,7 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" - "PO-Revision-Date: 2019-08-27 03:32-0400\n" - "Last-Translator: Ludek Janda \n" - "Language-Team: \n" -@@ -15,12 +15,12 @@ - "%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" - "X-Generator: Zanata 4.6.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" - msgstr "" - --#: ../org_fedora_oscap/content_discovery.py:167 -+#: ../org_fedora_oscap/content_discovery.py:189 - #, fuzzy, python-brace-format - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "" -@@ -39,7 +39,7 @@ - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -51,7 +51,7 @@ - "безопасности" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -60,17 +60,17 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "не забудьте создать пароль с минимальной длиной %d персонажи" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "не удается проверить длину пароля root (пароль зашифрован)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -79,13 +79,13 @@ - "пароль root слишком короткий, более длинный с по крайней мере %d требуется " - "персонаж" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "пакет '%s'добавлен в список установленных пакетов" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -93,30 +93,30 @@ - "installation." - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "пакет '%s'добавлен в список исключенных пакетов" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump будет отключен при запуске" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump будет включен при запуске" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "Брандмауэр будет отключен при запуске" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "Брандмауэр будет включен при запуске" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " -@@ -125,16 +125,16 @@ - "оказание услуг '%s'добавлен в список служб, которые будут добавлены в " - "брандмауэр" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "" - "порт '%s'добавлен в список портов, которые будут добавлены в брандмауэр" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -142,8 +142,8 @@ - "доверие \"%s'добавлен в список доверенностей, которые будут добавлены в " - "брандмауэр" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -152,15 +152,7 @@ - "оказание услуг '%s'добавлен в список служб, которые необходимо удалить из " - "брандмауэра" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 -+#: ../org_fedora_oscap/service/installation.py:41 - #, fuzzy - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "The integrity check of the security content failed." -@@ -168,77 +160,99 @@ - "Не удалось проверить целостность содержимого. Невозможно использовать " - "контент." - --#: ../org_fedora_oscap/ks/oscap.py:404 -+#: ../org_fedora_oscap/service/installation.py:46 - #, fuzzy - #| msgid "Error fetching and loading content" - msgid "There was an error fetching and loading the security content:\n" - msgstr "Ошибка получения и загрузки содержимого" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:462 -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "" -+ -+#: ../org_fedora_oscap/service/installation.py:148 - #, fuzzy - #| msgid "Misconfiguration detected" - msgid "Wrong configuration detected!" - msgstr "Обнаружено несоответствие" - -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+ - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" -+#, fuzzy -+#| msgid "_Security Policy" -+msgid "_Security Profile" - msgstr "_Политика безопасности" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "Не готов" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Получение данных контента" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+#, fuzzy -+#| msgid "Fetching content data" -+msgid "Fetch complete, analyzing data." -+msgstr "Получение данных контента" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Не выбран профиль" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Нет правил для этапа предварительной установки" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Недопустимый контент. Введите другой URL-адрес, пожалуйста." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "Неверный или неподдерживаемый URL-адрес контента, введите другой." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Не удалось получить контент. Введите другой URL-адрес, пожалуйста." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." - msgstr "" - "Ошибка сети при сборе данных. Убедитесь, что сеть настроена и работает." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - "Не удалось проверить целостность содержимого. Невозможно использовать " - "контент." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Не удалось извлечь контент (%s). Введите другой URL-адрес, пожалуйста." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -247,53 +261,57 @@ - "Профиль с идентификатором '%s'не определено в контенте. Выберите другой " - "профиль, пожалуйста" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+#, fuzzy -+#| msgid "Not applying security policy" -+msgid "Not applying security profile" - msgstr "Не применять политику безопасности" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr " или введите содержимое потока данных или URL-адрес архива ниже:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Контент не найден. Введите содержимое потока данных или URL-адрес архива " - "ниже:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Ошибка получения и загрузки содержимого" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Не найдено ни одного контента" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Обнаружено несоответствие" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Появились предупреждения" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Все в порядке" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "Недействительный или неподдерживаемый URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Получение контента ..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" -+#, fuzzy -+#| msgid "SECURITY POLICY" -+msgid "SECURITY PROFILE" - msgstr "ПОЛИТИКА БЕЗОПАСНОСТИ" - - #: tmp/oscap.glade.h:2 -diff -U3 -N -r a/po/si.po b/po/si.po ---- a/po/si.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/si.po 2023-07-19 13:47:28.583054415 +0200 -@@ -6,21 +6,24 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" --"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --"Last-Translator: Automatically generated\n" --"Language-Team: none\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2021-08-19 07:04+0000\n" -+"Last-Translator: Hela Basa \n" -+"Language-Team: Sinhala \n" - "Language: si\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural=n > 1;\n" -+"X-Generator: Weblate 4.7.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" - msgstr "" - --#: ../org_fedora_oscap/content_discovery.py:167 -+#: ../org_fedora_oscap/content_discovery.py:189 - #, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" -@@ -36,7 +39,7 @@ - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -45,37 +48,37 @@ - msgstr "" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" - msgstr "" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -83,185 +86,195 @@ - "installation." - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:404 -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:462 -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "" -+ -+#: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" - msgstr "" - -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+ - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" -+msgid "_Security Profile" - msgstr "" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" --msgstr "" -+msgstr "සූදානම් නැත" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+msgid "Fetch complete, analyzing data." -+msgstr "" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " - "please" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" - msgstr "" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "" - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" -+msgid "SECURITY PROFILE" - msgstr "" - - #: tmp/oscap.glade.h:2 -diff -U3 -N -r a/po/sr.po b/po/sr.po ---- a/po/sr.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/sr.po 2023-07-19 13:47:28.583054415 +0200 -@@ -9,7 +9,7 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" - "PO-Revision-Date: 2015-04-18 01:39-0400\n" - "Last-Translator: Momcilo Medic \n" - "Language-Team: Serbian (http://www.transifex.com/projects/p/oscap-anaconda-" -@@ -22,12 +22,12 @@ - "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - "X-Generator: Zanata 4.6.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" - msgstr "" - --#: ../org_fedora_oscap/content_discovery.py:167 -+#: ../org_fedora_oscap/content_discovery.py:189 - #, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" -@@ -43,7 +43,7 @@ - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -52,7 +52,7 @@ - msgstr "" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -60,30 +60,30 @@ - "прикључна опција '%(mount_option)s' додата за прикључну тачку %(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "изаберите шифру од најмање %d карактера" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "немогуће проверити дужину root шифре (шифра је криптована)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "пакет '%s' је додат на листу пакета за инсталацију" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -91,189 +91,207 @@ - "installation." - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "пакет '%s' је додат на листу искључених пакета" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:404 -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:462 -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "" -+ -+#: ../org_fedora_oscap/service/installation.py:148 - #, fuzzy - #| msgid "Misconfiguration detected" - msgid "Wrong configuration detected!" - msgstr "Погрешно подешавање откривено" - -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+ - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "" -+#, fuzzy -+#| msgid "_Select profile" -+msgid "_Security Profile" -+msgstr "_Изаберите профил" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "Није спремно" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Преузимање података о садржају" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+#, fuzzy -+#| msgid "Fetching content data" -+msgid "Fetch complete, analyzing data." -+msgstr "Преузимање података о садржају" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Није изабран профил" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Нема правила за пред-инсталациону фазу" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Неисправан садржај пружен. Унесите други URL, молим." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Неуспешно преузимање садржаја. Унесите други URL, молим." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Неуспешно извлачење садржаја (%s). Унесите други URL, молим." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " - "please" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+#, fuzzy -+#| msgid "Not applying security policy" -+msgid "Not applying security profile" - msgstr "Не примењујем полису безбедности" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr "или унесите садржајни или архивски URL за stream података испод:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Садржај није пронађен. Молим унесите садржајни или архивски URL за stream " - "података:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Садржај није пронађен" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Погрешно подешавање откривено" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Упозорења су се појавила" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Све је у реду" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "Неисправан или неподржан URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Преузимање садржаја..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" -+#, fuzzy -+#| msgid "SECURITY POLICY" -+msgid "SECURITY PROFILE" - msgstr "БЕЗБЕДНОСНИ МОДЕЛ" - - #: tmp/oscap.glade.h:2 -diff -U3 -N -r a/po/sv.po b/po/sv.po ---- a/po/sv.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/sv.po 2023-07-19 13:47:28.583054415 +0200 -@@ -3,43 +3,43 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" --"PO-Revision-Date: 2020-09-08 14:29+0000\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2022-05-18 08:18+0000\n" - "Last-Translator: Göran Uddeborg \n" --"Language-Team: Swedish \n" -+"Language-Team: Swedish \n" - "Language: sv\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=n != 1;\n" --"X-Generator: Weblate 4.2.2\n" -+"X-Generator: Weblate 4.12.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" --msgstr "" -+msgstr "Fel vid extrahering av arkiv som zipfil: {exc}" - --#: ../org_fedora_oscap/content_discovery.py:167 --#, fuzzy, python-brace-format --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/content_discovery.py:189 -+#, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" - msgstr "" --"Integritetskontrollen av innehållet misslyckades. Kan inte använda " --"innehållet." -+"Integritetskontrollen av innehållet misslyckades – {hash_obj.name}-hachen " -+"stämmer inte" - - #: ../org_fedora_oscap/data_fetch.py:117 - msgid "Network connection needed to fetch data." --msgstr "" -+msgstr "Nätverksanslutning behövs för att hämta data." - - #: ../org_fedora_oscap/data_fetch.py:262 - #, python-brace-format - msgid "" - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" -+"Det gick inte att hämta data - begäran returnerade HTTP-felkod {return_code}" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -50,7 +50,7 @@ - "i partitioneringslayouten före installationen kan ske med en säkerhetsprofil" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -59,30 +59,30 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "se till att skapa lösenord med minsta längd av %d tecken" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "kan inte kontrollera root-lösenordets längd (lösenordet är krypterat)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "root-lösenordet är för kort, ett längre med åtminstone %d tecken krävs" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "paketet ”%s” har lagts till till listan av paket att installeras" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -93,30 +93,30 @@ - "kan inte tas bort från det aktuella programvaruvalet utan att göra sönder " - "installationen." - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "paketet ”%s” har lagts till till listan av uteslutna paket" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump kommer avaktiveras vid uppstart" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump kommer aktiveras vid uppstart" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "Brandväggen kommer avaktiveras vid uppstart" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "Brandväggen kommer aktiveras vid uppstart" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " -@@ -125,8 +125,8 @@ - "tjänsten ”%s”har lagts till till listan över tjänster att läggas till i " - "brandväggen" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" -@@ -134,17 +134,17 @@ - "porten ”%s”har lagts till till listan över portar att läggas till i " - "brandväggen" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "" --"förtroendet ”%s” har lagts till till listan över förtoenden att läggas till " -+"förtroendet ”%s” har lagts till till listan över förtroenden att läggas till " - "i brandväggen" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -153,75 +153,78 @@ - "tjänsten ”%s” har lagts till till listan över tjänster att tas bort från " - "brandväggen" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 --#, fuzzy --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." --msgstr "" --"Integritetskontrollen av innehållet misslyckades. Kan inte använda " --"innehållet." -+msgstr "Integritetskontrollen av säkerhetsinnehållet misslyckades." - --#: ../org_fedora_oscap/ks/oscap.py:404 --#, fuzzy --#| msgid "Error fetching and loading content" -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" --msgstr "Fel när innehåll hämtades och laddades" -+msgstr "Det uppstod ett fel när säkerhetsinnehåll hämtades och laddades:\n" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." --msgstr "" -+msgstr "Det uppstod ett oväntat problem med det levererade innehållet." -+ -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "Installationen bör avbrytas." - --#: ../org_fedora_oscap/ks/oscap.py:462 --#, fuzzy --#| msgid "Misconfiguration detected" -+#: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" --msgstr "Felkonfiguration upptäckt" -+msgstr "Felkonfiguration upptäckt!" -+ -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "Du har använt mer än en oscap-tilläggssektion i kickstart:en. " -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+"Du har konfigurerat oscap-tilläget i sektionen ”{used_section_header}”. " - - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "_Säkerhetspolicy" -+msgid "_Security Profile" -+msgstr "_Säkerhetsprofil" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" --msgstr "Inte redo" -+msgstr "Inte klar" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Hämtar innehållsdata" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+msgid "Fetch complete, analyzing data." -+msgstr "Hämtning slutförd, analyserar data." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Ingen profil vald" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Inga regler för förinstallationsfasen" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Felaktigt innehåll tillhandahölls. Ange en annan URL." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "Felaktig eller ej stödd innehålls-URL, ange en annan." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Misslyckades att hämta innehåll. Ange en annan URL." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -229,18 +232,18 @@ - "Nätverksfel uppstod när data hämtades. Kontrollera att nätverket är uppsatt " - "och fungerar." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - "Integritetskontrollen av innehållet misslyckades. Kan inte använda " - "innehållet." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Misslyckades att extrahera innehållet (%s). Ange en annan URL." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -248,52 +251,52 @@ - msgstr "" - "Profilen med ID ”%s” är inte definierad i innehållet. Välj en annan profil" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" --msgstr "Tillämpar inte säkerhetspolicyn" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" -+msgstr "Säkerhetsprofilen tillämpas inte" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr " eller ange ett dataströmsinnehåll eller en arkiv-URL nedan:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "Inget innehåll hittat. Ange dataströmsinnehåll eller arkiv-URL nedan:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Fel när innehåll hämtades och laddades" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Inget innehåll hittat" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Felkonfiguration upptäckt" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Varningar uppstod" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Allting okej" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "Felaktig eller ej stödd URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Hämtar innehåll …" - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" --msgstr "SÄKERHETSPOLICY" -+msgid "SECURITY PROFILE" -+msgstr "SÄKERHETSPROFIL" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" -@@ -339,6 +342,9 @@ - msgid "_Fetch" - msgstr "_Hämta" - -+#~ msgid "Do you wish to continue anyway?" -+#~ msgstr "Vill du fortsätta ändå?" -+ - #~ msgid "" - #~ "There was an error fetching and loading the security content:\n" - #~ "%s\n" -diff -U3 -N -r a/po/uk.po b/po/uk.po ---- a/po/uk.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/uk.po 2023-07-19 13:47:28.583054415 +0200 -@@ -4,42 +4,45 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" --"PO-Revision-Date: 2020-09-13 14:29+0000\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2022-05-04 20:18+0000\n" - "Last-Translator: Yuri Chornoivan \n" --"Language-Team: Ukrainian \n" -+"Language-Team: Ukrainian \n" - "Language: uk\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" - "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" --"X-Generator: Weblate 4.2.2\n" -+"X-Generator: Weblate 4.12.1\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" --msgstr "" -+msgstr "Помилка під час спроби видобути дані з архіву як файла zip: {exc}" - --#: ../org_fedora_oscap/content_discovery.py:167 --#, fuzzy, python-brace-format --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/content_discovery.py:189 -+#, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" --msgstr "Дані не пройшли перевірку на цілісність. Їхнє використання неможливе." -+msgstr "" -+"Не пройдено перевірку цілісності даних — хеш {hash_obj.name} не збігається з " -+"еталонним" - - #: ../org_fedora_oscap/data_fetch.py:117 - msgid "Network connection needed to fetch data." --msgstr "" -+msgstr "Для отримання даних потрібне з'єднання з мережею." - - #: ../org_fedora_oscap/data_fetch.py:262 - #, python-brace-format - msgid "" - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" -+"Не вдалося отримати дані — у відповідь на запит отримано код помилки HTTP " -+"{return_code}" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -51,7 +54,7 @@ - "захисту" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -60,17 +63,17 @@ - "«%(mount_option)s»" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "довжина пароля має бути не меншою за %d символів" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "не вдалося перевірити довжину пароля root (пароль зашифровано)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -78,13 +81,13 @@ - msgstr "" - "пароль root є надто коротким, потрібен довший, принаймні із %d символів" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "до списку встановлюваних пакунків додано пакунок «%s»" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -95,30 +98,30 @@ - "можна вилучати з поточного вибору програмного забезпечення без того, щоб " - "ушкодити встановлену систему." - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "до списку виключених пакунків додано пакунок «%s»" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump буде вимкнено при запуску" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump буде увімкнено при запуску" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "Брандмауер буде вимкнено при запуску" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "Брандмауер буде увімкнено при запуску" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " -@@ -126,15 +129,15 @@ - msgstr "" - "службу «%s» було додано до списку служб, які слід додати до брандмауера" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "порт «%s» було додано до списку портів, які слід додати до брандмауера" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -142,8 +145,8 @@ - "запис довіри «%s» було додано до списку записів довіри, які слід додати до " - "брандмауера" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -151,74 +154,80 @@ - msgstr "" - "службу «%s» було додано до списку служб, які слід вилучити з брандмауера" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 --#, fuzzy --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." --msgstr "Дані не пройшли перевірку на цілісність. Їхнє використання неможливе." -+msgstr "Захищені дані не пройшли перевірку на цілісність." - --#: ../org_fedora_oscap/ks/oscap.py:404 --#, fuzzy --#| msgid "Error fetching and loading content" -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" --msgstr "Помилка під час спроби отримання та завантаження даних" -+msgstr "" -+"Під час спроби отримання та завантаження захищених даних сталася помилка:\n" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." --msgstr "" -+msgstr "Виникла непередбачена проблема із наданими даними." -+ -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "Встановлення слід перервати." - --#: ../org_fedora_oscap/ks/oscap.py:462 --#, fuzzy --#| msgid "Misconfiguration detected" -+#: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" --msgstr "Виявлено помилки у налаштуваннях" -+msgstr "Виявлено помилкові налаштування!" -+ -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "У вас використано декілька розділів додатків oscap у kickstart. " -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+"Вами налаштовано додаток oscap за допомогою розділу «{used_section_header}». " - - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "П_равила безпеки" -+msgid "_Security Profile" -+msgstr "Профіль за_хисту" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "Неготовий" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "Отримуємо дані" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+msgid "Fetch complete, analyzing data." -+msgstr "Отримання завершено, аналізуємо дані." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "Не вибрано жодного профілю" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "Правил для кроку перед встановленням немає" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Надано некоректні дані. Будь ласка, вкажіть іншу адресу." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" - "Некоректна або непідтримувана адреса даних. Будь ласка, введіть якусь іншу." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Не вдалося отримати дані. Будь ласка, вкажіть іншу адресу." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -227,16 +236,16 @@ - "ласка, перевірте, чи правильно налаштовано з’єднання, та чи є воно " - "працездатним." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "Дані не пройшли перевірку на цілісність. Їхнє використання неможливе." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Не вдалося видобути дані (%s). Будь ласка, вкажіть іншу адресу." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " -@@ -245,52 +254,52 @@ - "Профіль з ідентифікатором «%s» у даних не визначено. Виберіть, будь ласка, " - "інший профіль" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" --msgstr "Не застосовуємо правил захисту" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" -+msgstr "Не застосовуємо профіль захисту" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr " або вкажіть адресу потоку даних чи архіву:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "Даних не знайдено. Будь ласка, вкажіть адресу потоку даних або архіву:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "Помилка під час спроби отримання та завантаження даних" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "Даних не знайдено" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "Виявлено помилки у налаштуваннях" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "Отримано попередження" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "Все гаразд" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "Некоректна або непідтримувана адреса" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "Отримуємо дані…" - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" --msgstr "ПРАВИЛА ЗАХИСТУ" -+msgid "SECURITY PROFILE" -+msgstr "ПРОФІЛЬ ЗАХИСТУ" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" -@@ -336,6 +345,9 @@ - msgid "_Fetch" - msgstr "_Отримати" - -+#~ msgid "Do you wish to continue anyway?" -+#~ msgstr "Хочете продовжити попри це?" -+ - #~ msgid "" - #~ "There was an error fetching and loading the security content:\n" - #~ "%s\n" -diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po ---- a/po/zh_CN.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/zh_CN.po 2023-07-19 13:47:28.583054415 +0200 -@@ -4,40 +4,40 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" --"PO-Revision-Date: 2020-06-26 04:26-0400\n" --"Last-Translator: Copied by Zanata \n" --"Language-Team: Chinese (Simplified)\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" -+"PO-Revision-Date: 2022-11-02 07:19+0000\n" -+"Last-Translator: Ludek Janda \n" -+"Language-Team: Chinese (Simplified) \n" - "Language: zh_CN\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=1; plural=0\n" --"X-Generator: Zanata 4.6.2\n" -+"Plural-Forms: nplurals=1; plural=0;\n" -+"X-Generator: Weblate 4.14.1\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" --msgstr "" -+msgstr "解压 zip 文件时出错： {exc}" - --#: ../org_fedora_oscap/content_discovery.py:167 --#, fuzzy, python-brace-format --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/content_discovery.py:189 -+#, python-brace-format - msgid "" - "Integrity check of the content failed - {hash_obj.name} hash didn't match" --msgstr "内容的完整性检查失败。不能使用这个内容。" -+msgstr "内容完整性检查失败 - {hash_obj.name} 哈希值不匹配" - - #: ../org_fedora_oscap/data_fetch.py:117 - msgid "Network connection needed to fetch data." --msgstr "" -+msgstr "获取数据所需的网络连接。" - - #: ../org_fedora_oscap/data_fetch.py:262 - #, python-brace-format - msgid "" - "Failed to fetch data - the request returned HTTP error code {return_code}" --msgstr "" -+msgstr "获取数据失败 - 请求返回 HTTP 错误代码 {return_code}" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -48,37 +48,37 @@ - "布局中创建" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" - msgstr "为挂载点 %(mount_point)s 添加的挂载选项 '%(mount_option)s'" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "确保创建的密码长度最少为 %d 个字符" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "无法检查 root 密码的长度（密码已加密）" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "root 密码太短，它需要最少包括 %d 个字符" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "软件包 '%s' 已被添加到要被安装的软件包列表中" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -88,196 +88,200 @@ - "软件包 '{package}' 已被添加到排除的软件包列表中，但在不破坏安装的情况下，无法" - "从当前的软件选择中删除。" - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "软件包 '%s' 已被添加到排除的软件包列表中" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump 将在启动时被禁用" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump 将在启动时被启用" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "防火墙将在启动时被禁用" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "防火墙将在启动时被启用" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "服务 '%s' 已被添加到要加到防火墙的服务列表中" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "端口 '%s' 已被添加到要加到防火墙的端口列表中" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "信任 '%s' 已被添加到要加到防火墙的信任列表中" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" - msgstr "服务 '%s' 已被添加到要从防火墙删除的服务列表中" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 --#, fuzzy --#| msgid "The integrity check of the content failed. Cannot use the content." -+#: ../org_fedora_oscap/service/installation.py:41 - msgid "The integrity check of the security content failed." --msgstr "内容的完整性检查失败。不能使用这个内容。" -+msgstr "安全内容的完整性检查失败。" - --#: ../org_fedora_oscap/ks/oscap.py:404 --#, fuzzy --#| msgid "Error fetching and loading content" -+#: ../org_fedora_oscap/service/installation.py:46 - msgid "There was an error fetching and loading the security content:\n" --msgstr "获取并加载内容错误" -+msgstr "获取并载入安全内容时出错：\n" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." --msgstr "" -+msgstr "提供的内容出现意外问题。" -+ -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "安装应终止。" - --#: ../org_fedora_oscap/ks/oscap.py:462 --#, fuzzy --#| msgid "Misconfiguration detected" -+#: ../org_fedora_oscap/service/installation.py:148 - msgid "Wrong configuration detected!" --msgstr "发现错误配置" -+msgstr "检测到配置错误！" -+ -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "您已在 kickstart 中使用了多个 oscap 插件部分。 " -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "您已经使用'{used_section_header}'部分配置了 oscap 插件。 " - - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" --msgstr "安全策略（_S）" -+msgid "_Security Profile" -+msgstr "安全配置文件(_S)" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "未就绪" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "获取内容数据" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+msgid "Fetch complete, analyzing data." -+msgstr "获取完成，分析数据。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" --msgstr "没有选择 profile" -+msgstr "没有选择配置文件" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "没有预安装阶段的规则" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "提供无效的内容。请输入一个不同的 URL。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "无效或不支持的内容 URL，请输入一个不同的 URL。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "获取内容失败。请输入一个不同的 URL。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." - msgstr "在获取数据时出现网络错误。请检查网络是否正常。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "内容的完整性检查失败。不能使用这个内容。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "提取内容 (%s) 失败。请输入一个不同的 URL。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " - "please" - msgstr "ID 为 '%s' 的档案没有在内容中定义。请选择一个不同的档案" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" --msgstr "没有应用安全策略" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+msgid "Not applying security profile" -+msgstr "没有应用安全配置文件" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" --msgstr "或输入数据流内容或归档 URL：" -+msgstr " 或输入数据流内容或归档 URL：" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "没有找到内容。请输入数据流或归档 URL：" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "获取并加载内容错误" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "没有找到内容" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "发现错误配置" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "出现的警告" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "一切正常" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "无效或不支持的 URL" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "获取内容..." - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" --msgstr "安全策略" -+msgid "SECURITY PROFILE" -+msgstr "安全配置文件" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" --msgstr "修改内容(_C)" -+msgstr "改变内容(_C)" - - #: tmp/oscap.glade.h:3 - msgid "Apply security policy:" -@@ -293,7 +297,7 @@ - - #: tmp/oscap.glade.h:6 - msgid "Choose profile below:" --msgstr "选择档案：" -+msgstr "选择下面的配置文件：" - - #: tmp/oscap.glade.h:7 - msgid "Profile" -@@ -305,7 +309,7 @@ - - #: tmp/oscap.glade.h:9 - msgid "_Select profile" --msgstr "选择档案(_S)" -+msgstr "选择配置文件(_S)" - - #: tmp/oscap.glade.h:10 - msgid "Changes that were done or need to be done:" -@@ -319,6 +323,9 @@ - msgid "_Fetch" - msgstr "获取(_F)" - -+#~ msgid "Do you wish to continue anyway?" -+#~ msgstr "您是否希望继续？" -+ - #~ msgid "" - #~ "There was an error fetching and loading the security content:\n" - #~ "%s\n" -diff -U3 -N -r a/po/zh_TW.po b/po/zh_TW.po ---- a/po/zh_TW.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/zh_TW.po 2023-07-19 13:47:28.583054415 +0200 -@@ -3,7 +3,7 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2021-06-21 11:51+0200\n" -+"POT-Creation-Date: 2021-07-02 15:52+0200\n" - "PO-Revision-Date: 2019-08-30 10:56-0400\n" - "Last-Translator: Ludek Janda \n" - "Language-Team: \n" -@@ -14,12 +14,12 @@ - "Plural-Forms: nplurals=1; plural=0;\n" - "X-Generator: Zanata 4.6.2\n" - --#: ../org_fedora_oscap/common.py:326 -+#: ../org_fedora_oscap/common.py:358 - #, python-brace-format - msgid "Error extracting archive as a zipfile: {exc}" - msgstr "" - --#: ../org_fedora_oscap/content_discovery.py:167 -+#: ../org_fedora_oscap/content_discovery.py:189 - #, fuzzy, python-brace-format - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "" -@@ -36,7 +36,7 @@ - "Failed to fetch data - the request returned HTTP error code {return_code}" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:434 -+#: ../org_fedora_oscap/rule_handling.py:441 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -47,37 +47,37 @@ - "配置文件進行安裝" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:445 -+#: ../org_fedora_oscap/rule_handling.py:452 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" - msgstr "掛載選項'%(mount_option)s'為掛載點添加了 %(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:554 -+#: ../org_fedora_oscap/rule_handling.py:560 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "確保以最小的長度創建密碼 %d 人物" - --#: ../org_fedora_oscap/rule_handling.py:561 -+#: ../org_fedora_oscap/rule_handling.py:567 - msgid "cannot check root password length (password is crypted)" - msgstr "無法檢查root密碼長度（密碼被加密）" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:567 -+#: ../org_fedora_oscap/rule_handling.py:573 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "root密碼太短，至少有一個 %d 字符是必需的" - --#: ../org_fedora_oscap/rule_handling.py:685 --#: ../org_fedora_oscap/rule_handling.py:700 -+#: ../org_fedora_oscap/rule_handling.py:712 -+#: ../org_fedora_oscap/rule_handling.py:727 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "包'%s'已添加到要安裝的軟件包列表中" - --#: ../org_fedora_oscap/rule_handling.py:710 -+#: ../org_fedora_oscap/rule_handling.py:737 - #, python-brace-format - msgid "" - "package '{package}' has been added to the list of excluded packages, but it " -@@ -85,191 +85,209 @@ - "installation." - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:717 --#: ../org_fedora_oscap/rule_handling.py:732 -+#: ../org_fedora_oscap/rule_handling.py:744 -+#: ../org_fedora_oscap/rule_handling.py:759 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "包'%s'已添加到已排除的包列表中" - --#: ../org_fedora_oscap/rule_handling.py:833 -+#: ../org_fedora_oscap/rule_handling.py:866 - msgid "Kdump will be disabled on startup" - msgstr "Kdump將在啟動時被禁用" - --#: ../org_fedora_oscap/rule_handling.py:835 -+#: ../org_fedora_oscap/rule_handling.py:868 - msgid "Kdump will be enabled on startup" - msgstr "Kdump將在啟動時啟用" - --#: ../org_fedora_oscap/rule_handling.py:988 -+#: ../org_fedora_oscap/rule_handling.py:1026 - msgid "Firewall will be disabled on startup" - msgstr "防火牆將在啟動時禁用" - --#: ../org_fedora_oscap/rule_handling.py:995 -+#: ../org_fedora_oscap/rule_handling.py:1033 - msgid "Firewall will be enabled on startup" - msgstr "防火牆將在啟動時啟用" - --#: ../org_fedora_oscap/rule_handling.py:1003 --#: ../org_fedora_oscap/rule_handling.py:1042 -+#: ../org_fedora_oscap/rule_handling.py:1041 -+#: ../org_fedora_oscap/rule_handling.py:1080 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "服務'%s'已添加到要添加到防火牆的服務列表中" - --#: ../org_fedora_oscap/rule_handling.py:1010 --#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1048 -+#: ../org_fedora_oscap/rule_handling.py:1093 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "港口 '%s'已被添加到要添加到防火牆的端口列表中" - --#: ../org_fedora_oscap/rule_handling.py:1017 --#: ../org_fedora_oscap/rule_handling.py:1068 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1106 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "信任'%s'已被添加到要添加到防火牆的信任列表中" - --#: ../org_fedora_oscap/rule_handling.py:1080 --#: ../org_fedora_oscap/rule_handling.py:1095 -+#: ../org_fedora_oscap/rule_handling.py:1118 -+#: ../org_fedora_oscap/rule_handling.py:1133 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" - msgstr "服務'%s'已被添加到要從防火牆中刪除的服務列表中" - --#: ../org_fedora_oscap/ks/oscap.py:376 --msgid "The installation should be aborted." --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:377 --msgid "Do you wish to continue anyway?" --msgstr "" -- --#: ../org_fedora_oscap/ks/oscap.py:400 -+#: ../org_fedora_oscap/service/installation.py:41 - #, fuzzy - #| msgid "The integrity check of the content failed. Cannot use the content." - msgid "The integrity check of the security content failed." - msgstr "內容的完整性檢查失敗。無法使用內容。" - --#: ../org_fedora_oscap/ks/oscap.py:404 -+#: ../org_fedora_oscap/service/installation.py:46 - #, fuzzy - #| msgid "Error fetching and loading content" - msgid "There was an error fetching and loading the security content:\n" - msgstr "獲取和加載內容時出錯" - --#: ../org_fedora_oscap/ks/oscap.py:409 --#: ../org_fedora_oscap/gui/spokes/oscap.py:774 -+#: ../org_fedora_oscap/service/installation.py:51 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:793 - msgid "There was an unexpected problem with the supplied content." - msgstr "" - --#: ../org_fedora_oscap/ks/oscap.py:462 -+#: ../org_fedora_oscap/service/installation.py:56 -+msgid "The installation should be aborted." -+msgstr "" -+ -+#: ../org_fedora_oscap/service/installation.py:148 - #, fuzzy - #| msgid "Misconfiguration detected" - msgid "Wrong configuration detected!" - msgstr "檢測到配置錯誤" - -+#: ../org_fedora_oscap/service/oscap.py:121 -+msgid "You have used more than one oscap addon sections in the kickstart. " -+msgstr "" -+ -+#: ../org_fedora_oscap/service/oscap.py:135 -+#, python-brace-format -+msgid "" -+"You have configured the oscap addon using '{used_section_header}' section. " -+msgstr "" -+ - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:201 --msgid "_Security Policy" -+#, fuzzy -+#| msgid "_Security Policy" -+msgid "_Security Profile" - msgstr "安全政策（_S）" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:229 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:228 - msgid "Not ready" - msgstr "沒有準備好" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:383 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:393 - msgid "Fetching content data" - msgstr "獲取內容數據" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:626 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:431 -+#, fuzzy -+#| msgid "Fetching content data" -+msgid "Fetch complete, analyzing data." -+msgstr "獲取內容數據" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "No profile selected" - msgstr "沒有選擇個人資料" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:631 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:648 - msgid "No rules for the pre-installation phase" - msgstr "沒有預安裝階段的規則" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:782 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:801 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "提供的內容無效。請輸入其他網址。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:790 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:809 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "無效或不受支持的內容網址，請輸入其他網址。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:817 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "無法獲取內容。請輸入其他網址。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:806 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:825 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." - msgstr "獲取數據時遇到網絡錯誤。請檢查網絡是否已設置並正常運行。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:815 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:834 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "內容的完整性檢查失敗。無法使用內容。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:823 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:842 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "無法提取內容（%s）。請輸入其他網址。" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:840 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:860 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " - "please" - msgstr "帶ID的個人資料'%s'沒有在內容中定義。請選擇其他個人資料" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:856 --msgid "Not applying security policy" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:879 -+#, fuzzy -+#| msgid "Not applying security policy" -+msgid "Not applying security profile" - msgstr "不應用安全策略" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also - #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:887 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:921 - msgid " or enter data stream content or archive URL below:" - msgstr " 或輸入以下數據流內容或存檔URL：" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "找不到任何內容。請在下面輸入數據流內容或存檔URL：" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1062 - msgid "Error fetching and loading content" - msgstr "獲取和加載內容時出錯" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 - msgid "No content found" - msgstr "找不到任何內容" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080 - msgid "Misconfiguration detected" - msgstr "檢測到配置錯誤" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086 - msgid "Warnings appeared" - msgstr "警告出現了" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088 - msgid "Everything okay" - msgstr "一切都好" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170 - msgid "Invalid or unsupported URL" - msgstr "網址無效或不受支持" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "獲取內容......" - - #: tmp/oscap.glade.h:1 --msgid "SECURITY POLICY" -+#, fuzzy -+#| msgid "SECURITY POLICY" -+msgid "SECURITY PROFILE" - msgstr "安全政策" - - #: tmp/oscap.glade.h:2 diff --git a/oscap-anaconda-addon-1.2.2-dbus_show_integration-PR_182.patch b/oscap-anaconda-addon-1.2.2-dbus_show_integration-PR_182.patch deleted file mode 100644 index b94a864..0000000 --- a/oscap-anaconda-addon-1.2.2-dbus_show_integration-PR_182.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 20843d815a82d10cba773f4e10e9a45c57d5e12e Mon Sep 17 00:00:00 2001 -From: Vendula Poncova -Date: Wed, 18 Aug 2021 10:54:20 +0200 -Subject: [PATCH] Don't show the OSCAP spoke if the OSCAP DBus module is - disabled - -Add-ons can be disabled in the Anaconda configuration files. Without the fix, -the OSCAP DBus module is started on demand by the OSCAP spoke even though it -shouldn't be activated. In the future, it will result in a failure of the -installer. - -Related: rhbz#1994003 ---- - org_fedora_oscap/gui/spokes/oscap.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index 36c8d7a..fe26076 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -36,6 +36,7 @@ - from org_fedora_oscap.structures import PolicyData - - from pyanaconda.modules.common.constants.services import USERS -+from pyanaconda.modules.common.util import is_module_available - from pyanaconda.threading import threadMgr, AnacondaThread - from pyanaconda.ui.gui.spokes import NormalSpoke - from pyanaconda.ui.communication import hubQ -@@ -203,6 +204,10 @@ class OSCAPSpoke(NormalSpoke): - # as it is displayed inside the spoke as the spoke label, - # and spoke labels are all uppercase by a convention. - -+ @classmethod -+ def should_run(cls, environment, data): -+ return is_module_available(OSCAP) -+ - # methods defined by API and helper methods # - def __init__(self, data, storage, payload): - """ diff --git a/oscap-anaconda-addon-2.0.1-absent_appstream-PR_185.patch b/oscap-anaconda-addon-2.0.1-absent_appstream-PR_185.patch deleted file mode 100644 index 8fbae5b..0000000 --- a/oscap-anaconda-addon-2.0.1-absent_appstream-PR_185.patch +++ /dev/null @@ -1,191 +0,0 @@ -From c92205d5a5c788eeac84a6e67956a3e0540ab565 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Mon, 3 Jan 2022 17:31:49 +0100 -Subject: [PATCH 1/2] Add oscap sanity check before attempting remediation - -If something is obviously wrong with the scanner, then don't attempt to remediate -and try to show relevant information in a dialog window. ---- - org_fedora_oscap/common.py | 39 +++++++++++++++++++----- - org_fedora_oscap/service/installation.py | 11 +++++++ - tests/test_common.py | 8 +++++ - tests/test_installation.py | 3 +- - 4 files changed, 52 insertions(+), 9 deletions(-) - -diff --git a/org_fedora_oscap/common.py b/org_fedora_oscap/common.py -index c432168..eeb27fc 100644 ---- a/org_fedora_oscap/common.py -+++ b/org_fedora_oscap/common.py -@@ -171,7 +171,8 @@ def execute(self, ** kwargs): - proc = subprocess.Popen(self.args, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, ** kwargs) - except OSError as oserr: -- msg = "Failed to run the oscap tool: %s" % oserr -+ msg = ("Failed to execute command '{command_string}': {oserr}" -+ .format(command_string=command_string, oserr=oserr)) - raise OSCAPaddonError(msg) - - (stdout, stderr) = proc.communicate() -@@ -247,6 +248,34 @@ def _run_oscap_gen_fix(profile, fpath, template, ds_id="", xccdf_id="", - return proc.stdout - - -+def do_chroot(chroot): -+ """Helper function doing the chroot if requested.""" -+ if chroot and chroot != "/": -+ os.chroot(chroot) -+ os.chdir("/") -+ -+ -+def assert_scanner_works(chroot, executable="oscap"): -+ args = [executable, "--version"] -+ command = " ".join(args) -+ -+ try: -+ proc = subprocess.Popen( -+ args, preexec_fn=lambda: do_chroot(chroot), -+ stdout=subprocess.PIPE, stderr=subprocess.PIPE) -+ (stdout, stderr) = proc.communicate() -+ stderr = stderr.decode(errors="replace") -+ except OSError as exc: -+ msg = _(f"Basic invocation '{command}' fails: {str(exc)}") -+ raise OSCAPaddonError(msg) -+ if proc.returncode != 0: -+ msg = _( -+ f"Basic scanner invocation '{command}' exited " -+ "with non-zero error code {proc.returncode}: {stderr}") -+ raise OSCAPaddonError(msg) -+ return True -+ -+ - def run_oscap_remediate(profile, fpath, ds_id="", xccdf_id="", tailoring="", - chroot=""): - """ -@@ -276,12 +305,6 @@ def run_oscap_remediate(profile, fpath, ds_id="", xccdf_id="", tailoring="", - if not profile: - return "" - -- def do_chroot(): -- """Helper function doing the chroot if requested.""" -- if chroot and chroot != "/": -- os.chroot(chroot) -- os.chdir("/") -- - # make sure the directory for the results exists - results_dir = os.path.dirname(RESULTS_PATH) - if chroot: -@@ -306,7 +329,7 @@ def do_chroot(): - args.append(fpath) - - proc = SubprocessLauncher(args) -- proc.execute(preexec_fn=do_chroot) -+ proc.execute(preexec_fn=lambda: do_chroot(chroot)) - proc.log_messages() - - if proc.returncode not in (0, 2): -diff --git a/org_fedora_oscap/service/installation.py b/org_fedora_oscap/service/installation.py -index 2da8559..d909c44 100644 ---- a/org_fedora_oscap/service/installation.py -+++ b/org_fedora_oscap/service/installation.py -@@ -239,6 +239,17 @@ def name(self): - - def run(self): - """Run the task.""" -+ try: -+ common.assert_scanner_works( -+ chroot=self._sysroot, executable="oscap") -+ except Exception as exc: -+ msg_lines = [_( -+ "The 'oscap' scanner doesn't work in the installed system: {error}" -+ .format(error=str(exc)))] -+ msg_lines.append(_("As a result, the installed system can't be hardened.")) -+ terminate("\n".join(msg_lines)) -+ return -+ - common.run_oscap_remediate( - self._policy_data.profile_id, - self._target_content_path, -diff --git a/tests/test_common.py b/tests/test_common.py -index 9f7a16a..4f25379 100644 ---- a/tests/test_common.py -+++ b/tests/test_common.py -@@ -77,6 +77,14 @@ def _run_oscap(mock_subprocess, additional_args): - return expected_args, kwargs - - -+def test_oscap_works(): -+ assert common.assert_scanner_works(chroot="/") -+ with pytest.raises(common.OSCAPaddonError, match="No such file"): -+ common.assert_scanner_works(chroot="/", executable="i_dont_exist") -+ with pytest.raises(common.OSCAPaddonError, match="non-zero"): -+ common.assert_scanner_works(chroot="/", executable="false") -+ -+ - def test_run_oscap_remediate_profile_only(mock_subprocess, monkeypatch): - return run_oscap_remediate_profile( - mock_subprocess, monkeypatch, -diff --git a/tests/test_installation.py b/tests/test_installation.py -index 5749a94..f819c3b 100644 ---- a/tests/test_installation.py -+++ b/tests/test_installation.py -@@ -115,4 +115,5 @@ def test_remediate_system_task(sysroot_path, content_path, tailoring_path): - ) - - assert task.name == "Remediate the system" -- task.run() -+ with pytest.raises(installation.NonCriticalInstallationError, match="No such file"): -+ task.run() - -From ea2dbf5017445875b1c0e4ee27899c8dde292c98 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Mon, 3 Jan 2022 17:42:31 +0100 -Subject: [PATCH 2/2] Don't raise exceptions in execute() - -Those result in tracebacks during the installation, -while a dialog window presents a more useful form of user interaction. ---- - org_fedora_oscap/service/installation.py | 27 ++++++++++++++---------- - 1 file changed, 16 insertions(+), 11 deletions(-) - -diff --git a/org_fedora_oscap/service/installation.py b/org_fedora_oscap/service/installation.py -index d909c44..290da40 100644 ---- a/org_fedora_oscap/service/installation.py -+++ b/org_fedora_oscap/service/installation.py -@@ -210,9 +210,9 @@ def run(self): - ) - - if ret != 0: -- raise common.ExtractionError( -- "Failed to install content RPM to the target system" -- ) -+ msg = _(f"Failed to install content RPM to the target system.") -+ terminate(msg) -+ return - else: - pattern = utils.join_paths(common.INSTALLATION_CONTENT_DIR, "*") - utils.universal_copy(pattern, target_content_dir) -@@ -250,11 +250,16 @@ def run(self): - terminate("\n".join(msg_lines)) - return - -- common.run_oscap_remediate( -- self._policy_data.profile_id, -- self._target_content_path, -- self._policy_data.datastream_id, -- self._policy_data.xccdf_id, -- self._target_tailoring_path, -- chroot=self._sysroot -- ) -+ try: -+ common.run_oscap_remediate( -+ self._policy_data.profile_id, -+ self._target_content_path, -+ self._policy_data.datastream_id, -+ self._policy_data.xccdf_id, -+ self._target_tailoring_path, -+ chroot=self._sysroot -+ ) -+ except Exception as exc: -+ msg = _(f"Something went wrong during the final hardening: {str(exc)}.") -+ terminate(msg) -+ return diff --git a/oscap-anaconda-addon-2.0.1-fix_archive_handling-PR_170.patch b/oscap-anaconda-addon-2.0.1-fix_archive_handling-PR_170.patch deleted file mode 100644 index 82a08c2..0000000 --- a/oscap-anaconda-addon-2.0.1-fix_archive_handling-PR_170.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py -index bc14ef1..ccfe6c8 100644 ---- a/org_fedora_oscap/content_discovery.py -+++ b/org_fedora_oscap/content_discovery.py -@@ -225,7 +225,8 @@ def _gather_available_files(self, actually_fetched_content, dest_filename): - if not dest_filename: # using scap-security-guide - fpaths = [self.DEFAULT_SSG_DATA_STREAM_PATH] - else: # Using downloaded XCCDF/OVAL/DS/tailoring -- fpaths = glob(str(self.CONTENT_DOWNLOAD_LOCATION / "*.xml")) -+ fpaths = pathlib.Path(self.CONTENT_DOWNLOAD_LOCATION).rglob("*") -+ fpaths = [str(p) for p in fpaths if p.is_file()] - else: - dest_filename = pathlib.Path(dest_filename) - # RPM is an archive at this phase diff --git a/oscap-anaconda-addon-2.0.1-fix_fingerprint-PR_177.patch b/oscap-anaconda-addon-2.0.1-fix_fingerprint-PR_177.patch deleted file mode 100644 index ecdc065..0000000 --- a/oscap-anaconda-addon-2.0.1-fix_fingerprint-PR_177.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c72b95146650b0debc36b8da546b60a9d5482ab3 Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Fri, 15 Oct 2021 15:28:24 +0200 -Subject: [PATCH] Fix bad destination for the parsed content fingerprint - ---- - org_fedora_oscap/service/kickstart.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/org_fedora_oscap/service/kickstart.py b/org_fedora_oscap/service/kickstart.py -index d6f22ac..dc1a100 100644 ---- a/org_fedora_oscap/service/kickstart.py -+++ b/org_fedora_oscap/service/kickstart.py -@@ -140,7 +140,7 @@ def _parse_fingerprint(self, value): - msg = "Unsupported fingerprint" - raise KickstartValueError(msg) - -- self.fingerprint = value -+ self.policy_data.fingerprint = value - - def _parse_certificates(self, value): - self.policy_data.certificates = value diff --git a/oscap-anaconda-addon-2.0.1-fix_no_hardening-PR_176.patch b/oscap-anaconda-addon-2.0.1-fix_no_hardening-PR_176.patch deleted file mode 100644 index 4ef965d..0000000 --- a/oscap-anaconda-addon-2.0.1-fix_no_hardening-PR_176.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 56806b88b139d62276e8522bb3daf7d4fb02df84 Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Fri, 15 Oct 2021 15:05:55 +0200 -Subject: [PATCH] Represent unselected profile by an empty string - -None can't be passed via the DBUS interface. ---- - org_fedora_oscap/gui/spokes/oscap.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index 4425757..36c8d7a 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -244,7 +244,7 @@ def __init__(self, data, storage, payload): - self.__old_root_pw = None - - # used to check if the profile was changed or not -- self._active_profile = None -+ self._active_profile = "" - - # prevent multiple simultaneous data fetches - self._fetching = False -@@ -719,7 +719,7 @@ def _unselect_profile(self, profile_id): - self._revert_rootpw_changes() - self._rule_data = None - -- self._active_profile = None -+ self._active_profile = "" - - @async_action_wait - def _select_profile(self, profile_id): diff --git a/oscap-anaconda-addon-2.0.1-fix_strings-PR_207.patch b/oscap-anaconda-addon-2.0.1-fix_strings-PR_207.patch deleted file mode 100644 index 4be2a37..0000000 --- a/oscap-anaconda-addon-2.0.1-fix_strings-PR_207.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 1b96504a8bbc198cce11647a0c3a65e1a3ffaba1 Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Fri, 13 May 2022 14:44:45 +0200 -Subject: [PATCH] Fix strings for translations - -The input of the _() function has to be a static string, -and it was in those cases a formatted one, -which didn't match the translation data. ---- - org_fedora_oscap/rule_handling.py | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/org_fedora_oscap/rule_handling.py b/org_fedora_oscap/rule_handling.py -index 244aac8..635446e 100644 ---- a/org_fedora_oscap/rule_handling.py -+++ b/org_fedora_oscap/rule_handling.py -@@ -707,10 +707,11 @@ def eval_rules(self, ksdata, storage, report_only=False): - messages = [] - packages_data = get_packages_data() - -+ msg_installed_template = _( -+ "package '%s' has been added to the list of to be installed packages") - # add messages for the already added packages - for pkg in self._added_pkgs: -- msg = _("package '%s' has been added to the list of to be installed " -- "packages" % pkg) -+ msg = msg_installed_template % pkg - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) - -@@ -724,11 +725,12 @@ def eval_rules(self, ksdata, storage, report_only=False): - self._added_pkgs.add(pkg) - packages_data.packages.append(pkg) - -- msg = _("package '%s' has been added to the list of to be installed " -- "packages" % pkg) -+ msg = msg_installed_template % pkg - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) - -+ msg_excluded_template = _( -+ "package '%s' has been added to the list of excluded packages") - # now do the same for the packages that should be excluded - # add messages for the already excluded packages - for pkg in self._removed_pkgs: -@@ -736,13 +738,12 @@ def eval_rules(self, ksdata, storage, report_only=False): - msg = _( - "package '{package}' has been added to the list " - "of excluded packages, but it can't be removed " -- "from the current software selection without breaking the installation." -- .format(package=pkg)) -+ "from the current software selection without breaking the installation.") -+ msg = msg.format(package=pkg) - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_FATAL, msg)) - else: -- msg = _("package '%s' has been added to the list of excluded " -- "packages" % pkg) -+ msg = msg_excluded_template % pkg - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) - -@@ -756,8 +757,7 @@ def eval_rules(self, ksdata, storage, report_only=False): - self._removed_pkgs.add(pkg) - packages_data.excluded_packages.append(pkg) - -- msg = _("package '%s' has been added to the list of excluded " -- "packages" % pkg) -+ msg = msg_excluded_template % pkg - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) - diff --git a/oscap-anaconda-addon-2.0.1-package-groups-PR_248.patch b/oscap-anaconda-addon-2.0.1-package-groups-PR_248.patch deleted file mode 100644 index 01ed252..0000000 --- a/oscap-anaconda-addon-2.0.1-package-groups-PR_248.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cdb131f0b1282f833b697ef4cb4eb934ca2e9966 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Mon, 17 Jul 2023 15:27:24 +0200 -Subject: [PATCH] Remove obsolete mapping of packages-groups - ---- - org_fedora_oscap/rule_handling.py | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/org_fedora_oscap/rule_handling.py b/org_fedora_oscap/rule_handling.py -index 635446e..7e2077c 100644 ---- a/org_fedora_oscap/rule_handling.py -+++ b/org_fedora_oscap/rule_handling.py -@@ -59,12 +59,6 @@ - "env": ["graphical-server-environment", "workstation-product-environment"], - "groups": ["workstation-product-environment"], - }, -- "tftp": { -- "groups": ["network-server"], -- }, -- "abrt": { -- "groups": ["debugging"], -- }, - "gssproxy": { - "groups": ["file-server"], - }, diff --git a/oscap-anaconda-addon-2.0.1-rhel9_tailoring_fix-PR_180.patch b/oscap-anaconda-addon-2.0.1-rhel9_tailoring_fix-PR_180.patch deleted file mode 100644 index f56fc1e..0000000 --- a/oscap-anaconda-addon-2.0.1-rhel9_tailoring_fix-PR_180.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a306b736f144260721dfae25f0b268353d6760c5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= -Date: Thu, 25 Nov 2021 15:15:14 +0100 -Subject: [PATCH] Fix tailoring - -Fixes an error during installation caused during tailoring - -Addressing: -dasbus.error.DBusError: Content evaluation and remediation with the oscap tool failed: OpenSCAP Error: Unable to open file: '/tmp/openscap_data/usr/share/xml/scap/sc_tailoring/tailoring-xccdf.xml' [/builddir/build/BUILD/openscap-1.3.5/src/source/oscap_source.c:288] - -This is proabably a typo coming from 87509fb6ee22b6eeaa66ea4ae85ebf5abd353e14 -which is only in rhel9-branch. ---- - org_fedora_oscap/service/oscap.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/org_fedora_oscap/service/oscap.py b/org_fedora_oscap/service/oscap.py -index 4237a47..65da08b 100755 ---- a/org_fedora_oscap/service/oscap.py -+++ b/org_fedora_oscap/service/oscap.py -@@ -221,7 +221,7 @@ def install_with_tasks(self): - sysroot=conf.target.system_root, - policy_data=self.policy_data, - target_content_path=common.get_postinst_content_path(self.policy_data), -- target_tailoring_path=common.get_preinst_tailoring_path(self.policy_data) -+ target_tailoring_path=common.get_postinst_tailoring_path(self.policy_data) - ) - ] - diff --git a/oscap-anaconda-addon-2.0.1-tar-extraction-PR_250.patch b/oscap-anaconda-addon-2.0.1-tar-extraction-PR_250.patch deleted file mode 100644 index 07aba45..0000000 --- a/oscap-anaconda-addon-2.0.1-tar-extraction-PR_250.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2fbde88c29210c48083bd4840661d2af2d00ae69 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Mon, 17 Jul 2023 17:10:41 +0200 -Subject: [PATCH] Make tar extraction safer on RHEL9 - -See also https://bugzilla.redhat.com/show_bug.cgi?id=2218875 ---- - org_fedora_oscap/common.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/org_fedora_oscap/common.py b/org_fedora_oscap/common.py -index eeb27fc..77d24c1 100644 ---- a/org_fedora_oscap/common.py -+++ b/org_fedora_oscap/common.py -@@ -392,7 +392,7 @@ def extract_data(archive, out_dir, ensure_has_files=None): - raise ExtractionError(msg) - - utils.ensure_dir_exists(out_dir) -- zfile.extractall(path=out_dir) -+ zfile.extractall(path=out_dir, filter="data") - result = [utils.join_paths(out_dir, info.filename) for info in zfile.filelist] - zfile.close() - elif archive.endswith(".tar"): -@@ -450,7 +450,7 @@ def _extract_tarball(archive, out_dir, ensure_has_files, alg): - raise ExtractionError(msg) - - utils.ensure_dir_exists(out_dir) -- tfile.extractall(path=out_dir) -+ tfile.extractall(path=out_dir, filter="data") - result = [utils.join_paths(out_dir, member.path) for member in tfile.getmembers()] - tfile.close() - diff --git a/oscap-anaconda-addon-2.0.1-various_bugfixes-PR_166.patch b/oscap-anaconda-addon-2.0.1-various_bugfixes-PR_166.patch deleted file mode 100644 index b137b6b..0000000 --- a/oscap-anaconda-addon-2.0.1-various_bugfixes-PR_166.patch +++ /dev/null @@ -1,460 +0,0 @@ -From aeb0e2ed5a524c5d4e5b72b2b11ea74a5119d45a Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Mon, 2 Aug 2021 17:23:17 +0200 -Subject: [PATCH 1/3] Improve logging - -Make all log entries identifiable easily. ---- - org_fedora_oscap/common.py | 4 ++-- - org_fedora_oscap/content_discovery.py | 16 +++++++++++----- - org_fedora_oscap/gui/spokes/oscap.py | 19 ++++++++++++------- - org_fedora_oscap/rule_handling.py | 8 ++++---- - org_fedora_oscap/service/installation.py | 6 +++--- - org_fedora_oscap/service/kickstart.py | 2 +- - org_fedora_oscap/service/oscap.py | 12 ++++++------ - 7 files changed, 39 insertions(+), 28 deletions(-) - -diff --git a/org_fedora_oscap/common.py b/org_fedora_oscap/common.py -index a307baa..c432168 100644 ---- a/org_fedora_oscap/common.py -+++ b/org_fedora_oscap/common.py -@@ -564,7 +564,7 @@ def get_content_name(data): - def get_raw_preinst_content_path(data): - """Path to the raw (unextracted, ...) pre-installation content file""" - if data.content_type == "scap-security-guide": -- log.debug("Using scap-security-guide, no single content file") -+ log.debug("OSCAP addon: Using scap-security-guide, no single content file") - return None - - content_name = get_content_name(data) -@@ -667,7 +667,7 @@ def set_packages_data(data: PackagesConfigurationData): - payload_proxy = get_payload_proxy() - - if payload_proxy.Type != PAYLOAD_TYPE_DNF: -- log.debug("The payload doesn't support packages.") -+ log.debug("OSCAP addon: The payload doesn't support packages.") - return - - return payload_proxy.SetPackages( -diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py -index 894f3e1..bc14ef1 100644 ---- a/org_fedora_oscap/content_discovery.py -+++ b/org_fedora_oscap/content_discovery.py -@@ -98,7 +98,7 @@ def fetch_content(self, what_if_fail, ca_certs_path=""): - def _fetch_files(self, scheme, path, destdir, ca_certs_path, what_if_fail): - with self.activity_lock: - if self.now_fetching_or_processing: -- msg = "Strange, it seems that we are already fetching something." -+ msg = "OSCAP Addon: Strange, it seems that we are already fetching something." - log.warn(msg) - return - self.now_fetching_or_processing = True -@@ -175,7 +175,7 @@ def finish_content_fetch(self, fetching_thread_name, fingerprint, report_callbac - - def _verify_fingerprint(self, dest_filename, fingerprint=""): - if not fingerprint: -- log.info("No fingerprint provided, skipping integrity check") -+ log.info("OSCAP Addon: No fingerprint provided, skipping integrity check") - return - - hash_obj = utils.get_hashing_algorithm(fingerprint) -@@ -183,15 +183,19 @@ def _verify_fingerprint(self, dest_filename, fingerprint=""): - hash_obj) - if digest != fingerprint: - log.error( -+ "OSCAP Addon: " - f"File {dest_filename} failed integrity check - assumed a " - f"{hash_obj.name} hash and '{fingerprint}', got '{digest}'" - ) -- msg = _(f"Integrity check of the content failed - {hash_obj.name} hash didn't match") -+ msg = _(f"OSCAP Addon: Integrity check of the content failed - {hash_obj.name} hash didn't match") - raise content_handling.ContentCheckError(msg) - log.info(f"Integrity check passed using {hash_obj.name} hash") - - def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_filename): -- threadMgr.wait(wait_for) -+ if wait_for: -+ log.info(f"OSCAP Addon: Waiting for thread {wait_for}") -+ threadMgr.wait(wait_for) -+ log.info(f"OSCAP Addon: Finished waiting for thread {wait_for}") - actually_fetched_content = wait_for is not None - - if fingerprint and dest_filename: -@@ -201,6 +205,7 @@ def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_file - - structured_content = ObtainedContent(self.CONTENT_DOWNLOAD_LOCATION) - content_type = self.get_content_type(str(dest_filename)) -+ log.info(f"OSCAP Addon: started to look at the content") - if content_type in ("archive", "rpm"): - structured_content.add_content_archive(dest_filename) - -@@ -211,6 +216,7 @@ def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_file - if fingerprint and dest_filename: - structured_content.record_verification(dest_filename) - -+ log.info(f"OSCAP Addon: finished looking at the content") - return structured_content - - def _gather_available_files(self, actually_fetched_content, dest_filename): -@@ -232,7 +238,7 @@ def _gather_available_files(self, actually_fetched_content, dest_filename): - ) - except common.ExtractionError as err: - msg = f"Failed to extract the '{dest_filename}' archive: {str(err)}" -- log.error(msg) -+ log.error("OSCAP Addon: " + msg) - raise err - - elif content_type == "file": -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index 76e508f..332e956 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -331,6 +331,7 @@ def initialize(self): - - # if no content was specified and SSG is available, use it - if not self._policy_data.content_type and common.ssg_available(): -+ log.info("OSCAP Addon: Defaulting to local content") - self._policy_data.content_type = "scap-security-guide" - self._policy_data.content_path = common.SSG_DIR + common.SSG_CONTENT - -@@ -351,7 +352,7 @@ def initialize(self): - self._fetch_data_and_initialize() - - def _handle_error(self, exception): -- log.error(str(exception)) -+ log.error("OSCAP Addon: " + str(exception)) - if isinstance(exception, KickstartValueError): - self._invalid_url() - elif isinstance(exception, common.OSCAPaddonNetworkError): -@@ -365,7 +366,7 @@ def _handle_error(self, exception): - elif isinstance(exception, content_handling.ContentCheckError): - self._integrity_check_failed() - else: -- log.exception("Unknown exception occurred", exc_info=exception) -+ log.exception("OSCAP Addon: Unknown exception occurred", exc_info=exception) - self._general_content_problem() - - def _render_selected(self, column, renderer, model, itr, user_data=None): -@@ -385,6 +386,7 @@ def _fetch_data_and_initialize(self): - - thread_name = None - if self._policy_data.content_url and self._policy_data.content_type != "scap-security-guide": -+ log.info(f"OSCAP Addon: Actually fetching content from somewhere") - thread_name = self.content_bringer.fetch_content( - self._handle_error, self._policy_data.certificates) - -@@ -442,7 +444,7 @@ def update_progress_label(msg): - msg += f" with tailoring {preinst_tailoring_path}" - else: - msg += " without considering tailoring" -- log.info(msg) -+ log.info("OSCAP Addon: " + msg) - - self._content_handler = scap_content_handler.SCAPContentHandler( - preinst_content_path, -@@ -456,7 +458,7 @@ def update_progress_label(msg): - - return - -- log.info("OAA: Done with analysis") -+ log.info("OSCAP Addon: Done with analysis") - - self._ds_checklists = self._content_handler.get_data_streams_checklists() - if self._using_ds: -@@ -592,7 +594,7 @@ def _update_profiles_store(self): - try: - profiles = self._content_handler.get_profiles() - except scap_content_handler.SCAPContentHandlerError as e: -- log.warning(str(e)) -+ log.warning("OSCAP Addon: " + str(e)) - self._invalid_content() - - for profile in profiles: -@@ -736,7 +738,7 @@ def _select_profile(self, profile_id): - ds, xccdf, common.get_preinst_tailoring_path(self._policy_data)) - except common.OSCAPaddonError as exc: - log.error( -- "Failed to get rules for the profile '{}': {}" -+ "OSCAP Addon: Failed to get rules for the profile '{}': {}" - .format(profile_id, str(exc))) - self._set_error( - "Failed to get rules for the profile '{}'" -@@ -908,6 +910,7 @@ def refresh(self): - def _refresh_ui(self): - """Refresh the UI elements.""" - if not self._content_defined: -+ log.info("OSCAP Addon: Content not defined") - # hide the control buttons - really_hide(self._control_buttons) - -@@ -1156,7 +1159,9 @@ def on_fetch_button_clicked(self, *args): - with self._fetch_flag_lock: - if self._fetching: - # some other fetching/pre-processing running, give up -- log.warn("Clicked the fetch button, although the GUI is in the fetching mode.") -+ log.warn( -+ "OSCAP Addon: " -+ "Clicked the fetch button, although the GUI is in the fetching mode.") - return - - # prevent user from changing the URL in the meantime -diff --git a/org_fedora_oscap/rule_handling.py b/org_fedora_oscap/rule_handling.py -index c478aa0..244aac8 100644 ---- a/org_fedora_oscap/rule_handling.py -+++ b/org_fedora_oscap/rule_handling.py -@@ -261,7 +261,7 @@ def new_rule(self, rule): - try: - actions[first_word](rule) - except (ModifiedOptionParserException, KeyError) as e: -- log.warning("Unknown OSCAP Addon rule '{}': {}".format(rule, e)) -+ log.warning("OSCAP Addon: Unknown OSCAP Addon rule '{}': {}".format(rule, e)) - - def eval_rules(self, ksdata, storage, report_only=False): - """:see: RuleHandler.eval_rules""" -@@ -565,7 +565,7 @@ def eval_rules(self, ksdata, storage, report_only=False): - # root password set - if users_proxy.IsRootPasswordCrypted: - msg = _("cannot check root password length (password is crypted)") -- log.warning("cannot check root password length (password is crypted)") -+ log.warning("OSCAP Addon: cannot check root password length (password is crypted)") - return [RuleMessage(self.__class__, - common.MESSAGE_TYPE_WARNING, msg)] - elif len(users_proxy.RootPassword) < self._minlen: -@@ -880,7 +880,7 @@ def eval_rules(self, ksdata, storage, report_only=False): - - kdump_proxy.KdumpEnabled = self._kdump_enabled - else: -- log.warning("com_redhat_kdump is not installed. " -+ log.warning("OSCAP Addon: com_redhat_kdump is not installed. " - "Skipping kdump configuration") - - return messages -@@ -894,7 +894,7 @@ def revert_changes(self, ksdata, storage): - if self._kdump_enabled is not None: - kdump_proxy.KdumpEnabled = self._kdump_default_enabled - else: -- log.warning("com_redhat_kdump is not installed. " -+ log.warning("OSCAP Addon: com_redhat_kdump is not installed. " - "Skipping reverting kdump configuration") - - self._kdump_enabled = None -diff --git a/org_fedora_oscap/service/installation.py b/org_fedora_oscap/service/installation.py -index e3a1d0f..2da8559 100644 ---- a/org_fedora_oscap/service/installation.py -+++ b/org_fedora_oscap/service/installation.py -@@ -28,14 +28,14 @@ - from org_fedora_oscap.content_handling import ContentCheckError - from org_fedora_oscap import content_discovery - --log = logging.getLogger(__name__) -+log = logging.getLogger("anaconda") - - - REQUIRED_PACKAGES = ("openscap", "openscap-scanner",) - - - def _handle_error(exception): -- log.error("Failed to fetch and initialize SCAP content!") -+ log.error("OSCAP Addon: Failed to fetch and initialize SCAP content!") - - if isinstance(exception, ContentCheckError): - msg = _("The integrity check of the security content failed.") -@@ -87,7 +87,7 @@ def run(self): - - content = self.content_bringer.finish_content_fetch( - fetching_thread_name, self._policy_data.fingerprint, -- lambda msg: log.info(msg), content_dest, _handle_error) -+ lambda msg: log.info("OSCAP Addon: " + msg), content_dest, _handle_error) - - if not content: - # this shouldn't happen because error handling is supposed to -diff --git a/org_fedora_oscap/service/kickstart.py b/org_fedora_oscap/service/kickstart.py -index 341c6c5..d6f22ac 100644 ---- a/org_fedora_oscap/service/kickstart.py -+++ b/org_fedora_oscap/service/kickstart.py -@@ -25,7 +25,7 @@ - from org_fedora_oscap import common, utils - from org_fedora_oscap.structures import PolicyData - --log = logging.getLogger(__name__) -+log = logging.getLogger("anaconda") - - __all__ = ["OSCAPKickstartSpecification"] - -diff --git a/org_fedora_oscap/service/oscap.py b/org_fedora_oscap/service/oscap.py -index d491060..4237a47 100755 ---- a/org_fedora_oscap/service/oscap.py -+++ b/org_fedora_oscap/service/oscap.py -@@ -34,7 +34,7 @@ - from org_fedora_oscap.service.oscap_interface import OSCAPInterface - from org_fedora_oscap.structures import PolicyData - --log = logging.getLogger(__name__) -+log = logging.getLogger("anaconda") - - __all__ = ["OSCAPService"] - -@@ -71,7 +71,7 @@ def policy_enabled(self, value): - """ - self._policy_enabled = value - self.policy_enabled_changed.emit() -- log.debug("Policy enabled is set to '%s'.", value) -+ log.debug("OSCAP Addon: Policy enabled is set to '%s'.", value) - - @property - def policy_data(self): -@@ -89,7 +89,7 @@ def policy_data(self, value): - """ - self._policy_data = value - self.policy_data_changed.emit() -- log.debug("Policy data is set to '%s'.", value) -+ log.debug("OSCAP Addon: Policy data is set to '%s'.", value) - - @property - def installation_enabled(self): -@@ -150,7 +150,7 @@ def collect_requirements(self): - :return: a list of requirements - """ - if not self.installation_enabled: -- log.debug("The installation is disabled. Skip the requirements.") -+ log.debug("OSCAP Addon: The installation is disabled. Skip the requirements.") - return [] - - requirements = [ -@@ -180,7 +180,7 @@ def configure_with_tasks(self): - :return: a list of tasks - """ - if not self.installation_enabled: -- log.debug("The installation is disabled. Skip the configuration.") -+ log.debug("OSCAP Addon: The installation is disabled. Skip the configuration.") - return [] - - tasks = [ -@@ -205,7 +205,7 @@ def install_with_tasks(self): - :return: a list of tasks - """ - if not self.installation_enabled: -- log.debug("The installation is disabled. Skip the installation.") -+ log.debug("OSCAP Addon: The installation is disabled. Skip the installation.") - return [] - - tasks = [ - -From b081e32012b93177167d3f7d0cc2024deb50e965 Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Mon, 2 Aug 2021 17:24:15 +0200 -Subject: [PATCH 2/3] Save addon data when using local content - -Addon loads its data from the shared storage upon refresh, -which caused it to overwrite clicking on the "use SSG content" button. - -Now the data is saved after clicking that button, and convenience -load/save methods were introduced. ---- - org_fedora_oscap/gui/spokes/oscap.py | 27 +++++++++++++++------------ - 1 file changed, 15 insertions(+), 12 deletions(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index 332e956..4425757 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -232,11 +232,8 @@ def __init__(self, data, storage, payload): - # the proxy to OSCAP DBus module - self._oscap_module = OSCAP.get_proxy() - -- # the security policy data -- self._policy_enabled = self._oscap_module.PolicyEnabled -- self._policy_data = PolicyData.from_structure( -- self._oscap_module.PolicyData -- ) -+ self._policy_data = PolicyData() -+ self._load_policy_data() - - # used for changing profiles - self._rule_data = None -@@ -334,6 +331,7 @@ def initialize(self): - log.info("OSCAP Addon: Defaulting to local content") - self._policy_data.content_type = "scap-security-guide" - self._policy_data.content_path = common.SSG_DIR + common.SSG_CONTENT -+ self._save_policy_data() - - if not self._content_defined: - # nothing more to be done now, the spoke is ready -@@ -351,6 +349,16 @@ def initialize(self): - # else fetch data - self._fetch_data_and_initialize() - -+ def _save_policy_data(self): -+ self._oscap_module.PolicyData = PolicyData.to_structure(self._policy_data) -+ self._oscap_module.PolicyEnabled = self._policy_enabled -+ -+ def _load_policy_data(self): -+ self._policy_data.update_from(PolicyData.from_structure( -+ self._oscap_module.PolicyData -+ )) -+ self._policy_enabled = self._oscap_module.PolicyEnabled -+ - def _handle_error(self, exception): - log.error("OSCAP Addon: " + str(exception)) - if isinstance(exception, KickstartValueError): -@@ -897,13 +905,7 @@ def refresh(self): - :see: pyanaconda.ui.common.UIObject.refresh - - """ -- # update the security policy data -- self._policy_enabled = self._oscap_module.PolicyEnabled -- fresh_data = PolicyData.from_structure( -- self._oscap_module.PolicyData -- ) -- -- self._policy_data.update_from(fresh_data) -+ self._load_policy_data() - # update the UI elements - self._refresh_ui() - -@@ -1202,4 +1204,5 @@ def on_change_content_clicked(self, *args): - - def on_use_ssg_clicked(self, *args): - self.content_bringer.use_system_content() -+ self._save_policy_data() - self._fetch_data_and_initialize() - -From fee170f54aeb9f649ab891781532012a7b069f8f Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Tue, 3 Aug 2021 11:01:59 +0200 -Subject: [PATCH 3/3] Refactor content identification - -Don't use the multiprocessing pool - it sometimes creates probems during -its initialization: -https://bugzilla.redhat.com/show_bug.cgi?id=1989434 ---- - org_fedora_oscap/content_handling.py | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/org_fedora_oscap/content_handling.py b/org_fedora_oscap/content_handling.py -index f2af22f..65d5a28 100644 ---- a/org_fedora_oscap/content_handling.py -+++ b/org_fedora_oscap/content_handling.py -@@ -111,9 +111,8 @@ def parse_HTML_from_content(content): - - - def identify_files(fpaths): -- with multiprocessing.Pool(os.cpu_count()) as p: -- labels = p.map(get_doc_type, fpaths) -- return {path: label for (path, label) in zip(fpaths, labels)} -+ result = {path: get_doc_type(path) for path in fpaths} -+ return result - - - def get_doc_type(file_path): -@@ -131,7 +130,9 @@ def get_doc_type(file_path): - except UnicodeDecodeError: - # 'oscap info' supplied weird output, which happens when it tries - # to explain why it can't examine e.g. a JPG. -- return None -+ pass -+ except Exception as e: -+ log.warning(f"OSCAP addon: Unexpected error when looking at {file_path}: {str(e)}") - log.info("OSCAP addon: Identified {file_path} as {content_type}" - .format(file_path=file_path, content_type=content_type)) - return content_type diff --git a/oscap-anaconda-addon-2.1.0-archive_handling-PR_224.patch b/oscap-anaconda-addon-2.1.0-archive_handling-PR_224.patch deleted file mode 100644 index 43aaadb..0000000 --- a/oscap-anaconda-addon-2.1.0-archive_handling-PR_224.patch +++ /dev/null @@ -1,380 +0,0 @@ -From a1b983b4b5f8e49daa978aec6f9d28ba6dcea20c Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Wed, 12 Oct 2022 11:37:04 +0200 -Subject: [PATCH 1/5] Add capability to preselect content from archives - -Users can specify content path and tailoring path in kickstarts, -and the addon should be able to assure that those files are available, -and that they have precedence over other files. ---- - org_fedora_oscap/content_discovery.py | 35 +++++++++++++++++++ - tests/test_content_discovery.py | 48 +++++++++++++++++++++++++++ - 2 files changed, 83 insertions(+) - create mode 100644 tests/test_content_discovery.py - -diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py -index ccfe6c8..9ef144e 100644 ---- a/org_fedora_oscap/content_discovery.py -+++ b/org_fedora_oscap/content_discovery.py -@@ -12,6 +12,7 @@ - from org_fedora_oscap import data_fetch, utils - from org_fedora_oscap import common - from org_fedora_oscap import content_handling -+from org_fedora_oscap.content_handling import CONTENT_TYPES - from org_fedora_oscap import rule_handling - - from org_fedora_oscap.common import _ -@@ -191,6 +192,38 @@ def _verify_fingerprint(self, dest_filename, fingerprint=""): - raise content_handling.ContentCheckError(msg) - log.info(f"Integrity check passed using {hash_obj.name} hash") - -+ def filter_discovered_content(self, labelled_files): -+ expected_path = self._addon_data.content_path -+ categories = (CONTENT_TYPES["DATASTREAM"], CONTENT_TYPES["XCCDF_CHECKLIST"]) -+ if expected_path: -+ labelled_files = self.reduce_files(labelled_files, expected_path, categories) -+ -+ expected_path = self._addon_data.tailoring_path -+ categories = (CONTENT_TYPES["TAILORING"], ) -+ if expected_path: -+ labelled_files = self.reduce_files(labelled_files, expected_path, categories) -+ -+ expected_path = self._addon_data.cpe_path -+ categories = (CONTENT_TYPES["CPE_DICT"], ) -+ if expected_path: -+ labelled_files = self.reduce_files(labelled_files, expected_path, categories) -+ -+ return labelled_files -+ -+ def reduce_files(self, labelled_files, expected_path, categories): -+ reduced_files = dict() -+ if expected_path not in labelled_files: -+ msg = ( -+ f"Expected a file {expected_path} to be part of the supplied content, " -+ f"but it was not the case, got only {list(labelled_files.keys())}" -+ ) -+ raise RuntimeError(msg) -+ for path, label in labelled_files.items(): -+ if label in categories and path != expected_path: -+ continue -+ reduced_files[path] = label -+ return reduced_files -+ - def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_filename): - if wait_for: - log.info(f"OSCAP Addon: Waiting for thread {wait_for}") -@@ -210,6 +243,8 @@ def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_file - structured_content.add_content_archive(dest_filename) - - labelled_files = content_handling.identify_files(fpaths) -+ labelled_files = self.filter_discovered_content(labelled_files) -+ - for fname, label in labelled_files.items(): - structured_content.add_file(fname, label) - -diff --git a/tests/test_content_discovery.py b/tests/test_content_discovery.py -new file mode 100644 -index 0000000..5463c9a ---- /dev/null -+++ b/tests/test_content_discovery.py -@@ -0,0 +1,48 @@ -+import pytest -+ -+import org_fedora_oscap.content_discovery as tested_module -+ -+ -+@pytest.fixture -+def labelled_files(): -+ return { -+ "dir/datastream": "D", -+ "dir/datastream2": "D", -+ "dir/dir/datastream3": "D", -+ "dir/dir/datastream3": "D", -+ "dir/XCCDF": "X", -+ "XCCDF2": "X", -+ "cpe": "C", -+ "t1": "T", -+ "dir3/t2": "T", -+ } -+ -+ -+def test_reduce(labelled_files): -+ bringer = tested_module.ContentBringer(None) -+ -+ d_count = 0 -+ x_count = 0 -+ for l in labelled_files.values(): -+ if l == "D": -+ d_count += 1 -+ elif l == "X": -+ x_count += 1 -+ -+ reduced = bringer.reduce_files(labelled_files, "dir/datastream", ["D"]) -+ assert len(reduced) == len(labelled_files) - d_count + 1 -+ assert "dir/datastream" in reduced -+ -+ reduced = bringer.reduce_files(labelled_files, "dir/datastream", ["D", "X"]) -+ assert len(reduced) == len(labelled_files) - d_count - x_count + 1 -+ assert "dir/datastream" in reduced -+ -+ reduced = bringer.reduce_files(labelled_files, "dir/XCCDF", ["D", "X"]) -+ assert len(reduced) == len(labelled_files) - d_count - x_count + 1 -+ assert "dir/XCCDF" in reduced -+ -+ with pytest.raises(RuntimeError, match="dir/datastream4"): -+ bringer.reduce_files(labelled_files, "dir/datastream4", ["D"]) -+ -+ reduced = bringer.reduce_files(labelled_files, "cpe", ["C"]) -+ assert reduced == labelled_files - -From 2a536a8ec4cdf20e4f19e8175898b7ace3fc7ca4 Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Wed, 12 Oct 2022 11:40:11 +0200 -Subject: [PATCH 2/5] Handle changes in content identification - -The code is able to handle changes in the way how oscap identifies -content much more gracefully. ---- - org_fedora_oscap/content_discovery.py | 13 +++++++++---- - org_fedora_oscap/content_handling.py | 5 +++++ - 2 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py -index 9ef144e..9ed643b 100644 ---- a/org_fedora_oscap/content_discovery.py -+++ b/org_fedora_oscap/content_discovery.py -@@ -2,6 +2,7 @@ - import logging - import pathlib - import shutil -+import os - from glob import glob - from typing import List - -@@ -242,11 +243,15 @@ def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_file - if content_type in ("archive", "rpm"): - structured_content.add_content_archive(dest_filename) - -- labelled_files = content_handling.identify_files(fpaths) -- labelled_files = self.filter_discovered_content(labelled_files) -+ labelled_filenames = content_handling.identify_files(fpaths) -+ labelled_relative_filenames = { -+ os.path.relpath(path, self.CONTENT_DOWNLOAD_LOCATION): label -+ for path, label in labelled_filenames.items()} -+ labelled_relative_filenames = self.filter_discovered_content(labelled_relative_filenames) - -- for fname, label in labelled_files.items(): -- structured_content.add_file(fname, label) -+ for rel_fname, label in labelled_relative_filenames.items(): -+ fname = self.CONTENT_DOWNLOAD_LOCATION / rel_fname -+ structured_content.add_file(str(fname), label) - - if fingerprint and dest_filename: - structured_content.record_verification(dest_filename) -diff --git a/org_fedora_oscap/content_handling.py b/org_fedora_oscap/content_handling.py -index 65d5a28..3e2ecae 100644 ---- a/org_fedora_oscap/content_handling.py -+++ b/org_fedora_oscap/content_handling.py -@@ -122,6 +122,11 @@ def get_doc_type(file_path): - if line.startswith("Document type:"): - _prefix, _sep, type_info = line.partition(":") - content_type = type_info.strip() -+ if content_type not in CONTENT_TYPES.values(): -+ log.info( -+ f"File {file_path} labelled by oscap as {content_type}, " -+ "which is an unexpected type.") -+ content_type = f"unknown - {content_type}" - break - except OSError: - # 'oscap info' exitted with a non-zero exit code -> unknown doc - -From 17f80b71d17ce5a2bdbed87730133cdabec2e22b Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Wed, 12 Oct 2022 11:38:51 +0200 -Subject: [PATCH 3/5] Remove unused code - -The function is not referenced anywhere in the project ---- - org_fedora_oscap/content_handling.py | 40 ---------------------------- - 1 file changed, 40 deletions(-) - -diff --git a/org_fedora_oscap/content_handling.py b/org_fedora_oscap/content_handling.py -index 3e2ecae..5096bab 100644 ---- a/org_fedora_oscap/content_handling.py -+++ b/org_fedora_oscap/content_handling.py -@@ -141,43 +141,3 @@ def get_doc_type(file_path): - log.info("OSCAP addon: Identified {file_path} as {content_type}" - .format(file_path=file_path, content_type=content_type)) - return content_type -- -- --def explore_content_files(fpaths): -- """ -- Function for finding content files in a list of file paths. SIMPLY PICKS -- THE FIRST USABLE CONTENT FILE OF A PARTICULAR TYPE AND JUST PREFERS DATA -- STREAMS OVER STANDALONE BENCHMARKS. -- -- :param fpaths: a list of file paths to search for content files in -- :type fpaths: [str] -- :return: ContentFiles instance containing the file names of the XCCDF file, -- CPE dictionary and tailoring file or "" in place of those items -- if not found -- :rtype: ContentFiles -- -- """ -- xccdf_file = "" -- cpe_file = "" -- tailoring_file = "" -- found_ds = False -- -- for fpath in fpaths: -- doc_type = get_doc_type(fpath) -- if not doc_type: -- continue -- -- # prefer DS over standalone XCCDF -- if doc_type == "Source Data Stream" and (not xccdf_file or not found_ds): -- xccdf_file = fpath -- found_ds = True -- elif doc_type == "XCCDF Checklist" and not xccdf_file: -- xccdf_file = fpath -- elif doc_type == "CPE Dictionary" and not cpe_file: -- cpe_file = fpath -- elif doc_type == "XCCDF Tailoring" and not tailoring_file: -- tailoring_file = fpath -- -- # TODO: raise exception if no xccdf_file is found? -- files = ContentFiles(xccdf_file, cpe_file, tailoring_file) -- return files - -From 3aff547e2689a1ede4236c9166b11c99f272e3f7 Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Thu, 13 Oct 2022 14:11:25 +0200 -Subject: [PATCH 4/5] Dont use tailoring if it is not expected - -Take tailorings into account only if it is specified in the kickstart. -Compulsive usage of tailoring may be unwanted. ---- - org_fedora_oscap/content_discovery.py | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py -index 9ed643b..4235af7 100644 ---- a/org_fedora_oscap/content_discovery.py -+++ b/org_fedora_oscap/content_discovery.py -@@ -193,16 +193,25 @@ def _verify_fingerprint(self, dest_filename, fingerprint=""): - raise content_handling.ContentCheckError(msg) - log.info(f"Integrity check passed using {hash_obj.name} hash") - -+ def allow_one_expected_tailoring_or_no_tailoring(self, labelled_files): -+ expected_tailoring = self._addon_data.tailoring_path -+ tailoring_label = CONTENT_TYPES["TAILORING"] -+ if expected_tailoring: -+ labelled_files = self.reduce_files(labelled_files, expected_tailoring, [tailoring_label]) -+ else: -+ labelled_files = { -+ path: label for path, label in labelled_files.items() -+ if label != tailoring_label -+ } -+ return labelled_files -+ - def filter_discovered_content(self, labelled_files): - expected_path = self._addon_data.content_path - categories = (CONTENT_TYPES["DATASTREAM"], CONTENT_TYPES["XCCDF_CHECKLIST"]) - if expected_path: - labelled_files = self.reduce_files(labelled_files, expected_path, categories) - -- expected_path = self._addon_data.tailoring_path -- categories = (CONTENT_TYPES["TAILORING"], ) -- if expected_path: -- labelled_files = self.reduce_files(labelled_files, expected_path, categories) -+ labelled_files = self.allow_one_expected_tailoring_or_no_tailoring(labelled_files) - - expected_path = self._addon_data.cpe_path - categories = (CONTENT_TYPES["CPE_DICT"], ) - -From 56d8e497e0a4c394784b1c950bd1a148a6dc42ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Thu, 10 Nov 2022 12:46:46 +0100 -Subject: [PATCH 5/5] Make the content RPM installation robust - -If a package manager fails to install the package, -use the rpm command directly and skip deps. ---- - org_fedora_oscap/service/installation.py | 48 +++++++++++++++++------- - 1 file changed, 34 insertions(+), 14 deletions(-) - -diff --git a/org_fedora_oscap/service/installation.py b/org_fedora_oscap/service/installation.py -index 255b992..f667479 100644 ---- a/org_fedora_oscap/service/installation.py -+++ b/org_fedora_oscap/service/installation.py -@@ -18,6 +18,7 @@ - import logging - import os - import shutil -+import io - - from pyanaconda.core import util - from pyanaconda.modules.common.task import Task -@@ -198,21 +199,11 @@ def run(self): - elif self._policy_data.content_type == "datastream": - shutil.copy2(self._content_path, target_content_dir) - elif self._policy_data.content_type == "rpm": -- # copy the RPM to the target system -- shutil.copy2(self._file_path, target_content_dir) -+ try: -+ self._copy_rpm_to_target_and_install(target_content_dir) - -- # get the path of the RPM -- content_name = common.get_content_name(self._policy_data) -- package_path = utils.join_paths(self._target_directory, content_name) -- -- # and install it with yum -- ret = util.execInSysroot( -- "yum", ["-y", "--nogpg", "install", package_path] -- ) -- -- if ret != 0: -- msg = _(f"Failed to install content RPM to the target system.") -- terminate(msg) -+ except Exception as exc: -+ terminate(str(exc)) - return - else: - pattern = utils.join_paths(common.INSTALLATION_CONTENT_DIR, "*") -@@ -221,6 +212,35 @@ def run(self): - if os.path.exists(self._tailoring_path): - shutil.copy2(self._tailoring_path, target_content_dir) - -+ def _attempt_rpm_installation(self, chroot_package_path): -+ log.info("OSCAP addon: Installing the security content RPM to the installed system.") -+ stdout = io.StringIO() -+ ret = util.execWithRedirect( -+ "dnf", ["-y", "--nogpg", "install", chroot_package_path], -+ stdout=stdout, root=self._sysroot) -+ stdout.seek(0) -+ if ret != 0: -+ log.error( -+ "OSCAP addon: Error installing security content RPM using yum: {0}", -+ stdout.read()) -+ -+ stdout = io.StringIO() -+ ret = util.execWithRedirect( -+ "rpm", ["--install", "--nodeps", chroot_package_path], -+ stdout=stdout, root=self._sysroot) -+ if ret != 0: -+ log.error( -+ "OSCAP addon: Error installing security content RPM using rpm: {0}", -+ stdout.read()) -+ msg = _(f"Failed to install content RPM to the target system.") -+ raise RuntimeError(msg) -+ -+ def _copy_rpm_to_target_and_install(self, target_content_dir): -+ shutil.copy2(self._file_path, target_content_dir) -+ content_name = common.get_content_name(self._policy_data) -+ chroot_package_path = utils.join_paths(self._target_directory, content_name) -+ self._attempt_rpm_installation(chroot_package_path) -+ - - class RemediateSystemTask(Task): - """The installation task for running the remediation.""" diff --git a/oscap-anaconda-addon-2.1.0-clicking_fix-PR_223.patch b/oscap-anaconda-addon-2.1.0-clicking_fix-PR_223.patch deleted file mode 100644 index f45122a..0000000 --- a/oscap-anaconda-addon-2.1.0-clicking_fix-PR_223.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 99fc53d3691b24c6724c1cf3e7281c181b31cf45 Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Tue, 11 Oct 2022 17:07:28 +0200 -Subject: [PATCH 1/2] Remove redundant message - -The send_ready already performs what the removed call -could aim to accomplish. ---- - org_fedora_oscap/gui/spokes/oscap.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index 6d0aa5c..37b9681 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -151,7 +151,6 @@ def decorated(self, *args, **kwargs): - self._ready = True - # pylint: disable-msg=E1101 - hubQ.send_ready(self.__class__.__name__) -- hubQ.send_message(self.__class__.__name__, self.status) - - return ret - - -From 24787f02e80162129256dc57dc3d491f00080370 Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Thu, 13 Oct 2022 17:19:17 +0200 -Subject: [PATCH 2/2] Increase robustness of fetching state detection - -It is not completely practical to rely on locks alone, -and we can elliminate some corner cases by looking -whether well-known UI threads exist. ---- - org_fedora_oscap/gui/spokes/oscap.py | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index 37b9681..97c4553 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -389,11 +389,14 @@ def _render_selected(self, column, renderer, model, itr, user_data=None): - else: - renderer.set_property("stock-id", None) - -+ def _still_fetching(self): -+ return self._fetching or threadMgr.get('OSCAPguiWaitForDataFetchThread') -+ - def _fetch_data_and_initialize(self): - """Fetch data from a specified URL and initialize everything.""" - - with self._fetch_flag_lock: -- if self._fetching: -+ if self._still_fetching(): - # prevent multiple fetches running simultaneously - return - self._fetching = True -@@ -940,7 +943,7 @@ def _refresh_ui(self): - - # hide the progress box, no progress now - with self._fetch_flag_lock: -- if not self._fetching: -+ if not self._still_fetching(): - really_hide(self._progress_box) - - self._content_url_entry.set_sensitive(True) -@@ -1165,7 +1168,7 @@ def on_fetch_button_clicked(self, *args): - """Handler for the Fetch button""" - - with self._fetch_flag_lock: -- if self._fetching: -+ if self._still_fetching(): - # some other fetching/pre-processing running, give up - log.warn( - "OSCAP Addon: " diff --git a/oscap-anaconda-addon-2.1.0-content_paths-PR_227.patch b/oscap-anaconda-addon-2.1.0-content_paths-PR_227.patch deleted file mode 100644 index f23ae51..0000000 --- a/oscap-anaconda-addon-2.1.0-content_paths-PR_227.patch +++ /dev/null @@ -1,325 +0,0 @@ -From e2c47422b0ecfd561a8fe203b53e4a3831ae0ff7 Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Tue, 22 Nov 2022 11:45:11 +0100 -Subject: [PATCH 1/3] Fix handling of content paths - -Archives and ready-to-use content use paths differently. - -Archives get unpacked into a directory, where they need to be unpacked, -analyzed, and cross-checked with e.g. the supplied content path, -whereas ready-to-use content can be used directly. - -As the current codebase doesn't untangle all possible ways how to obtain -existing content in a way of decomposing those into layers, this change -just makes the current code working at the expense of making it worse to -maintain. ---- - org_fedora_oscap/content_discovery.py | 34 ++++++++++++++++++--------- - org_fedora_oscap/service/kickstart.py | 10 +++++++- - tests/test_content_discovery.py | 21 +++++++++++++++++ - 3 files changed, 53 insertions(+), 12 deletions(-) - -diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py -index 4235af7..ebef618 100644 ---- a/org_fedora_oscap/content_discovery.py -+++ b/org_fedora_oscap/content_discovery.py -@@ -46,6 +46,14 @@ def clear_all(data): - data.dry_run = False - - -+def path_is_present_among_paths(path, paths): -+ absolute_path = os.path.abspath(path) -+ for second_path in paths: -+ if absolute_path == os.path.abspath(second_path): -+ return True -+ return False -+ -+ - class ContentBringer: - CONTENT_DOWNLOAD_LOCATION = pathlib.Path(common.INSTALLATION_CONTENT_DIR) - DEFAULT_SSG_DATA_STREAM_PATH = f"{common.SSG_DIR}/{common.SSG_CONTENT}" -@@ -194,7 +202,7 @@ def _verify_fingerprint(self, dest_filename, fingerprint=""): - log.info(f"Integrity check passed using {hash_obj.name} hash") - - def allow_one_expected_tailoring_or_no_tailoring(self, labelled_files): -- expected_tailoring = self._addon_data.tailoring_path -+ expected_tailoring = common.get_preinst_tailoring_path(self._addon_data) - tailoring_label = CONTENT_TYPES["TAILORING"] - if expected_tailoring: - labelled_files = self.reduce_files(labelled_files, expected_tailoring, [tailoring_label]) -@@ -206,7 +214,7 @@ def allow_one_expected_tailoring_or_no_tailoring(self, labelled_files): - return labelled_files - - def filter_discovered_content(self, labelled_files): -- expected_path = self._addon_data.content_path -+ expected_path = common.get_preinst_content_path(self._addon_data) - categories = (CONTENT_TYPES["DATASTREAM"], CONTENT_TYPES["XCCDF_CHECKLIST"]) - if expected_path: - labelled_files = self.reduce_files(labelled_files, expected_path, categories) -@@ -222,7 +230,7 @@ def filter_discovered_content(self, labelled_files): - - def reduce_files(self, labelled_files, expected_path, categories): - reduced_files = dict() -- if expected_path not in labelled_files: -+ if not path_is_present_among_paths(expected_path, labelled_files.keys()): - msg = ( - f"Expected a file {expected_path} to be part of the supplied content, " - f"but it was not the case, got only {list(labelled_files.keys())}" -@@ -253,13 +261,9 @@ def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_file - structured_content.add_content_archive(dest_filename) - - labelled_filenames = content_handling.identify_files(fpaths) -- labelled_relative_filenames = { -- os.path.relpath(path, self.CONTENT_DOWNLOAD_LOCATION): label -- for path, label in labelled_filenames.items()} -- labelled_relative_filenames = self.filter_discovered_content(labelled_relative_filenames) -+ labelled_filenames = self.filter_discovered_content(labelled_filenames) - -- for rel_fname, label in labelled_relative_filenames.items(): -- fname = self.CONTENT_DOWNLOAD_LOCATION / rel_fname -+ for fname, label in labelled_filenames.items(): - structured_content.add_file(str(fname), label) - - if fingerprint and dest_filename: -@@ -303,11 +307,18 @@ def use_downloaded_content(self, content): - # We know that we have ended up with a datastream-like content, - # but if we can't convert an archive to a datastream. - # self._addon_data.content_type = "datastream" -- self._addon_data.content_path = str(preferred_content.relative_to(content.root)) -+ content_type = self._addon_data.content_type -+ if content_type in ("archive", "rpm"): -+ self._addon_data.content_path = str(preferred_content.relative_to(content.root)) -+ else: -+ self._addon_data.content_path = str(preferred_content) - - preferred_tailoring = self.get_preferred_tailoring(content) - if content.tailoring: -- self._addon_data.tailoring_path = str(preferred_tailoring.relative_to(content.root)) -+ if content_type in ("archive", "rpm"): -+ self._addon_data.tailoring_path = str(preferred_tailoring.relative_to(content.root)) -+ else: -+ self._addon_data.tailoring_path = str(preferred_tailoring) - - def use_system_content(self, content=None): - clear_all(self._addon_data) -@@ -403,6 +414,7 @@ def _xccdf_content(self): - - def find_expected_usable_content(self, relative_expected_content_path): - content_path = self.root / relative_expected_content_path -+ content_path = content_path.resolve() - eligible_main_content = (self._datastream_content(), self._xccdf_content()) - - if content_path in eligible_main_content: -diff --git a/org_fedora_oscap/service/kickstart.py b/org_fedora_oscap/service/kickstart.py -index ce049d1..6698978 100644 ---- a/org_fedora_oscap/service/kickstart.py -+++ b/org_fedora_oscap/service/kickstart.py -@@ -17,6 +17,7 @@ - # - import logging - import re -+import os - - from pyanaconda.core.kickstart import KickstartSpecification - from pyanaconda.core.kickstart.addon import AddonData -@@ -146,7 +147,14 @@ def _parse_profile_id(self, value): - self.policy_data.profile_id = value - - def _parse_content_path(self, value): -- # need to be checked? -+ absolute_content_path_in_archive_like_file = ( -+ self.policy_data.content_type in ("archive", "rpm") -+ and os.path.isabs(value)) -+ if absolute_content_path_in_archive_like_file: -+ msg = ( -+ "When using archives-like content input, the corresponding content path " -+ "has to be relative, but got '{value}'.") -+ raise KickstartValueError(msg) - self.policy_data.content_path = value - - def _parse_cpe_path(self, value): -diff --git a/tests/test_content_discovery.py b/tests/test_content_discovery.py -index 5463c9a..d6e14d9 100644 ---- a/tests/test_content_discovery.py -+++ b/tests/test_content_discovery.py -@@ -1,3 +1,5 @@ -+import os -+ - import pytest - - import org_fedora_oscap.content_discovery as tested_module -@@ -46,3 +48,22 @@ def test_reduce(labelled_files): - - reduced = bringer.reduce_files(labelled_files, "cpe", ["C"]) - assert reduced == labelled_files -+ -+ -+def test_path_presence_detection(): -+ list_of_paths = ["file1", os.path.abspath("file2"), os.path.abspath("dir///file3")] -+ -+ list_of_paths_in_list = [ -+ "file1", os.path.abspath("file1"), "./file1", -+ "file2", "dir/..//file2", -+ "dir/../dir/file3", "dir/file3", -+ ] -+ list_of_paths_not_in_list = [ -+ "../file1", "file3" -+ ] -+ -+ for path in list_of_paths_in_list: -+ assert tested_module.path_is_present_among_paths(path, list_of_paths) -+ -+ for path in list_of_paths_not_in_list: -+ assert not tested_module.path_is_present_among_paths(path, list_of_paths) - -From 9808e21ff4e6a4ce878d556f26cfddede04c870f Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Wed, 16 Nov 2022 15:35:09 +0100 -Subject: [PATCH 2/3] Compare paths according to their equivalence - -not according their arbitrary string form ---- - org_fedora_oscap/content_discovery.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py -index ebef618..9da44e7 100644 ---- a/org_fedora_oscap/content_discovery.py -+++ b/org_fedora_oscap/content_discovery.py -@@ -46,10 +46,14 @@ def clear_all(data): - data.dry_run = False - - -+def paths_are_equivalent(p1, p2): -+ return os.path.abspath(p1) == os.path.abspath(p2) -+ -+ - def path_is_present_among_paths(path, paths): - absolute_path = os.path.abspath(path) - for second_path in paths: -- if absolute_path == os.path.abspath(second_path): -+ if paths_are_equivalent(path, second_path): - return True - return False - -@@ -237,7 +241,7 @@ def reduce_files(self, labelled_files, expected_path, categories): - ) - raise RuntimeError(msg) - for path, label in labelled_files.items(): -- if label in categories and path != expected_path: -+ if label in categories and not paths_are_equivalent(path, expected_path): - continue - reduced_files[path] = label - return reduced_files - -From b422abba29a9304225c97e79945cf0f1a21de810 Mon Sep 17 00:00:00 2001 -From: Matej Tyc -Date: Tue, 22 Nov 2022 15:44:13 +0100 -Subject: [PATCH 3/3] Fix tests when relative content paths are enforced - ---- - org_fedora_oscap/content_discovery.py | 2 +- - org_fedora_oscap/service/installation.py | 7 ++++++- - tests/test_content_discovery.py | 3 ++- - tests/test_installation.py | 2 +- - tests/test_kickstart.py | 6 +++--- - tests/test_service_kickstart.py | 19 +++++++++++++++---- - 6 files changed, 28 insertions(+), 11 deletions(-) - -diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py -index 9da44e7..61c4930 100644 ---- a/org_fedora_oscap/content_discovery.py -+++ b/org_fedora_oscap/content_discovery.py -@@ -239,7 +239,7 @@ def reduce_files(self, labelled_files, expected_path, categories): - f"Expected a file {expected_path} to be part of the supplied content, " - f"but it was not the case, got only {list(labelled_files.keys())}" - ) -- raise RuntimeError(msg) -+ raise content_handling.ContentHandlingError(msg) - for path, label in labelled_files.items(): - if label in categories and not paths_are_equivalent(path, expected_path): - continue -diff --git a/org_fedora_oscap/service/installation.py b/org_fedora_oscap/service/installation.py -index f667479..5ca102c 100644 ---- a/org_fedora_oscap/service/installation.py -+++ b/org_fedora_oscap/service/installation.py -@@ -23,10 +23,11 @@ - from pyanaconda.core import util - from pyanaconda.modules.common.task import Task - from pyanaconda.modules.common.errors.installation import NonCriticalInstallationError -+from pykickstart.errors import KickstartValueError - - from org_fedora_oscap import common, data_fetch, rule_handling, utils - from org_fedora_oscap.common import _, get_packages_data, set_packages_data --from org_fedora_oscap.content_handling import ContentCheckError -+from org_fedora_oscap.content_handling import ContentCheckError, ContentHandlingError - from org_fedora_oscap import content_discovery - - log = logging.getLogger("anaconda") -@@ -48,6 +49,10 @@ def _handle_error(exception): - msg = _("There was an error fetching and loading the security content:\n" + - f"{str(exception)}") - terminate(msg) -+ elif isinstance(exception, ContentHandlingError): -+ msg = _("There was a problem with the supplied security content:\n" + -+ f"{str(exception)}") -+ terminate(msg) - - else: - msg = _("There was an unexpected problem with the supplied content.") -diff --git a/tests/test_content_discovery.py b/tests/test_content_discovery.py -index d6e14d9..d664ede 100644 ---- a/tests/test_content_discovery.py -+++ b/tests/test_content_discovery.py -@@ -3,6 +3,7 @@ - import pytest - - import org_fedora_oscap.content_discovery as tested_module -+from org_fedora_oscap import content_handling - - - @pytest.fixture -@@ -43,7 +44,7 @@ def test_reduce(labelled_files): - assert len(reduced) == len(labelled_files) - d_count - x_count + 1 - assert "dir/XCCDF" in reduced - -- with pytest.raises(RuntimeError, match="dir/datastream4"): -+ with pytest.raises(content_handling.ContentHandlingError, match="dir/datastream4"): - bringer.reduce_files(labelled_files, "dir/datastream4", ["D"]) - - reduced = bringer.reduce_files(labelled_files, "cpe", ["C"]) -diff --git a/tests/test_installation.py b/tests/test_installation.py -index 302f5ed..2cf78db 100644 ---- a/tests/test_installation.py -+++ b/tests/test_installation.py -@@ -76,7 +76,7 @@ def test_fetch_content_task(caplog, file_path, content_path): - - assert task.name == "Fetch the content, and optionally perform check or archive extraction" - -- with pytest.raises(NonCriticalInstallationError, match="Couldn't find a valid datastream"): -+ with pytest.raises(NonCriticalInstallationError, match="Expected a file"): - task.run() - - -diff --git a/tests/test_kickstart.py b/tests/test_kickstart.py -index d4cfda2..60fe63d 100644 ---- a/tests/test_kickstart.py -+++ b/tests/test_kickstart.py -@@ -163,7 +163,7 @@ def test_rpm(service): - content-url = http://example.com/oscap_content.rpm - content-type = RPM - profile = Web Server -- xccdf-path = /usr/share/oscap/xccdf.xml -+ xccdf-path = usr/share/oscap/xccdf.xml - %end - """ - check_ks_input(service, ks_in) -@@ -198,7 +198,7 @@ def test_rpm_with_wrong_suffix(service): - content-url = http://example.com/oscap_content.xml - content-type = RPM - profile = Web Server -- xccdf-path = /usr/share/oscap/xccdf.xml -+ xccdf-path = usr/share/oscap/xccdf.xml - %end - """ - check_ks_input(service, ks_in, errors=[ diff --git a/oscap-anaconda-addon-2.1.0-unified_help-PR_192.patch b/oscap-anaconda-addon-2.1.0-unified_help-PR_192.patch deleted file mode 100644 index 8f7c7b2..0000000 --- a/oscap-anaconda-addon-2.1.0-unified_help-PR_192.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3d7a943969d542392134f55078eadb0793b094dc Mon Sep 17 00:00:00 2001 -From: Vendula Poncova -Date: Wed, 22 Sep 2021 17:52:03 +0200 -Subject: [PATCH 1/2] Specify a unique screen id - -All spokes and hubs should provide a unique id. ---- - org_fedora_oscap/gui/spokes/oscap.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index fe26076..44c7ced 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -204,6 +204,11 @@ class OSCAPSpoke(NormalSpoke): - # as it is displayed inside the spoke as the spoke label, - # and spoke labels are all uppercase by a convention. - -+ @staticmethod -+ def get_screen_id(): -+ """Return a unique id of this UI screen.""" -+ return "security-policy-selection" -+ - @classmethod - def should_run(cls, environment, data): - return is_module_available(OSCAP) - -From ae9fdc9e6e189db215aeb39f2881311e5281587b Mon Sep 17 00:00:00 2001 -From: Vendula Poncova -Date: Wed, 22 Sep 2021 17:52:51 +0200 -Subject: [PATCH 2/2] Remove the help_id attribute - -The help_id attribute is no longer used. Specify a screen id -or redefine the help handler to provide the built-in help. ---- - org_fedora_oscap/gui/spokes/oscap.py | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index 44c7ced..6d0aa5c 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -185,9 +185,6 @@ class OSCAPSpoke(NormalSpoke): - # name of the .glade file in the same directory as this source - uiFile = "oscap.glade" - -- # id of the help content for this spoke -- help_id = "SecurityPolicySpoke" -- - # domain of oscap-anaconda-addon translations - translationDomain = "oscap-anaconda-addon" -